blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up authentication routine

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-15 11:29:48 +01:00
parent 58619ea6db
commit beda64d7c0
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/flamenco-manager-poc/main.go
View File

@ -99,7 +99,7 @@ func buildWebService(flamenco api.ServerInterface, persist api_impl.PersistenceS
&oapi_middle.Options{ &oapi_middle.Options{
Options: openapi3filter.Options{ Options: openapi3filter.Options{
AuthenticationFunc: func(ctx context.Context, authInfo *openapi3filter.AuthenticationInput) error { AuthenticationFunc: func(ctx context.Context, authInfo *openapi3filter.AuthenticationInput) error {
return api_impl.WorkerAuth(ctx, authInfo, persist) return authenticator(ctx, authInfo, persist)
}, },
}, },
@ -129,27 +129,12 @@ func buildWebService(flamenco api.ServerInterface, persist api_impl.PersistenceS
return e return e
} }
func authenticator(ctx context.Context, authInfo *openapi3filter.AuthenticationInput) error { func authenticator(ctx context.Context, authInfo *openapi3filter.AuthenticationInput, persist api_impl.PersistenceService) error {
switch authInfo.SecuritySchemeName { switch authInfo.SecuritySchemeName {
case "worker_auth": case "worker_auth":
return workerAuth(ctx, authInfo) return api_impl.WorkerAuth(ctx, authInfo, persist)
default: default:
log.Warn().Str("scheme", authInfo.SecuritySchemeName).Msg("unknown security scheme") log.Warn().Str("scheme", authInfo.SecuritySchemeName).Msg("unknown security scheme")
return errors.New("unknown security scheme") return errors.New("unknown security scheme")
} }
} }
func workerAuth(ctx context.Context, authInfo *openapi3filter.AuthenticationInput) error {
echo := ctx.Value(oapi_middle.EchoContextKey).(echo.Context)
req := echo.Request()
u, p, ok := req.BasicAuth()
// TODO: stop logging passwords.
log.Debug().Interface("scheme", authInfo.SecuritySchemeName).Str("user", u).Str("password", p).Msg("authenticator")
if !ok {
return authInfo.NewError(errors.New("no auth header found"))
}
// TODO: check username/password against worker database.
return nil
}