Iter

Author: ajanikow

integrations/authentication/v1/implementation.go

@@ -171,21 +171,12 @@ func (i *implementation) CreateToken(ctx context.Context, request *pbAuthenticat
 	// Token is validated, we can continue with creation
 	secret := cache.token
 
-<<<<<<< HEAD
-	signedToken, err := token.New(secret,
-		token.NewClaims().With(token.WithDefaultClaims(),
-			token.WithCurrentIAT(),
-			token.WithDuration(duration),
-			token.WithUsername(user),
-			token.WithRoles(request.GetRoles()...)),
-	)
-=======
 	signedToken, err := token.NewClaims().With(
 		token.WithDefaultClaims(),
 		token.WithCurrentIAT(),
 		token.WithDuration(duration),
-		token.WithUsername(user)).Sign(secret)
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
+		token.WithUsername(user),
+		token.WithRoles(request.GetRoles()...)).Sign(secret)
 	if err != nil {
 		return nil, err
 	}
@@ -248,14 +239,9 @@ func (i *implementation) Identity(ctx context.Context, _ *pbSharedV1.Empty) (*pb
 	return nil, status.Error(codes.Unauthenticated, "Unauthenticated")
 }
 
-<<<<<<< HEAD
 func (i *implementation) extractTokenDetails(cache *cache, t string) (string, []string, time.Duration, error) {
 	// Let's check if token is signed properly
-=======
-func (i *implementation) extractTokenDetails(cache *cache, t string) (string, time.Duration, error) {
-	// Token is validated, we can continue with creation
 	secret := cache.token
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
 
 	// Let's check if token is signed properly
 	p, err := secret.Validate(t)
@@ -272,7 +258,9 @@ func (i *implementation) extractTokenDetails(cache *cache, t string) (string, ti
 
 	duration := DefaultTokenMaxTTL
 
-	if v, ok := p.Claims()[token.ClaimEXP]; ok {
+	claims := p.Claims()
+
+	if v, ok := claims[token.ClaimEXP]; ok {
 		switch o := v.(type) {
 		case int64:
 			duration = time.Until(time.Unix(o, 0))
@@ -283,7 +271,7 @@ func (i *implementation) extractTokenDetails(cache *cache, t string) (string, ti
 
 	var roles []string
 
-	if v, ok := p[token.ClaimRoles]; ok {
+	if v, ok := claims[token.ClaimRoles]; ok {
 		switch o := v.(type) {
 		case []string:
 			roles = o

pkg/api/auth.go

@@ -27,10 +27,6 @@ import (
 	"fmt"
 	"time"
 
-<<<<<<< HEAD
-	jwt "github.com/golang-jwt/jwt/v5"
-=======
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -427,19 +423,12 @@ func AppendKeyfileToKeyfolder(ctx context.Context, cachedStatus inspectorInterfa
 }
 
 var (
-<<<<<<< HEAD
-	exporterTokenClaims = jwt.MapClaims{
-		token.ClaimISS: token.ClaimISSValue,
-		"server_id":    "exporter",
-		"allowed_paths": []interface{}{"/_admin/statistics", "/_admin/statistics-description",
-=======
 	exporterTokenClaimsMods = []util.ModR[token.Claims]{
 		token.WithDefaultClaims(),
 		token.WithServerID("exporter"),
 		token.WithAllowedPaths(
 			"/_admin/statistics",
 			"/_admin/statistics-description",
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
 			shared.ArangoExporterInternalEndpoint,
 			shared.ArangoExporterInternalEndpointV2,
 			shared.ArangoExporterUsageEndpoint,
@@ -504,21 +493,12 @@ func (r *Resources) ensureExporterTokenSecretCreateRequired(cachedStatus inspect
 			return true, true, errors.WithStack(err)
 		}
 
-<<<<<<< HEAD
-		token, err := token.Parse(string(data), []byte(secret))
-
-=======
 		tokenClaims, err := secret.Validate(string(data))
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
 		if err != nil {
 			return true, true, nil
 		}
 
-<<<<<<< HEAD
-		tokenClaims := jwt.MapClaims(token)
-=======
 		expectedClaims := token.NewClaims().With(exporterTokenClaimsMods...)
->>>>>>> bbaf385d5 ([Bugfix] Fix JWT Secret Tail characters)
 
 		return !equality.Semantic.DeepDerivative(tokenClaims, expectedClaims), true, nil
 	}

pkg/api/jwt.go

@@ -92,8 +92,6 @@ func ApplyModsEP1[T, P1 any](in *T, p1 P1, mods ...ModEP1[T, P1]) error {
 	return nil
 }
 
-func emptyModR[T any](z T) T { return z }
-
 type ModR[T any] func(in T) T
 
 func (m ModR[T]) Optional() ModR[T] {
@@ -106,9 +104,9 @@ func (m ModR[T]) Optional() ModR[T] {
 
 func ApplyModsR[T any](in T, mods ...ModR[T]) T {
 	for _, mod := range mods {
-		if mod != nil {
-			mod(in)
-		}
+		in = mod(in)
 	}
 	return in
 }
+
+func emptyModR[T any](z T) T { return z }