From a74a0f05319038c8b88828349355b3c97a85a7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Tue, 6 Dec 2016 00:43:16 +0100 Subject: [PATCH] Also accept 202-Accepted for registration and authorization deactivation --- .../src/main/java/org/shredzone/acme4j/Authorization.java | 2 +- .../src/main/java/org/shredzone/acme4j/Registration.java | 2 +- .../src/test/java/org/shredzone/acme4j/AuthorizationTest.java | 2 +- .../src/test/java/org/shredzone/acme4j/RegistrationTest.java | 2 +- .../src/main/java/org/shredzone/acme4j/ClientTest.java | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java index 69f85be5..67b8119c 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java @@ -210,7 +210,7 @@ public class Authorization extends AcmeResource { claims.put("status", "deactivated"); int rc = conn.sendSignedRequest(getLocation(), claims, getSession()); - if (rc != HttpURLConnection.HTTP_OK) { + if (rc != HttpURLConnection.HTTP_OK && rc != HttpURLConnection.HTTP_ACCEPTED) { conn.throwAcmeException(); } } catch (IOException ex) { diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java index 579283d3..70c5ac48 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java @@ -342,7 +342,7 @@ public class Registration extends AcmeResource { claims.put("status", "deactivated"); int rc = conn.sendSignedRequest(getLocation(), claims, getSession()); - if (rc != HttpURLConnection.HTTP_OK) { + if (rc != HttpURLConnection.HTTP_OK && rc != HttpURLConnection.HTTP_ACCEPTED) { conn.throwAcmeException(); } } catch (IOException ex) { diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java index d9eeaaff..592be0bb 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -271,7 +271,7 @@ public class AuthorizationTest { assertThat(claimMap.get("status"), is((Object) "deactivated")); assertThat(uri, is(locationUri)); assertThat(session, is(notNullValue())); - return HttpURLConnection.HTTP_OK; + return HttpURLConnection.HTTP_ACCEPTED; } }; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java index 928e6fa8..09b9f8b6 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java @@ -440,7 +440,7 @@ public class RegistrationTest { assertThat(claimMap.get("status"), is((Object) "deactivated")); assertThat(uri, is(locationUri)); assertThat(session, is(notNullValue())); - return HttpURLConnection.HTTP_OK; + return HttpURLConnection.HTTP_ACCEPTED; } }; diff --git a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java index 713a20b2..ca36ca20 100644 --- a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java +++ b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java @@ -201,6 +201,9 @@ public class ClientTest { // Revoke the certificate (uncomment if needed...) // certificate.revoke(); + + // Deactivate the registration (uncomment if needed...) + // reg.deactivate(); } /**