Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: a workaround for fido2 dependency #1590

Merged
merged 2 commits into from
Jun 23, 2022
Merged

fix: a workaround for fido2 dependency #1590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d604c95
fix: a workaround for fido2 dependency
iromli Jun 22, 2022
aed230a
style: add comments
moabu Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions docker-jans-auth-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,21 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/webapps \
RUN mkdir -p /usr/share/java

ARG TWILIO_VERSION=7.17.0
RUN wget -q https://repo1.maven.org/maven2/com/twilio/sdk/twilio/${TWILIO_VERSION}/twilio-${TWILIO_VERSION}.jar -O /usr/share/java/twilio.jar
RUN wget -q https://repo1.maven.org/maven2/com/twilio/sdk/twilio/${TWILIO_VERSION}/twilio-${TWILIO_VERSION}.jar -P /usr/share/java/

ARG JSMPP_VERSION=2.3.7
RUN wget -q https://repo1.maven.org/maven2/org/jsmpp/jsmpp/${JSMPP_VERSION}/jsmpp-${JSMPP_VERSION}.jar -O /usr/share/java/jsmpp.jar
RUN wget -q https://repo1.maven.org/maven2/org/jsmpp/jsmpp/${JSMPP_VERSION}/jsmpp-${JSMPP_VERSION}.jar -P /usr/share/java/

# This will later be refactored and moved to be pulled from persitence or a central bucket
ARG CASA_CONFIG_VERSION=5.0.0-SNAPSHOT
ARG CASA_CONFIG_BUILD_DATE="2022-05-26 13:56"
RUN wget -q https://jenkins.gluu.org/maven/org/gluu/casa-config/${CASA_CONFIG_VERSION}/casa-config-${CASA_CONFIG_VERSION}.jar -O /usr/share/java/casa-config.jar
RUN wget -q https://jenkins.gluu.org/maven/org/gluu/casa-config/${CASA_CONFIG_VERSION}/casa-config-${CASA_CONFIG_VERSION}.jar -P /usr/share/java/

# A workaround for Fido2 integration
# @TODO: possibly will be removed (depends on https://github.com/JanssenProject/jans/issues/1499)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like its not a workaround any more. GluuFederation/flex#263

ARG FIDO2_CLIENT_VERSION=1.0.1-SNAPSHOT
ARG FIDO2_CLIENT_BUILD_DATE="2022-06-22 08:13"
RUN wget -q https://jenkins.jans.io/maven/io/jans/jans-fido2-client/${FIDO2_CLIENT_VERSION}/jans-fido2-client-${FIDO2_CLIENT_VERSION}.jar -P /usr/share/java/

# =====================
# Casa external scripts
Expand Down
18 changes: 4 additions & 14 deletions docker-jans-auth-server/scripts/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,10 @@ get_debug_opt() {
}

move_builtin_jars() {
# move twilio lib
if [ ! -f /opt/jans/jetty/jans-auth/custom/libs/twilio.jar ]; then
cp /usr/share/java/twilio.jar /opt/jans/jetty/jans-auth/custom/libs/twilio.jar
fi

# move jsmpp lib
if [ ! -f /opt/jans/jetty/jans-auth/custom/libs/jsmpp.jar ]; then
cp /usr/share/java/jsmpp.jar /opt/jans/jetty/jans-auth/custom/libs/jsmpp.jar
fi

# move casa-config lib
if [ ! -f /opt/jans/jetty/jans-auth/custom/libs/casa-config.jar ]; then
cp /usr/share/java/casa-config.jar /opt/jans/jetty/jans-auth/custom/libs/casa-config.jar
fi
for src in /usr/share/java/*.jar; do
moabu marked this conversation as resolved.
Show resolved Hide resolved
fname=$(basename "$src")
cp "$src" "/opt/jans/jetty/jans-auth/custom/libs/$fname"
done
}

get_prometheus_opt() {
Expand Down