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

More debug log output

pull/17/merge
Richard Körber 2015-12-16 00:50:55 +01:00
parent 943f604a21
commit e3ff6043df
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ import org.shredzone.acme4j.connector.Session;
import org.shredzone.acme4j.exception.AcmeException; import org.shredzone.acme4j.exception.AcmeException;
import org.shredzone.acme4j.exception.AcmeServerException; import org.shredzone.acme4j.exception.AcmeServerException;
import org.shredzone.acme4j.util.ClaimBuilder; import org.shredzone.acme4j.util.ClaimBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* An abstract implementation of the {@link AcmeClient} interface. It contains abstract * An abstract implementation of the {@link AcmeClient} interface. It contains abstract
@ -39,6 +41,7 @@ import org.shredzone.acme4j.util.ClaimBuilder;
* @author Richard "Shred" Körber * @author Richard "Shred" Körber
*/ */
public abstract class AbstractAcmeClient implements AcmeClient { public abstract class AbstractAcmeClient implements AcmeClient {
private static final Logger LOG = LoggerFactory.getLogger(AbstractAcmeClient.class);
private final Session session = new Session(); private final Session session = new Session();
@ -70,6 +73,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public void newRegistration(Account account, Registration registration) throws AcmeException { public void newRegistration(Account account, Registration registration) throws AcmeException {
LOG.debug("newRegistration");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
ClaimBuilder claims = new ClaimBuilder(); ClaimBuilder claims = new ClaimBuilder();
claims.putResource(Resource.NEW_REG); claims.putResource(Resource.NEW_REG);
@ -94,6 +98,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public void updateRegistration(Account account, Registration registration) throws AcmeException { public void updateRegistration(Account account, Registration registration) throws AcmeException {
LOG.debug("updateRegistration");
if (registration.getLocation() == null) { if (registration.getLocation() == null) {
throw new IllegalArgumentException("location must be set. Use newRegistration() if not known."); throw new IllegalArgumentException("location must be set. Use newRegistration() if not known.");
} }
@ -116,6 +121,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public void newAuthorization(Account account, Authorization auth) throws AcmeException { public void newAuthorization(Account account, Authorization auth) throws AcmeException {
LOG.debug("newAuthorization");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
ClaimBuilder claims = new ClaimBuilder(); ClaimBuilder claims = new ClaimBuilder();
claims.putResource(Resource.NEW_AUTHZ); claims.putResource(Resource.NEW_AUTHZ);
@ -163,6 +169,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public void triggerChallenge(Account account, Challenge challenge) throws AcmeException { public void triggerChallenge(Account account, Challenge challenge) throws AcmeException {
LOG.debug("triggerChallenge");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
ClaimBuilder claims = new ClaimBuilder(); ClaimBuilder claims = new ClaimBuilder();
claims.putResource("challenge"); claims.putResource("challenge");
@ -176,6 +183,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public void updateChallenge(Account account, Challenge challenge) throws AcmeException { public void updateChallenge(Account account, Challenge challenge) throws AcmeException {
LOG.debug("updateChallenge");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
conn.sendRequest(challenge.getUri()); conn.sendRequest(challenge.getUri());
challenge.unmarshall(conn.readJsonResponse()); challenge.unmarshall(conn.readJsonResponse());
@ -184,6 +192,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public URI requestCertificate(Account account, byte[] csr) throws AcmeException { public URI requestCertificate(Account account, byte[] csr) throws AcmeException {
LOG.debug("requestCertificate");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
ClaimBuilder claims = new ClaimBuilder(); ClaimBuilder claims = new ClaimBuilder();
claims.putResource(Resource.NEW_CERT); claims.putResource(Resource.NEW_CERT);
@ -200,6 +209,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
@Override @Override
public X509Certificate downloadCertificate(URI certUri) throws AcmeException { public X509Certificate downloadCertificate(URI certUri) throws AcmeException {
LOG.debug("downloadCertificate");
try (Connection conn = createConnection()) { try (Connection conn = createConnection()) {
conn.sendRequest(certUri); conn.sendRequest(certUri);
return conn.readCertificate(); return conn.readCertificate();

4
acme4j-client/src/main/java/org/shredzone/acme4j/impl/DefaultConnection.java
View File

@ -259,7 +259,9 @@ public class DefaultConnection implements Connection {
Matcher m = p.matcher(link); Matcher m = p.matcher(link);
if (m.matches()) { if (m.matches()) {
try { try {
return new URI(m.group(1)); String location = m.group(1);
LOG.debug("Link: {} -> {}", relation, location);
return new URI(location);
} catch (URISyntaxException ex) { } catch (URISyntaxException ex) {
throw new AcmeException("Bad Link header: " + link); throw new AcmeException("Bad Link header: " + link);
} }