github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed code formatting issues and added copyright header

pull/17/head
argy 2016-06-02 23:24:44 +03:00
parent d5b4ff37dc
commit b13c90b7a4
5 changed files with 110 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
acme4j-client/src/main/java/org/shredzone/acme4j/CertificateURIs.java
View File

@ -1,3 +1,16 @@
/*
* acme4j - Java ACME client
*
* Copyright (C) 2015 Richard "Shred" Körber
* http://acme4j.shredzone.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j;
import java.net.URI;
@ -14,8 +27,8 @@ public class CertificateURIs {
private final URI chainCertUri;
public CertificateURIs(URI certUri, URI chainCertUri) {
this.certUri = certUri;
this.chainCertUri = chainCertUri;
this.certUri = certUri;
this.chainCertUri = chainCertUri;
}
/**
@ -25,7 +38,7 @@ public class CertificateURIs {
* {@link URI} the certificate can be downloaded from
*/
public URI getCertUri() {
return certUri;
return certUri;
}
/**
@ -35,7 +48,7 @@ public class CertificateURIs {
* {@link URI} the certificate chain can be downloaded from
*/
public URI getChainCertUri() {
return chainCertUri;
return chainCertUri;
}
}

49
acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
View File

@ -28,7 +28,11 @@ import java.util.Map;
import org.jose4j.jwk.PublicJsonWebKey;
import org.jose4j.jws.JsonWebSignature;
import org.jose4j.lang.JoseException;
import org.shredzone.acme4j.*;
import org.shredzone.acme4j.AcmeClient;
import org.shredzone.acme4j.Authorization;
import org.shredzone.acme4j.CertificateURIs;
import org.shredzone.acme4j.Registration;
import org.shredzone.acme4j.Status;
import org.shredzone.acme4j.challenge.Challenge;
import org.shredzone.acme4j.connector.Connection;
import org.shredzone.acme4j.connector.Resource;
@ -440,32 +444,31 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override
public X509Certificate[] downloadCertificateChain(URI chainCertUri) throws AcmeException {
if (chainCertUri == null) {
throw new NullPointerException("certChainUri must not be null");
}
if (chainCertUri == null) {
throw new NullPointerException("certChainUri must not be null");
}
LOG.debug("getCertificateChain");
LOG.debug("getCertificateChain");
List<X509Certificate> certChain = new ArrayList<>();
URI link = chainCertUri;
while (link != null && certChain.size() < MAX_CHAIN_LENGTH) {
try (Connection conn = createConnection()) {
int rc = conn.sendRequest(chainCertUri);
if (rc != HttpURLConnection.HTTP_OK) {
conn.throwAcmeException();
}
List<X509Certificate> certChain = new ArrayList<>();
URI link = chainCertUri;
while (link != null && certChain.size() < MAX_CHAIN_LENGTH) {
try (Connection conn = createConnection()) {
int rc = conn.sendRequest(chainCertUri);
if (rc != HttpURLConnection.HTTP_OK) {
conn.throwAcmeException();
}
certChain.add(conn.readCertificate());
link = conn.getLink("up");
} catch (IOException ex) {
throw new AcmeNetworkException(ex);
}
}
certChain.add(conn.readCertificate());
link = conn.getLink("up");
} catch (IOException ex) {
throw new AcmeNetworkException(ex);
}
}
if (link != null)
throw new AcmeException("Recursion limit reached (" + MAX_CHAIN_LENGTH + "). Didn't get " + link);
if (link != null)
throw new AcmeException("Recursion limit reached (" + MAX_CHAIN_LENGTH + "). Didn't get " + link);
return certChain.toArray(new X509Certificate[certChain.size()]);
return certChain.toArray(new X509Certificate[certChain.size()]);
}
@Override

3
acme4j-client/src/test/java/org/shredzone/acme4j/impl/AbstractAcmeClientTest.java
View File

@ -459,8 +459,7 @@ public class AbstractAcmeClientTest {
@Test
public void testRequestCertificate() throws AcmeException, IOException {
Connection connection = new DummyConnection() {
@Override
@Override
public int sendSignedRequest(URI uri, ClaimBuilder claims, Session session, Registration registration) {
assertThat(uri, is(resourceUri));
assertThat(claims.toString(), sameJSONAs(getJson("requestCertificateRequest")));

15
acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java
View File

@ -18,7 +18,6 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.net.URI;
import java.security.KeyPair;
import java.security.Security;
import java.security.cert.X509Certificate;
@ -51,6 +50,7 @@ public class ClientTest {
private static final File USER_KEY_FILE = new File("user.key");
private static final File DOMAIN_KEY_FILE = new File("domain.key");
private static final File DOMAIN_CERT_FILE = new File("domain.crt");
private static final File CERT_CHAIN_FILE = new File("chain.crt");
private static final File DOMAIN_CSR_FILE = new File("domain.csr");
private static final int KEY_SIZE = 2048;
@ -176,16 +176,23 @@ public class ClientTest {
}
// Request a signed certificate
URI certificateUri = client.requestCertificate(reg, csrb.getEncoded());
CertificateURIs certificateUris = client.requestCertificate(reg, csrb.getEncoded());
LOG.info("Success! The certificate for domains " + domains + " has been generated!");
LOG.info("Certificate URI: " + certificateUri);
LOG.info("Certificate URI: " + certificateUris.getCertUri());
LOG.info("Certificate Chain URI: " + certificateUris.getChainCertUri());
// Download the certificate
X509Certificate cert = client.downloadCertificate(certificateUri);
X509Certificate cert = client.downloadCertificate(certificateUris.getCertUri());
try (FileWriter fw = new FileWriter(DOMAIN_CERT_FILE)) {
CertificateUtils.writeX509Certificate(cert, fw);
}
// Download the certificate chain
X509Certificate[] chain = client.downloadCertificateChain(certificateUris.getChainCertUri());
try (FileWriter fw = new FileWriter(CERT_CHAIN_FILE)) {
CertificateUtils.writeX509CertificateChain(chain, fw);
}
// Revoke the certificate (uncomment if needed...)
// client.revokeCertificate(reg, cert);
}

15
acme4j-utils/src/main/java/org/shredzone/acme4j/util/CertificateUtils.java
View File

@ -94,6 +94,21 @@ public final class CertificateUtils {
}
}
/**
* Writes an X.509 certificate chain PEM file.
*
* @param chain
* {@link X509Certificate[]} to write
* @param w
* {@link Writer} to write the PEM file to
*/
public static void writeX509CertificateChain(X509Certificate[] chain, Writer w) throws IOException {
try (JcaPEMWriter jw = new JcaPEMWriter(w)) {
for (X509Certificate cert : chain)
jw.writeObject(cert);
}
}
/**
* Reads a CSR PEM file.
*