voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip, little bit of refactor

This commit is contained in:
voidlizard 2024-10-13 17:11:24 +03:00
parent 1739669e47
commit 4831dcfa70
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbs2-cli/lib/HBS2/CLI/Run/Sigil.hs
View File

@ -97,24 +97,26 @@ hbs2:sigil:create:from-keyring KEYRING-FILE S
|] |]
$ entry $ bindMatch "hbs2:sigil:create:from-keyring" $ \syn -> do $ entry $ bindMatch "hbs2:sigil:create:from-keyring" $ \syn -> do
let readKeyring fn = liftIO (BS8.readFile fn) <&> parseCredentials @'HBS2Basic . AsCredFile let readKeyring fn = liftIO (BS8.readFile fn)
<&> parseCredentials @'HBS2Basic . AsCredFile
>>= orThrowUser "malformed keyring file"
(cred, KeyringEntry enc _ _) <- case syn of (cred, KeyringEntry enc _ _) <- case syn of
[ StringLike fn ] -> do [ StringLike fn ] -> do
s <- readKeyring fn >>= orThrowUser "malformed keyring file" s <- readKeyring fn
kr <- headMay (view peerKeyring s) & orThrowUser "encryption key missed" kr <- headMay (view peerKeyring s) & orThrowUser "encryption key missed"
pure (s,kr) pure (s,kr)
[ StringLike fn, LitIntVal n ] -> do [ StringLike fn, LitIntVal n ] -> do
s <- readKeyring fn
s <- readKeyring fn >>= orThrowUser "malformed keyring file"
kr <- headMay (drop (fromIntegral (max 0 (n-1))) (view peerKeyring s)) kr <- headMay (drop (fromIntegral (max 0 (n-1))) (view peerKeyring s))
& orThrowUser "encryption key not found" & orThrowUser "encryption key not found"
pure (s,kr) pure (s,kr)
[ StringLike fn, StringLike p ] -> do [ StringLike fn, StringLike p ] -> do
s <- readKeyring fn >>= orThrowUser "malformed keyring file" s <- readKeyring fn
kr <- findKey p (view peerKeyring s) & orThrowUser "encryption key not found" kr <- findKey p (view peerKeyring s) & orThrowUser "encryption key not found"
pure (s,kr) pure (s,kr)