From ed68a9f44ea3462fd35bd78b528af5aec2a69516 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 1 Nov 2024 11:09:35 +0100
Subject: [PATCH] docker: fixes DB-driver loading and disables Resolver-by-DB
(forces direct resolve from ivoid)
---
.../servlet/src/main/java/cutout/webapi/ServletCutout.java | 2 +-
docker/Dockerfile.soda | 2 +-
docker/deps/soda.logging.properties | 2 +-
docker/start-soda.sh.soda | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
index 81ab9cf..34585c6 100644
--- a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
+++ b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
@@ -52,7 +52,7 @@ public class ServletCutout extends HttpServlet
protected static final Settings settings = Settings.getInstance();
protected static final Subsurvey[] subsurveys = Subsurvey.loadSubsurveys(settings.fitsPaths.surveysMetadataAbsPathname());
- protected boolean resolveFromId = settings.dbConn.isDbUriEmpty();
+ protected boolean resolveFromId = true;//FIXME separate setting authz is separate table settings.dbConn.isDbUriEmpty();
protected boolean useEngineOverCli = settings.amqpConn.isHostnameEmpty();
final String RESPONSE_ENCODING = "utf-8";
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 5dc88fa..f83f34b 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -54,7 +54,7 @@ COPY deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml
# DB used for authorization
# Tomcat must load DB-driver (postgresql_*.jar), vlkb-soda does not explicitely load DB-drivers
-COPY deps/postgresql-*.jar /var/lib/tomcat9/lib
+COPY deps/postgresql-*.jar ${CATALINA_BASE}/lib
# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT
diff --git a/docker/deps/soda.logging.properties b/docker/deps/soda.logging.properties
index d7d04e1..1301c18 100644
--- a/docker/deps/soda.logging.properties
+++ b/docker/deps/soda.logging.properties
@@ -68,4 +68,4 @@ ServletCutout.level = CONFIG
ResolverFromId.level = INFO
SodaImpl.level = INFO
VlkbCli.level = INFO
-
+AuthPolicyDb.level = INFO
diff --git a/docker/start-soda.sh.soda b/docker/start-soda.sh.soda
index b07d140..8b6e6f6 100755
--- a/docker/start-soda.sh.soda
+++ b/docker/start-soda.sh.soda
@@ -114,7 +114,7 @@ else
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
+ } >> $WEBAPP_DIR/WEB-INF/classes/cutout.properties
# cp $WEBAPP_DIR/WEB-INF/web-cutout-ia2token.xml $WEBAPP_DIR/WEB-INF/web.xml
fi
@@ -127,6 +127,7 @@ sed -i "s/.*ServletCutout\.level.*=.*/ServletCutout.level = $DBG_LEVEL/g" $CATAL
sed -i "s/.*ResolverFromId\.level.*=.*/ResolverFromId.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
sed -i "s/.*SodaImpl\.level.*=.*/SodaImpl.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
sed -i "s/.*VlkbCli\.level.*=.*/VlkbCli.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
+sed -i "s/.*AuthPolicyDb\.level.*=.*/AuthPolicyDb.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
date
--
GitLab