marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename fingerprint to safety number

Browse Source 
Fixes #92
This commit is contained in:
AsamK 2020-04-03 14:27:18 +02:00
parent f51f0cbbcf
commit e04c45766d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/signal-cli.1.adoc
View File

@ -226,9 +226,9 @@ number::
*-a*, *--trust-all-known-keys*:: *-a*, *--trust-all-known-keys*::
Trust all known keys of this user, only use this for testing. Trust all known keys of this user, only use this for testing.
*-v* VERIFIED_FINGERPRINT, *--verified-fingerprint* VERIFIED_FINGERPRINT:: *-v* VERIFIED_SAFETY_NUMBER, *--verified-safety-number* VERIFIED_SAFETY_NUMBER::
Specify the safety number or fingerprint of the key, only use this option if you have verified Specify the safety number of the key, only use this option if you have verified
the fingerprint. the safety number.
updateProfile updateProfile
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
@ -355,7 +355,7 @@ Send a message to a group::
signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID signal-cli -u USERNAME send -m "This is a message" -g GROUP_ID
Trust new key, after having verified it:: Trust new key, after having verified it::
signal-cli -u USERNAME trust -v FINGER_PRINT NUMBER signal-cli -u USERNAME trust -v SAFETY_NUMBER NUMBER
Trust new key, without having verified it. Only use this if you don't care about security:: Trust new key, without having verified it. Only use this if you don't care about security::
signal-cli -u USERNAME trust -a NUMBER signal-cli -u USERNAME trust -a NUMBER

22
src/main/java/org/asamk/signal/commands/TrustCommand.java
View File

@ -23,8 +23,8 @@ public class TrustCommand implements LocalCommand {
mutTrust.addArgument("-a", "--trust-all-known-keys") mutTrust.addArgument("-a", "--trust-all-known-keys")
.help("Trust all known keys of this user, only use this for testing.") .help("Trust all known keys of this user, only use this for testing.")
.action(Arguments.storeTrue()); .action(Arguments.storeTrue());
mutTrust.addArgument("-v", "--verified-fingerprint") mutTrust.addArgument("-v", "--verified-safety-number", "--verified-fingerprint")
.help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint."); .help("Specify the safety number of the key, only use this option if you have verified the safety number.");
} }
@Override @Override
@ -41,13 +41,13 @@ public class TrustCommand implements LocalCommand {
return 1; return 1;
} }
} else { } else {
String fingerprint = ns.getString("verified_fingerprint"); String safetyNumber = ns.getString("verified_safety_number");
if (fingerprint != null) { if (safetyNumber != null) {
fingerprint = fingerprint.replaceAll(" ", ""); safetyNumber = safetyNumber.replaceAll(" ", "");
if (fingerprint.length() == 66) { if (safetyNumber.length() == 66) {
byte[] fingerprintBytes; byte[] fingerprintBytes;
try { try {
fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT)); fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
} catch (Exception e) { } catch (Exception e) {
System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters."); System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
return 1; return 1;
@ -63,10 +63,10 @@ public class TrustCommand implements LocalCommand {
System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct."); System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
return 1; return 1;
} }
} else if (fingerprint.length() == 60) { } else if (safetyNumber.length() == 60) {
boolean res; boolean res;
try { try {
res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint); res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
} catch (InvalidNumberException e) { } catch (InvalidNumberException e) {
ErrorUtils.handleInvalidNumberException(e); ErrorUtils.handleInvalidNumberException(e);
return 1; return 1;
@ -76,11 +76,11 @@ public class TrustCommand implements LocalCommand {
return 1; return 1;
} }
} else { } else {
System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number"); System.err.println("Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
return 1; return 1;
} }
} else { } else {
System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT"); System.err.println("You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
return 1; return 1;
} }
} }