diff --git a/README.md b/README.md index d09fe4063dcbd96c6626804679b5bd7464425293..1ce9d02f2d3b4c0c57fc9fef9a13f4a68be28b4e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ Configure security: | **OIDC_CLIENT** | client-id of a Relying party | | **OIDC_SECRET** | secret of of the client | | **AUTHZ_DB_URL** | DB where a table with authorization info ('groups' column) can be found | -| **AUTHZ_DB_SCHEMA** | schema of the authorization table | | **AUTHZ_DB_USERNAME** | user in the DB with authorization table | | **AUTHZ_DB_PASSWORD** | password for the DB-user | diff --git a/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java b/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java index 4b3b9822574f72b40dae711ea7a678fe05f0f6cd..0ff97a10c8f988a69fa552736da39b19bf797d05 100644 --- a/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java +++ b/data-access/servlet/src/main/java/auth/authz/webapi/AuthZSettings.java @@ -14,17 +14,15 @@ class AuthZSettings public static class DBConn { private String uri; - private String schema; private String user_name; private String password; public String toString() { - return uri() + " [" + schema + "] " + user_name + " / " + password + " "; + return uri() + " " + user_name; } public String uri() { return uri; } - public String schema() { return schema; } public String userName() { return user_name; } public String password() { return password; } } @@ -78,7 +76,6 @@ class AuthZSettings DBConn dbconn = new AuthZSettings.DBConn(); dbconn.uri = properties.getProperty("db_uri", "").strip(); - dbconn.schema = properties.getProperty("db_schema", "").strip(); dbconn.user_name = properties.getProperty("db_user_name", "").strip(); dbconn.password = properties.getProperty("db_password", "").strip(); return dbconn; diff --git a/data-access/servlet/src/main/java/common/webapi/Settings.java b/data-access/servlet/src/main/java/common/webapi/Settings.java index c56dc955dfbaecff0422d57016b5fa07658a44b3..3d391830373b4707d775bccac0fa00c6f049ab07 100644 --- a/data-access/servlet/src/main/java/common/webapi/Settings.java +++ b/data-access/servlet/src/main/java/common/webapi/Settings.java @@ -37,13 +37,12 @@ class Settings public static class DBConn { private String uri; - private String schema; private String user_name; private String password; public String toString() { - return uri() + " [" + schema + "] " + user_name + " / " + password + " "; + return uri() + " " + user_name; } public boolean isDbUriEmpty() @@ -52,7 +51,6 @@ class Settings } public String uri() { return uri; } - public String schema() { return schema; } public String userName() { return user_name; } public String password() { return password; } } @@ -144,7 +142,6 @@ class Settings { DBConn dbconn = new Settings.DBConn(); dbconn.uri = properties.getProperty("db_uri", "").strip(); - dbconn.schema = properties.getProperty("db_schema", "").strip(); dbconn.user_name = properties.getProperty("db_user_name", "").strip(); dbconn.password = properties.getProperty("db_password", "").strip(); return dbconn; diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index 8fe766512e02dc1fa4213cb281ac5d2c483b5050..a5ea7c284d58ec8302c45596d372ba6594718296 100644 --- a/docker/Dockerfile.soda +++ b/docker/Dockerfile.soda @@ -61,7 +61,7 @@ COPY deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml # enable IA2 token filter update RUN chmod -R a+rwX ${WEBAPP_DIR}/WEB-INF \ - && touch ${WEBAPP_DIR}/WEB-INF/classes/ia2token.properties \ + && touch ${WEBAPP_DIR}/WEB-INF/classes/auth.properties \ && touch ${WEBAPP_DIR}/WEB-INF/classes/iamtoken.properties \ && chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/*.properties diff --git a/docker/start-soda.sh b/docker/start-soda.sh index 3e40904d5b2dfa322823dd138e4e1a39ffe22036..d6170d2d5b0bc1839c0b57950aa6e9e6ee88afa7 100755 --- a/docker/start-soda.sh +++ b/docker/start-soda.sh @@ -16,7 +16,6 @@ OIDC_CLIENT=${OIDC_CLIENT:-} OIDC_SECRET=${OIDC_SECRET:-} AUTHZ_DB_URL=${AUTHZ_DB_URL:-} -AUTHZ_DB_SCHEMA=${AUTHZ_DB_SCHEMA:-} AUTHZ_DB_USERNAME=${AUTHZ_DB_USERNAME:-} AUTHZ_DB_PASSWORD=${AUTHZ_DB_PASSWORD:-} @@ -46,7 +45,7 @@ fi if [ -z "$OIDC_RAP_URL" ] || [ -z "$OIDC_GMS_URL" ] || [ -z "$OIDC_CLIENT" ] || [ -z "$OIDC_SECRET" ] \ - [ -z "$AUTHZ_DB_URL" ] || [ -z "$AUTHZ_DB_SCHEMA" ] || [ -z "$AUTHZ_DB_USERNAME" ] || [ -z "$AUTHZ_DB_PASSWORD" ]; + [ -z "$AUTHZ_DB_URL" ] || [ -z "$AUTHZ_DB_USERNAME" ] || [ -z "$AUTHZ_DB_PASSWORD" ]; then echo "Some of OIDC_ or AUTHZ_ is not set. All must be set to activate security." touch $WEBAPP_DIR/WEB-INF/security.node.xml @@ -61,12 +60,11 @@ else echo "store_state_on_login_endpoint=true" echo "scope=openid email profile read:rap" echo "allow_anonymous_access=true" - } > $WEBAPP_DIR/WEB-INF/classes/ia2token.properties + } > $WEBAPP_DIR/WEB-INF/classes/auth.properties echo "Config VLKB authorization ..." { echo "db_uri=$AUTHZ_DB_URL" - echo "db_schema=$AUTHZ_DB_SCHEMA" echo "db_user_name=$AUTHZ_DB_USERNAME" echo "db_password=$AUTHZ_DB_PASSWORD" } > $WEBAPP_DIR/WEB-INF/classes/authpolicy.properties