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

feat: BCFIPS support (sub-part 01) #5767

Merged
merged 7 commits into from
Aug 3, 2023
Merged

feat: BCFIPS support (sub-part 01) #5767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
920e87e
feat (jans-auth-server): bc-fips build has been added;
smansoft Aug 2, 2023
1bb2ddc
feat (jans-bom): bc-fips modules have been added;
smansoft Aug 2, 2023
a706c16
feat (jans-config-api): bc-fips build has been added;
smansoft Aug 2, 2023
268abdd
feat (jans-config-api, jans-eleven, jans-fido2, jans-scim): bc-fips b…
smansoft Aug 3, 2023
a0377bd
feat (jans-link): bc-fips build has been added;
smansoft Aug 3, 2023
0ebff7c
Merge branch 'main' into bcfips-support-01-issue-5719
smansoft Aug 3, 2023
ecee4e7
feat: version has been updated: 1.0.16-SNAPSHOT -> 1.0.17-SNAPSHOT;
smansoft Aug 3, 2023
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
82 changes: 67 additions & 15 deletions jans-auth-server/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,80 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>external</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<createSourcesJar>false</createSourcesJar>
</configuration>
<executions>
<execution>
<id>uber-jar-with-all-dependencies</id>
<phase>package</phase>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<configuration>
<finalName>jans-auth-client-jar-with-dependencies</finalName>
<shadedArtifactId>jans-auth-client-jar-with-dependencies</shadedArtifactId>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<mainClass>io.jans.as.client.util.KeyGenerator</mainClass>
</manifestEntries>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/LICENSE</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
<execution>
<id>uber-jar-without-crypto-provider</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>jans-auth-client-jar-without-provider-dependencies</finalName>
<shadedArtifactId>jans-auth-client-jar-without-provider-dependencies</shadedArtifactId>
<artifactSet>
<excludes>
<exclude>org.bouncycastle:*</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<mainClass>io.jans.as.client.util.KeyGenerator</mainClass>
</manifestEntries>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/LICENSE</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>io.jans.as.client.util.KeyGenerator</mainClass>
</manifest>
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 6 additions & 0 deletions jans-auth-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
<module>agama/engine</module>
<module>agama/inboundID</module>
<module>server</module>
<module>server-fips</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -531,6 +532,11 @@
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
160 changes: 160 additions & 0 deletions jans-auth-server/server-fips/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<artifactId>jans-auth-server-fips</artifactId>
<name>Jans authentication server (FIPS)</name>
<packaging>war</packaging>

<parent>
<groupId>io.jans</groupId>
<artifactId>jans-auth-server-parent</artifactId>
<version>1.0.16-SNAPSHOT</version>
</parent>

<prerequisites>
<maven>${maven.min-version}</maven>
</prerequisites>

<build>
<finalName>${project.artifactId}</finalName>

<resources>
<resource>
<directory>${project.basedir}/../server/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>META-INF/services/*.*</include>
</includes>
</resource>
</resources>

<testResources>
<testResource>
<directory>${project.basedir}/../server/src/main/webapp</directory>
<includes>
<include>WEB-INF/**</include>
</includes>
<filtering>true</filtering>
</testResource>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>build-oxauth-fips-war</id>
<phase>process-sources</phase>
<configuration>
<target>
<property name="server.webapp.dir" value="${project.basedir}/../server/target/jans-auth-server" />
<property name="dest.webapp.dir" value="${project.build.directory}/${project.artifactId}" />
<delete dir="${dest.webapp.dir}" />
<mkdir dir="${dest.webapp.dir}" />
<copy todir="${dest.webapp.dir}" preservelastmodified="true" overwrite="true">
<fileset dir="${server.webapp.dir}" includes="**/*" />
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<outdatedCheckPath>tmp</outdatedCheckPath>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Implementation-Build>${buildNumber}</Implementation-Build>
</manifestEntries>
</archive>
<packagingExcludes>
WEB-INF/lib/bcpkix-jdk15on-*.jar,
WEB-INF/lib/bcprov-jdk15on-*.jar,
WEB-INF/lib/bcutil-jdk15on-*.jar,
WEB-INF/lib/bcmail-jdk15on-*.jar
</packagingExcludes>
</configuration>
</plugin>

<!-- Build number plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<executions>
<execution>
<id>get-the-git-infos</id>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>

</build>

<dependencies>
<!-- Bouncycastle Fips -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-fips</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-fips</artifactId>
</dependency>
</dependencies>

</project>
15 changes: 15 additions & 0 deletions jans-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,21 @@
<artifactId>bcmail-jdk15on</artifactId>
<version>${bc.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.3</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-fips</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-fips</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions jans-config-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<module>common</module>
<module>shared</module>
<module>server</module>
<module>server-fips</module>
<module>plugins</module>
</modules>

Expand Down Expand Up @@ -599,6 +600,11 @@
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>

</pluginManagement>
Expand Down
Loading