seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed logging, added test cases

pull/1836/head
greg.guydo 2024-05-14 02:13:31 +00:00
parent 6a01670385
commit b8a27c4834
2 changed files with 137 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/deploy/gateway/oauth_proxy.go
View File

@ -101,24 +101,20 @@ skip_provider_button = false
func getSecretValue(ctx *chetypes.DeployContext) string {
secret := &corev1.Secret{}
exists, err := deploy.GetNamespacedObject(ctx, ctx.CheCluster.Spec.Networking.Auth.OAuthSecret, secret)
if err != nil {
logrus.Debug(err)
}
exists, _ := deploy.GetNamespacedObject(ctx, ctx.CheCluster.Spec.Networking.Auth.OAuthSecret, secret)
if !exists {
logrus.Infof("Kubernetes secret with name '%s' not found. Assuming oAuthSecret provided is the actual secret.", ctx.CheCluster.Spec.Networking.Auth.OAuthSecret)
// Kubernetes secret provided name not found. Assuming oAuthSecret provided is the actual secret.
return ctx.CheCluster.Spec.Networking.Auth.OAuthSecret
}
// Retrieve the value associated with the key "oAuthSecret"
value, found := secret.Data["oAuthSecret"]
if !found {
logrus.Warn("Key 'oAuthSecret' not found. Assuming oAuthSecret provided is the actual secret.")
// Key 'oAuthSecret' not found. Assuming oAuthSecret provided is the actual secret.
return ctx.CheCluster.Spec.Networking.Auth.OAuthSecret
}
// Convert the byte slice to a string
logrus.Infof("Using oAuthSecret found in Kubernetes secret %s", ctx.CheCluster.Spec.Networking.Auth.OAuthSecret)
secretValue := string(value)
return secretValue
}

134
pkg/deploy/gateway/oauth_proxy_test.go
View File

@ -17,8 +17,13 @@ import (
"k8s.io/utils/pointer"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"github.com/devfile/devworkspace-operator/pkg/infrastructure"
chev2 "github.com/eclipse-che/che-operator/api/v2"
"github.com/eclipse-che/che-operator/pkg/common/constants"
"github.com/eclipse-che/che-operator/pkg/common/test"
"github.com/stretchr/testify/assert"
)
@ -63,6 +68,135 @@ func TestCookieExpireKubernetesOauthProxyConfig(t *testing.T) {
assert.Contains(t, config, "cookie_expire = \"1h1m5s\"")
}
func TestKubernetesOauthProxySecretSecretFoundWithKey(t *testing.T) {
ctx := test.GetDeployContext(
&chev2.CheCluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: "eclipse-che",
},
Spec: chev2.CheClusterSpec{
Networking: chev2.CheClusterSpecNetworking{
Auth: chev2.Auth{
OAuthSecret: "my-secret",
},
}},
},
[]runtime.Object{
&corev1.Secret{
TypeMeta: metav1.TypeMeta{
Kind: "Secret",
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "my-secret",
Namespace: "eclipse-che",
Labels: map[string]string{constants.KubernetesPartOfLabelKey: constants.CheEclipseOrg},
},
Type: corev1.SecretTypeOpaque,
Data: map[string][]byte{"oAuthSecret": []byte("my")},
},
})
ctx.CheHost = "che-site.che-domain.com"
infrastructure.InitializeForTesting(infrastructure.Kubernetes)
config := kubernetesOauthProxyConfig(ctx, "blabol")
assert.Contains(t, config, "client_secret = \"my\"")
}
func TestKubernetesOauthProxySecretSecretFoundWithWrongKey(t *testing.T) {
ctx := test.GetDeployContext(
&chev2.CheCluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: "eclipse-che",
},
Spec: chev2.CheClusterSpec{
Networking: chev2.CheClusterSpecNetworking{
Auth: chev2.Auth{
OAuthSecret: "my-secret",
},
}},
},
[]runtime.Object{
&corev1.Secret{
TypeMeta: metav1.TypeMeta{
Kind: "Secret",
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "my-secret",
Namespace: "eclipse-che",
Labels: map[string]string{constants.KubernetesPartOfLabelKey: constants.CheEclipseOrg},
},
Type: corev1.SecretTypeOpaque,
Data: map[string][]byte{"keyIsNotoAuthSecret": []byte("my")},
},
})
ctx.CheHost = "che-site.che-domain.com"
infrastructure.InitializeForTesting(infrastructure.Kubernetes)
config := kubernetesOauthProxyConfig(ctx, "blabol")
//expect interpret as literal secret
assert.Contains(t, config, "client_secret = \"my-secret\"")
}
func TestKubernetesOauthProxySecretSecretFoundWithWrongSecretName(t *testing.T) {
ctx := test.GetDeployContext(
&chev2.CheCluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: "eclipse-che",
},
Spec: chev2.CheClusterSpec{
Networking: chev2.CheClusterSpecNetworking{
Auth: chev2.Auth{
OAuthSecret: "wrong-secret-name",
},
}},
},
[]runtime.Object{
&corev1.Secret{
TypeMeta: metav1.TypeMeta{
Kind: "Secret",
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "my-secret",
Namespace: "eclipse-che",
Labels: map[string]string{constants.KubernetesPartOfLabelKey: constants.CheEclipseOrg},
},
Type: corev1.SecretTypeOpaque,
Data: map[string][]byte{"oAuthSecret": []byte("my")},
},
})
ctx.CheHost = "che-site.che-domain.com"
infrastructure.InitializeForTesting(infrastructure.Kubernetes)
config := kubernetesOauthProxyConfig(ctx, "blabol")
//expect interpret as literal secret
assert.Contains(t, config, "client_secret = \"wrong-secret-name\"")
}
func TestKubernetesOauthProxySecretLegacyPlaintextSecretName(t *testing.T) {
ctx := test.GetDeployContext(
&chev2.CheCluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: "eclipse-che",
},
Spec: chev2.CheClusterSpec{
Networking: chev2.CheClusterSpecNetworking{
Auth: chev2.Auth{
OAuthSecret: "abcdefPlainTextSecret",
},
},
},
}, nil)
ctx.CheHost = "che-site.che-domain.com"
infrastructure.InitializeForTesting(infrastructure.Kubernetes)
config := kubernetesOauthProxyConfig(ctx, "blabol")
//expect interpret as literal secret
assert.Contains(t, config, "client_secret = \"abcdefPlainTextSecret\"")
}
func TestKubernetesOauthProxyConfig(t *testing.T) {
ctx := test.GetDeployContext(
&chev2.CheCluster{