From 46af22cc50bb5dfc9898f78f228b572a3408c65d Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 10 Jul 2020 18:17:29 +0200
Subject: [PATCH] Add toUri/fromUri methods to OpenPgpV4Fingerprint

---
 .../pgpainless/key/OpenPgpV4Fingerprint.java  | 19 +++++++++++++++++++
 .../key/OpenPgpV4FingerprintTest.java         | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java b/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
index 1e70044b..a4be8ec8 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
@@ -15,6 +15,8 @@
  */
 package org.pgpainless.key;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -31,6 +33,8 @@ import org.bouncycastle.util.encoders.Hex;
  */
 public class OpenPgpV4Fingerprint implements CharSequence, Comparable<OpenPgpV4Fingerprint> {
 
+    public static final String SCHEME = "openpgp4fpr";
+
     private static final Charset utf8 = Charset.forName("UTF-8");
     private final String fingerprint;
 
@@ -138,6 +142,21 @@ public class OpenPgpV4Fingerprint implements CharSequence, Comparable<OpenPgpV4F
         return fingerprint;
     }
 
+    public URI toUri() {
+        try {
+            return new URI(SCHEME, toString(), null);
+        } catch (URISyntaxException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public static OpenPgpV4Fingerprint fromUri(URI uri) {
+        if (!SCHEME.equals(uri.getScheme())) {
+            throw new IllegalArgumentException("URI scheme MUST equal '" + SCHEME + "'");
+        }
+        return new OpenPgpV4Fingerprint(uri.getSchemeSpecificPart());
+    }
+
     @Override
     public int compareTo(@Nonnull OpenPgpV4Fingerprint openPgpV4Fingerprint) {
         return fingerprint.compareTo(openPgpV4Fingerprint.fingerprint);
diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/OpenPgpV4FingerprintTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/OpenPgpV4FingerprintTest.java
index 04ffc8f6..8ff5b5d1 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/OpenPgpV4FingerprintTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/OpenPgpV4FingerprintTest.java
@@ -19,6 +19,8 @@ import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.junit.Test;
@@ -74,4 +76,21 @@ public class OpenPgpV4FingerprintTest {
         OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint(key);
         assertEquals(keyId, fingerprint.getKeyId());
     }
+
+    @Test
+    public void testToUri() {
+        OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint("5448452043414B452049532041204C4945212121");
+
+        URI uri = fingerprint.toUri();
+        assertEquals("openpgp4fpr:5448452043414B452049532041204C4945212121", uri.toString());
+
+        OpenPgpV4Fingerprint parsed = OpenPgpV4Fingerprint.fromUri(uri);
+        assertEquals(fingerprint, parsed);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testFromUriThrowsIfWrongScheme() throws URISyntaxException {
+        URI uri = new URI(null, "5448452043414B452049532041204C4945212121", null);
+        OpenPgpV4Fingerprint.fromUri(uri);
+    }
 }