TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-23 18:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

linting/formatting

Browse Source
This commit is contained in:
Justin Angel 2022-01-29 14:15:33 -05:00
parent 5935b13b67
commit c98a559b4d
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app.go
View File

@ -646,19 +646,19 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
log.Warn().Msg("Listening with TLS but ServerURL does not start with https://") log.Warn().Msg("Listening with TLS but ServerURL does not start with https://")
} }
var client_auth_mode tls.ClientAuthType var clientAuthMode tls.ClientAuthType
if(h.cfg.TLSClientAuthMode == "disabled"){ if h.cfg.TLSClientAuthMode == "disabled" {
// Client cert is _not_ required. // Client cert is _not_ required.
client_auth_mode = tls.NoClientCert clientAuthMode = tls.NoClientCert
}else if (h.cfg.TLSClientAuthMode == "relaxed"){ } else if h.cfg.TLSClientAuthMode == "relaxed" {
// Client cert required, but not verified. // Client cert required, but not verified.
client_auth_mode = tls.RequireAnyClientCert clientAuthMode = tls.RequireAnyClientCert
}else if (h.cfg.TLSClientAuthMode == "enforced"){ } else if h.cfg.TLSClientAuthMode == "enforced" {
// Client cert is required and verified. // Client cert is required and verified.
client_auth_mode = tls.RequireAndVerifyClientCert clientAuthMode = tls.RequireAndVerifyClientCert
} else { } else {
return nil, errors.New( return nil, errors.New(
"Invalid tls_client_auth_mode provided: " + "Invalid tls_clientAuthMode provided: " +
h.cfg.TLSClientAuthMode) h.cfg.TLSClientAuthMode)
} }
@ -667,7 +667,7 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
h.cfg.TLSClientAuthMode)) h.cfg.TLSClientAuthMode))
tlsConfig := &tls.Config{ tlsConfig := &tls.Config{
ClientAuth: client_auth_mode, ClientAuth: clientAuthMode,
NextProtos: []string{"http/1.1"}, NextProtos: []string{"http/1.1"},
Certificates: make([]tls.Certificate, 1), Certificates: make([]tls.Certificate, 1),
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,

4
cmd/headscale/cli/utils.go
View File

@ -82,8 +82,8 @@ func LoadConfig(path string) error {
errorText += "Fatal config error: server_url must start with https:// or http://\n" errorText += "Fatal config error: server_url must start with https:// or http://\n"
} }
auth_mode := viper.GetString("tls_client_auth_mode") clientAuthMode := viper.GetString("tls_client_auth_mode")
if (auth_mode != "disabled" && auth_mode != "relaxed" && auth_mode != "enforced"){ if clientAuthMode != "disabled" && clientAuthMode != "relaxed" && clientAuthMode != "enforced" {
errorText += "Invalid tls_client_auth_mode supplied. Accepted values: disabled, relaxed, enforced." errorText += "Invalid tls_client_auth_mode supplied. Accepted values: disabled, relaxed, enforced."
} }