From d8cea008a73ccecb1b734a010b9e9bdd363c8432 Mon Sep 17 00:00:00 2001 From: SMan Date: Thu, 3 Aug 2023 09:08:27 -0500 Subject: [PATCH] feat: BCFIPS support (sub-part 01) (#5767) * feat (jans-auth-server): bc-fips build has been added; * feat (jans-bom): bc-fips modules have been added; * feat (jans-config-api): bc-fips build has been added; * feat (jans-config-api, jans-eleven, jans-fido2, jans-scim): bc-fips build has been added; feat (jans-auth-server): client without provider dependencies (for bc-fips launching) has been added; * feat (jans-link): bc-fips build has been added; * feat: version has been updated: 1.0.16-SNAPSHOT -> 1.0.17-SNAPSHOT; --- jans-auth-server/client/pom.xml | 82 +++++++++++--- jans-auth-server/pom.xml | 6 + jans-auth-server/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ jans-bom/pom.xml | 15 +++ jans-config-api/pom.xml | 6 + jans-config-api/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ jans-eleven/pom.xml | 6 + jans-eleven/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ jans-eleven/server/pom.xml | 4 + jans-fido2/pom.xml | 30 +++-- jans-fido2/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ jans-link/pom.xml | 140 +++++++++++++---------- jans-link/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ jans-scim/pom.xml | 6 + jans-scim/server-fips/pom.xml | 160 +++++++++++++++++++++++++++ 15 files changed, 1167 insertions(+), 88 deletions(-) create mode 100644 jans-auth-server/server-fips/pom.xml create mode 100644 jans-config-api/server-fips/pom.xml create mode 100644 jans-eleven/server-fips/pom.xml create mode 100644 jans-fido2/server-fips/pom.xml create mode 100644 jans-link/server-fips/pom.xml create mode 100644 jans-scim/server-fips/pom.xml diff --git a/jans-auth-server/client/pom.xml b/jans-auth-server/client/pom.xml index fad9287a615..3d56081a737 100644 --- a/jans-auth-server/client/pom.xml +++ b/jans-auth-server/client/pom.xml @@ -84,28 +84,80 @@ maven-source-plugin - maven-assembly-plugin + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + true + external + false + false + + uber-jar-with-all-dependencies package - single + shade + + jans-auth-client-jar-with-dependencies + jans-auth-client-jar-with-dependencies + + + + io.jans.as.client.util.KeyGenerator + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/LICENSE + + + + + + + uber-jar-without-crypto-provider + package + + shade + + + jans-auth-client-jar-without-provider-dependencies + jans-auth-client-jar-without-provider-dependencies + + + org.bouncycastle:* + + + + + + io.jans.as.client.util.KeyGenerator + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/LICENSE + + + + - - - jar-with-dependencies - - - - io.jans.as.client.util.KeyGenerator - - - true - - - diff --git a/jans-auth-server/pom.xml b/jans-auth-server/pom.xml index 4752794c162..31723f3e995 100644 --- a/jans-auth-server/pom.xml +++ b/jans-auth-server/pom.xml @@ -116,6 +116,7 @@ agama/engine agama/inboundID server + server-fips @@ -531,6 +532,11 @@ buildnumber-maven-plugin 3.0.0 + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + diff --git a/jans-auth-server/server-fips/pom.xml b/jans-auth-server/server-fips/pom.xml new file mode 100644 index 00000000000..1b7694d1b96 --- /dev/null +++ b/jans-auth-server/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-auth-server-fips + Jans authentication server (FIPS) + war + + + io.jans + jans-auth-server-parent + 1.0.16-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + + diff --git a/jans-bom/pom.xml b/jans-bom/pom.xml index 6d368e914d7..bfd2db24f46 100644 --- a/jans-bom/pom.xml +++ b/jans-bom/pom.xml @@ -284,6 +284,21 @@ bcmail-jdk15on ${bc.version} + + org.bouncycastle + bc-fips + 1.0.2.3 + + + org.bouncycastle + bcpkix-fips + 1.0.6 + + + org.bouncycastle + bcmail-fips + 1.0.4 + com.nimbusds nimbus-jose-jwt diff --git a/jans-config-api/pom.xml b/jans-config-api/pom.xml index 753bfd37477..171e7e2abc8 100644 --- a/jans-config-api/pom.xml +++ b/jans-config-api/pom.xml @@ -65,6 +65,7 @@ common shared server + server-fips plugins @@ -599,6 +600,11 @@ buildnumber-maven-plugin 3.0.0 + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + diff --git a/jans-config-api/server-fips/pom.xml b/jans-config-api/server-fips/pom.xml new file mode 100644 index 00000000000..1590335f7ca --- /dev/null +++ b/jans-config-api/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-config-api-server-fips + jans-config-api-server-fips + war + + + io.jans + jans-config-api-parent + 1.0.16-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + + diff --git a/jans-eleven/pom.xml b/jans-eleven/pom.xml index 163c48d7118..f8217cc6d48 100644 --- a/jans-eleven/pom.xml +++ b/jans-eleven/pom.xml @@ -66,6 +66,7 @@ model client server + server-fips @@ -167,6 +168,11 @@ jetty-maven-plugin ${jetty.version} + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + diff --git a/jans-eleven/server-fips/pom.xml b/jans-eleven/server-fips/pom.xml new file mode 100644 index 00000000000..3513274308d --- /dev/null +++ b/jans-eleven/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-eleven-server-fips + jans-eleven-server-fips + war + + + io.jans + jans-eleven-parent + 1.0.16-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + + diff --git a/jans-eleven/server/pom.xml b/jans-eleven/server/pom.xml index b63a5c77ab7..b72fa708060 100644 --- a/jans-eleven/server/pom.xml +++ b/jans-eleven/server/pom.xml @@ -50,6 +50,10 @@ org.bouncycastle bcprov-jdk15on + + org.bouncycastle + bcpkix-jdk15on + diff --git a/jans-fido2/pom.xml b/jans-fido2/pom.xml index 119d3f1ac66..851c5b9a027 100644 --- a/jans-fido2/pom.xml +++ b/jans-fido2/pom.xml @@ -8,13 +8,13 @@ 1.0.17-SNAPSHOT Fido2 API - - - github - GitHub Packages - https://maven.pkg.github.com/JanssenProject/jans - - + + + github + GitHub Packages + https://maven.pkg.github.com/JanssenProject/jans + + UTF-8 @@ -71,6 +71,7 @@ model client server + server-fips @@ -94,11 +95,11 @@ jans-auth-model ${project.version} - - io.jans - jans-auth-client - ${project.version} - + + io.jans + jans-auth-client + ${project.version} + io.jans jans-fido2-model @@ -215,6 +216,11 @@ buildnumber-maven-plugin 3.0.0 + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + diff --git a/jans-fido2/server-fips/pom.xml b/jans-fido2/server-fips/pom.xml new file mode 100644 index 00000000000..9f599d968a6 --- /dev/null +++ b/jans-fido2/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-fido2-server-fips + Fido2 API Server (FIPS) + war + + + io.jans + jans-fido2-parent + 1.0.16-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + + diff --git a/jans-link/pom.xml b/jans-link/pom.xml index 307431fedc1..952f8e0cff4 100644 --- a/jans-link/pom.xml +++ b/jans-link/pom.xml @@ -1,50 +1,57 @@ - 4.0.0 - io.jans - jans-link-server-parent - 1.0.17-SNAPSHOT - - model + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + io.jans + jans-link-server-parent + 1.0.17-SNAPSHOT + + model service server + server-fips - pom - jans link server parent - http://maven.apache.org + pom + jans link server parent + http://maven.apache.org - + ${project.version} - UTF-8 - 11 - 11 - 11.0.8 + UTF-8 + 11 + 11 + 11.0.8 4.0.3.Final - + - - - mavencentral - maven central - https://repo1.maven.org/maven2 - - - jans - Janssen project repository - https://maven.jans.io/maven - - - bouncycastle - Bouncy Castle - https://repo1.maven.org/maven2/org/bouncycastle - - - repository.jboss.org - JBoss Repository - https://repository.jboss.org/nexus/content/groups/public-jboss/ - - + + https://github.com/JanssenProject/jans + scm:git:git://github.com/JanssenProject/jans.git + scm:git:git@github.com:JanssenProject/jans.git + + + + + mavencentral + maven central + https://repo1.maven.org/maven2 + + + jans + Janssen project repository + https://maven.jans.io/maven + + + bouncycastle + Bouncy Castle + https://repo1.maven.org/maven2/org/bouncycastle + + + repository.jboss.org + JBoss Repository + https://repository.jboss.org/nexus/content/groups/public-jboss/ + + @@ -59,15 +66,15 @@ - - - io.jans - jans-core-service - - - io.jans - jans-core-timer-weld - + + + io.jans + jans-core-service + + + io.jans + jans-core-timer-weld + @@ -95,25 +102,36 @@ org.jboss.resteasy resteasy-jackson2-provider - - commons-beanutils - commons-beanutils - + + commons-beanutils + commons-beanutils + - - org.jboss.weld.servlet - weld-servlet-core - + + org.jboss.weld.servlet + weld-servlet-core + - - junit - junit - test - + + junit + junit + test + - + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + + diff --git a/jans-link/server-fips/pom.xml b/jans-link/server-fips/pom.xml new file mode 100644 index 00000000000..5cadbcce772 --- /dev/null +++ b/jans-link/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-link-server-fips + jans link server (FIPS) + war + + + jans-link-server-parent + io.jans + 1.0.17-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + + diff --git a/jans-scim/pom.xml b/jans-scim/pom.xml index 4a10245443e..76a0c0b7ec5 100644 --- a/jans-scim/pom.xml +++ b/jans-scim/pom.xml @@ -68,6 +68,7 @@ client service server + server-fips @@ -189,6 +190,11 @@ buildnumber-maven-plugin 3.0.0 + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + diff --git a/jans-scim/server-fips/pom.xml b/jans-scim/server-fips/pom.xml new file mode 100644 index 00000000000..40b0bc0326c --- /dev/null +++ b/jans-scim/server-fips/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + jans-scim-server-fips + SCIM API Server (FIPS) + war + + + io.jans + jans-scim + 1.0.17-SNAPSHOT + + + + ${maven.min-version} + + + + ${project.artifactId} + + + + ${project.basedir}/../server/src/main/resources + true + + **/*.xml + **/*.properties + META-INF/services/*.* + + + + + + + ${project.basedir}/../server/src/main/webapp + + WEB-INF/** + + true + + + src/test/resources + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + build-oxauth-fips-war + process-sources + + + + + + + + + + + + + run + + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + tmp + + + true + + + ${buildNumber} + + + + WEB-INF/lib/bcpkix-jdk15on-*.jar, + WEB-INF/lib/bcprov-jdk15on-*.jar, + WEB-INF/lib/bcutil-jdk15on-*.jar, + WEB-INF/lib/bcmail-jdk15on-*.jar + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + + + + org.bouncycastle + bc-fips + + + org.bouncycastle + bcpkix-fips + + + org.bouncycastle + bcmail-fips + + + +