Add maut (#468)

Co-authored-by: Jonas Plum <git@jonasplum.de>

cmd/cmd.go

@@ -6,13 +6,12 @@ import (
 	"github.com/alecthomas/kong"
 	kongyaml "github.com/alecthomas/kong-yaml"
 	"github.com/coreos/go-oidc/v3/oidc"
+	maut "github.com/jonas-plum/maut/auth"
 	"golang.org/x/exp/slices"
 	"golang.org/x/oauth2"
 
 	"github.com/SecurityBrewery/catalyst"
-	"github.com/SecurityBrewery/catalyst/auth"
 	"github.com/SecurityBrewery/catalyst/database"
-	"github.com/SecurityBrewery/catalyst/role"
 	"github.com/SecurityBrewery/catalyst/storage"
 )
 
@@ -73,10 +72,6 @@ func ParseCatalystConfig() (*catalyst.Config, error) {
 }
 
 func MapConfig(cli CLI) (*catalyst.Config, error) {
-	roles := role.Explode(role.Analyst)
-	roles = append(roles, role.Explodes(cli.AuthDefaultRoles)...)
-	roles = role.Explodes(role.Strings(roles))
-
 	scopes := slices.Compact(append([]string{oidc.ScopeOpenID, "profile", "email"}, cli.OIDCScopes...))
 	config := &catalyst.Config{
 		IndexPath: cli.IndexPath,
@@ -87,32 +82,34 @@ func MapConfig(cli CLI) (*catalyst.Config, error) {
 			Password: cli.ArangoDBPassword,
 		},
 		Storage:         &storage.Config{Host: cli.S3Host, User: cli.S3User, Password: cli.S3Password},
-		Secret:          []byte(cli.Secret),
 		ExternalAddress: cli.ExternalAddress,
 		InternalAddress: cli.CatalystAddress,
 		Port:            cli.Port,
-		Auth: &auth.Config{
+		Auth: &maut.Config{
+			CookieSecret:     []byte(cli.Secret),
 			SimpleAuthEnable: false, // cli.SimpleAuthEnable,
 			APIKeyAuthEnable: cli.APIKeyAuthEnable,
 			OIDCAuthEnable:   cli.OIDCEnable,
-			OIDCIssuer:       cli.OIDCIssuer,
-			AuthURL:          cli.AuthURL,
+			// InitialUser:      "",
+			// InitialPassword:  "",
+			InitialAPIKey: cli.InitialAPIKey,
+			OIDCIssuer:    cli.OIDCIssuer,
+			AuthURL:       cli.AuthURL,
 			OAuth2: &oauth2.Config{
 				ClientID:     cli.OIDCClientID,
 				ClientSecret: cli.OIDCClientSecret,
 				RedirectURL:  cli.ExternalAddress + "/auth/callback",
 				Scopes:       scopes,
 			},
-			UserCreateConfig: &auth.UserCreateConfig{
+			UserCreateConfig: &maut.UserCreateConfig{
 				AuthBlockNew:      cli.AuthBlockNew,
-				AuthDefaultRoles:  roles,
+				AuthDefaultRoles:  cli.AuthDefaultRoles,
 				AuthAdminUsers:    cli.AuthAdminUsers,
 				OIDCClaimUsername: cli.OIDCClaimUsername,
 				OIDCClaimEmail:    cli.OIDCClaimEmail,
 				OIDCClaimName:     cli.OIDCClaimName,
 			},
 		},
-		InitialAPIKey: cli.InitialAPIKey,
 	}
 
 	return config, nil