This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 87535ed29c5751f80af05625498e010bf8fc4bb6 Author: Marat Gubaidullin <[email protected]> AuthorDate: Tue Sep 13 15:14:52 2022 -0400 Cleanup after oidc/basic auth implemetation --- .../org/apache/camel/karavan/api/AuthResource.java | 17 ------------ .../apache/camel/karavan/service/AuthService.java | 31 ---------------------- .../src/main/resources/application.properties | 2 +- 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java index 60300fe..d7ff213 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java @@ -19,14 +19,9 @@ package org.apache.camel.karavan.api; import org.apache.camel.karavan.service.AuthService; import javax.inject.Inject; -import javax.ws.rs.Consumes; import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -36,18 +31,6 @@ public class AuthResource { @Inject AuthService authService; - @POST - @Path("/auth") - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - public Response auth(@HeaderParam("Authorization") String basicAuth, @Context HttpHeaders headers) throws Exception { - if (authService.login(basicAuth)){ - return Response.ok().build(); - } else { - return Response.status(Response.Status.UNAUTHORIZED).build(); - } - } - @GET @Path("/auth") @Produces(MediaType.TEXT_PLAIN) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java index 400e4f4..56c378a 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java @@ -16,10 +16,7 @@ */ package org.apache.camel.karavan.service; -import io.fabric8.kubernetes.api.model.Secret; -import io.smallrye.mutiny.tuples.Tuple2; import io.vertx.core.Vertx; -import org.apache.camel.karavan.model.GitConfig; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; @@ -27,41 +24,13 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Base64; import java.util.Map; @ApplicationScoped public class AuthService { - @Inject - Vertx vertx; - - @Inject - KubernetesService kubernetesService; - private static final Logger LOGGER = Logger.getLogger(AuthService.class.getName()); - private Tuple2<String, String> getMasterConfig() { - if (kubernetesService.inKubernetes()){ - Secret secret = kubernetesService.getKaravanSecret(); - String username = new String(Base64.getDecoder().decode(secret.getData().get("master-username").getBytes(StandardCharsets.UTF_8))); - String password = new String(Base64.getDecoder().decode(secret.getData().get("master-password").getBytes(StandardCharsets.UTF_8))); - return Tuple2.of(username, password); - } else { - String username = ConfigProvider.getConfig().getValue("karavan.master-username", String.class); - String password = ConfigProvider.getConfig().getValue("karavan.master-password", String.class); - return Tuple2.of(username, password); - } - } - - public boolean login(String basicAuth) { - Tuple2<String, String> master = getMasterConfig(); - String secretToken = new String(Base64.getEncoder().encode((master.getItem1() + ":" + master.getItem2()).getBytes())); - String auth = "Basic " + secretToken; - return auth.equals(basicAuth); - } - public String authType() { return ConfigProvider.getConfig().getValue("karavan.auth", String.class); } diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties index 4114c1d..284d4b3 100644 --- a/karavan-app/src/main/resources/application.properties +++ b/karavan-app/src/main/resources/application.properties @@ -100,7 +100,7 @@ quarkus.keycloak.devservices.enabled=false %basic.quarkus.kubernetes.env.mapping.master-password.from-secret=karavan %basic.quarkus.kubernetes.env.mapping.master-password.with-key=master-password %basic.quarkus.security.users.embedded.plain-text=true -%basic.quarkus.security.users.embedded.users.admin=karavan +%basic.quarkus.security.users.embedded.users.admin=${master-password} %basic.quarkus.security.users.embedded.roles.admin=administrator,developer # Quarkus configuration
