Also accept 202-Accepted for registration and authorization deactivation

shred · Dec 5, 2016 · a74a0f0 · a74a0f0
1 parent 033e74e
commit a74a0f0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 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
@@ -210,7 +210,7 @@ public void deactivate() throws AcmeException {
             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
@@ -342,7 +342,7 @@ public void deactivate() throws AcmeException {
             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
@@ -271,7 +271,7 @@ public int sendSignedRequest(URI uri, ClaimBuilder claims, Session session) {
                 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
@@ -440,7 +440,7 @@ public int sendSignedRequest(URI uri, ClaimBuilder claims, Session session) {
                 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
@@ -201,6 +201,9 @@ public void fetchCertificate(Collection<String> domains) throws IOException, Acm
 
         // Revoke the certificate (uncomment if needed...)
         // certificate.revoke();
+
+        // Deactivate the registration (uncomment if needed...)
+        // reg.deactivate();
     }
 
     /**