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

Use consistent exceptions, remove unneccessary throws clause

pull/81/head
Richard Körber 2019-04-07 10:46:17 +02:00
parent 31409a3872
commit 72a716bafd
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JoseUtils.java
View File

@ -29,8 +29,6 @@ import org.jose4j.jwk.RsaJsonWebKey;
import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.jws.AlgorithmIdentifiers;
import org.jose4j.jws.JsonWebSignature; import org.jose4j.jws.JsonWebSignature;
import org.jose4j.lang.JoseException; import org.jose4j.lang.JoseException;
import org.shredzone.acme4j.exception.AcmeException;
import org.shredzone.acme4j.exception.AcmeProtocolException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -103,7 +101,7 @@ public final class JoseUtils {
jb.put("signature", jws.getEncodedSignature()); jb.put("signature", jws.getEncodedSignature());
return jb; return jb;
} catch (JoseException ex) { } catch (JoseException ex) {
throw new AcmeProtocolException("Failed to sign a JSON request", ex); throw new IllegalArgumentException("Could not create a JOSE request", ex);
} }
} }
@ -121,7 +119,7 @@ public final class JoseUtils {
* @return Created JSON structure * @return Created JSON structure
*/ */
public static Map<String, Object> createExternalAccountBinding(String kid, public static Map<String, Object> createExternalAccountBinding(String kid,
PublicKey accountKey, SecretKey macKey, URL resource) throws AcmeException { PublicKey accountKey, SecretKey macKey, URL resource) {
try { try {
PublicJsonWebKey keyJwk = PublicJsonWebKey.Factory.newPublicJwk(accountKey); PublicJsonWebKey keyJwk = PublicJsonWebKey.Factory.newPublicJwk(accountKey);
@ -140,7 +138,7 @@ public final class JoseUtils {
outerClaim.put("payload", innerJws.getEncodedPayload()); outerClaim.put("payload", innerJws.getEncodedPayload());
return outerClaim.toMap(); return outerClaim.toMap();
} catch (JoseException ex) { } catch (JoseException ex) {
throw new AcmeException("Could not create external account binding", ex); throw new IllegalArgumentException("Could not create external account binding", ex);
} }
} }