From cadc97d59cfc070e987f61df93fd1ae23e18593e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 21 Jul 2023 15:51:18 +0200
Subject: [PATCH] OZG-3961 OZG-4082 try with simple string as password
---
.../ozgcloud/operator/keycloak/KeycloakClient.java | 8 +++++++-
.../keycloak/user/KeycloakUserRemoteService.java | 13 +++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
index 8a92e32..c20d684 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
@@ -24,6 +24,7 @@
package de.ozgcloud.operator.keycloak;
import java.util.Base64;
+import java.util.logging.Level;
import org.keycloak.admin.client.Keycloak;
import org.keycloak.admin.client.KeycloakBuilder;
@@ -35,7 +36,9 @@ import org.springframework.context.annotation.Scope;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.Resource;
+import lombok.extern.java.Log;
+@Log
@Configuration
public class KeycloakClient {
@@ -73,6 +76,9 @@ public class KeycloakClient {
}
String decodeBase64(String base64String) {
- return new String(Base64.getDecoder().decode(base64String));
+ log.log(Level.INFO, "base64String to decode: " + base64String);
+ var decoded = Base64.getDecoder().decode(base64String);
+ log.log(Level.INFO, "decoded string: " + decoded);
+ return new String(decoded);
}
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
index edb1b79..48966b2 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
@@ -143,20 +143,25 @@ class KeycloakUserRemoteService {
return kubernetesClient.secrets().inNamespace(namespace).withName(secretName);
}
- private Secret buildSecret(String name) {
+ Secret buildSecret(String name) {
var metadata = new ObjectMeta();
metadata.setName(name);
metadata.setGenerateName(name);
metadata.setNamespace("keycloak");
- metadata.setAdditionalProperty("passwordMeta", Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes()));
+
return new SecretBuilder()
.withType("Opaque")
.withMetadata(metadata)
- .addToData(SECRET_PASSWORD_FIELD, Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes()))
- .addToData(SECRET_NAME_FIELD, name)
+// .addToStringData(SECRET_PASSWORD_FIELD, encodeString("Y9nk43yrQ_zzIPpfFU-I"))
+ .addToStringData(SECRET_PASSWORD_FIELD, "123Test")
+ .addToStringData(SECRET_NAME_FIELD, name)
.build();
}
+ public String encodeString(String str) {
+ return new String(Base64.getEncoder().encodeToString(str.getBytes()));
+ }
+
private String getPassword(Resource<Secret> secret) {
return secret.get().getData().get(SECRET_PASSWORD_FIELD);
}
--
GitLab