Merge pull request #36 from fosrl/dev

0.9.0

Author: miloschwartz

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @oschwartz10612 @miloschwartz

config/config.go

@@ -22,6 +22,7 @@ const (
 	DefaultPrimaryDNS  = "1.1.1.1"
 	DefaultDNSOverride = true
 	DefaultDNSTunnel   = false
+	DefaultMTU         = 1280
 )
 
 // Config represents the per-user application configuration stored under
@@ -31,6 +32,7 @@ type Config struct {
 	DNSTunnel              *bool   `json:"dnsTunnel,omitempty"`
 	PrimaryDNS             *string `json:"primaryDNS,omitempty"`
 	SecondaryDNS           *string `json:"secondaryDNS,omitempty"`
+	MTU                    *int    `json:"mtu,omitempty"`
 	DefaultServerURL       *string `json:"defaultServerURL,omitempty"`
 	UserSettingsDisabled   *bool   `json:"userSettingsDisabled,omitempty"`
 	AuthPath               *string `json:"authPath,omitempty"`
@@ -198,6 +200,17 @@ func (cm *ConfigManager) GetSecondaryDNS() string {
 	return ""
 }
 
+// GetMTU returns the MTU from config or default if not set
+func (cm *ConfigManager) GetMTU() int {
+	cm.mu.RLock()
+	defer cm.mu.RUnlock()
+
+	if cm.config != nil && cm.config.MTU != nil && *cm.config.MTU > 0 {
+		return *cm.config.MTU
+	}
+	return DefaultMTU
+}
+
 // GetDefaultServerURL returns the default server URL from config or empty string if not set
 func (cm *ConfigManager) GetDefaultServerURL() string {
 	cm.mu.RLock()
@@ -332,6 +345,17 @@ func (cm *ConfigManager) SetSecondaryDNS(value string) bool {
 	return cm.save(cfg)
 }
 
+// SetMTU sets the MTU and saves to config
+func (cm *ConfigManager) SetMTU(value int) bool {
+	cm.mu.Lock()
+	defer cm.mu.Unlock()
+
+	// Get current config and copy it to preserve all fields
+	cfg := cm.getConfigCopy()
+	cfg.MTU = &value
+	return cm.save(cfg)
+}
+
 func LoadSystemConfig() *SystemConfig {
 	configPath := filepath.Join(GetProgramDataDir(), ConfigFileName)
 
@@ -418,6 +442,10 @@ func mergeConfig(base, override *Config) *Config {
 		v := *override.SecondaryDNS
 		merged.SecondaryDNS = &v
 	}
+	if override.MTU != nil {
+		v := *override.MTU
+		merged.MTU = &v
+	}
 	if override.DefaultServerURL != nil {
 		v := *override.DefaultServerURL
 		merged.DefaultServerURL = &v
@@ -461,6 +489,10 @@ func copyConfig(src *Config) *Config {
 		secondaryDNS := *src.SecondaryDNS
 		cfg.SecondaryDNS = &secondaryDNS
 	}
+	if src.MTU != nil {
+		mtu := *src.MTU
+		cfg.MTU = &mtu
+	}
 	if src.DefaultServerURL != nil {
 		defaultServerURL := *src.DefaultServerURL
 		cfg.DefaultServerURL = &defaultServerURL

pangolin.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="Pangolin" 
            Language="1033" 
-           Version="0.8.1" 
+           Version="0.9.0" 
            Manufacturer="Fossorial" 
            UpgradeCode="165F13D3-9A2F-4AF7-9C68-474A8256B274"
            Compressed="yes">

tunnel/manager.go

@@ -184,7 +184,7 @@ func (tm *Manager) buildConfig() (Config, error) {
 		ID:                  olmId,
 		Secret:              olmSecret,
 		UserToken:           userToken,
-		MTU:                 1280,
+		MTU:                 tm.configManager.GetMTU(),
 		Holepunch:           true,
 		PingIntervalSeconds: 5,
 		PingTimeoutSeconds:  5,
@@ -374,11 +374,11 @@ type OLMStatusError struct {
 // sessionExpiredErrorCodes are OLM/connection error codes that mean session expired or unauthorized.
 // When the connection reports one of these before fully established, we set session-expired state.
 var sessionExpiredErrorCodes = map[string]struct{}{
-	"UNAUTHORIZED":                        {},
-	"SESSION_EXPIRED":                     {},
-	"ORG_ACCESS_POLICY_SESSION_EXPIRED":   {},
-	"INVALID_USER_SESSION":                {},
-	"USER_ID_NOT_FOUND":                   {},
+	"UNAUTHORIZED":                      {},
+	"SESSION_EXPIRED":                   {},
+	"ORG_ACCESS_POLICY_SESSION_EXPIRED": {},
+	"INVALID_USER_SESSION":              {},
+	"USER_ID_NOT_FOUND":                 {},
 }
 
 // OLMStatusResponse represents the status response from OLM API

ui/preferences/preferences_tab.go

@@ -4,6 +4,7 @@ package preferences
 
 import (
 	"net"
+	"strconv"
 	"strings"
 
 	"github.com/fosrl/newt/logger"
@@ -21,11 +22,17 @@ type PreferencesTab struct {
 	dnsTunnelCheckBox   *walk.CheckBox
 	primaryDNSEdit      *walk.LineEdit
 	secondaryDNSEdit    *walk.LineEdit
+	mtuEdit             *walk.LineEdit
 	saveButton          *walk.PushButton
 	configManager       *config.ConfigManager
 	window              *PreferencesWindow
 }
 
+const (
+	minMTU = 576
+	maxMTU = 9000
+)
+
 // NewPreferencesTab creates a new preferences tab
 func NewPreferencesTab(cm *config.ConfigManager) *PreferencesTab {
 	return &PreferencesTab{
@@ -220,6 +227,49 @@ func (pt *PreferencesTab) Create(parent *walk.TabWidget) (*walk.TabPage, error)
 	// Spacer
 	walk.NewHSpacer(secondaryDNSContainer)
 
+	// Advanced section title
+	advancedSectionTitle, err := walk.NewLabel(pt.contentContainer)
+	if err != nil {
+		return nil, err
+	}
+	advancedSectionTitle.SetText("Advanced")
+	if font != nil {
+		advancedSectionTitle.SetFont(font)
+	}
+
+	// MTU section
+	mtuContainer, err := walk.NewComposite(pt.contentContainer)
+	if err != nil {
+		return nil, err
+	}
+	mtuLayout := walk.NewHBoxLayout()
+	mtuLayout.SetMargins(walk.Margins{})
+	mtuLayout.SetSpacing(12)
+	mtuContainer.SetLayout(mtuLayout)
+
+	mtuLabel, err := walk.NewLabel(mtuContainer)
+	if err != nil {
+		return nil, err
+	}
+	mtuLabel.SetText("MTU")
+	mtuLabel.SetMinMaxSize(walk.Size{Width: 200, Height: 0}, walk.Size{Width: 200, Height: 0})
+
+	if pt.mtuEdit, err = walk.NewLineEdit(mtuContainer); err != nil {
+		return nil, err
+	}
+	pt.mtuEdit.SetText(strconv.Itoa(pt.configManager.GetMTU()))
+
+	// Spacer
+	walk.NewHSpacer(mtuContainer)
+
+	mtuDescLabel, err := walk.NewLabel(pt.contentContainer)
+	if err != nil {
+		return nil, err
+	}
+	mtuDescLabel.SetText("Your sites must be configured to use the same MTU value.")
+	mtuDescLabel.SetTextColor(walk.RGB(100, 100, 100))
+	mtuDescLabel.SetMinMaxSize(walk.Size{}, walk.Size{Width: 400, Height: 0})
+
 	// Add spacer to fill remaining space
 	walk.NewVSpacer(pt.contentContainer)
 
@@ -282,6 +332,26 @@ func (pt *PreferencesTab) onSave() {
 	dnsTunnel := pt.dnsTunnelCheckBox.Checked()
 	primaryDNS := strings.TrimSpace(pt.primaryDNSEdit.Text())
 	secondaryDNS := strings.TrimSpace(pt.secondaryDNSEdit.Text())
+	mtuText := strings.TrimSpace(pt.mtuEdit.Text())
+	mtu, err := strconv.Atoi(mtuText)
+	if mtuText == "" || err != nil || mtu < minMTU || mtu > maxMTU {
+		// Restore to current config value
+		currentValue := strconv.Itoa(pt.configManager.GetMTU())
+		pt.mtuEdit.SetText(currentValue)
+		var owner walk.Form
+		if pt.window != nil {
+			owner = pt.window
+		}
+		td := walk.NewTaskDialog()
+		_, _ = td.Show(walk.TaskDialogOpts{
+			Owner:         owner,
+			Title:         "Invalid Input",
+			Content:       "MTU must be a whole number between 576 and 9000.",
+			IconSystem:    walk.TaskDialogSystemIconWarning,
+			CommonButtons: win.TDCBF_OK_BUTTON,
+		})
+		return
+	}
 
 	// Validate primary DNS (required)
 	if primaryDNS == "" {
@@ -356,9 +426,11 @@ func (pt *PreferencesTab) onSave() {
 	dnsOverrideVal := dnsOverride
 	dnsTunnelVal := dnsTunnel
 	primaryDNSVal := primaryDNS
+	mtuVal := mtu
 	cfg.DNSOverride = &dnsOverrideVal
 	cfg.DNSTunnel = &dnsTunnelVal
 	cfg.PrimaryDNS = &primaryDNSVal
+	cfg.MTU = &mtuVal
 	if secondaryDNS != "" {
 		cfg.SecondaryDNS = &secondaryDNS
 	} else {

version/version.go

@@ -3,5 +3,5 @@
 package version
 
 const (
-	Number = "0.8.1"
+	Number = "0.9.0"
 )