Skip to content

[1.14] fix CVE namespace-isolation break CVE-13484 #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged

[1.14] fix CVE namespace-isolation break CVE-13484 #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions controllers/argocd_metrics_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,23 @@ func (r *ArgoCDMetricsReconciler) Reconcile(ctx context.Context, request reconci
}

const clusterMonitoringLabel = "openshift.io/cluster-monitoring"
labelVal, exists := namespace.Labels[clusterMonitoringLabel]
const userDefinedMonitoringLabel = "openshift.io/user-monitoring"
var labelVal, monitoringLabel string
var exists bool
if strings.HasPrefix(namespace.Name, "openshift-") {
labelVal, exists = namespace.Labels[clusterMonitoringLabel]
monitoringLabel = clusterMonitoringLabel
} else {
labelVal, exists = namespace.Labels[userDefinedMonitoringLabel]
monitoringLabel = userDefinedMonitoringLabel
}

if argocd.Spec.Monitoring.DisableMetrics == nil || !*argocd.Spec.Monitoring.DisableMetrics {
if !exists || labelVal != "true" {
if namespace.Labels == nil {
namespace.Labels = make(map[string]string)
}
namespace.Labels[clusterMonitoringLabel] = "true"
namespace.Labels[monitoringLabel] = "true"
err = r.Client.Update(ctx, &namespace)
if err != nil {
reqLogger.Error(err, "Error updating namespace",
Expand Down Expand Up @@ -178,7 +187,7 @@ func (r *ArgoCDMetricsReconciler) Reconcile(ctx context.Context, request reconci
}
} else {
if exists {
namespace.Labels[clusterMonitoringLabel] = "false"
namespace.Labels[monitoringLabel] = "false"
err = r.Client.Update(ctx, &namespace)
if err != nil {
reqLogger.Error(err, "Error updating namespace",
Expand Down
17 changes: 10 additions & 7 deletions controllers/argocd_metrics_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,19 @@ func newMetricsReconciler(t *testing.T, namespace, name string, disableMetrics *

func TestReconcile_add_namespace_label(t *testing.T) {
testCases := []struct {
instanceName string
namespace string
instanceName string
namespace string
expectedLabel string
}{
{
instanceName: argoCDInstanceName,
namespace: "openshift-gitops",
instanceName: argoCDInstanceName,
namespace: "openshift-gitops",
expectedLabel: "openshift.io/cluster-monitoring",
},
{
instanceName: "instance-two",
namespace: "namespace-two",
instanceName: "instance-two",
namespace: "namespace-two",
expectedLabel: "openshift.io/user-monitoring",
},
}
for _, tc := range testCases {
Expand All @@ -101,7 +104,7 @@ func TestReconcile_add_namespace_label(t *testing.T) {
ns := corev1.Namespace{}
err = r.Client.Get(context.TODO(), types.NamespacedName{Name: tc.namespace}, &ns)
assert.NilError(t, err)
value := ns.Labels["openshift.io/cluster-monitoring"]
value := ns.Labels[tc.expectedLabel]
assert.Equal(t, value, "true")
}
}
Expand Down