marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: reduces information returned by settings api when accessed anonymously (#25346)

Browse Source 
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
This commit is contained in:
Papapetrou Patroklos
2025-11-20 14:07:34 +02:00
committed by GitHub
parent 8373059176
commit b7dbff80b2
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/settings/settings.go
View File

@@ -99,7 +99,6 @@ func (s *Server) Get(ctx context.Context, _ *settingspkg.SettingsQuery) (*settin
URL: argoCDSettings.URL,
AdditionalURLs: argoCDSettings.AdditionalURLs,
AppLabelKey: appInstanceLabelKey,
ResourceOverrides: overrides,
StatusBadgeEnabled: argoCDSettings.StatusBadgeEnabled,
StatusBadgeRootUrl: argoCDSettings.StatusBadgeRootUrl,
KustomizeOptions: &v1alpha1.KustomizeOptions{
@@ -132,6 +131,7 @@ func (s *Server) Get(ctx context.Context, _ *settingspkg.SettingsQuery) (*settin
set.UiBannerPermanent = argoCDSettings.UiBannerPermanent
set.UiBannerPosition = argoCDSettings.UiBannerPosition
set.ControllerNamespace = s.mgr.GetNamespace()
set.ResourceOverrides = overrides
}
if sessionmgr.LoggedIn(ctx) {
set.PasswordPattern = argoCDSettings.PasswordPattern

37
server/settings/settings_test.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"testing"
"github.com/golang-jwt/jwt/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
@@ -14,7 +15,20 @@ import (
"github.com/argoproj/argo-cd/v3/util/settings"
)
const testNamespace = "default"
const (
testNamespace = "default"
resourceOverrides = `{
"jsonPointers": [
""
],
"jqPathExpressions": [
""
],
"managedFieldsManagers": [
""
]
}`
)
func fixtures(ctx context.Context, data map[string]string) (*fake.Clientset, *settings.SettingsManager) {
kubeClient := fake.NewClientset(&corev1.ConfigMap{
@@ -79,4 +93,25 @@ func TestSettingsServer(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, "instance", resp.AppLabelKey)
})
t.Run("TestGetResourceOverridesNotLoggedIn", func(t *testing.T) {
settingsServer := newServer(map[string]string{
"resource.customizations.ignoreResourceUpdates.all": resourceOverrides,
})
resp, err := settingsServer.Get(t.Context(), nil)
require.NoError(t, err)
assert.Nil(t, resp.ResourceOverrides)
})
t.Run("TestGetResourceOverridesLoggedIn", func(t *testing.T) {
//nolint:staticcheck // it's ok to use built-in type string as key for value for testing purposes
loggedInContext := context.WithValue(t.Context(), "claims", &jwt.MapClaims{"iss": "qux", "sub": "foo", "email": "bar", "groups": []string{"baz"}})
settingsServer := newServer(map[string]string{
"resource.customizations.ignoreResourceUpdates.all": resourceOverrides,
})
resp, err := settingsServer.Get(loggedInContext, nil)
require.NoError(t, err)
assert.NotNil(t, resp.ResourceOverrides)
assert.NotEmpty(t, resp.ResourceOverrides["*/*"])
})
}