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

Origin/feature/is 14 pki credentials #17

Merged
merged 6 commits into from
Sep 6, 2022
Merged

Origin/feature/is 14 pki credentials #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4b496a
duration and pki credential update
Razumain Sep 1, 2022
f12622c
Addressing issues
Razumain Sep 2, 2022
ea6a48b
Update ExternalChainCredential.java
Razumain Sep 5, 2022
feeb1e3
javadoc
Razumain Sep 6, 2022
1dbc294
Update pom.xml
Razumain Sep 6, 2022
6a054c2
IS-17 Fixed copyright statement, formatting, comments and some warnings
martin-lindstrom Sep 6, 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
49 changes: 26 additions & 23 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ Add this maven dependency to your project
## Java API

### CA Service
This library provides classes for instantiating Certification Authority services with revocation and repository functionality
This library provides classes for instantiating Certification Authority services with revocation and repository functionality.

The basic interface for the CA service is the `se.swedenconnect.ca.engine.ca.issuer.CAService` interface
The basic interface for the CA service is the `se.swedenconnect.ca.engine.ca.issuer.CAService` interface.

The core functions of a CA service is implemented by the `se.swedenconnect.ca.engine.ca.issuer.impl.AbstractCAService` class.
The typical way to implement a CA is to extend this class.
Expand All @@ -47,19 +47,20 @@ public class BasicCAService extends AbstractCAService<DefaultCertificateModelBui
private String ocspResponderUrl;

/**
* Constructor
* Constructor.
*
* @param privateKey private key of the CA service
* @param caCertificateChain Certificate chain representing this CA with the ca certificate of this CA
* @param caCertificateChain certificate chain representing this CA with the ca certificate of this CA
being the first certificate
* @param caRepository repository for storing issued certificates
* @param issuerModel model for issuing certificates
* @param crlIssuerModel model for publishing CRL:s
* @param caRepository repository for storing issued certificates
* @param issuerModel model for issuing certificates
* @param crlIssuerModel model for publishing CRL:s
* @throws NoSuchAlgorithmException algorithm is not supported
*/
public BasicCAService(PrivateKey privateKey, List<X509CertificateHolder> caCertificateChain,
CARepository caRepository, CertificateIssuerModel issuerModel, CRLIssuerModel crlIssuerModel)
throws NoSuchAlgorithmException {
public BasicCAService(final PrivateKey privateKey, final List<X509CertificateHolder> caCertificateChain,
final CARepository caRepository, final CertificateIssuerModel issuerModel, final CRLIssuerModel crlIssuerModel)
throws NoSuchAlgorithmException {

super(caCertificateChain, caRepository);

// Setup service
Expand All @@ -73,12 +74,14 @@ public class BasicCAService extends AbstractCAService<DefaultCertificateModelBui
}

/** {@inheritDoc} */
@Override public CertificateIssuer getCertificateIssuer() {
@Override
public CertificateIssuer getCertificateIssuer() {
return certificateIssuer;
}

/** {@inheritDoc} */
@Override protected CRLIssuer getCrlIssuer() {
@Override
protected CRLIssuer getCrlIssuer() {
return crlIssuer;
}

Expand Down Expand Up @@ -107,14 +110,14 @@ public class BasicCAService extends AbstractCAService<DefaultCertificateModelBui
}

/**
* Set OCSP responder for this CA service
* Set OCSP responder for this CA service.
*
* @param ocspResponder ocsp responder implementation
* @param ocspResponderUrl URL for sending requests to the OCSP responder
* @param ocspResponderCertificate OCSP responder certificate
*/
public void setOcspResponder(OCSPResponder ocspResponder, String ocspResponderUrl,
X509CertificateHolder ocspResponderCertificate) {
public void setOcspResponder(final OCSPResponder ocspResponder, final String ocspResponderUrl,
final X509CertificateHolder ocspResponderCertificate) {
this.ocspResponder = ocspResponder;
this.ocspResponderUrl = ocspResponderUrl;
this.ocspResponderCertificate = ocspResponderCertificate;
Expand All @@ -128,13 +131,13 @@ public class BasicCAService extends AbstractCAService<DefaultCertificateModelBui

/** {@inheritDoc} */
@Override
protected DefaultCertificateModelBuilder getBaseCertificateModelBuilder(CertNameModel subject,
PublicKey publicKey,
X509CertificateHolder issuerCertificate, CertificateIssuerModel certificateIssuerModel)
throws CertificateIssuanceException {
DefaultCertificateModelBuilder certModelBuilder = DefaultCertificateModelBuilder.getInstance(publicKey,
getCaCertificate(),
certificateIssuerModel);
protected DefaultCertificateModelBuilder getBaseCertificateModelBuilder(final CertNameModel subject,
final PublicKey publicKey, final X509CertificateHolder issuerCertificate,
final CertificateIssuerModel certificateIssuerModel)
throws CertificateIssuanceException {
DefaultCertificateModelBuilder certModelBuilder = DefaultCertificateModelBuilder.getInstance(
publicKey, getCaCertificate(), certificateIssuerModel);
certModelBuilder
.subject(subject)
.includeAki(true)
Expand All @@ -158,7 +161,7 @@ This interface is designed to match the JPA API for database storage, but could

-----

Copyright &copy; 2022, [Myndigheten för digital förvaltning - Swedish Agency for Digital Government (DIGG)](http://www.digg.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
Copyright &copy; 2021-2022, [Myndigheten för digital förvaltning - Swedish Agency for Digital Government (DIGG)](http://www.digg.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).



70 changes: 54 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>se.idsec.signservice.commons</groupId>
<artifactId>signservice-bom</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -94,15 +94,18 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>

<!-- JAXB -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>

<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
Expand All @@ -112,36 +115,66 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>

<dependency>
<groupId>se.swedenconnect.security</groupId>
<artifactId>credentials-support</artifactId>
</dependency>

<dependency>
<groupId>se.swedenconnect.sigval</groupId>
<artifactId>cert-extensions</artifactId>
<version>1.2.0</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.18.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>se.swedenconnect.sigval</groupId>
<artifactId>cert-validation</artifactId>
<version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>se.swedenconnect.security</groupId>
<artifactId>credentials-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>se.idsec.utils</groupId>
<artifactId>print-cert</artifactId>
Expand All @@ -153,38 +186,42 @@

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<configuration>
<source>11</source>
<release>11</release>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
<configuration>
<parallel>methods</parallel>
<threadCount>10</threadCount>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.1</version>
<configuration>
<doctitle>CA engine - ${project.version}</doctitle>
<windowtitle>CA engine - ${project.version}</windowtitle>
<source>11</source>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce</id>
Expand All @@ -199,6 +236,7 @@
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down Expand Up @@ -233,7 +271,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<executions>
<execution>
<phase>process-sources</phase>
Expand Down Expand Up @@ -265,7 +303,7 @@
</executions>
<configuration>
<sourcepath>target/generated-sources/delombok</sourcepath>
<additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
<doclint>all,-missing</doclint>
<additionalOptions>-Xdoclint:all -Xdoclint:-missing</additionalOptions>
<additionalJOptions>
<additionalJOption>-Xdoclint:all</additionalJOption>
Expand Down Expand Up @@ -309,7 +347,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0</version>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
Loading