some extra b64url and crypto stuff

Author: functora

pub/functora/src/aes/Functora/Aes.hs

@@ -1,7 +1,9 @@
 module Functora.Aes
   ( Crypto,
     encryptHmac,
+    unsafeEncrypt,
     unHmacDecrypt,
+    unsafeDecrypt,
     SomeAesKey,
     drvSomeAesKey,
     Word128,
@@ -39,20 +41,29 @@ encryptHmac ::
   SomeAesKey ->
   a ->
   Crypto
-encryptHmac (SomeAesKey cipher hmacer) plain =
+encryptHmac aes@(SomeAesKey _ hmacer) plain =
   Crypto
     { cryptoValue = value,
       cryptoValueHmac = sha256Hmac (unOkm hmacer) value
     }
   where
-    value =
-      from @[Word8] @ByteString
-        . Utils.listToOctets
-        . Modes.cbc AES.encrypt 0 cipher
-        . Utils.listFromOctets
-        . from @ByteString @[Word8]
-        . PKCS7.padBytesN bytesPerBlock
-        $ from @a @ByteString plain
+    value = unsafeEncrypt @a aes plain
+
+unsafeEncrypt ::
+  forall a.
+  ( From a ByteString
+  ) =>
+  SomeAesKey ->
+  a ->
+  ByteString
+unsafeEncrypt (SomeAesKey cipher _) =
+  from @[Word8] @ByteString
+    . Utils.listToOctets
+    . Modes.cbc AES.encrypt 0 cipher
+    . Utils.listFromOctets
+    . from @ByteString @[Word8]
+    . PKCS7.padBytesN bytesPerBlock
+    . from @a @ByteString
 
 unHmacDecrypt ::
   forall a.
@@ -61,17 +72,27 @@ unHmacDecrypt ::
   SomeAesKey ->
   Crypto ->
   Maybe a
-unHmacDecrypt (SomeAesKey cipher hmacer) (Crypto value valueHmac) = do
+unHmacDecrypt aes@(SomeAesKey _ hmacer) (Crypto value valueHmac) = do
   if sha256Hmac (unOkm hmacer) value == valueHmac
     then Just ()
     else Nothing
+  unsafeDecrypt aes value
+
+unsafeDecrypt ::
+  forall a.
+  ( From ByteString a
+  ) =>
+  SomeAesKey ->
+  ByteString ->
+  Maybe a
+unsafeDecrypt (SomeAesKey cipher _) =
   fmap (from @ByteString @a)
     . PKCS7.unpadBytesN bytesPerBlock
     . from @[Word8] @ByteString
     . Utils.listToOctets
     . Modes.unCbc AES.decrypt 0 cipher
     . Utils.listFromOctets
-    $ from @ByteString @[Word8] value
+    . from @ByteString @[Word8]
 
 bytesPerBlock :: Int
 bytesPerBlock = 16

pub/functora/src/cfg/Functora/Cfg.hs

@@ -23,6 +23,8 @@ module Functora.Cfg
     encodeBinary,
     decodeBinaryB64Url,
     encodeBinaryB64Url,
+    decodeB64Url,
+    encodeB64Url,
   )
 where
 
@@ -202,11 +204,7 @@ decodeBinaryB64Url ::
   str ->
   Either (BL.ByteString, Binary.ByteOffset, String) typ
 decodeBinaryB64Url b64 = do
-  bin <-
-    first (mempty,0,)
-      . B64URL.decode
-      . unTagged
-      $ via @Text @str @(UTF_8 ByteString) b64
+  bin <- first (mempty,0,) $ decodeB64Url @ByteString b64
   decodeBinary bin
 
 encodeBinaryB64Url ::
@@ -217,9 +215,31 @@ encodeBinaryB64Url ::
   typ ->
   str
 encodeBinaryB64Url =
+  encodeB64Url . Binary.encode
+
+decodeB64Url ::
+  forall bin str.
+  ( From str Text,
+    From ByteString bin
+  ) =>
+  str ->
+  Either String bin
+decodeB64Url =
+  fmap (from @ByteString @bin)
+    . B64URL.decode
+    . unTagged
+    . via @Text @str @(UTF_8 ByteString)
+
+encodeB64Url ::
+  forall str bin.
+  ( From Text str,
+    From bin ByteString
+  ) =>
+  bin ->
+  str
+encodeB64Url =
   from @Text @str
     . unsafeFrom @(UTF_8 ByteString) @Text
     . from @ByteString @(UTF_8 ByteString)
     . B64URL.encode
-    . from @BL.ByteString @ByteString
-    . Binary.encode
+    . from @bin @ByteString