Skip to content

Resolve bare WGConfig filenames relative to parent config directory. #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve bare WGConfig filenames relative to parent config directory. #204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"errors"
"net"
"os"
"path/filepath"
"strings"

"github.com/go-ini/ini"
Expand Down Expand Up @@ -540,7 +541,14 @@ func ParseConfig(path string) (*Configuration, error) {
wgConf, err := root.GetKey("WGConfig")
wgCfg := cfg
if err == nil {
wgCfg, err = ini.LoadSources(iniOpt, wgConf.String())
wgPath := wgConf.String()
// A bare filename (no path separators) is resolved relative to the
// directory of the parent config file, so the wg config can sit
// alongside the wireproxy config without needing a full path.
if filepath.Base(wgPath) == wgPath {
wgPath = filepath.Join(filepath.Dir(path), wgPath)
}
wgCfg, err = ini.LoadSources(iniOpt, wgPath)
if err != nil {
return nil, err
}
Expand Down
Loading