mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-20 19:09:07 +01:00
linting again
This commit is contained in:
parent
9de5c7f8b8
commit
da5250ea32
3
app.go
3
app.go
@ -658,7 +658,6 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
|
||||
}
|
||||
|
||||
clientAuthMode, err := h.GetClientAuthMode()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -683,7 +682,6 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
|
||||
// Look up the TLS constant relative to user-supplied TLS client
|
||||
// authentication mode.
|
||||
func (h *Headscale) GetClientAuthMode() (tls.ClientAuthType, error) {
|
||||
|
||||
switch h.cfg.TLSClientAuthMode {
|
||||
case DisabledClientAuth:
|
||||
// Client cert is _not_ required.
|
||||
@ -698,7 +696,6 @@ func (h *Headscale) GetClientAuthMode() (tls.ClientAuthType, error) {
|
||||
return tls.NoClientCert, Error("Invalid tls_client_auth_mode provided: " +
|
||||
h.cfg.TLSClientAuthMode)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (h *Headscale) setLastStateChangeToNow(namespace string) {
|
||||
|
11
app_test.go
11
app_test.go
@ -66,22 +66,19 @@ func (s *Suite) ResetDB(c *check.C) {
|
||||
|
||||
// Enusre an error is returned when an invalid auth mode
|
||||
// is supplied.
|
||||
func (s *Suite) TestInvalidClientAuthMode(c *check.C){
|
||||
func (s *Suite) TestInvalidClientAuthMode(c *check.C) {
|
||||
app.cfg.TLSClientAuthMode = "invalid"
|
||||
_, err := app.GetClientAuthMode()
|
||||
c.Assert(err, check.NotNil)
|
||||
}
|
||||
|
||||
// Ensure that all client auth modes return a nil error
|
||||
func (s *Suite) TestAuthModes(c *check.C){
|
||||
|
||||
var modes = []string{"disabled", "relaxed", "enforced"}
|
||||
// Ensure that all client auth modes return a nil error.
|
||||
func (s *Suite) TestAuthModes(c *check.C) {
|
||||
modes := []string{"disabled", "relaxed", "enforced"}
|
||||
|
||||
for _, v := range modes {
|
||||
app.cfg.TLSClientAuthMode = v
|
||||
_, err := app.GetClientAuthMode()
|
||||
c.Assert(err, check.IsNil)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user