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

Checkstyle fixes

pull/81/head
Richard Körber 2019-04-28 12:19:57 +02:00
parent c19a6ad1a4
commit d02746156d
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,8 @@ public class Certificate extends AcmeResource {
private static final long serialVersionUID = 7381527770159084201L; private static final long serialVersionUID = 7381527770159084201L;
private static final Logger LOG = LoggerFactory.getLogger(Certificate.class); private static final Logger LOG = LoggerFactory.getLogger(Certificate.class);
private ArrayList<X509Certificate> certChain = null; private ArrayList<X509Certificate> certChain;
private ArrayList<URL> alternates = null; private ArrayList<URL> alternates;
protected Certificate(Login login, URL certUrl) { protected Certificate(Login login, URL certUrl) {
super(login, certUrl); super(login, certUrl);

2
acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
View File

@ -457,7 +457,7 @@ public class DefaultConnection implements Connection {
private void throwAcmeException() throws AcmeException { private void throwAcmeException() throws AcmeException {
try { try {
String contentType = AcmeUtils.getContentType(conn.getHeaderField(CONTENT_TYPE_HEADER)); String contentType = AcmeUtils.getContentType(conn.getHeaderField(CONTENT_TYPE_HEADER));
if (!"application/problem+json".equals(contentType)) { if (!MIME_JSON_PROBLEM.equals(contentType)) {
throw new AcmeException("HTTP " + conn.getResponseCode() + ": " + conn.getResponseMessage()); throw new AcmeException("HTTP " + conn.getResponseCode() + ": " + conn.getResponseMessage());
} }

12
acme4j-client/src/main/java/org/shredzone/acme4j/provider/pebble/PebbleHttpConnector.java
View File

@ -26,10 +26,8 @@ import java.security.cert.CertificateException;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.TrustManagerFactory;
@ -42,14 +40,6 @@ import org.shredzone.acme4j.connector.HttpConnector;
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
@ThreadSafe @ThreadSafe
public class PebbleHttpConnector extends HttpConnector { public class PebbleHttpConnector extends HttpConnector {
private static HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER = new HostnameVerifier() {
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
}
};
private static SSLSocketFactory sslSocketFactory; private static SSLSocketFactory sslSocketFactory;
@Override @Override
@ -58,7 +48,7 @@ public class PebbleHttpConnector extends HttpConnector {
if (conn instanceof HttpsURLConnection) { if (conn instanceof HttpsURLConnection) {
HttpsURLConnection conns = (HttpsURLConnection) conn; HttpsURLConnection conns = (HttpsURLConnection) conn;
conns.setSSLSocketFactory(createSocketFactory()); conns.setSSLSocketFactory(createSocketFactory());
conns.setHostnameVerifier(ALLOW_ALL_HOSTNAME_VERIFIER); conns.setHostnameVerifier((hostname, session) -> true);
} }
return conn; return conn;
} }