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

Verification: Make use of Optional for signature mode and description

Browse source
This commit is contained in:
Paul Schaub 2023-04-27 12:44:01 +02:00
parent 226b5d99a0
commit 19d6b7e142
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
sop-java/src/main/java/sop/Verification.java
View file

@ -4,11 +4,12 @@
package sop; package sop;
import java.util.Date;
import sop.enums.SignatureMode; import sop.enums.SignatureMode;
import sop.util.Optional;
import sop.util.UTCUtil; import sop.util.UTCUtil;
import java.util.Date;
/** /**
* Class bundling information about a verified signature. * Class bundling information about a verified signature.
*/ */
@ -17,8 +18,8 @@ public class Verification {
private final Date creationTime; private final Date creationTime;
private final String signingKeyFingerprint; private final String signingKeyFingerprint;
private final String signingCertFingerprint; private final String signingCertFingerprint;
private final SignatureMode signatureMode; private final Optional<SignatureMode> signatureMode;
private final String description; private final Optional<String> description;
private static final String MODE = "mode:"; private static final String MODE = "mode:";
@ -30,7 +31,7 @@ public class Verification {
* @param signingCertFingerprint fingerprint of the certificate * @param signingCertFingerprint fingerprint of the certificate
*/ */
public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint) { public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint) {
this(creationTime, signingKeyFingerprint, signingCertFingerprint, null, null); this(creationTime, signingKeyFingerprint, signingCertFingerprint, Optional.ofEmpty(), Optional.ofEmpty());
} }
/** /**
@ -43,11 +44,28 @@ public class Verification {
* @param description free-form description, e.g. <pre>certificate from dkg.asc</pre> (optional, may be <pre>null</pre>) * @param description free-form description, e.g. <pre>certificate from dkg.asc</pre> (optional, may be <pre>null</pre>)
*/ */
public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint, SignatureMode signatureMode, String description) { public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint, SignatureMode signatureMode, String description) {
this(
creationTime,
signingKeyFingerprint,
signingCertFingerprint,
Optional.ofNullable(signatureMode),
Optional.ofNullable(nullSafeTrim(description))
);
}
private Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint, Optional<SignatureMode> signatureMode, Optional<String> description) {
this.creationTime = creationTime; this.creationTime = creationTime;
this.signingKeyFingerprint = signingKeyFingerprint; this.signingKeyFingerprint = signingKeyFingerprint;
this.signingCertFingerprint = signingCertFingerprint; this.signingCertFingerprint = signingCertFingerprint;
this.signatureMode = signatureMode; this.signatureMode = signatureMode;
this.description = description == null ? null : description.trim(); this.description = description;
}
private static String nullSafeTrim(String string) {
if (string == null) {
return null;
}
return string.trim();
} }
public static Verification fromString(String toString) { public static Verification fromString(String toString) {
@ -121,7 +139,7 @@ public class Verification {
* *
* @return signature mode * @return signature mode
*/ */
public SignatureMode getSignatureMode() { public Optional<SignatureMode> getSignatureMode() {
return signatureMode; return signatureMode;
} }
@ -131,7 +149,7 @@ public class Verification {
* *
* @return description * @return description
*/ */
public String getDescription() { public Optional<String> getDescription() {
return description; return description;
} }
@ -144,12 +162,12 @@ public class Verification {
.append(' ') .append(' ')
.append(getSigningCertFingerprint()); .append(getSigningCertFingerprint());
if (signatureMode != null) { if (signatureMode.isPresent()) {
sb.append(' ').append(MODE).append(signatureMode); sb.append(' ').append(MODE).append(signatureMode.get());
} }
if (description != null) { if (description.isPresent()) {
sb.append(' ').append(description); sb.append(' ').append(description.get());
} }
return sb.toString(); return sb.toString();

8
sop-java/src/testFixtures/java/sop/testsuite/assertions/VerificationAssert.java
View file

@ -45,12 +45,12 @@ public final class VerificationAssert {
} }
public VerificationAssert hasDescription(String description) { public VerificationAssert hasDescription(String description) {
assertEquals(description, verification.getDescription()); assertEquals(description, verification.getDescription().get());
return this; return this;
} }
public VerificationAssert hasDescriptionOrNull(String description) { public VerificationAssert hasDescriptionOrNull(String description) {
if (verification.getDescription() == null) { if (verification.getDescription().isEmpty()) {
return this; return this;
} }
@ -58,12 +58,12 @@ public final class VerificationAssert {
} }
public VerificationAssert hasMode(SignatureMode mode) { public VerificationAssert hasMode(SignatureMode mode) {
assertEquals(mode, verification.getSignatureMode()); assertEquals(mode, verification.getSignatureMode().get());
return this; return this;
} }
public VerificationAssert hasModeOrNull(SignatureMode mode) { public VerificationAssert hasModeOrNull(SignatureMode mode) {
if (verification.getSignatureMode() == null) { if (verification.getSignatureMode().isEmpty()) {
return this; return this;
} }
return hasMode(mode); return hasMode(mode);