NetDB: Add new reseed

Add CLI flag to force IPv6 for testing
This commit is contained in:
zzz
2025-04-24 15:33:18 -04:00
parent 3681c43519
commit 75a4752fe0
3 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,34 @@
-----BEGIN CERTIFICATE-----
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
N4jAXWQ7s5p4GYaf4Q==
-----END CERTIFICATE-----

View File

@ -0,0 +1,16 @@
-----BEGIN CERTIFICATE-----
MIICiTCCAhCgAwIBAgIRANnCngKnxnq69APyJi8ck5UwCgYIKoZIzj0EAwQwbjEL
MAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwGA1UEChMV
STJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxFzAVBgNVBAMTDmN1
YmljY2hhb3MubmV0MB4XDTI1MDMzMTE4MTExOFoXDTMwMDMzMDE4MTExOFowbjEL
MAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwGA1UEChMV
STJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxFzAVBgNVBAMTDmN1
YmljY2hhb3MubmV0MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEpbV2NztI4SZ29paT
fCQbLVttjN0BYKheuN/Dm8FNyR/OHBvcrF8rPKCqQDD+JFebk3g+J9D9M2mX92TC
dBquivOR2ptici7cyhqtYz3yA2IosoPo9RzEVEWVpwJ5gC8Fo3IwcDAOBgNVHQ8B
Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAd
BgNVHQ4EFgQUB76tW0XSWIhYMocS6ZQruVbpVKcwGQYDVR0RBBIwEIIOY3ViaWNj
aGFvcy5uZXQwCgYIKoZIzj0EAwQDZwAwZAIwQP7pCG7dHTxAd31A9A6QAuOPtmxP
/6zDp5SkSiLE/UtJ8SAbv1T43y1pVfnMtyp9AjBjS4dJBUlB8XQC4s2v0t6Yx//q
Js1WUZFe/X2+X2C8BdNRKhuOPB4K41byZSwA9Ng=
-----END CERTIFICATE-----

View File

@ -116,6 +116,7 @@ public class Reseeder {
//
// https url:port, ending with "/" // certificates/reseed/ // certificates/ssl/ // notes
// ---------------------------------- ------------------------ ------------------------- ---------------
"https://cubicchaos.net:8443/" + ',' + // unixeno_at_cubicchaos.net.crt // cubicchaos.net.crt
"https://coconut.incognet.io/" + ',' + // rambler_at_mail.i2p.crt // CA
"https://reseed.stormycloud.org/" + ',' + // admin_at_stormycloud.org.crt // CA
"https://i2p.ghativega.in/" + ',' + // arnavbhatt288_at_mail.i2p.crt // CA
@ -1232,7 +1233,7 @@ public class Reseeder {
*/
public static void main(String args[]) throws Exception {
if (args.length == 1 && args[0].equals("help")) {
System.out.println("Usage: reseeder [https://hostname/ ...]");
System.out.println("Usage: reseeder [-6] [https://hostname/ ...]");
System.out.println(" reseeder list");
System.exit(1);
}
@ -1245,6 +1246,11 @@ public class Reseeder {
}
System.exit(0);
}
boolean ipV6 = false;
if (args.length > 0 && args[0].equals("-6")) {
ipV6 = true;
args = Arrays.copyOfRange(args, 1, args.length);
}
File f = new File("certificates");
if (!f.exists()) {
System.out.println("Must be run from $I2P or have symlink to $I2P/certificates in this directory");
@ -1275,6 +1281,8 @@ public class Reseeder {
} else {
get = new SSLEepGet(ctx, su3.getPath(), url, sslState);
}
if (ipV6)
get.forceDNSOverHTTPS(true, true);
long start = System.currentTimeMillis();
if (get.fetch()) {
int rc = get.getStatusCode();