avoid tenancy checks in the queues

Author: pitabwire

queue/publisher.go

@@ -51,8 +51,6 @@ func (p *publisher) Publish(ctx context.Context, payload any, headers ...map[str
 		metadata = localization.ToMap(metadata, language)
 	}
 
-	metadata = security.SkipTenancyChecksToMap(ctx, metadata)
-
 	message, err := internal.Marshal(payload)
 	if err != nil {
 		return err

queue/subscriber.go

@@ -218,7 +218,7 @@ func (s *subscriber) processReceivedMessage(ctx context.Context, msg *pubsub.Mes
 
 		var metadata propagation.MapCarrier = msg.Metadata
 
-		pCtx := security.SkipTenancyChecksFromMap(jobCtx, metadata)
+		pCtx := security.SkipTenancyChecksOnClaims(jobCtx)
 
 		authClaim := security.ClaimsFromMap(metadata)
 		if authClaim != nil {

security/security_claims.go

@@ -242,22 +242,6 @@ func SkipTenancyChecksOnClaims(ctx context.Context) context.Context {
 	return context.WithValue(ctx, ctxKeySkipTenancyCheckOnClaim, true)
 }
 
-func SkipTenancyChecksFromMap(ctx context.Context, m map[string]string) context.Context {
-	check, ok := m["skip_tenancy_check"]
-	if ok && check == "true" {
-		return SkipTenancyChecksOnClaims(ctx)
-	}
-
-	return ctx
-}
-
-func SkipTenancyChecksToMap(ctx context.Context, m map[string]string) map[string]string {
-	if !IsTenancyChecksOnClaimSkipped(ctx) {
-		m["skip_tenancy_check"] = "true"
-	}
-	return m
-}
-
 func IsTenancyChecksOnClaimSkipped(ctx context.Context) bool {
 	isSkipped, ok := ctx.Value(ctxKeySkipTenancyCheckOnClaim).(bool)
 	if !ok {

security/security_claims_test.go

@@ -254,85 +254,6 @@ func (s *AuthenticationTestSuite) TestTenancySkipFunctions() {
 		setup       func(context.Context, map[string]string) (context.Context, map[string]string)
 		checkResult func(*testing.T, context.Context, map[string]string)
 	}{
-		{
-			name: "SkipTenancyChecksFromMap with skip_tenancy_check=true should set skip flag",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m["skip_tenancy_check"] = "true"
-				ctx = security.SkipTenancyChecksFromMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, _ map[string]string) {
-				require.True(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should be skipped")
-			},
-		},
-		{
-			name: "SkipTenancyChecksFromMap with skip_tenancy_check=false should not set skip flag",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m["skip_tenancy_check"] = "false"
-				ctx = security.SkipTenancyChecksFromMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, _ map[string]string) {
-				require.False(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should not be skipped")
-			},
-		},
-		{
-			name: "SkipTenancyChecksFromMap without skip_tenancy_check should not set skip flag",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				ctx = security.SkipTenancyChecksFromMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, _ map[string]string) {
-				require.False(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should not be skipped")
-			},
-		},
-		{
-			name: "SkipTenancyChecksFromMap with other values should not set skip flag",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m["skip_tenancy_check"] = "maybe"
-				m["other_key"] = "value"
-				ctx = security.SkipTenancyChecksFromMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, _ map[string]string) {
-				require.False(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should not be skipped")
-			},
-		},
-		{
-			name: "SkipTenancyChecksToMap with skip flag should not set skip_tenancy_check in map",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				ctx = security.SkipTenancyChecksOnClaims(ctx)
-				m = security.SkipTenancyChecksToMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, m map[string]string) {
-				require.True(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should be skipped")
-				require.NotContains(t, m, "skip_tenancy_check", "map should not contain skip_tenancy_check key")
-			},
-		},
-		{
-			name: "SkipTenancyChecksToMap without skip flag should set skip_tenancy_check=true in map",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m = security.SkipTenancyChecksToMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, ctx context.Context, m map[string]string) {
-				require.False(t, security.IsTenancyChecksOnClaimSkipped(ctx), "tenancy checks should not be skipped")
-				require.Equal(t, "true", m["skip_tenancy_check"], "map should contain skip_tenancy_check=true")
-			},
-		},
-		{
-			name: "SkipTenancyChecksToMap preserves existing map values",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m["existing_key"] = "existing_value"
-				m = security.SkipTenancyChecksToMap(ctx, m)
-				return ctx, m
-			},
-			checkResult: func(t *testing.T, _ context.Context, m map[string]string) {
-				require.Equal(t, "existing_value", m["existing_key"], "existing map values should be preserved")
-				require.Equal(t, "true", m["skip_tenancy_check"], "skip_tenancy_check should be set to true")
-			},
-		},
 		{
 			name: "IsTenancyChecksOnClaimSkipped with skip flag returns true",
 			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
@@ -384,26 +305,6 @@ func (s *AuthenticationTestSuite) TestTenancySkipFunctions() {
 				)
 			},
 		},
-		{
-			name: "Round trip: FromMap -> ToMap preserves skip state",
-			setup: func(ctx context.Context, m map[string]string) (context.Context, map[string]string) {
-				m["skip_tenancy_check"] = "true"
-				ctx = security.SkipTenancyChecksFromMap(ctx, m)
-				// Clear the original map and recreate it
-				newMap := make(map[string]string)
-				newMap = security.SkipTenancyChecksToMap(ctx, newMap)
-				return ctx, newMap
-			},
-			checkResult: func(t *testing.T, ctx context.Context, m map[string]string) {
-				require.True(t, security.IsTenancyChecksOnClaimSkipped(ctx), "context should have skip flag")
-				require.NotContains(
-					t,
-					m,
-					"skip_tenancy_check",
-					"map should not contain skip_tenancy_check when context has skip flag",
-				)
-			},
-		},
 	}
 
 	for _, tc := range testCases {