From 81512897a683e9da7b4435d81f597c2681fab4aa Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:25:50 +0100 Subject: [PATCH 01/10] add start script & option for config template --- Dockerfile | 17 +++++++++++++---- start.sh | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 start.sh diff --git a/Dockerfile b/Dockerfile index f38be64..a37458f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,21 @@ RUN ./build.sh nl && mv build /www/nl # Let root redirect to the english version RUN cp /webapp/redirect-en.html /www/index.html -FROM gradle:7.6-jdk11 as javabuild +# -------------------------------------------------------- + +FROM gradle:7.6-jdk11 AS javabuild # Build the java app COPY ./ /app/ WORKDIR /app RUN gradle build +# -------------------------------------------------------- + FROM tomee:9.1-jre11 +RUN apt-get update && apt-get install gettext-base + +WORKDIR /server # Copy the webapp to the webapps directory RUN rm -rf /usr/local/tomee/webapps/* @@ -32,12 +39,14 @@ COPY --from=javabuild /app/build/libs/irma_email_issuer.war /usr/local/tomee/web COPY ./src/main/resources/email-en.html /email-templates/email-en.html COPY ./src/main/resources/email-nl.html /email-templates/email-nl.html +COPY --from=javabuild /app/start.sh ./start.sh +RUN chmod +x ./start.sh RUN mkdir /usr/local/keys - -ENV IRMA_CONF="/config/" +RUN mkdir /irma-config +ENV IRMA_CONF="/irma-config/" ENV EMAIL_TEMPLATE_DIR="/email-templates/" EXPOSE 8080 # Copy the config file to the webapp. This is done at runtime so that the config file can be mounted as a volume. -CMD [ "/bin/sh", "-c", "openssl rsa -in /irma-jwt-key/priv.pem -outform der -out /usr/local/keys/priv.der && for lang in 'en' 'nl'; do cp /config/config.js /usr/local/tomee/webapps/ROOT/$lang/assets/config.js; done && exec catalina.sh run" ] +CMD [ "/bin/sh", "-C", "./start.sh" ] diff --git a/start.sh b/start.sh new file mode 100644 index 0000000..d5a50e6 --- /dev/null +++ b/start.sh @@ -0,0 +1,22 @@ +# this is the startup script in the docker container, +# doing a bunch of config at runtime before starting the actual server + +set -e # exit the script immediately when an error is encountered + +# in some cases secrets from different places might be required to be used together +# so this provides the option to provide a config template with some environment variables +echo "creating config.json based on template" +envsubst < /config/config.json > /tmp/conf.json +cp /tms/conf.json $IRMA_CONF/config.json + +echo "generating binary file for private key" +openssl rsa -in /irma-jwt-key/priv.pem -outform der -out /usr/local/keys/priv.der + +echo "copying config files to web app dir" +for lang in 'en' 'nl'; do + cp /config/config.js /usr/local/tomee/webapps/ROOT/$lang/assets/config.js; +done + + +echo "starting up server" +exec catalina.sh run From d8b24478463ddb217f3bc6cebea05f2f1ab8dfeb Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:39:30 +0100 Subject: [PATCH 02/10] fix typo --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index d5a50e6..1bb936c 100644 --- a/start.sh +++ b/start.sh @@ -7,7 +7,7 @@ set -e # exit the script immediately when an error is encountered # so this provides the option to provide a config template with some environment variables echo "creating config.json based on template" envsubst < /config/config.json > /tmp/conf.json -cp /tms/conf.json $IRMA_CONF/config.json +cp /tmp/conf.json $IRMA_CONF/config.json echo "generating binary file for private key" openssl rsa -in /irma-jwt-key/priv.pem -outform der -out /usr/local/keys/priv.der From a5517d694c438eafdc766dee9e14a7af7b1ce2df Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:45:25 +0100 Subject: [PATCH 03/10] remove outdated comment --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a37458f..971072e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,5 +48,4 @@ ENV IRMA_CONF="/irma-config/" ENV EMAIL_TEMPLATE_DIR="/email-templates/" EXPOSE 8080 -# Copy the config file to the webapp. This is done at runtime so that the config file can be mounted as a volume. CMD [ "/bin/sh", "-C", "./start.sh" ] From e525355f33c0c817709558fa14e4bd9d015b4314 Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:50:35 +0100 Subject: [PATCH 04/10] remove some unused files --- .gitlab-ci.yml | 38 ---------- .vscode/settings.json | 4 - gradlew | 172 ------------------------------------------ gradlew.bat | 84 --------------------- 4 files changed, 298 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .vscode/settings.json delete mode 100755 gradlew delete mode 100644 gradlew.bat diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a4aeb36..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -stages: - - build - -before_script: - - set -euxo pipefail - -build-webapp: - image: privacybydesign/node_yarn:latest - stage: build - script: - - cd webapp - - yarn install - - cd .. - - mkdir -p artifacts/webapp - - ./webapp/build.sh en - - mv webapp/build artifacts/webapp/en - - ./webapp/build.sh nl - - mv webapp/build artifacts/webapp/nl - artifacts: - # Disabling artifact expiry is not supported yet, so make - expire_in: 100 year - paths: - - artifacts/webapp - -build-war: - image: privacybydesign/jdk11:latest - stage: build - script: - - mkdir artifacts - - gradle clean - - gradle build - - mv build/libs/irma_email_issuer-*.war ./irma_email_issuer.war - artifacts: - # Disabling artifact expiry is not supported yet, so make - expire_in: 100 year - paths: - - irma_email_issuer.war - diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index d53ecaf..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "automatic" -} \ No newline at end of file diff --git a/gradlew b/gradlew deleted file mode 100755 index cccdd3d..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega From df7c2666237d569dbf1014071a974b4271b3391c Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:51:09 +0100 Subject: [PATCH 05/10] add .vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 04d7247..6f3dd55 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ src/main/webapp/* !src/main/webapp/WEB-INF/ .idea/ +.vscode/ From d749026a0b504bd5de6062690f7f2a07b459da11 Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:55:26 +0100 Subject: [PATCH 06/10] Revert "remove some unused files" This reverts commit e525355f33c0c817709558fa14e4bd9d015b4314. --- .gitlab-ci.yml | 38 ++++++++++ .vscode/settings.json | 4 + gradlew | 172 ++++++++++++++++++++++++++++++++++++++++++ gradlew.bat | 84 +++++++++++++++++++++ 4 files changed, 298 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 .vscode/settings.json create mode 100755 gradlew create mode 100644 gradlew.bat diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a4aeb36 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,38 @@ +stages: + - build + +before_script: + - set -euxo pipefail + +build-webapp: + image: privacybydesign/node_yarn:latest + stage: build + script: + - cd webapp + - yarn install + - cd .. + - mkdir -p artifacts/webapp + - ./webapp/build.sh en + - mv webapp/build artifacts/webapp/en + - ./webapp/build.sh nl + - mv webapp/build artifacts/webapp/nl + artifacts: + # Disabling artifact expiry is not supported yet, so make + expire_in: 100 year + paths: + - artifacts/webapp + +build-war: + image: privacybydesign/jdk11:latest + stage: build + script: + - mkdir artifacts + - gradle clean + - gradle build + - mv build/libs/irma_email_issuer-*.war ./irma_email_issuer.war + artifacts: + # Disabling artifact expiry is not supported yet, so make + expire_in: 100 year + paths: + - irma_email_issuer.war + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d53ecaf --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 7838d1f37a1f67a677240383f36eb7f819d20970 Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:55:56 +0100 Subject: [PATCH 07/10] Revert "add .vscode to gitignore" This reverts commit df7c2666237d569dbf1014071a974b4271b3391c. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6f3dd55..04d7247 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ src/main/webapp/* !src/main/webapp/WEB-INF/ .idea/ -.vscode/ From c6fe68c4fdbe840c899e6f725e396fabf21633d1 Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:56:54 +0100 Subject: [PATCH 08/10] remove unused files --- .gitlab-ci.yml | 38 -------------------------------------- .vscode/settings.json | 4 ---- 2 files changed, 42 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .vscode/settings.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a4aeb36..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -stages: - - build - -before_script: - - set -euxo pipefail - -build-webapp: - image: privacybydesign/node_yarn:latest - stage: build - script: - - cd webapp - - yarn install - - cd .. - - mkdir -p artifacts/webapp - - ./webapp/build.sh en - - mv webapp/build artifacts/webapp/en - - ./webapp/build.sh nl - - mv webapp/build artifacts/webapp/nl - artifacts: - # Disabling artifact expiry is not supported yet, so make - expire_in: 100 year - paths: - - artifacts/webapp - -build-war: - image: privacybydesign/jdk11:latest - stage: build - script: - - mkdir artifacts - - gradle clean - - gradle build - - mv build/libs/irma_email_issuer-*.war ./irma_email_issuer.war - artifacts: - # Disabling artifact expiry is not supported yet, so make - expire_in: 100 year - paths: - - irma_email_issuer.war - diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index d53ecaf..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "automatic" -} \ No newline at end of file From f3cd1ab92d4cbe821cb211943f42c99e1b911f7b Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:57:26 +0100 Subject: [PATCH 09/10] add vscode to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 04d7247..8a5b3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ src/main/webapp/* !src/main/webapp/WEB-INF/ .idea/ +.vscode From 0ba14df6e759c29572b9d719132592607e672d19 Mon Sep 17 00:00:00 2001 From: Wouter Ensink <46427708+w-ensink@users.noreply.github.com> Date: Mon, 13 Jan 2025 16:09:52 +0100 Subject: [PATCH 10/10] small simplification --- start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/start.sh b/start.sh index 1bb936c..8228a3d 100644 --- a/start.sh +++ b/start.sh @@ -6,8 +6,7 @@ set -e # exit the script immediately when an error is encountered # in some cases secrets from different places might be required to be used together # so this provides the option to provide a config template with some environment variables echo "creating config.json based on template" -envsubst < /config/config.json > /tmp/conf.json -cp /tmp/conf.json $IRMA_CONF/config.json +envsubst < /config/config.json > $IRMA_CONF/config.json echo "generating binary file for private key" openssl rsa -in /irma-jwt-key/priv.pem -outform der -out /usr/local/keys/priv.der