From f841daa5b62fb1def79170041daa3e630d4ffaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Tue, 2 May 2017 11:29:11 +0200 Subject: [PATCH] Remove resource field from payload --- .../org/shredzone/acme4j/Authorization.java | 1 - .../org/shredzone/acme4j/Certificate.java | 1 - .../org/shredzone/acme4j/Registration.java | 5 ---- .../shredzone/acme4j/RegistrationBuilder.java | 1 - .../shredzone/acme4j/challenge/Challenge.java | 1 - .../shredzone/acme4j/util/JSONBuilder.java | 23 ------------------- .../shredzone/acme4j/AuthorizationTest.java | 1 - .../shredzone/acme4j/RegistrationTest.java | 3 --- .../acme4j/util/JSONBuilderTest.java | 18 --------------- .../resources/json/modifyRegistration.json | 1 - .../json/newAuthorizationRequest.json | 1 - .../test/resources/json/newRegistration.json | 1 - .../json/requestCertificateRequest.json | 3 +-- .../requestCertificateRequestWithDate.json | 3 +-- .../json/revokeCertificateRequest.json | 3 +-- .../revokeCertificateWithReasonRequest.json | 1 - .../json/triggerHttpChallengeRequest.json | 1 - .../resources/json/updateRegistration.json | 4 +--- 18 files changed, 4 insertions(+), 68 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 976d52f1..caa2a999 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java @@ -156,7 +156,6 @@ public class Authorization extends AcmeResource { LOG.debug("deactivate"); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource("authz"); claims.put("status", "deactivated"); conn.sendSignedRequest(getLocation(), claims, getSession()); diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java index ce10dd00..76bfccaf 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Certificate.java @@ -141,7 +141,6 @@ public class Certificate extends AcmeResource { try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource(Resource.REVOKE_CERT); claims.putBase64("certificate", getCertificate().getEncoded()); if (reason != null) { claims.put("reason", reason.getReasonCode()); 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 0ec12c8f..6c7f1e4a 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java @@ -131,7 +131,6 @@ public class Registration extends AcmeResource { LOG.debug("update"); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource("reg"); conn.sendSignedRequest(getLocation(), claims, getSession()); conn.accept(HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED); @@ -194,7 +193,6 @@ public class Registration extends AcmeResource { LOG.debug("authorizeDomain {}", domain); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource(Resource.NEW_AUTHZ); claims.object("identifier") .put("type", "dns") .put("value", toAce(domain)); @@ -245,7 +243,6 @@ public class Registration extends AcmeResource { innerJws.sign(); JSONBuilder outerClaim = new JSONBuilder(); - outerClaim.putResource(Resource.KEY_CHANGE); // Let's Encrypt needs the resource here outerClaim.put("protected", innerJws.getHeaders().getEncodedHeader()); outerClaim.put("signature", innerJws.getEncodedSignature()); outerClaim.put("payload", innerJws.getEncodedPayload()); @@ -269,7 +266,6 @@ public class Registration extends AcmeResource { LOG.debug("deactivate"); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource("reg"); claims.put(KEY_STATUS, "deactivated"); conn.sendSignedRequest(getLocation(), claims, getSession()); @@ -383,7 +379,6 @@ public class Registration extends AcmeResource { LOG.debug("modify/commit"); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource("reg"); if (!editContacts.isEmpty()) { claims.put(KEY_CONTACT, editContacts); } diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java index bb15526b..00fd5f06 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java @@ -89,7 +89,6 @@ public class RegistrationBuilder { try (Connection conn = session.provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource(Resource.NEW_ACCOUNT); if (!contacts.isEmpty()) { claims.put("contact", contacts); } diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java index b0d2409a..4916227d 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java @@ -180,7 +180,6 @@ public class Challenge extends AcmeResource { LOG.debug("trigger"); try (Connection conn = getSession().provider().connect()) { JSONBuilder claims = new JSONBuilder(); - claims.putResource("challenge"); respond(claims); conn.sendSignedRequest(getLocation(), claims, getSession()); diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java index f4a3874e..d3544e52 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/util/JSONBuilder.java @@ -28,7 +28,6 @@ import org.jose4j.json.JsonUtil; import org.jose4j.jwk.JsonWebKey; import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.lang.JoseException; -import org.shredzone.acme4j.connector.Resource; import org.shredzone.acme4j.exception.AcmeProtocolException; /** @@ -80,28 +79,6 @@ public class JSONBuilder { return this; } - /** - * Puts a resource. - * - * @param resource - * Resource name - * @return {@code this} - */ - public JSONBuilder putResource(String resource) { - return put("resource", resource); - } - - /** - * Puts a resource. - * - * @param resource - * {@link Resource} - * @return {@code this} - */ - public JSONBuilder putResource(Resource resource) { - return putResource(resource.path()); - } - /** * Puts binary data to the JSON. The data is base64 url encoded. * 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 e83a7238..1250d237 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -256,7 +256,6 @@ public class AuthorizationTest { @Override public void sendSignedRequest(URL url, JSONBuilder claims, Session session) { JSON json = claims.toJSON(); - assertThat(json.get("resource").asString(), is("authz")); assertThat(json.get("status").asString(), is("deactivated")); assertThat(url, is(locationUrl)); assertThat(session, is(notNullValue())); 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 569a6984..1d4c9493 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java @@ -348,8 +348,6 @@ public class RegistrationTest { assertThat(session.getKeyPair(), is(sameInstance(oldKeyPair))); JSON json = payload.toJSON(); - assertThat(json.get("resource").asString(), is("key-change")); // Required by Let's Encrypt - String encodedHeader = json.get("protected").asString(); String encodedSignature = json.get("signature").asString(); String encodedPayload = json.get("payload").asString(); @@ -428,7 +426,6 @@ public class RegistrationTest { @Override public void sendSignedRequest(URL url, JSONBuilder claims, Session session) { JSON json = claims.toJSON(); - assertThat(json.get("resource").asString(), is("reg")); assertThat(json.get("status").asString(), is("deactivated")); assertThat(url, is(locationUrl)); assertThat(session, is(notNullValue())); diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java index 0457338e..46fe6670 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/JSONBuilderTest.java @@ -27,7 +27,6 @@ import java.util.Map; import org.jose4j.json.JsonUtil; import org.jose4j.lang.JoseException; import org.junit.Test; -import org.shredzone.acme4j.connector.Resource; /** * Unit test for {@link JSONBuilder}. @@ -90,23 +89,6 @@ public class JSONBuilderTest { assertThat(cb.toString(), is("{\"fooDate\":\"2016-06-01T03:13:46Z\",\"fooNull\":null}")); } - /** - * Test resources. - */ - @Test - public void testResource() { - JSONBuilder res; - - JSONBuilder cb = new JSONBuilder(); - res = cb.putResource("new-reg"); - assertThat(res, is(sameInstance(cb))); - assertThat(cb.toString(), is("{\"resource\":\"new-reg\"}")); - - res = cb.putResource(Resource.NEW_AUTHZ); - assertThat(res, is(sameInstance(cb))); - assertThat(cb.toString(), is("{\"resource\":\"new-authz\"}")); - } - /** * Test base64 encoding. */ diff --git a/acme4j-client/src/test/resources/json/modifyRegistration.json b/acme4j-client/src/test/resources/json/modifyRegistration.json index c0e899c0..2ea857d0 100644 --- a/acme4j-client/src/test/resources/json/modifyRegistration.json +++ b/acme4j-client/src/test/resources/json/modifyRegistration.json @@ -1,5 +1,4 @@ { - "resource": "reg", "contact": [ "mailto:foo2@example.com", "mailto:foo3@example.com" diff --git a/acme4j-client/src/test/resources/json/newAuthorizationRequest.json b/acme4j-client/src/test/resources/json/newAuthorizationRequest.json index 2cb1f3f1..91813901 100644 --- a/acme4j-client/src/test/resources/json/newAuthorizationRequest.json +++ b/acme4j-client/src/test/resources/json/newAuthorizationRequest.json @@ -1,5 +1,4 @@ { - "resource": "new-authz", "identifier": { "type": "dns", "value": "example.org" diff --git a/acme4j-client/src/test/resources/json/newRegistration.json b/acme4j-client/src/test/resources/json/newRegistration.json index 459694f9..8f018b6c 100644 --- a/acme4j-client/src/test/resources/json/newRegistration.json +++ b/acme4j-client/src/test/resources/json/newRegistration.json @@ -1,5 +1,4 @@ { - "resource": "new-account", "terms-of-service-agreed": true, "contact": [ "mailto:foo@example.com" diff --git a/acme4j-client/src/test/resources/json/requestCertificateRequest.json b/acme4j-client/src/test/resources/json/requestCertificateRequest.json index 034942de..eefb9e6a 100644 --- a/acme4j-client/src/test/resources/json/requestCertificateRequest.json +++ b/acme4j-client/src/test/resources/json/requestCertificateRequest.json @@ -1,4 +1,3 @@ { - "csr": "MIIChDCCAWwCAQAwFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPemmumcNGR0hsPo-2N6nkJ0FcEMdb0_MlucHR0dNeHEvn8vmcQHlYRjkDVX0aypnfKQI3tvhTBKLdlNvbVIW1TQ_Wbqh9TQlC8G3Hog8nRQ2vAzO4sH6nhvdrAFUmq6hkATpU3iQuDvtYu03ExaYHKsItLocl1OndaQizBn5udBv1baOW3Kd790k6lEWGrD-TXo6uwuMha2k_YBGNKd4S4UuPmbPV9SUVW8JSylBSgDhvY3BHv-dfdIMhVwRMZDFaa0mHDIYUiwcEaU5x4P6Q5bGP2wxcUPCLwFsbAK5K6B2T2P3A2fNjGBAlHwEkg6VMvi7jax8MD-oRnku2M2JLAgMBAAGgKTAnBgkqhkiG9w0BCQ4xGjAYMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQACnMZdjE1jVqnkHkEeGrMXujWuwuiKLZVa4YZ9fL0UIGOqqf4b9-3JmtEiLB9ycQO5N9rW4V-6_DBMeoeRBLu-wranHnxU4ds6GzNzBxKfI86_8t5pdQK4Cglv7yfseseZRdQtvcR2ejkW0F3SL1DF5Sk3T46aRYiUXxeoNC4Uh3zoIHOv8YGUa-DuZQ6OnHMhPrdsfU09L7KVAMTq1bodjGWmgoIJm4x5JSm19GbhYAm9Q9XWnN56YHqgS3FtS9n3wDxz7Dvo24whto1tUU5hnjrp31rTvyxG3kydoEZf2Ciq_82bQDb40kwnoO6RytPYJVMRIBsP2mCfaFtIt9Eb", - "resource": "new-cert" + "csr": "MIIChDCCAWwCAQAwFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPemmumcNGR0hsPo-2N6nkJ0FcEMdb0_MlucHR0dNeHEvn8vmcQHlYRjkDVX0aypnfKQI3tvhTBKLdlNvbVIW1TQ_Wbqh9TQlC8G3Hog8nRQ2vAzO4sH6nhvdrAFUmq6hkATpU3iQuDvtYu03ExaYHKsItLocl1OndaQizBn5udBv1baOW3Kd790k6lEWGrD-TXo6uwuMha2k_YBGNKd4S4UuPmbPV9SUVW8JSylBSgDhvY3BHv-dfdIMhVwRMZDFaa0mHDIYUiwcEaU5x4P6Q5bGP2wxcUPCLwFsbAK5K6B2T2P3A2fNjGBAlHwEkg6VMvi7jax8MD-oRnku2M2JLAgMBAAGgKTAnBgkqhkiG9w0BCQ4xGjAYMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQACnMZdjE1jVqnkHkEeGrMXujWuwuiKLZVa4YZ9fL0UIGOqqf4b9-3JmtEiLB9ycQO5N9rW4V-6_DBMeoeRBLu-wranHnxU4ds6GzNzBxKfI86_8t5pdQK4Cglv7yfseseZRdQtvcR2ejkW0F3SL1DF5Sk3T46aRYiUXxeoNC4Uh3zoIHOv8YGUa-DuZQ6OnHMhPrdsfU09L7KVAMTq1bodjGWmgoIJm4x5JSm19GbhYAm9Q9XWnN56YHqgS3FtS9n3wDxz7Dvo24whto1tUU5hnjrp31rTvyxG3kydoEZf2Ciq_82bQDb40kwnoO6RytPYJVMRIBsP2mCfaFtIt9Eb" } diff --git a/acme4j-client/src/test/resources/json/requestCertificateRequestWithDate.json b/acme4j-client/src/test/resources/json/requestCertificateRequestWithDate.json index 5813dd9b..c6666c54 100644 --- a/acme4j-client/src/test/resources/json/requestCertificateRequestWithDate.json +++ b/acme4j-client/src/test/resources/json/requestCertificateRequestWithDate.json @@ -1,6 +1,5 @@ { "csr": "MIIChDCCAWwCAQAwFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPemmumcNGR0hsPo-2N6nkJ0FcEMdb0_MlucHR0dNeHEvn8vmcQHlYRjkDVX0aypnfKQI3tvhTBKLdlNvbVIW1TQ_Wbqh9TQlC8G3Hog8nRQ2vAzO4sH6nhvdrAFUmq6hkATpU3iQuDvtYu03ExaYHKsItLocl1OndaQizBn5udBv1baOW3Kd790k6lEWGrD-TXo6uwuMha2k_YBGNKd4S4UuPmbPV9SUVW8JSylBSgDhvY3BHv-dfdIMhVwRMZDFaa0mHDIYUiwcEaU5x4P6Q5bGP2wxcUPCLwFsbAK5K6B2T2P3A2fNjGBAlHwEkg6VMvi7jax8MD-oRnku2M2JLAgMBAAGgKTAnBgkqhkiG9w0BCQ4xGjAYMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQACnMZdjE1jVqnkHkEeGrMXujWuwuiKLZVa4YZ9fL0UIGOqqf4b9-3JmtEiLB9ycQO5N9rW4V-6_DBMeoeRBLu-wranHnxU4ds6GzNzBxKfI86_8t5pdQK4Cglv7yfseseZRdQtvcR2ejkW0F3SL1DF5Sk3T46aRYiUXxeoNC4Uh3zoIHOv8YGUa-DuZQ6OnHMhPrdsfU09L7KVAMTq1bodjGWmgoIJm4x5JSm19GbhYAm9Q9XWnN56YHqgS3FtS9n3wDxz7Dvo24whto1tUU5hnjrp31rTvyxG3kydoEZf2Ciq_82bQDb40kwnoO6RytPYJVMRIBsP2mCfaFtIt9Eb", "notBefore": "2016-01-01T00:00:00Z", - "notAfter": "2016-01-08T00:00:00Z", - "resource": "new-cert" + "notAfter": "2016-01-08T00:00:00Z" } diff --git a/acme4j-client/src/test/resources/json/revokeCertificateRequest.json b/acme4j-client/src/test/resources/json/revokeCertificateRequest.json index 1cda1a03..bc34856a 100644 --- a/acme4j-client/src/test/resources/json/revokeCertificateRequest.json +++ b/acme4j-client/src/test/resources/json/revokeCertificateRequest.json @@ -1,4 +1,3 @@ { - "certificate": "MIIDFzCCAf-gAwIBAgIIYZRPVr9ji5UwDQYJKoZIhvcNAQELBQAwKDEmMCQGA1UEAxMdUGViYmxlIEludGVybWVkaWF0ZSBDQSA2NDVmYzUwHhcNMTcwNDI2MTE0NDEzWhcNMjIwNDI2MTE0NDEzWjAWMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCRYYYLLZxJeoJKOcSwe-VpwUR_vehvx1dMy1fZoK3UX9sDcc5kRKxQJ7vog7q6XG4vA4fGcrGAfG6AeuwplWq3kb3UzYeqJeESeoRG0QhWVwCtIUPPVjHaPS19jP1xaE0vsfzCP3gD4l6W9ZhYlIqirFHEFgK8aKtMxFsmEVR2cDOyH9S5Eoe7QAY43mcflSV6-BzULRwvtT6ds-0Upf0UMbzp0z8Vdx017MoZdDMAumTaQt8MuIbwxcmRBrZp3pltF3mjGvtBMmuEUoqkiLWtCzhiH2pq4T9LDBbilZmjgCWB9pLcqe-KxsdgmBSwPVB_3yhvDaAX0ZuvafjEF68CAwEAAaNXMFUwDgYDVR0PAQH_BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAtZKzESSFF9wVUQdjSe-2P-0OFR7vvfnABs0p1fRv3n17OEgwqiZEui8aUVkY_mzH90rnL25iIUt-7v4PUUIa7NgZ5adxNvnMvTpuQyFYSwfJODFHZTZnJQJikvmxa0hIoH-zV0s3Pe3OctNeBEMAu2Tq4KsZZY4hF3c7G0Uwe7vmmffgHtixADkbOKwqZm1fBzRx6CUjz3u-rmGa4b30unRuF81YI4jqyeOJGNezSYsvLPdInp-ISa9mbQvI09bZY_zis0uMGVFcNwKLX3X95xxMONdX7VUsEBq1rFz4ec7priCoiaEPAD7lAq7FFB1HHwVkPovtYQq7IKXS5VXr4", - "resource": "revoke-cert" + "certificate": "MIIDFzCCAf-gAwIBAgIIYZRPVr9ji5UwDQYJKoZIhvcNAQELBQAwKDEmMCQGA1UEAxMdUGViYmxlIEludGVybWVkaWF0ZSBDQSA2NDVmYzUwHhcNMTcwNDI2MTE0NDEzWhcNMjIwNDI2MTE0NDEzWjAWMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCRYYYLLZxJeoJKOcSwe-VpwUR_vehvx1dMy1fZoK3UX9sDcc5kRKxQJ7vog7q6XG4vA4fGcrGAfG6AeuwplWq3kb3UzYeqJeESeoRG0QhWVwCtIUPPVjHaPS19jP1xaE0vsfzCP3gD4l6W9ZhYlIqirFHEFgK8aKtMxFsmEVR2cDOyH9S5Eoe7QAY43mcflSV6-BzULRwvtT6ds-0Upf0UMbzp0z8Vdx017MoZdDMAumTaQt8MuIbwxcmRBrZp3pltF3mjGvtBMmuEUoqkiLWtCzhiH2pq4T9LDBbilZmjgCWB9pLcqe-KxsdgmBSwPVB_3yhvDaAX0ZuvafjEF68CAwEAAaNXMFUwDgYDVR0PAQH_BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAtZKzESSFF9wVUQdjSe-2P-0OFR7vvfnABs0p1fRv3n17OEgwqiZEui8aUVkY_mzH90rnL25iIUt-7v4PUUIa7NgZ5adxNvnMvTpuQyFYSwfJODFHZTZnJQJikvmxa0hIoH-zV0s3Pe3OctNeBEMAu2Tq4KsZZY4hF3c7G0Uwe7vmmffgHtixADkbOKwqZm1fBzRx6CUjz3u-rmGa4b30unRuF81YI4jqyeOJGNezSYsvLPdInp-ISa9mbQvI09bZY_zis0uMGVFcNwKLX3X95xxMONdX7VUsEBq1rFz4ec7priCoiaEPAD7lAq7FFB1HHwVkPovtYQq7IKXS5VXr4" } diff --git a/acme4j-client/src/test/resources/json/revokeCertificateWithReasonRequest.json b/acme4j-client/src/test/resources/json/revokeCertificateWithReasonRequest.json index 5d22b4b0..3314d545 100644 --- a/acme4j-client/src/test/resources/json/revokeCertificateWithReasonRequest.json +++ b/acme4j-client/src/test/resources/json/revokeCertificateWithReasonRequest.json @@ -1,5 +1,4 @@ { "certificate": "MIIDFzCCAf-gAwIBAgIIYZRPVr9ji5UwDQYJKoZIhvcNAQELBQAwKDEmMCQGA1UEAxMdUGViYmxlIEludGVybWVkaWF0ZSBDQSA2NDVmYzUwHhcNMTcwNDI2MTE0NDEzWhcNMjIwNDI2MTE0NDEzWjAWMRQwEgYDVQQDEwtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCRYYYLLZxJeoJKOcSwe-VpwUR_vehvx1dMy1fZoK3UX9sDcc5kRKxQJ7vog7q6XG4vA4fGcrGAfG6AeuwplWq3kb3UzYeqJeESeoRG0QhWVwCtIUPPVjHaPS19jP1xaE0vsfzCP3gD4l6W9ZhYlIqirFHEFgK8aKtMxFsmEVR2cDOyH9S5Eoe7QAY43mcflSV6-BzULRwvtT6ds-0Upf0UMbzp0z8Vdx017MoZdDMAumTaQt8MuIbwxcmRBrZp3pltF3mjGvtBMmuEUoqkiLWtCzhiH2pq4T9LDBbilZmjgCWB9pLcqe-KxsdgmBSwPVB_3yhvDaAX0ZuvafjEF68CAwEAAaNXMFUwDgYDVR0PAQH_BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAtZKzESSFF9wVUQdjSe-2P-0OFR7vvfnABs0p1fRv3n17OEgwqiZEui8aUVkY_mzH90rnL25iIUt-7v4PUUIa7NgZ5adxNvnMvTpuQyFYSwfJODFHZTZnJQJikvmxa0hIoH-zV0s3Pe3OctNeBEMAu2Tq4KsZZY4hF3c7G0Uwe7vmmffgHtixADkbOKwqZm1fBzRx6CUjz3u-rmGa4b30unRuF81YI4jqyeOJGNezSYsvLPdInp-ISa9mbQvI09bZY_zis0uMGVFcNwKLX3X95xxMONdX7VUsEBq1rFz4ec7priCoiaEPAD7lAq7FFB1HHwVkPovtYQq7IKXS5VXr4", - "resource": "revoke-cert", "reason": 1 } diff --git a/acme4j-client/src/test/resources/json/triggerHttpChallengeRequest.json b/acme4j-client/src/test/resources/json/triggerHttpChallengeRequest.json index 4c0cffe3..a2c1462f 100644 --- a/acme4j-client/src/test/resources/json/triggerHttpChallengeRequest.json +++ b/acme4j-client/src/test/resources/json/triggerHttpChallengeRequest.json @@ -1,5 +1,4 @@ { - "resource": "challenge", "type": "http-01", "token": "IlirfxKKXAsHtmzK29Pj8A", "keyAuthorization": "IlirfxKKXAsHtmzK29Pj8A.HnWjTDnyqlCrm6tZ-6wX-TrEXgRdeNu9G71gqxSO6o0" diff --git a/acme4j-client/src/test/resources/json/updateRegistration.json b/acme4j-client/src/test/resources/json/updateRegistration.json index b39d7f32..0967ef42 100644 --- a/acme4j-client/src/test/resources/json/updateRegistration.json +++ b/acme4j-client/src/test/resources/json/updateRegistration.json @@ -1,3 +1 @@ -{ - "resource": "reg" -} +{}