PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2025-09-09 10:19:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix exception handling and add tests

Browse source
This commit is contained in:
Paul Schaub 2022-02-09 23:35:44 +01:00
parent 117117b735
commit 3e1502ff2a
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
4 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,7 @@ public class DecryptCmd implements Runnable {
try {
sessionKey = FileUtil.stringFromInputStream(FileUtil.getFileInputStream(sessionKeyFile));
} catch (IOException e) {
throw new SOPGPException.BadData("Cannot read session key from session key file " + sessionKeyFile, e);
throw new RuntimeException(e);
}
if (!sessionKeyPattern.matcher(sessionKey).matches()) {
throw new IllegalArgumentException("Session keys are expected in the format 'ALGONUM:HEXKEY'.");
@ -224,7 +224,7 @@ public class DecryptCmd implements Runnable {
} catch (SOPGPException.UnsupportedOption unsupportedOption) {
throw new SOPGPException.UnsupportedOption(String.format(ERROR_UNSUPPORTED_OPTION, "--with-password"), unsupportedOption);
} catch (IOException e) {
throw new SOPGPException.PasswordNotHumanReadable("Cannot read password from password file " + passwordFile, e);
throw new RuntimeException(e);
}
}
}