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.

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

feat(server): add apikey auth method #2437

Merged
merged 1 commit into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions internal/server/middlewares/auth/apikey.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package auth

import (
"crypto/subtle"
"net/http"
)

type apiKeyMethod struct {
apiKey string
}

func newAPIKeyMethod(apiKey string) *apiKeyMethod {
return &apiKeyMethod{
apiKey: apiKey,
}
}

// equal returns true if another auth checker is equal.
// This is used to deduplicate checkers for a particular route.
func (a *apiKeyMethod) equal(other authorizationChecker) bool {
otherTokenMethod, ok := other.(*apiKeyMethod)
if !ok {
return false
}
return a.apiKey == otherTokenMethod.apiKey
}

func (a *apiKeyMethod) isAuthorized(request *http.Request) bool {
xAPIKey := request.Header.Get("X-API-Key")
if xAPIKey == "" {
xAPIKey = request.URL.Query().Get("api_key")
}
return subtle.ConstantTimeCompare([]byte(xAPIKey), []byte(a.apiKey)) == 1
}
14 changes: 13 additions & 1 deletion internal/server/middlewares/auth/configfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,24 @@ func Test_Read(t *testing.T) {
fileContent: `[[roles]]
name = "public"
auth = "none"
routes = ["GET /v1/vpn/status", "PUT /v1/vpn/status"]`,
routes = ["GET /v1/vpn/status", "PUT /v1/vpn/status"]

[[roles]]
name = "client"
auth = "apikey"
apikey = "xyz"
routes = ["GET /v1/vpn/status"]
`,
settings: Settings{
Roles: []Role{{
Name: "public",
Auth: AuthNone,
Routes: []string{"GET /v1/vpn/status", "PUT /v1/vpn/status"},
}, {
Name: "client",
Auth: AuthAPIKey,
APIKey: "xyz",
Routes: []string{"GET /v1/vpn/status"},
}},
},
},
Expand Down
2 changes: 2 additions & 0 deletions internal/server/middlewares/auth/lookup.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ func settingsToLookupMap(settings Settings) (routeToRoles map[string][]internalR
switch role.Auth {
case AuthNone:
checker = newNoneMethod()
case AuthAPIKey:
checker = newAPIKeyMethod(role.APIKey)
default:
return nil, fmt.Errorf("%w: %s", ErrMethodNotSupported, role.Auth)
}
Expand Down
14 changes: 11 additions & 3 deletions internal/server/middlewares/auth/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ func (s Settings) ToLinesNode() (node *gotree.Node) {
}

const (
AuthNone = "none"
AuthNone = "none"
AuthAPIKey = "apikey"
)

// Role contains the role name, authentication method name and
Expand All @@ -85,24 +86,31 @@ type Role struct {
// Name is the role name and is only used for documentation
// and in the authentication middleware debug logs.
Name string
// Auth is the authentication method to use, which can be 'none'.
// Auth is the authentication method to use, which can be 'none' or 'apikey'.
Auth string
// APIKey is the API key to use when using the 'apikey' authentication.
APIKey string
// Routes is a list of routes that the role can access in the format
// "HTTP_METHOD PATH", for example "GET /v1/vpn/status"
Routes []string
}

var (
ErrMethodNotSupported = errors.New("authentication method not supported")
ErrAPIKeyEmpty = errors.New("api key is empty")
ErrRouteNotSupported = errors.New("route not supported by the control server")
)

func (r Role) validate() (err error) {
err = validate.IsOneOf(r.Auth, AuthNone)
err = validate.IsOneOf(r.Auth, AuthNone, AuthAPIKey)
if err != nil {
return fmt.Errorf("%w: %s", ErrMethodNotSupported, r.Auth)
}

if r.Auth == AuthAPIKey && r.APIKey == "" {
return fmt.Errorf("for role %s: %w", r.Name, ErrAPIKeyEmpty)
}

for i, route := range r.Routes {
_, ok := validRoutes[route]
if !ok {
Expand Down
Loading