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

Do not send authorization with challenge

pull/61/head
Richard Körber 2018-03-10 15:33:57 +01:00
parent 44a036a858
commit 1987d951e8
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acme4j-client/src/main/java/org/shredzone/acme4j/challenge/TokenChallenge.java
View File

@ -32,7 +32,6 @@ public class TokenChallenge extends Challenge {
private static final long serialVersionUID = 1634133407432681800L; private static final long serialVersionUID = 1634133407432681800L;
protected static final String KEY_TOKEN = "token"; protected static final String KEY_TOKEN = "token";
protected static final String KEY_KEY_AUTHORIZATION = "keyAuthorization";
/** /**
* Creates a new generic {@link TokenChallenge} object. * Creates a new generic {@link TokenChallenge} object.
@ -49,7 +48,6 @@ public class TokenChallenge extends Challenge {
@Override @Override
protected void prepareResponse(JSONBuilder response) { protected void prepareResponse(JSONBuilder response) {
super.prepareResponse(response); super.prepareResponse(response);
response.put(KEY_KEY_AUTHORIZATION, getAuthorization());
} }
/** /**

6
acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
View File

@ -30,8 +30,6 @@ import org.shredzone.acme4j.toolbox.TestUtils;
* Unit tests for {@link Dns01Challenge}. * Unit tests for {@link Dns01Challenge}.
*/ */
public class DnsChallengeTest { public class DnsChallengeTest {
private static final String KEY_AUTHORIZATION =
"pNvmJivs0WCko2suV7fhe-59oFqyYx_yB7tx6kIMAyE.HnWjTDnyqlCrm6tZ-6wX-TrEXgRdeNu9G71gqxSO6o0";
private Login login = TestUtils.login(); private Login login = TestUtils.login();
@ -45,12 +43,12 @@ public class DnsChallengeTest {
assertThat(challenge.getType(), is(Dns01Challenge.TYPE)); assertThat(challenge.getType(), is(Dns01Challenge.TYPE));
assertThat(challenge.getStatus(), is(Status.PENDING)); assertThat(challenge.getStatus(), is(Status.PENDING));
assertThat(challenge.getDigest(), is("rzMmotrIgsithyBYc0vgiLUEEKYx0WetQRgEF2JIozA")); assertThat(challenge.getDigest(), is("rzMmotrIgsithyBYc0vgiLUEEKYx0WetQRgEF2JIozA"));
assertThat(challenge.getAuthorization(), is("pNvmJivs0WCko2suV7fhe-59oFqyYx_yB7tx6kIMAyE.HnWjTDnyqlCrm6tZ-6wX-TrEXgRdeNu9G71gqxSO6o0"));
JSONBuilder response = new JSONBuilder(); JSONBuilder response = new JSONBuilder();
challenge.prepareResponse(response); challenge.prepareResponse(response);
assertThat(response.toString(), sameJSONAs("{\"keyAuthorization\"=\"" assertThat(response.toString(), sameJSONAs("{}").allowingExtraUnexpectedFields());
+ KEY_AUTHORIZATION + "\"}").allowingExtraUnexpectedFields());
} }
} }

3
acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
View File

@ -53,8 +53,7 @@ public class HttpChallengeTest {
JSONBuilder response = new JSONBuilder(); JSONBuilder response = new JSONBuilder();
challenge.prepareResponse(response); challenge.prepareResponse(response);
assertThat(response.toString(), sameJSONAs("{\"keyAuthorization\"=\"" assertThat(response.toString(), sameJSONAs("{}").allowingExtraUnexpectedFields());
+ KEY_AUTHORIZATION + "\"}").allowingExtraUnexpectedFields());
} }
/** /**

1
acme4j-client/src/test/resources/json/triggerHttpChallengeRequest.json
View File

@ -1,3 +1,2 @@
{ {
"keyAuthorization": "IlirfxKKXAsHtmzK29Pj8A.HnWjTDnyqlCrm6tZ-6wX-TrEXgRdeNu9G71gqxSO6o0"
} }

3
acme4j-client/src/test/resources/json/triggerHttpChallengeResponse.json
View File

@ -2,6 +2,5 @@
"type": "http-01", "type": "http-01",
"status": "pending", "status": "pending",
"url": "https://example.com/acme/some-location", "url": "https://example.com/acme/some-location",
"token": "IlirfxKKXAsHtmzK29Pj8A", "token": "IlirfxKKXAsHtmzK29Pj8A"
"keyAuthorization": "XbmEGDDc2AMDArHLt5x7GxZfIRv0aScknUKlyf5S4KU.KMH_h8aGAKlY3VQqBUczm1cfo9kaovivy59rSY1xZ0E"
} }