Skip to content
Snippets Groups Projects
Commit cadc97d5 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3961 OZG-4082 try with simple string as password

parent 749f145d
Branches
Tags
No related merge requests found
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
package de.ozgcloud.operator.keycloak; package de.ozgcloud.operator.keycloak;
import java.util.Base64; import java.util.Base64;
import java.util.logging.Level;
import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.Keycloak;
import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.KeycloakBuilder;
...@@ -35,7 +36,9 @@ import org.springframework.context.annotation.Scope; ...@@ -35,7 +36,9 @@ import org.springframework.context.annotation.Scope;
import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.kubernetes.client.dsl.Resource;
import lombok.extern.java.Log;
@Log
@Configuration @Configuration
public class KeycloakClient { public class KeycloakClient {
...@@ -73,6 +76,9 @@ public class KeycloakClient { ...@@ -73,6 +76,9 @@ public class KeycloakClient {
} }
String decodeBase64(String base64String) { 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);
} }
} }
...@@ -143,20 +143,25 @@ class KeycloakUserRemoteService { ...@@ -143,20 +143,25 @@ class KeycloakUserRemoteService {
return kubernetesClient.secrets().inNamespace(namespace).withName(secretName); return kubernetesClient.secrets().inNamespace(namespace).withName(secretName);
} }
private Secret buildSecret(String name) { Secret buildSecret(String name) {
var metadata = new ObjectMeta(); var metadata = new ObjectMeta();
metadata.setName(name); metadata.setName(name);
metadata.setGenerateName(name); metadata.setGenerateName(name);
metadata.setNamespace("keycloak"); metadata.setNamespace("keycloak");
metadata.setAdditionalProperty("passwordMeta", Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes()));
return new SecretBuilder() return new SecretBuilder()
.withType("Opaque") .withType("Opaque")
.withMetadata(metadata) .withMetadata(metadata)
.addToData(SECRET_PASSWORD_FIELD, Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes())) // .addToStringData(SECRET_PASSWORD_FIELD, encodeString("Y9nk43yrQ_zzIPpfFU-I"))
.addToData(SECRET_NAME_FIELD, name) .addToStringData(SECRET_PASSWORD_FIELD, "123Test")
.addToStringData(SECRET_NAME_FIELD, name)
.build(); .build();
} }
public String encodeString(String str) {
return new String(Base64.getEncoder().encodeToString(str.getBytes()));
}
private String getPassword(Resource<Secret> secret) { private String getPassword(Resource<Secret> secret) {
return secret.get().getData().get(SECRET_PASSWORD_FIELD); return secret.get().getData().get(SECRET_PASSWORD_FIELD);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment