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

Add missing ssl.com unit tests

pull/168/head
Richard Körber 2024-02-26 18:19:01 +01:00
parent c0b74bfc59
commit 7c17645212
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
2 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
acme4j-client/src/main/java/org/shredzone/acme4j/provider/sslcom/SslComAcmeProvider.java
View File

@ -1,7 +1,7 @@
/* /*
* acme4j - Java ACME client * acme4j - Java ACME client
* *
* Copyright (C) 2015 Richard "Shred" Körber * Copyright (C) 2024 Richard "Shred" Körber
* http://acme4j.shredzone.org * http://acme4j.shredzone.org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -30,10 +30,11 @@ import org.shredzone.acme4j.provider.AcmeProvider;
* If you want to use <em>SSL.com</em>, always prefer to use this provider. * If you want to use <em>SSL.com</em>, always prefer to use this provider.
* *
* @see <a href="https://ssl.com/">SSL.com</a> * @see <a href="https://ssl.com/">SSL.com</a>
* @since 3.2.0
*/ */
public class SslComAcmeProvider extends AbstractAcmeProvider { public class SslComAcmeProvider extends AbstractAcmeProvider {
private static final String V02_DIRECTORY_URL = "https://acme.ssl.com/sslcom-dv-ecc"; private static final String PRODUCTION_DIRECTORY_URL = "https://acme.ssl.com/sslcom-dv-ecc";
private static final String STAGING_DIRECTORY_URL = "https://acme-try.ssl.com/sslcom-dv-ecc"; private static final String STAGING_DIRECTORY_URL = "https://acme-try.ssl.com/sslcom-dv-ecc";
@Override @Override
@ -46,8 +47,8 @@ public class SslComAcmeProvider extends AbstractAcmeProvider {
public URL resolve(URI serverUri) { public URL resolve(URI serverUri) {
var path = serverUri.getPath(); var path = serverUri.getPath();
String directoryUrl; String directoryUrl;
if (path == null || "".equals(path) || "/".equals(path) || "/v02".equals(path)) { if (path == null || path.isEmpty() || "/".equals(path)) {
directoryUrl = V02_DIRECTORY_URL; directoryUrl = PRODUCTION_DIRECTORY_URL;
} else if ("/staging".equals(path)) { } else if ("/staging".equals(path)) {
directoryUrl = STAGING_DIRECTORY_URL; directoryUrl = STAGING_DIRECTORY_URL;
} else { } else {

65
acme4j-client/src/test/java/org/shredzone/acme4j/provider/sslcom/SslComAcmeProviderTest.java Normal file
View File

@ -0,0 +1,65 @@
/*
* acme4j - Java ACME client
*
* Copyright (C) 2024 Richard "Shred" Körber
* http://acme4j.shredzone.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
package org.shredzone.acme4j.provider.sslcom;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.shredzone.acme4j.toolbox.TestUtils.url;
import java.net.URI;
import java.net.URISyntaxException;
import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link SslComAcmeProviderTest}.
*/
public class SslComAcmeProviderTest {
private static final String PRODUCTION_DIRECTORY_URL = "https://acme.ssl.com/sslcom-dv-ecc";
private static final String STAGING_DIRECTORY_URL = "https://acme-try.ssl.com/sslcom-dv-ecc";
/**
* Tests if the provider accepts the correct URIs.
*/
@Test
public void testAccepts() throws URISyntaxException {
var provider = new SslComAcmeProvider();
try (var softly = new AutoCloseableSoftAssertions()) {
softly.assertThat(provider.accepts(new URI("acme://ssl.com"))).isTrue();
softly.assertThat(provider.accepts(new URI("acme://ssl.com/"))).isTrue();
softly.assertThat(provider.accepts(new URI("acme://ssl.com/staging"))).isTrue();
softly.assertThat(provider.accepts(new URI("acme://example.com"))).isFalse();
softly.assertThat(provider.accepts(new URI("http://example.com/acme"))).isFalse();
softly.assertThat(provider.accepts(new URI("https://example.com/acme"))).isFalse();
}
}
/**
* Test if acme URIs are properly resolved.
*/
@Test
public void testResolve() throws URISyntaxException {
var provider = new SslComAcmeProvider();
assertThat(provider.resolve(new URI("acme://ssl.com"))).isEqualTo(url(PRODUCTION_DIRECTORY_URL));
assertThat(provider.resolve(new URI("acme://ssl.com/"))).isEqualTo(url(PRODUCTION_DIRECTORY_URL));
assertThat(provider.resolve(new URI("acme://ssl.com/staging"))).isEqualTo(url(STAGING_DIRECTORY_URL));
assertThatIllegalArgumentException().isThrownBy(() -> provider.resolve(new URI("acme://ssl.com/v99")));
}
}