1 files changed, 26 insertions, 1 deletions
diff --git a/juick-server/src/main/java/com/juick/server/KeystoreManager.java b/juick-server/src/main/java/com/juick/server/KeystoreManager.java
index 75d72e72..855052c4 100644
--- a/juick-server/src/main/java/com/juick/server/KeystoreManager.java
+++ b/juick-server/src/main/java/com/juick/server/KeystoreManager.java
@@ -1,5 +1,6 @@
 package com.juick.server;
 
+import com.juick.server.api.activity.model.Person;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,8 +15,11 @@ import java.io.InputStream;
 import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
+import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @Component
 public class KeystoreManager {
@@ -61,9 +65,30 @@ public class KeystoreManager {
         }
         return null;
     }
-    public String getPublicKey() {
+    public PrivateKey getPrivateKey() {
+        return getKeyPair().getPrivate();
+    }
+    public PublicKey getPublicKey() {
+        return getKeyPair().getPublic();
+    }
+    public String getPublicKeyPem() {
         String[] key = Base64Utils.encodeToString(getKeyPair().getPublic().getEncoded()).split("(?<=\\G.{64})");
         return String.format("-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n",
                 Arrays.asList(key).stream().collect(Collectors.joining("\n")));
     }
+    public static PublicKey publicKeyOf(Person person) {
+        String pubkeyPem = person.getPublicKey().getPublicKeyPem();
+        String[] rawKey = pubkeyPem.split("\\n");
+        String pubkeyData = String.join("", Arrays.asList(rawKey).subList(1, rawKey.length - 1));
+        try{
+            byte[] byteKey = Base64Utils.decodeFromString(pubkeyData);
+            X509EncodedKeySpec X509publicKey = new X509EncodedKeySpec(byteKey);
+            KeyFactory kf = KeyFactory.getInstance("RSA");
+            return kf.generatePublic(X509publicKey);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
 }