diff options
Diffstat (limited to 'src/Crypto/Macaroon.hs')
-rw-r--r-- | src/Crypto/Macaroon.hs | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/Crypto/Macaroon.hs b/src/Crypto/Macaroon.hs index 07043f7..36aecf9 100644 --- a/src/Crypto/Macaroon.hs +++ b/src/Crypto/Macaroon.hs | |||
@@ -42,21 +42,14 @@ module Crypto.Macaroon ( | |||
42 | , inspect | 42 | , inspect |
43 | , addFirstPartyCaveat | 43 | , addFirstPartyCaveat |
44 | , addThirdPartyCaveat | 44 | , addThirdPartyCaveat |
45 | |||
46 | -- * Prepare Macaroons for transfer | ||
47 | , serialize | ||
48 | ) where | 45 | ) where |
49 | 46 | ||
50 | import Crypto.Cipher.AES | 47 | import Crypto.Cipher.AES |
51 | import Crypto.Hash | 48 | import Crypto.Hash |
52 | import Data.Char | ||
53 | import Data.Byteable | 49 | import Data.Byteable |
54 | import qualified Data.ByteString as BS | 50 | import qualified Data.ByteString as BS |
55 | import qualified Data.ByteString.Base64.URL as B64 | 51 | import qualified Data.ByteString.Base64.URL as B64 |
56 | import qualified Data.ByteString.Char8 as B8 | 52 | import qualified Data.ByteString.Char8 as B8 |
57 | import Data.Hex | ||
58 | import Data.Word | ||
59 | import Data.Serialize | ||
60 | 53 | ||
61 | import Crypto.Macaroon.Internal | 54 | import Crypto.Macaroon.Internal |
62 | 55 | ||
@@ -82,34 +75,6 @@ caveatVId = vid | |||
82 | inspect :: Macaroon -> String | 75 | inspect :: Macaroon -> String |
83 | inspect = show | 76 | inspect = show |
84 | 77 | ||
85 | -- | Serialize a macaroon in an URL-safe Base64 encoding | ||
86 | serialize :: Macaroon -> BS.ByteString | ||
87 | serialize m = B8.filter (/= '=') . B64.encode $ packets | ||
88 | where | ||
89 | packets = BS.concat [ putPacket "location" (location m) | ||
90 | , putPacket "identifier" (identifier m) | ||
91 | , caveatPackets | ||
92 | , putPacket "signature" (signature m) | ||
93 | ] | ||
94 | caveatPackets = BS.concat $ map (cavPacket (location m)) (caveats m) | ||
95 | cavPacket loc c | cl c == loc && vid c == BS.empty = putPacket "cid" (cid c) | ||
96 | | otherwise = BS.concat [ putPacket "cid" (cid c) | ||
97 | , putPacket "vid" (vid c) | ||
98 | , putPacket "cl" (cl c) | ||
99 | ] | ||
100 | putPacket key dat = BS.concat [ | ||
101 | B8.map toLower . hex . encode $ (fromIntegral size :: Word16) | ||
102 | , key | ||
103 | , " " | ||
104 | , dat | ||
105 | , "\n" | ||
106 | ] | ||
107 | where | ||
108 | size = 4 + 2 + BS.length key + BS.length dat | ||
109 | |||
110 | |||
111 | |||
112 | |||
113 | -- | Add a first party Caveat to a Macaroon, with its identifier | 78 | -- | Add a first party Caveat to a Macaroon, with its identifier |
114 | addFirstPartyCaveat :: Key -> Macaroon -> Macaroon | 79 | addFirstPartyCaveat :: Key -> Macaroon -> Macaroon |
115 | addFirstPartyCaveat ident m = addCaveat (location m) ident BS.empty m | 80 | addFirstPartyCaveat ident m = addCaveat (location m) ident BS.empty m |