Add pem/der loaders to PublicKey

biscuit-auth/Cargo.toml

@@ -25,7 +25,7 @@ bwk = ["chrono", "serde"]
 docsrs = []
 uuid = ["dep:uuid"]
 # used to expose pem/der loaders for keypairs
-pem = ["ed25519-dalek/pem"]
+pem = ["ed25519-dalek/pem", "ed25519-dalek/pkcs8"]
 
 [dependencies]
 rand_core = "^0.6"

biscuit-auth/src/crypto/mod.rs

@@ -12,6 +12,8 @@ use crate::{error::Format, format::schema};
 use super::error;
 #[cfg(feature = "pem")]
 use ed25519_dalek::pkcs8::DecodePrivateKey;
+#[cfg(feature = "pem")]
+use ed25519_dalek::pkcs8::DecodePublicKey;
 use ed25519_dalek::*;
 
 use nom::Finish;
@@ -170,6 +172,20 @@ impl PublicKey {
         }
     }
 
+    #[cfg(feature = "pem")]
+    pub fn from_public_key_der(bytes: &[u8]) -> Result<Self, error::Format> {
+        let verification_key = ed25519_dalek::VerifyingKey::from_public_key_der(bytes)
+            .map_err(|e| error::Format::InvalidKey(e.to_string()))?;
+        Ok(PublicKey(verification_key))
+    }
+
+    #[cfg(feature = "pem")]
+    pub fn from_public_key_pem(pem: &str) -> Result<Self, error::Format> {
+        let verification_key = ed25519_dalek::VerifyingKey::from_public_key_pem(pem)
+            .map_err(|e| error::Format::InvalidKey(e.to_string()))?;
+        Ok(PublicKey(verification_key))
+    }
+
     pub fn print(&self) -> String {
         self.to_string()
     }

biscuit-parser/Cargo.toml

@@ -21,5 +21,6 @@ time = {version = "0.3.7", features = ["formatting", "parsing"]}
 
 [features]
 datalog-macro = []
+pem = []
 # used by biscuit-wasm to serialize errors to JSON
 serde-error = ["serde"]