Skip to content
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

Add ability to set randomizeClientPort #624

Merged
merged 6 commits into from
Jun 11, 2022
Merged

Add ability to set randomizeClientPort #624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34be108
add ability to set randomizeClientPort
iSchluff Jun 9, 2022
3f7749c
Merge branch 'main' into feature/configure-randomize-port
kradalby Jun 11, 2022
9ff09b7
Update Changelog
kradalby Jun 11, 2022
02cc6bc
Merge branch 'main' into feature/configure-randomize-port
kradalby Jun 11, 2022
6faf2d6
Update integration dump tests
kradalby Jun 11, 2022
ab35baa
Merge branch 'main' into feature/configure-randomize-port
kradalby Jun 11, 2022
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
3 changes: 2 additions & 1 deletion api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ func (h *Headscale) getMapResponse(
DERPMap: h.DERPMap,
UserProfiles: profiles,
Debug: &tailcfg.Debug{
DisableLogTail: !h.cfg.LogTail.Enabled,
DisableLogTail: !h.cfg.LogTail.Enabled,
RandomizeClientPort: h.cfg.RandomizeClientPort,
},
}

Expand Down
1 change: 1 addition & 0 deletions cmd/headscale/headscale_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func (*Suite) TestConfigLoading(c *check.C) {
fs.FileMode(0o770),
)
c.Assert(viper.GetBool("logtail.enabled"), check.Equals, false)
c.Assert(viper.GetBool("randomize_client_port"), check.Equals, false)
}

func (*Suite) TestDNSConfigLoading(c *check.C) {
Expand Down
5 changes: 5 additions & 0 deletions config-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,8 @@ logtail:
# As there is currently no support for overriding the log server in headscale, this is
# disabled by default. Enabling this will make your clients send logs to Tailscale Inc.
enabled: false

# Enabling this option makes devices prefer a random port for WireGuard traffic over the
# default static port 41641. This option is intended as a workaround for some buggy
# firewall devices. See https://tailscale.com/kb/1181/firewalls/ for more information.
randomize_client_port: false
8 changes: 6 additions & 2 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ type Config struct {

OIDC OIDCConfig

LogTail LogTailConfig
LogTail LogTailConfig
RandomizeClientPort bool

CLI CLIConfig

Expand Down Expand Up @@ -153,6 +154,7 @@ func LoadConfig(path string) error {
viper.SetDefault("oidc.strip_email_domain", true)

viper.SetDefault("logtail.enabled", false)
viper.SetDefault("randomize_client_port", false)

if err := viper.ReadInConfig(); err != nil {
return fmt.Errorf("fatal error reading config file: %w", err)
Expand Down Expand Up @@ -385,6 +387,7 @@ func GetHeadscaleConfig() (*Config, error) {
dnsConfig, baseDomain := GetDNSConfig()
derpConfig := GetDERPConfig()
logConfig := GetLogTailConfig()
randomizeClientPort := viper.GetBool("randomize_client_port")

configuredPrefixes := viper.GetStringSlice("ip_prefixes")
parsedPrefixes := make([]netaddr.IPPrefix, 0, len(configuredPrefixes)+1)
Expand Down Expand Up @@ -490,7 +493,8 @@ func GetHeadscaleConfig() (*Config, error) {
StripEmaildomain: viper.GetBool("oidc.strip_email_domain"),
},

LogTail: logConfig,
LogTail: logConfig,
RandomizeClientPort: randomizeClientPort,

CLI: CLIConfig{
Address: viper.GetString("cli.address"),
Expand Down