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

Session accepts a provider instance

pull/81/head
Richard Körber 2019-04-18 13:41:13 +02:00
parent 396ddd7c86
commit 9a22a74429
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
acme4j-client/src/main/java/org/shredzone/acme4j/Session.java
View File

@ -99,6 +99,26 @@ public class Session {
.orElseThrow(() -> new IllegalArgumentException("No ACME provider found for " + localServerUri));
}
/**
* Creates a new {@link Session} using the given {@link AcmeProvider}.
* <p>
* This constructor should only be used for testing purposes.
*
* @param serverUri
* {@link URI} of the ACME server
* @param provider
* {@link AcmeProvider} to be used
* @since 2.8
*/
public Session(URI serverUri, AcmeProvider provider) {
this.serverUri = Objects.requireNonNull(serverUri, "serverUri");
this.provider = Objects.requireNonNull(provider, "provider");
if (!provider.accepts(serverUri)) {
throw new IllegalArgumentException("Provider does not accept " + serverUri);
}
}
/**
* Logs into an existing account.
*

14
acme4j-client/src/test/java/org/shredzone/acme4j/SessionTest.java
View File

@ -34,6 +34,7 @@ import org.mockito.ArgumentMatchers;
import org.shredzone.acme4j.connector.Resource;
import org.shredzone.acme4j.exception.AcmeException;
import org.shredzone.acme4j.provider.AcmeProvider;
import org.shredzone.acme4j.provider.GenericAcmeProvider;
import org.shredzone.acme4j.toolbox.TestUtils;
/**
@ -63,12 +64,23 @@ public class SessionTest {
assertThat(session2, not(nullValue()));
assertThat(session2.getServerUri(), is(serverUri));
Session session3 = new Session(serverUri, new GenericAcmeProvider());
assertThat(session3, not(nullValue()));
assertThat(session3.getServerUri(), is(serverUri));
try {
new Session("#*aBaDuRi*#");
fail("accepted bad URI in constructor");
} catch (IllegalArgumentException ex) {
// expected
}
try {
new Session(URI.create("acme://invalid"), new GenericAcmeProvider());
fail("Provider accepted unsupported URI");
} catch (IllegalArgumentException ex) {
// expected
}
}
/**
@ -189,7 +201,7 @@ public class SessionTest {
/**
* Asserts that the {@link Session} returns correct
* {@link Session#resourceUri(Resource)} and {@link Session#getMetadata()}.
* {@link Session#resourceUrl(Resource)} and {@link Session#getMetadata()}.
*
* @param session
* {@link Session} to assert