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

Check connection state

pull/17/merge
Richard Körber 2015-12-20 16:22:44 +01:00
parent 90f5476d13
commit ac2af16950
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@ public class DefaultConnection implements Connection {
conn.setRequestMethod("HEAD"); conn.setRequestMethod("HEAD");
conn.connect(); conn.connect();
updateSession(session); updateSession(session);
conn = null;
} }
if (session.getNonce() == null) { if (session.getNonce() == null) {
@ -195,6 +196,10 @@ public class DefaultConnection implements Connection {
@Override @Override
public Map<Resource, URI> readDirectory() throws AcmeException { public Map<Resource, URI> readDirectory() throws AcmeException {
if (conn == null) {
throw new IllegalStateException("Not connected");
}
String contentType = conn.getHeaderField("Content-Type"); String contentType = conn.getHeaderField("Content-Type");
if (!("application/json".equals(contentType))) { if (!("application/json".equals(contentType))) {
throw new AcmeException("Unexpected content type: " + contentType); throw new AcmeException("Unexpected content type: " + contentType);
@ -229,6 +234,10 @@ public class DefaultConnection implements Connection {
@Override @Override
public void updateSession(Session session) throws AcmeException { public void updateSession(Session session) throws AcmeException {
if (conn == null) {
throw new IllegalStateException("Not connected");
}
String nonceHeader = conn.getHeaderField("Replay-Nonce"); String nonceHeader = conn.getHeaderField("Replay-Nonce");
if (nonceHeader == null || nonceHeader.trim().isEmpty()) { if (nonceHeader == null || nonceHeader.trim().isEmpty()) {
return; return;
@ -245,6 +254,10 @@ public class DefaultConnection implements Connection {
@Override @Override
public URI getLocation() throws AcmeException { public URI getLocation() throws AcmeException {
if (conn == null) {
throw new IllegalStateException("Not connected");
}
String location = conn.getHeaderField("Location"); String location = conn.getHeaderField("Location");
if (location == null) { if (location == null) {
return null; return null;
@ -260,6 +273,10 @@ public class DefaultConnection implements Connection {
@Override @Override
public URI getLink(String relation) throws AcmeException { public URI getLink(String relation) throws AcmeException {
if (conn == null) {
throw new IllegalStateException("Not connected");
}
List<String> links = conn.getHeaderFields().get("Link"); List<String> links = conn.getHeaderFields().get("Link");
if (links != null) { if (links != null) {
Pattern p = Pattern.compile("<(.*?)>\\s*;\\s*rel=\"?"+ Pattern.quote(relation) + "\"?"); Pattern p = Pattern.compile("<(.*?)>\\s*;\\s*rel=\"?"+ Pattern.quote(relation) + "\"?");
@ -281,6 +298,10 @@ public class DefaultConnection implements Connection {
@Override @Override
public void throwAcmeException() throws AcmeException { public void throwAcmeException() throws AcmeException {
if (conn == null) {
throw new IllegalStateException("Not connected");
}
if ("application/problem+json".equals(conn.getHeaderField("Content-Type"))) { if ("application/problem+json".equals(conn.getHeaderField("Content-Type"))) {
Map<String, Object> map = readJsonResponse(); Map<String, Object> map = readJsonResponse();
String type = (String) map.get("type"); String type = (String) map.get("type");