Skip to content

Commit b5a7e00

Browse files
shredshred
committed
Use example IPs according to RFC3849/RFC5737
1 parent 97a6708 commit b5a7e00

File tree

10 files changed

+31
-31
lines changed

10 files changed

+31
-31
lines changed

‎acme4j-client/src/test/java/org/shredzone/acme4j/IdentifierTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,20 @@ public void testNoDns() {
8080

8181
@Test
8282
public void testIp() throws UnknownHostException {
83-
var id1 = Identifier.ip(InetAddress.getByName("192.168.1.2"));
83+
var id1 = Identifier.ip(InetAddress.getByName("192.0.2.2"));
8484
assertThat(id1.getType()).isEqualTo(Identifier.TYPE_IP);
85-
assertThat(id1.getValue()).isEqualTo("192.168.1.2");
86-
assertThat(id1.getIP().getHostAddress()).isEqualTo("192.168.1.2");
85+
assertThat(id1.getValue()).isEqualTo("192.0.2.2");
86+
assertThat(id1.getIP().getHostAddress()).isEqualTo("192.0.2.2");
8787

8888
var id2 = Identifier.ip(InetAddress.getByName("2001:db8:85a3::8a2e:370:7334"));
8989
assertThat(id2.getType()).isEqualTo(Identifier.TYPE_IP);
9090
assertThat(id2.getValue()).isEqualTo("2001:db8:85a3:0:0:8a2e:370:7334");
9191
assertThat(id2.getIP().getHostAddress()).isEqualTo("2001:db8:85a3:0:0:8a2e:370:7334");
9292

93-
var id3 = Identifier.ip("192.168.2.99");
93+
var id3 = Identifier.ip("192.0.2.99");
9494
assertThat(id3.getType()).isEqualTo(Identifier.TYPE_IP);
95-
assertThat(id3.getValue()).isEqualTo("192.168.2.99");
96-
assertThat(id3.getIP().getHostAddress()).isEqualTo("192.168.2.99");
95+
assertThat(id3.getValue()).isEqualTo("192.0.2.99");
96+
assertThat(id3.getIP().getHostAddress()).isEqualTo("192.0.2.99");
9797
}
9898

9999
@Test

‎acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public URL getLocation() {
8383
.identifier(Identifier.dns("d.example.com"))
8484
.identifiers(Arrays.asList(
8585
Identifier.dns("d2.example.com"),
86-
Identifier.ip(InetAddress.getByName("192.168.1.2"))))
86+
Identifier.ip(InetAddress.getByName("192.0.2.2"))))
8787
.notBefore(notBefore)
8888
.notAfter(notAfter)
8989
.create();
@@ -97,7 +97,7 @@ public URL getLocation() {
9797
Identifier.dns("m.example.org"),
9898
Identifier.dns("d.example.com"),
9999
Identifier.dns("d2.example.com"),
100-
Identifier.ip(InetAddress.getByName("192.168.1.2")));
100+
Identifier.ip(InetAddress.getByName("192.0.2.2")));
101101
softly.assertThat(order.getNotBefore().orElseThrow())
102102
.isEqualTo("2016-01-01T00:10:00Z");
103103
softly.assertThat(order.getNotAfter().orElseThrow())

