PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-22 23:22:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Be less finnicky about session key formats

Browse source
This commit is contained in:
Paul Schaub 2022-11-06 20:23:01 +01:00
parent dd5d790e21
commit aa953428ee
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sop-java-picocli/src/main/java/sop/cli/picocli/commands/DecryptCmd.java
View file

@ -175,24 +175,22 @@ public class DecryptCmd extends AbstractSopCmd {
} }
private void setWithSessionKeys(List<String> withSessionKey, Decrypt decrypt) { private void setWithSessionKeys(List<String> withSessionKey, Decrypt decrypt) {
Pattern sessionKeyPattern = Pattern.compile("^\\d+:[0-9A-F]+$");
for (String sessionKeyFile : withSessionKey) { for (String sessionKeyFile : withSessionKey) {
String sessionKey; String sessionKeyString;
try { try {
sessionKey = stringFromInputStream(getInput(sessionKeyFile)); sessionKeyString = stringFromInputStream(getInput(sessionKeyFile));
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
if (!sessionKeyPattern.matcher(sessionKey).matches()) { SessionKey sessionKey;
String errorMsg = getMsg("sop.error.input.malformed_session_key");
throw new IllegalArgumentException(errorMsg);
}
String[] split = sessionKey.split(":");
byte algorithm = (byte) Integer.parseInt(split[0]);
byte[] key = HexUtil.hexToBytes(split[1]);
try { try {
decrypt.withSessionKey(new SessionKey(algorithm, key)); sessionKey = SessionKey.fromString(sessionKeyString);
} catch (IllegalArgumentException e) {
String errorMsg = getMsg("sop.error.input.malformed_session_key");
throw new IllegalArgumentException(errorMsg, e);
}
try {
decrypt.withSessionKey(sessionKey);
} catch (SOPGPException.UnsupportedOption unsupportedOption) { } catch (SOPGPException.UnsupportedOption unsupportedOption) {
String errorMsg = getMsg("sop.error.feature_support.option_not_supported", OPT_WITH_SESSION_KEY); String errorMsg = getMsg("sop.error.feature_support.option_not_supported", OPT_WITH_SESSION_KEY);
throw new SOPGPException.UnsupportedOption(errorMsg, unsupportedOption); throw new SOPGPException.UnsupportedOption(errorMsg, unsupportedOption);

3
sop-java/src/main/java/sop/SessionKey.java
View file

@ -12,7 +12,7 @@ import sop.util.HexUtil;
public class SessionKey { public class SessionKey {
private static final Pattern PATTERN = Pattern.compile("^(\\d):([0-9a-fA-F]+)$"); private static final Pattern PATTERN = Pattern.compile("^(\\d):([0-9A-F]+)$");
private final byte algorithm; private final byte algorithm;
private final byte[] sessionKey; private final byte[] sessionKey;
@ -62,6 +62,7 @@ public class SessionKey {
} }
public static SessionKey fromString(String string) { public static SessionKey fromString(String string) {
string = string.trim().toUpperCase().replace("\n", "");
Matcher matcher = PATTERN.matcher(string); Matcher matcher = PATTERN.matcher(string);
if (!matcher.matches()) { if (!matcher.matches()) {
throw new IllegalArgumentException("Provided session key does not match expected format."); throw new IllegalArgumentException("Provided session key does not match expected format.");

8
sop-java/src/test/java/sop/util/SessionKeyTest.java
View file

@ -20,6 +20,14 @@ public class SessionKeyTest {
assertEquals(string, sessionKey.toString()); assertEquals(string, sessionKey.toString());
} }
@Test
public void fromLowerStringTest() {
String string = "9:FCA4BEAF687F48059CACC14FB019125CD57392BAB7037C707835925CBF9F7BCD";
String lowercaseWithTrailingNewLine = "9:fca4beaf687f48059cacc14fb019125cd57392bab7037c707835925cbf9f7bcd\n";
SessionKey sessionKey = SessionKey.fromString(lowercaseWithTrailingNewLine);
assertEquals(string, sessionKey.toString());
}
@Test @Test
public void toStringTest() { public void toStringTest() {
SessionKey sessionKey = new SessionKey((byte) 9, HexUtil.hexToBytes("FCA4BEAF687F48059CACC14FB019125CD57392BAB7037C707835925CBF9F7BCD")); SessionKey sessionKey = new SessionKey((byte) 9, HexUtil.hexToBytes("FCA4BEAF687F48059CACC14FB019125CD57392BAB7037C707835925CBF9F7BCD"));