echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PKF: Add support for addsubdomain

Browse Source
This commit is contained in:
zzz
2020-04-03 19:38:39 +00:00
parent 6b05acff8d
commit 2ec9a4ab64
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/src/net/i2p/data/PrivateKeyFile.java
View File

@ -98,10 +98,13 @@ public class PrivateKeyFile {
String ttype = null; String ttype = null;
String hostname = null; String hostname = null;
String offline = null; String offline = null;
String signer = null;
String signername = null;
String signaction = null;
int days = 365; int days = 365;
int mode = 0; int mode = 0;
boolean error = false; boolean error = false;
Getopt g = new Getopt("pkf", args, "t:nuxhse:c:a:o:d:r:p:"); Getopt g = new Getopt("pkf", args, "t:nuxhse:c:a:o:d:r:p:b:y:z:");
int c; int c;
while ((c = g.getopt()) != -1) { while ((c = g.getopt()) != -1) {
switch (c) { switch (c) {
@ -136,6 +139,18 @@ public class PrivateKeyFile {
error = true; error = true;
break; break;
case 'b':
signername = g.getOptarg();
break;
case 'y':
signer = g.getOptarg();
break;
case 'z':
signaction = g.getOptarg();
break;
case 'o': case 'o':
offline = g.getOptarg(); offline = g.getOptarg();
if (mode == 0) if (mode == 0)
@ -178,6 +193,9 @@ public class PrivateKeyFile {
String orig = offline != null ? offline : filearg; String orig = offline != null ? offline : filearg;
File f = new File(orig); File f = new File(orig);
boolean exists = f.exists(); boolean exists = f.exists();
if (mode == 'a' && !exists) {
throw new I2PException("File for authentication does not exist: " + orig);
}
PrivateKeyFile pkf = new PrivateKeyFile(f, client); PrivateKeyFile pkf = new PrivateKeyFile(f, client);
Destination d; Destination d;
if (etype != null && !exists) { if (etype != null && !exists) {
@ -261,8 +279,25 @@ public class PrivateKeyFile {
// addressbook auth // addressbook auth
OrderedProperties props = new OrderedProperties(); OrderedProperties props = new OrderedProperties();
HostTxtEntry he = new HostTxtEntry(hostname, d.toBase64(), props); HostTxtEntry he = new HostTxtEntry(hostname, d.toBase64(), props);
if (signer != null && signername != null && signaction != null) {
File fsigner = new File(signer);
if (!fsigner.exists())
throw new I2PException("Signing file does not exist: " + signer);
if (!signaction.equals(HostTxtEntry.ACTION_ADDSUBDOMAIN))
throw new I2PException("Unsupported action: " + signaction);
if (!hostname.endsWith('.' + signername))
throw new I2PException(hostname + " is not a subdomain of " + signername);
PrivateKeyFile pkf2 = new PrivateKeyFile(fsigner);
props.setProperty(HostTxtEntry.PROP_ACTION, signaction);
props.setProperty(HostTxtEntry.PROP_OLDNAME, signername);
props.setProperty(HostTxtEntry.PROP_OLDDEST, pkf2.getDestination().toBase64());
he.signInner(pkf2.getSigningPrivKey());
} else if (signer != null || signername != null || signaction != null) {
usage();
return;
}
he.sign(pkf.getSigningPrivKey()); he.sign(pkf.getSigningPrivKey());
System.out.println("Addressbook Authentication String:"); System.out.println("\nAddressbook Authentication String:");
OutputStreamWriter out = new OutputStreamWriter(System.out); OutputStreamWriter out = new OutputStreamWriter(System.out);
he.write(out); he.write(out);
out.flush(); out.flush();
@ -342,6 +377,7 @@ public class PrivateKeyFile {
" -x (changes to hidden cert)\n" + " -x (changes to hidden cert)\n" +
"\nother options:\n" + "\nother options:\n" +
" -a example.i2p (generate addressbook authentication string)\n" + " -a example.i2p (generate addressbook authentication string)\n" +
" -b example.i2p (hostname of the 2LD dest for signing)\n" +
" -c sigtype (specify sig type of destination)\n" + " -c sigtype (specify sig type of destination)\n" +
" -d days (specify expiration in days of offline sig, default 365)\n" + " -d days (specify expiration in days of offline sig, default 365)\n" +
" -e effort (specify HashCash effort instead of default " + HASH_EFFORT + ")\n" + " -e effort (specify HashCash effort instead of default " + HASH_EFFORT + ")\n" +
@ -349,6 +385,8 @@ public class PrivateKeyFile {
" -p enctype (specify enc type of destination)\n" + " -p enctype (specify enc type of destination)\n" +
" -r sigtype (specify sig type of transient key, default Ed25519)\n" + " -r sigtype (specify sig type of transient key, default Ed25519)\n" +
" -t sigtype (changes to KeyCertificate of the given sig type)\n" + " -t sigtype (changes to KeyCertificate of the given sig type)\n" +
" -y 2lddestfile (sign the authentication string with the 2LD key file specified)\n" +
" -z signaction (authentication string command, must be \"addsubdomain\"\n" +
""); "");
StringBuilder buf = new StringBuilder(256); StringBuilder buf = new StringBuilder(256);
buf.append("Available signature types:\n"); buf.append("Available signature types:\n");