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

Set the LetsEncrypt ACMEv2 staging server URL

pull/55/head
Richard Körber 2018-01-05 07:40:05 +01:00
parent a7ea703e93
commit 92fff2379e
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acme4j-client/src/main/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProvider.java
View File

@ -33,8 +33,8 @@ import org.shredzone.acme4j.provider.AcmeProvider;
*/ */
public class LetsEncryptAcmeProvider extends AbstractAcmeProvider { public class LetsEncryptAcmeProvider extends AbstractAcmeProvider {
private static final String V01_DIRECTORY_URL = "https://acme-v01.api.letsencrypt.org/directory"; private static final String V02_DIRECTORY_URL = "https://acme-v02.api.letsencrypt.org/directory";
private static final String STAGING_DIRECTORY_URL = "https://acme-staging.api.letsencrypt.org/directory"; private static final String STAGING_DIRECTORY_URL = "https://acme-staging-v02.api.letsencrypt.org/directory";
@Override @Override
public boolean accepts(URI serverUri) { public boolean accepts(URI serverUri) {
@ -46,8 +46,8 @@ public class LetsEncryptAcmeProvider extends AbstractAcmeProvider {
public URL resolve(URI serverUri) { public URL resolve(URI serverUri) {
String path = serverUri.getPath(); String path = serverUri.getPath();
String directoryUrl; String directoryUrl;
if (path == null || "".equals(path) || "/".equals(path) || "/v01".equals(path)) { if (path == null || "".equals(path) || "/".equals(path) || "/v02".equals(path)) {
directoryUrl = V01_DIRECTORY_URL; directoryUrl = V02_DIRECTORY_URL;
} else if ("/staging".equals(path)) { } else if ("/staging".equals(path)) {
directoryUrl = STAGING_DIRECTORY_URL; directoryUrl = STAGING_DIRECTORY_URL;
} else { } else {

12
acme4j-client/src/test/java/org/shredzone/acme4j/provider/letsencrypt/LetsEncryptAcmeProviderTest.java
View File

@ -27,8 +27,8 @@ import org.junit.Test;
*/ */
public class LetsEncryptAcmeProviderTest { public class LetsEncryptAcmeProviderTest {
private static final String V01_DIRECTORY_URL = "https://acme-v01.api.letsencrypt.org/directory"; private static final String V02_DIRECTORY_URL = "https://acme-v02.api.letsencrypt.org/directory";
private static final String STAGING_DIRECTORY_URL = "https://acme-staging.api.letsencrypt.org/directory"; private static final String STAGING_DIRECTORY_URL = "https://acme-staging-v02.api.letsencrypt.org/directory";
/** /**
* Tests if the provider accepts the correct URIs. * Tests if the provider accepts the correct URIs.
@ -40,7 +40,7 @@ public class LetsEncryptAcmeProviderTest {
assertThat(provider.accepts(new URI("acme://letsencrypt.org")), is(true)); assertThat(provider.accepts(new URI("acme://letsencrypt.org")), is(true));
assertThat(provider.accepts(new URI("acme://letsencrypt.org/")), is(true)); assertThat(provider.accepts(new URI("acme://letsencrypt.org/")), is(true));
assertThat(provider.accepts(new URI("acme://letsencrypt.org/staging")), is(true)); assertThat(provider.accepts(new URI("acme://letsencrypt.org/staging")), is(true));
assertThat(provider.accepts(new URI("acme://letsencrypt.org/v01")), is(true)); assertThat(provider.accepts(new URI("acme://letsencrypt.org/v02")), is(true));
assertThat(provider.accepts(new URI("acme://example.com")), is(false)); assertThat(provider.accepts(new URI("acme://example.com")), is(false));
assertThat(provider.accepts(new URI("http://example.com/acme")), is(false)); assertThat(provider.accepts(new URI("http://example.com/acme")), is(false));
assertThat(provider.accepts(new URI("https://example.com/acme")), is(false)); assertThat(provider.accepts(new URI("https://example.com/acme")), is(false));
@ -53,9 +53,9 @@ public class LetsEncryptAcmeProviderTest {
public void testResolve() throws URISyntaxException { public void testResolve() throws URISyntaxException {
LetsEncryptAcmeProvider provider = new LetsEncryptAcmeProvider(); LetsEncryptAcmeProvider provider = new LetsEncryptAcmeProvider();
assertThat(provider.resolve(new URI("acme://letsencrypt.org")), is(url(V01_DIRECTORY_URL))); assertThat(provider.resolve(new URI("acme://letsencrypt.org")), is(url(V02_DIRECTORY_URL)));
assertThat(provider.resolve(new URI("acme://letsencrypt.org/")), is(url(V01_DIRECTORY_URL))); assertThat(provider.resolve(new URI("acme://letsencrypt.org/")), is(url(V02_DIRECTORY_URL)));
assertThat(provider.resolve(new URI("acme://letsencrypt.org/v01")), is(url(V01_DIRECTORY_URL))); assertThat(provider.resolve(new URI("acme://letsencrypt.org/v02")), is(url(V02_DIRECTORY_URL)));
assertThat(provider.resolve(new URI("acme://letsencrypt.org/staging")), is(url(STAGING_DIRECTORY_URL))); assertThat(provider.resolve(new URI("acme://letsencrypt.org/staging")), is(url(STAGING_DIRECTORY_URL)));
try { try {