‎acme4j-client/src/test/java/org/shredzone/acme4j/connector/NetworkSettingsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class NetworkSettingsTest {
3636
public void testGettersAndSetters() {
3737
var settings = new NetworkSettings();
3838

39-
var proxyAddress = new InetSocketAddress("10.0.0.1", 8080);
39+
var proxyAddress = new InetSocketAddress("198.51.100.1", 8080);
4040
var proxySelector = ProxySelector.of(proxyAddress);
4141

4242
assertThat(settings.getProxySelector()).isSameAs(HttpClient.Builder.NO_PROXY);

‎acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@ private CSRBuilder createBuilderWithValues() throws UnknownHostException {
209209
builder.addDomains("jklm.no", "pqr.st");
210210
builder.addDomains(Arrays.asList("uv.wx", "y.z"));
211211
builder.addDomain("*.wild.card");
212-
builder.addIP(InetAddress.getByName("192.168.0.1"));
213-
builder.addIP(InetAddress.getByName("192.168.0.2"));
214-
builder.addIPs(InetAddress.getByName("10.0.0.1"), InetAddress.getByName("10.0.0.2"));
215-
builder.addIPs(Arrays.asList(InetAddress.getByName("fd00::1"), InetAddress.getByName("fd00::2")));
212+
builder.addIP(InetAddress.getByName("192.0.2.1"));
213+
builder.addIP(InetAddress.getByName("192.0.2.2"));
214+
builder.addIPs(InetAddress.getByName("198.51.100.1"), InetAddress.getByName("198.51.100.2"));
215+
builder.addIPs(Arrays.asList(InetAddress.getByName("2001:db8::1"), InetAddress.getByName("2001:db8::2")));
216216
builder.addIdentifier(Identifier.dns("ide1.nt"));
217-
builder.addIdentifier(Identifier.ip("192.168.5.5"));
218-
builder.addIdentifiers(Identifier.dns("ide2.nt"), Identifier.ip("192.168.5.6"));
219-
builder.addIdentifiers(Arrays.asList(Identifier.dns("ide3.nt"), Identifier.ip("192.168.5.7")));
217+
builder.addIdentifier(Identifier.ip("203.0.113.5"));
218+
builder.addIdentifiers(Identifier.dns("ide2.nt"), Identifier.ip("203.0.113.6"));
219+
builder.addIdentifiers(Arrays.asList(Identifier.dns("ide3.nt"), Identifier.ip("203.0.113.7")));
220220

221221
builder.setCommonName("abc.de");
222222
builder.setCountry("XX");
@@ -229,9 +229,9 @@ private CSRBuilder createBuilderWithValues() throws UnknownHostException {
229229
+ "OU=Testunit,ST=ABC,"
230230
+ "DNS=abc.de,DNS=fg.hi,DNS=jklm.no,DNS=pqr.st,DNS=uv.wx,DNS=y.z,DNS=*.wild.card,"
231231
+ "DNS=ide1.nt,DNS=ide2.nt,DNS=ide3.nt,"
232-
+ "IP=192.168.0.1,IP=192.168.0.2,IP=10.0.0.1,IP=10.0.0.2,"
233-
+ "IP=fd00:0:0:0:0:0:0:1,IP=fd00:0:0:0:0:0:0:2,"
234-
+ "IP=192.168.5.5,IP=192.168.5.6,IP=192.168.5.7");
232+
+ "IP=192.0.2.1,IP=192.0.2.2,IP=198.51.100.1,IP=198.51.100.2,"
233+
+ "IP=2001:db8:0:0:0:0:0:1,IP=2001:db8:0:0:0:0:0:2,"
234+
+ "IP=203.0.113.5,IP=203.0.113.6,IP=203.0.113.7");
235235
return builder;
236236
}
237237

@@ -281,9 +281,9 @@ private void csrTest(PKCS10CertificationRequest csr) {
281281
assertThat(names.getNames())
282282
.filteredOn(gn -> gn.getTagNo() == GeneralName.iPAddress)
283283
.extracting(gn -> getIP(gn.getName()).getHostAddress())
284-
.containsExactlyInAnyOrder("192.168.0.1", "192.168.0.2", "10.0.0.1",
285-
"10.0.0.2", "fd00:0:0:0:0:0:0:1", "fd00:0:0:0:0:0:0:2",
286-
"192.168.5.5", "192.168.5.6", "192.168.5.7");
284+
.containsExactlyInAnyOrder("192.0.2.1", "192.0.2.2", "198.51.100.1",
285+
"198.51.100.2", "2001:db8:0:0:0:0:0:1", "2001:db8:0:0:0:0:0:2",
286+
"203.0.113.5", "203.0.113.6", "203.0.113.7");
287287
}
288288

289289
/**

‎acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void testCreateTestCertificate() throws Exception {
220220

221221
var builder = new CSRBuilder();
222222
builder.addDomains("example.org", "www.example.org");
223-
builder.addIP(InetAddress.getByName("192.168.0.1"));
223+
builder.addIP(InetAddress.getByName("192.0.2.1"));
224224
builder.sign(keypair);
225225
var csr = builder.getCSR();
226226

@@ -230,7 +230,7 @@ public void testCreateTestCertificate() throws Exception {
230230
assertThat(cert.getIssuerX500Principal().getName()).isEqualTo(rootSubject);
231231
assertThat(cert.getSubjectX500Principal().getName()).isEqualTo("");
232232
assertThat(getSANs(cert)).contains("example.org", "www.example.org");
233-
assertThat(getIpSANs(cert)).contains(InetAddress.getByName("192.168.0.1"));
233+
assertThat(getIpSANs(cert)).contains(InetAddress.getByName("192.0.2.1"));
234234
assertThat(cert.getNotBefore().toInstant()).isEqualTo(notBefore);
235235
assertThat(cert.getNotAfter().toInstant()).isEqualTo(notAfter);
236236
assertThat(cert.getSerialNumber()).isNotNull();

‎acme4j-client/src/test/resources/json/requestOrderRequest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"type": "ip",
33-
"value": "192.168.1.2"
33+
"value": "192.0.2.2"
3434
}
3535
],
3636
"notBefore": "2016-01-01T00:00:00Z",

‎acme4j-client/src/test/resources/json/requestOrderResponse.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"type": "ip",
35-
"value": "192.168.1.2"
35+
"value": "192.0.2.2"
3636
}
3737
],
3838
"notBefore": "2016-01-01T00:10:00Z",

‎acme4j-smime/src/test/java/org/shredzone/acme4j/smime/email/EmailProcessorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public void textExpectedIdentifierFails2() {
227227
assertThatExceptionOfType(AcmeProtocolException.class)
228228
.isThrownBy(() -> {
229229
var processor = EmailProcessor.plainMessage(message);
230-
processor.expectedIdentifier(Identifier.ip("192.168.0.1"));
230+
processor.expectedIdentifier(Identifier.ip("192.0.2.1"));
231231
})
232232
.withMessage("Wrong identifier type: ip");
233233
}

‎src/doc/docs/usage/advanced.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ The `CSRBuilder` also accepts IP addresses and `Identifier` for generating the C
3535

3636
```java
3737
CSRBuilder csrb = new CSRBuilder();
38-
csrb.addIP(InetAddress.getByName("192.168.1.2"));
39-
csrb.addIdentifier(Identifier.ip("192.168.2.3"));
38+
csrb.addIP(InetAddress.getByName("192.0.2.2"));
39+
csrb.addIdentifier(Identifier.ip("192.0.2.3"));
4040
csrb.sign(domainKeyPair);
4141
```
4242

‎src/doc/docs/usage/order.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ Besides domains, _acme4j_ also supports IP identifier validation as specified in
212212

213213
```java
214214
Order order = account.newOrder()
215-
.identifier(Identifier.ip(InetAddress.getByName("192.168.1.2")))
216-
.identifier(Identifier.ip("192.168.2.3")) // for your convenience
215+
.identifier(Identifier.ip(InetAddress.getByName("192.0.2.2")))
216+
.identifier(Identifier.ip("192.0.2.3")) // for your convenience
217217
.identifier(Identifier.dns("example.org"))
218218
.create();
219219
```

0 commit comments

Comments
 (0)