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

Check content-type header

pull/17/merge
Richard Körber 2015-12-13 14:25:06 +01:00
parent 618dc27fbf
commit 535543e7b1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acme4j-client/src/main/java/org/shredzone/acme4j/connector/Connection.java
View File

@ -184,6 +184,12 @@ public class Connection implements AutoCloseable {
throw new IllegalStateException("Not connected"); throw new IllegalStateException("Not connected");
} }
String contentType = conn.getHeaderField("Content-Type");
if (!("application/json".equals(contentType)
|| "application/problem+json".equals(contentType))) {
throw new AcmeException("Unexpected content type: " + contentType);
}
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Map<String, Object> result = null; Map<String, Object> result = null;
@ -215,6 +221,11 @@ public class Connection implements AutoCloseable {
throw new IllegalStateException("Not connected"); throw new IllegalStateException("Not connected");
} }
String contentType = conn.getHeaderField("Content-Type");
if (!("application/pkix-cert".equals(contentType))) {
throw new AcmeException("Unexpected content type: " + contentType);
}
try (InputStream in = conn.getInputStream()) { try (InputStream in = conn.getInputStream()) {
CertificateFactory cf = CertificateFactory.getInstance("X.509"); CertificateFactory cf = CertificateFactory.getInstance("X.509");
return (X509Certificate) cf.generateCertificate(in); return (X509Certificate) cf.generateCertificate(in);
@ -231,6 +242,11 @@ public class Connection implements AutoCloseable {
* @return Map of {@link Resource} and the respective {@link URI} to invoke * @return Map of {@link Resource} and the respective {@link URI} to invoke
*/ */
public Map<Resource, URI> readDirectory() throws AcmeException { public Map<Resource, URI> readDirectory() throws AcmeException {
String contentType = conn.getHeaderField("Content-Type");
if (!("application/json".equals(contentType))) {
throw new AcmeException("Unexpected content type: " + contentType);
}
EnumMap<Resource, URI> resourceMap = new EnumMap<>(Resource.class); EnumMap<Resource, URI> resourceMap = new EnumMap<>(Resource.class);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();