Merge pull request #223 from iankko/CIAM-1495

[CIAM-1495] Explicitly add "com.ongres.scram.client" module as a dependency to the PostgreSQL's "org.postgresql" module

Author: ASzc

modules/sso/db/drivers/added/modules/system/layers/openshift/com/ongres/scram/client/main/module.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="com.ongres.scram.client">
+  <resources>
+    <resource-root path="ongres-scram-client.jar"/>
+  </resources>
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="javax.transaction.api"/>
+    <module name="com.ongres.scram.common" export="true"/>
+  </dependencies>
+</module>

modules/sso/db/drivers/added/modules/system/layers/openshift/com/ongres/scram/common/main/module.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="com.ongres.scram.common">
+  <resources>
+    <resource-root path="ongres-scram-common.jar"/>
+  </resources>
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="javax.transaction.api"/>
+  </dependencies>
+</module>

modules/sso/db/drivers/added/modules/system/layers/openshift/org/postgresql/main/module.xml

@@ -6,5 +6,19 @@
   <dependencies>
     <module name="javax.api"/>
     <module name="javax.transaction.api"/>
+    <!--
+      ~ CIAM-1495: Explicitly add "com.ongres.scram.client" module as
+      ~ a dependency to the PostgreSQL's "org.postgresql" module to prevent
+      ~ "java.lang.ClassNotFoundException" errors if using PostgreSQL JDBC
+      ~ client with SCRAM-SHA-256 password authentication method. See:
+      ~
+      ~ * https://github.com/pgjdbc/pgjdbc/commit/befea18d153dda7814daef4e036d3f5daf8de1e5
+      ~ * https://github.com/pgjdbc/pgjdbc/commit/1a89290e110d5863b35e0a2ccf79e4292c1056f8
+      ~
+      ~ for more details about the extra Ongres SCRAM library dependency,
+      ~ required by the PostgreSQL JDBC driver, but not packaged into the
+      ~ PostgreSQL driver by default.
+    -->
+    <module name="com.ongres.scram.client" export="true"/>
   </dependencies>
 </module>

modules/sso/db/drivers/configure.sh

@@ -1,20 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 # Link DB drivers, provided by RPM packages, into the "openshift" layer
 set -e
 
 # Import RH-SSO global variables & functions to image build-time
 # shellcheck disable=SC1091
 source "${JBOSS_HOME}/bin/launch/sso-rcfile-definitions.sh"
 
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "$0")
 ADDED_DIR=${SCRIPT_DIR}/added
 
 function link {
-  mkdir -p $(dirname $2)
-  ln -s $1 $2
+  mkdir -p "$(dirname "$2")"
+  ln -s "$1" "$2"
 }
 
-link /usr/share/java/postgresql-jdbc.jar $JBOSS_HOME/modules/system/layers/openshift/org/postgresql/main/postgresql-jdbc.jar
+# Link the main PostgreSQL JDBC JAR
+link /usr/share/java/postgresql-jdbc.jar "${JBOSS_HOME}"/modules/system/layers/openshift/org/postgresql/main/postgresql-jdbc.jar
+# CIAM-1495: But also the JARs for the Ongres SCRAM library, so it's possible to use SCRAM-SHA-256 password-based auth method
+link /usr/share/java/ongres-scram/common.jar "${JBOSS_HOME}"/modules/system/layers/openshift/com/ongres/scram/common/main/ongres-scram-common.jar
+link /usr/share/java/ongres-scram/client.jar "${JBOSS_HOME}"/modules/system/layers/openshift/com/ongres/scram/client/main/ongres-scram-client.jar
 
 # Remove any existing destination files first (which might be symlinks)
-cp -rp --remove-destination "$ADDED_DIR/modules" "$JBOSS_HOME/"
+cp -rp --remove-destination "${ADDED_DIR}/modules" "${JBOSS_HOME}"