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

PrivateKeyFile: Add option to generate addressbook authentication string

Browse Source 
fix inadvertent fallthru
HostTxtParser: Add -q command line option, enhance return codes
This commit is contained in:
zzz
2017-02-23 19:45:33 +00:00
parent 3c735eaf96
commit 33b1851317
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java
View File

@@ -236,21 +236,28 @@ class HostTxtParser {
}
/**
* Usage: HostTxtParser validate example.i2p=b64dest[#!key1=val1#key2=val2]
* Usage: HostTxtParser [-q] validate example.i2p=b64dest[#!key1=val1#key2=val2]
*/
public static void main(String[] args) throws Exception {
boolean quiet = false;
if (args.length > 0 && args[0].equals("-q")) {
quiet = true;
args = java.util.Arrays.copyOfRange(args, 1, args.length);
}
if (args.length != 2 || !args[0].equals("validate")) {
System.err.println("Usage: HostTxtParser validate example.i2p=b64dest[#!key1=val1#key2=val2]");
System.exit(1);
}
HostTxtEntry e = parse(args[1].trim(), false);
if (e == null) {
System.err.println("Bad format");
System.exit(1);
if (!quiet)
System.err.println("Bad format");
System.exit(2);
}
if (!e.hasValidSig()) {
System.err.println("Bad signature");
System.exit(1);
if (!quiet)
System.err.println("Bad signature");
System.exit(3);
}
Properties p = e.getProps();
if (p != null) {
@@ -259,12 +266,14 @@ class HostTxtParser {
p.containsKey(HostTxtEntry.PROP_OLDNAME) ||
p.containsKey(HostTxtEntry.PROP_OLDSIG)) {
if (!e.hasValidSig()) {
System.err.println("Bad inner signature");
System.exit(1);
if (!quiet)
System.err.println("Bad inner signature");
System.exit(4);
}
}
}
System.err.println("Good signature for " + e.getName());
if (!quiet)
System.err.println("Good signature for " + e.getName());
System.exit(0);
}