Merge pull request #28 from fosrl/dev

0.7.1

Author: miloschwartz

api/client.go

@@ -188,7 +188,7 @@ func (c *APIClient) makeRequest(method, path string, body []byte) ([]byte, *http
 		req.Header.Set("Cookie", fmt.Sprintf("%s=%s", c.sessionCookieName, c.sessionToken))
 	}
 
-	logger.Info("Making request to: %s", fullURL)
+	logger.Debug("Making request to: %s", fullURL)
 
 	resp, err := c.client.Do(req)
 	if err != nil {

auth/manager.go

@@ -475,7 +475,7 @@ func (am *AuthManager) RefreshOrganizations() error {
 	am.organizations = newOrgs
 	am.mu.Unlock()
 
-	logger.Info("Organizations refreshed successfully: %d orgs", len(newOrgs))
+	logger.Debug("Organizations refreshed successfully: %d orgs", len(newOrgs))
 	return nil
 }
 

config/config.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"unsafe"
 
@@ -17,18 +18,29 @@ const (
 	AppName            = "Pangolin"
 	DefaultHostname    = "https://app.pangolin.net"
 	ConfigFileName     = "pangolin.json"
-	LogLevel           = "debug" // Centralized log level for the application
-	DefaultPrimaryDNS  = "9.9.9.9"
+	LogLevel           = "info"
+	DefaultPrimaryDNS  = "1.1.1.1"
 	DefaultDNSOverride = true
 	DefaultDNSTunnel   = false
 )
 
-// Config represents the application configuration
+// Config represents the per-user application configuration stored under
+// %LOCALAPPDATA%\Pangolin\pangolin.json (or %APPDATA% as a fallback).
 type Config struct {
-	DNSOverride  *bool   `json:"dnsOverride,omitempty"`
-	DNSTunnel    *bool   `json:"dnsTunnel,omitempty"`
-	PrimaryDNS   *string `json:"primaryDNS,omitempty"`
-	SecondaryDNS *string `json:"secondaryDNS,omitempty"`
+	DNSOverride          *bool   `json:"dnsOverride,omitempty"`
+	DNSTunnel            *bool   `json:"dnsTunnel,omitempty"`
+	PrimaryDNS           *string `json:"primaryDNS,omitempty"`
+	SecondaryDNS         *string `json:"secondaryDNS,omitempty"`
+	DefaultServerURL     *string `json:"defaultServerURL,omitempty"`
+	UserSettingsDisabled *bool   `json:"userSettingsDisabled,omitempty"`
+	AuthPath             *string `json:"authPath,omitempty"`
+}
+
+// SystemConfig represents machine-wide configuration stored under
+// %ProgramData%\Pangolin\pangolin.json. This is used by background
+// services (manager, tunnel, etc.) and for global settings like log level.
+type SystemConfig struct {
+	LogLevel *string `json:"logLevel,omitempty"`
 }
 
 // ConfigManager manages loading and saving of application configuration
@@ -62,13 +74,21 @@ func NewConfigManager() *ConfigManager {
 	return cm
 }
 
-// GetConfig returns the current configuration
+// GetConfig returns the current configuration (do not modify; use GetConfigCopy for that)
 func (cm *ConfigManager) GetConfig() *Config {
 	cm.mu.RLock()
 	defer cm.mu.RUnlock()
 	return cm.config
 }
 
+// GetConfigCopy returns a deep copy of the current configuration.
+// Callers can modify the copy and pass it to Save to update only specific fields while preserving others.
+func (cm *ConfigManager) GetConfigCopy() *Config {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+	return cm.getConfigCopy()
+}
+
 // load loads the configuration from the file
 // Returns a default config if the file doesn't exist or can't be read
 func (cm *ConfigManager) load() *Config {
@@ -156,13 +176,13 @@ func (cm *ConfigManager) GetDNSOverride() bool {
 
 // GetDNSTunnel returns the DNS tunnel setting from config or false if not set
 func (cm *ConfigManager) GetDNSTunnel() bool {
-    cm.mu.RLock()
-    defer cm.mu.RUnlock()
+	cm.mu.RLock()
+	defer cm.mu.RUnlock()
 
-    if cm.config != nil && cm.config.DNSTunnel != nil {
-        return *cm.config.DNSTunnel
-    }
-    return DefaultDNSTunnel
+	if cm.config != nil && cm.config.DNSTunnel != nil {
+		return *cm.config.DNSTunnel
+	}
+	return DefaultDNSTunnel
 }
 
 // GetPrimaryDNS returns the primary DNS server from config or the default value
@@ -187,6 +207,80 @@ func (cm *ConfigManager) GetSecondaryDNS() string {
 	return ""
 }
 
+// GetDefaultServerURL returns the default server URL from config or empty string if not set
+func (cm *ConfigManager) GetDefaultServerURL() string {
+	cm.mu.RLock()
+	defer cm.mu.RUnlock()
+
+	if cm.config != nil && cm.config.DefaultServerURL != nil {
+		return strings.TrimSpace(*cm.config.DefaultServerURL)
+	}
+	return ""
+}
+
+// SetDefaultServerURL sets the default server URL and saves to config
+func (cm *ConfigManager) SetDefaultServerURL(value string) bool {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+
+	// Get current config and copy it to preserve all fields
+	cfg := cm.getConfigCopy()
+	value = strings.TrimSpace(value)
+	if value == "" {
+		cfg.DefaultServerURL = nil
+	} else {
+		cfg.DefaultServerURL = &value
+	}
+	return cm.save(cfg)
+}
+
+// GetUserSettingsDisabled returns whether user settings are disabled (e.g. by admin policy)
+func (cm *ConfigManager) GetUserSettingsDisabled() bool {
+	cm.mu.RLock()
+	defer cm.mu.RUnlock()
+
+	if cm.config != nil && cm.config.UserSettingsDisabled != nil {
+		return *cm.config.UserSettingsDisabled
+	}
+	return false
+}
+
+// SetUserSettingsDisabled sets whether user settings are disabled and saves to config
+func (cm *ConfigManager) SetUserSettingsDisabled(disabled bool) bool {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+
+	cfg := cm.getConfigCopy()
+	cfg.UserSettingsDisabled = &disabled
+	return cm.save(cfg)
+}
+
+// GetAuthPath returns the auth path query value for login URLs, or empty string if not set
+func (cm *ConfigManager) GetAuthPath() string {
+	cm.mu.RLock()
+	defer cm.mu.RUnlock()
+
+	if cm.config != nil && cm.config.AuthPath != nil {
+		return strings.TrimSpace(*cm.config.AuthPath)
+	}
+	return ""
+}
+
+// SetAuthPath sets the auth path and saves to config
+func (cm *ConfigManager) SetAuthPath(value string) bool {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+
+	cfg := cm.getConfigCopy()
+	value = strings.TrimSpace(value)
+	if value == "" {
+		cfg.AuthPath = nil
+	} else {
+		cfg.AuthPath = &value
+	}
+	return cm.save(cfg)
+}
+
 // SetDNSOverride sets the DNS override setting and saves to config
 func (cm *ConfigManager) SetDNSOverride(value bool) bool {
 	cm.mu.Lock()
@@ -200,13 +294,13 @@ func (cm *ConfigManager) SetDNSOverride(value bool) bool {
 
 // SetDNSTunnel sets the DNS tunnel setting and saves to config
 func (cm *ConfigManager) SetDNSTunnel(value bool) bool {
-    cm.mu.Lock()
-    defer cm.mu.Unlock()
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
 
-    // Get current config and copy it to preserve all fields
-    cfg := cm.getConfigCopy()
-    cfg.DNSTunnel = &value
-    return cm.save(cfg)
+	// Get current config and copy it to preserve all fields
+	cfg := cm.getConfigCopy()
+	cfg.DNSTunnel = &value
+	return cm.save(cfg)
 }
 
 // SetPrimaryDNS sets the primary DNS server and saves to config
@@ -235,6 +329,34 @@ func (cm *ConfigManager) SetSecondaryDNS(value string) bool {
 	return cm.save(cfg)
 }
 
+func LoadSystemConfig() *SystemConfig {
+	configPath := filepath.Join(GetProgramDataDir(), ConfigFileName)
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return &SystemConfig{}
+	}
+
+	var cfg SystemConfig
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return &SystemConfig{}
+	}
+
+	return &cfg
+}
+
+// GetSystemLogLevel returns the log level from the system config file
+func GetSystemLogLevel() string {
+	cfg := LoadSystemConfig()
+	if cfg.LogLevel != nil {
+		level := strings.TrimSpace(*cfg.LogLevel)
+		if level != "" {
+			return level
+		}
+	}
+	return LogLevel
+}
+
 // getConfigCopy creates a deep copy of the current config
 // Caller must hold the lock
 func (cm *ConfigManager) getConfigCopy() *Config {
@@ -249,9 +371,9 @@ func (cm *ConfigManager) getConfigCopy() *Config {
 		cfg.DNSOverride = &dnsOverride
 	}
 	if cm.config.DNSTunnel != nil {
-        dnsTunnel := *cm.config.DNSTunnel
-        cfg.DNSTunnel = &dnsTunnel
-    }
+		dnsTunnel := *cm.config.DNSTunnel
+		cfg.DNSTunnel = &dnsTunnel
+	}
 	if cm.config.PrimaryDNS != nil {
 		primaryDNS := *cm.config.PrimaryDNS
 		cfg.PrimaryDNS = &primaryDNS
@@ -260,6 +382,18 @@ func (cm *ConfigManager) getConfigCopy() *Config {
 		secondaryDNS := *cm.config.SecondaryDNS
 		cfg.SecondaryDNS = &secondaryDNS
 	}
+	if cm.config.DefaultServerURL != nil {
+		defaultServerURL := *cm.config.DefaultServerURL
+		cfg.DefaultServerURL = &defaultServerURL
+	}
+	if cm.config.UserSettingsDisabled != nil {
+		userSettingsDisabled := *cm.config.UserSettingsDisabled
+		cfg.UserSettingsDisabled = &userSettingsDisabled
+	}
+	if cm.config.AuthPath != nil {
+		authPath := *cm.config.AuthPath
+		cfg.AuthPath = &authPath
+	}
 	return cfg
 }
 

go.mod

@@ -4,8 +4,8 @@ go 1.25
 
 require (
 	github.com/Microsoft/go-winio v0.6.2
-	github.com/fosrl/newt v1.9.0
-	github.com/fosrl/olm v1.4.2
+	github.com/fosrl/newt v1.10.1
+	github.com/fosrl/olm v1.4.3
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/tailscale/walk v0.0.0-20251016200523-963e260a8227
 	github.com/tailscale/win v0.0.0-20250213223159-5992cb43ca35

go.sum

@@ -8,10 +8,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dblohm7/wingoes v0.0.0-20231019175336-f6e33aa7cc34 h1:FBMro26TLQwBk+n4fbTSmSf3QUKb09pvW4fz49lxpl0=
 github.com/dblohm7/wingoes v0.0.0-20231019175336-f6e33aa7cc34/go.mod h1:6NCrWM5jRefaG7iN0iMShPalLsljHWBh9v1zxM2f8Xs=
-github.com/fosrl/newt v1.9.0 h1:66eJMo6fA+YcBTbddxTfNJXNQo1WWKzmn6zPRP5kSDE=
-github.com/fosrl/newt v1.9.0/go.mod h1:d1+yYMnKqg4oLqAM9zdbjthjj2FQEVouiACjqU468ck=
-github.com/fosrl/olm v1.4.2 h1:IyMbQvWyswaSaCuRDU1WnafImcOSxtRrYaofVeFgw3s=
-github.com/fosrl/olm v1.4.2/go.mod h1:aC1oieI0tadd66zY7RDjXT3PPsR54mYS0FYMsHqFqs8=
+github.com/fosrl/newt v1.10.1 h1:3RZqYhJDDBWZHViVeDl4hWwWVJFtvFJB+wL+AF99neA=
+github.com/fosrl/newt v1.10.1/go.mod h1:d1+yYMnKqg4oLqAM9zdbjthjj2FQEVouiACjqU468ck=
+github.com/fosrl/olm v1.4.3 h1:hmAWfrJzpiwtvzw/B6xmCmeqK1OW0BJ2FUbEa7ztlmU=
+github.com/fosrl/olm v1.4.3/go.mod h1:aC1oieI0tadd66zY7RDjXT3PPsR54mYS0FYMsHqFqs8=
 github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=

logger.go

@@ -14,10 +14,10 @@ import (
 	"github.com/fosrl/newt/logger"
 )
 
-// stringToLogLevel converts a string log level to logger.LogLevel
-// Returns INFO as default if the string doesn't match any known level
+// stringToLogLevel converts a string log level to logger.LogLevel.
+// Returns INFO as default if the string doesn't match any known level.
 func stringToLogLevel(levelStr string) logger.LogLevel {
-	switch strings.ToUpper(levelStr) {
+	switch strings.ToLower(levelStr) {
 	case "debug":
 		return logger.DEBUG
 	case "info":
@@ -29,7 +29,7 @@ func stringToLogLevel(levelStr string) logger.LogLevel {
 	case "fatal":
 		return logger.FATAL
 	default:
-		return logger.DEBUG // Default to INFO if unknown
+		return logger.INFO
 	}
 }
 
@@ -38,8 +38,9 @@ func setupLogging() {
 	// Initialize the logger and set log level FIRST, before any logging calls
 	logInstance := logger.GetLogger()
 
-	// Set the log level from centralized config immediately
-	logLevel := stringToLogLevel(config.LogLevel)
+	// Resolve log level from system config file (with built-in default fallback)
+	logLevelStr := config.GetSystemLogLevel()
+	logLevel := stringToLogLevel(logLevelStr)
 	logInstance.SetLevel(logLevel)
 
 	// Create log directory if it doesn't exist
@@ -68,7 +69,7 @@ func setupLogging() {
 	// Set the custom logger output
 	logInstance.SetOutput(file)
 
-	logger.Info("Pangolin logging initialized - log file: %s, log level: %s", logFile, config.LogLevel)
+	logger.Info("Pangolin logging initialized - log file: %s, log level: %s", logFile, logLevelStr)
 }
 
 // rotateLogFile handles daily log rotation
@@ -101,8 +102,7 @@ func rotateLogFile(logDir string, logFile string) error {
 		return fmt.Errorf("failed to rotate log file: %v", err)
 	}
 
-	// Clean up old log files (keep last 30 days)
-	cleanupOldLogFiles(logDir, 30)
+	cleanupOldLogFiles(logDir, 3)
 	return nil
 }