From 7f5e466f681b2a197456a2cd601e980751b87e90 Mon Sep 17 00:00:00 2001
From: jerrypan <Jerrypan44@gmail.com>
Date: Fri, 25 Oct 2019 04:35:57 -0700
Subject: [PATCH] making username pass for galaxy baseauth parametrized
---
build.sh | 4 ++--
docker/config/application.tmpl | 5 +++--
.../java/eu/hbp/mip/controllers/RequestsApi.java | 4 ++--
src/main/java/eu/hbp/mip/utils/JWTUtil.java | 15 ++++++++-------
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/build.sh b/build.sh
index 48250ac9f..c9c1ff791 100755
--- a/build.sh
+++ b/build.sh
@@ -35,10 +35,10 @@ docker build --build-arg BUILD_DATE=$(date -Iseconds) \
--build-arg VERSION=$VERSION \
--tag "$IMAGE:latest" \
--tag "$IMAGE:$VERSION" \
- --tag jerrypan44/portal_backend:latest \
+ --tag jerrypan44/portal-backend:latest \
.
-docker push jerrypan44/portal_backend:latest
+docker push jerrypan44/portal-backend:latest
BUGSNAG_KEY=""
eval $(grep -e "^\\s*BUGSNAG_KEY" Dockerfile | tr '\\' ' ')
diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl
index b3fb351fe..5f2f72a3e 100644
--- a/docker/config/application.tmpl
+++ b/docker/config/application.tmpl
@@ -95,5 +95,6 @@ services:
jwtSecret: {{ default .Env.JWT_SECRET "secret" }}
workflowAuthorization: {{ default .Env.WORKFLOW_AUTHORIZATION "undefined" }}
galaxy:
- galaxyUsername: {{ default .Env.GALAXY_USERNAME admin }}
- galaxyPassword: {{ default .Env.GALAXY_PASSWORD admin }}
+ galaxyUsername: {{ default .Env.GALAXY_USERNAME "admin" }}
+ galaxyPassword: {{ default .Env.GALAXY_PASSWORD "admin" }}
+
diff --git a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
index 3a06a26fe..777eac0c5 100644
--- a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
@@ -123,10 +123,10 @@ public class RequestsApi {
}
@Value("#{'${services.galaxy.galaxyUsername:admin}'}")
- private boolean galaxyUsername;
+ private String galaxyUsername;
@Value("#{'${services.galaxy.galaxyPassword:admin}'}")
- private boolean galaxyPassword;
+ private String galaxyPassword;
/**
* Get Galaxy Reverse Proxy basic access token.
diff --git a/src/main/java/eu/hbp/mip/utils/JWTUtil.java b/src/main/java/eu/hbp/mip/utils/JWTUtil.java
index 1e7484184..48ed615e9 100644
--- a/src/main/java/eu/hbp/mip/utils/JWTUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/JWTUtil.java
@@ -2,18 +2,19 @@ package eu.hbp.mip.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.JWT;
+//import com.auth0.jwt.algorithms.Algorithm;
+//import com.auth0.jwt.JWT;
public class JWTUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(JWT.class);
+ //private static final Logger LOGGER = LoggerFactory.getLogger(JWT.class);
public static String getJWT(String secret, String subject) {
- LOGGER.info("getJWT");
- Algorithm algorithm = Algorithm.HMAC512(secret);
- String token = JWT.create().withIssuer("mip.humanbrainproject.eu").withSubject(subject).sign(algorithm);
+ //LOGGER.info("getJWT");
+// Algorithm algorithm = Algorithm.HMAC512(secret);
+// String token = JWT.create().withIssuer("mip.humanbrainproject.eu").withSubject(subject).sign(algorithm);
- return token;
+// return token;
+ return "";
}
}
\ No newline at end of file
--
GitLab