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

Remove authorize method from challenges

pull/55/head
Richard Körber 2018-01-14 13:15:56 +01:00
parent 113c922b42
commit 9a483fd4d1
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java
View File

@ -190,15 +190,6 @@ public class Challenge extends AcmeResource {
} }
data = json; data = json;
authorize();
}
/**
* Callback that is invoked when the challenge is supposed to compute its
* authorization data.
*/
protected void authorize() {
// Does nothing here...
} }
/** /**

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

@ -28,9 +28,6 @@ public class TlsSni02Challenge extends TokenChallenge {
*/ */
public static final String TYPE = "tls-sni-02"; public static final String TYPE = "tls-sni-02";
private String subject;
private String sanB;
/** /**
* Creates a new generic {@link TlsSni02Challenge} object. * Creates a new generic {@link TlsSni02Challenge} object.
* *
@ -46,7 +43,8 @@ public class TlsSni02Challenge extends TokenChallenge {
* The CA will send the SNI request against this domain. * The CA will send the SNI request against this domain.
*/ */
public String getSubject() { public String getSubject() {
return subject; String tokenHash = hexEncode(sha256hash(getToken()));
return tokenHash.substring(0, 32) + '.' + tokenHash.substring(32) + ".token.acme.invalid";
} }
/** /**
@ -54,7 +52,8 @@ public class TlsSni02Challenge extends TokenChallenge {
* certificate. * certificate.
*/ */
public String getSanB() { public String getSanB() {
return sanB; String kaHash = hexEncode(sha256hash(getAuthorization()));
return kaHash.substring(0, 32) + '.' + kaHash.substring(32) + ".ka.acme.invalid";
} }
@Override @Override
@ -62,15 +61,4 @@ public class TlsSni02Challenge extends TokenChallenge {
return TYPE.equals(type); return TYPE.equals(type);
} }
@Override
protected void authorize() {
super.authorize();
String tokenHash = hexEncode(sha256hash(getToken()));
subject = tokenHash.substring(0, 32) + '.' + tokenHash.substring(32) + ".token.acme.invalid";
String kaHash = hexEncode(sha256hash(getAuthorization()));
sanB = kaHash.substring(0, 32) + '.' + kaHash.substring(32) + ".ka.acme.invalid";
}
} }

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

@ -33,8 +33,6 @@ public class TokenChallenge extends Challenge {
protected static final String KEY_TOKEN = "token"; protected static final String KEY_TOKEN = "token";
protected static final String KEY_KEY_AUTHORIZATION = "keyAuthorization"; protected static final String KEY_KEY_AUTHORIZATION = "keyAuthorization";
private String authorization;
/** /**
* Creates a new generic {@link TokenChallenge} object. * Creates a new generic {@link TokenChallenge} object.
* *
@ -59,21 +57,12 @@ public class TokenChallenge extends Challenge {
} }
/** /**
* Gets the authorization. * Returns the authorization string.
*/
protected String getAuthorization() {
return authorization;
}
/**
* Computes the authorization string.
* <p> * <p>
* The default is {@code token + '.' + base64url(jwkThumbprint)}. Subclasses may * The default is {@code token + '.' + base64url(jwkThumbprint)}. Subclasses may
* override this method if a different algorithm is used. * override this method if a different algorithm is used.
*
* @return Authorization string
*/ */
protected String computeAuthorization() { protected String getAuthorization() {
try { try {
PublicKey pk = getSession().getKeyPair().getPublic(); PublicKey pk = getSession().getKeyPair().getPublic();
PublicJsonWebKey jwk = PublicJsonWebKey.Factory.newPublicJwk(pk); PublicJsonWebKey jwk = PublicJsonWebKey.Factory.newPublicJwk(pk);
@ -85,10 +74,4 @@ public class TokenChallenge extends Challenge {
} }
} }
@Override
protected void authorize() {
super.authorize();
authorization = computeAuthorization();
}
} }