diff options
Diffstat (limited to 'HTTP.hs')
| -rw-r--r-- | HTTP.hs | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -59,6 +59,8 @@ instance ToJSON t => ToJSON (POWGuarded t) instance FromJSON t => FromJSON (POWGuarded t) instance ToJSON ProofOfWorkRequirement instance FromJSON ProofOfWorkRequirement +instance ToJSON RequestID +instance FromJSON RequestID instance ToJSON RandomSalt instance FromJSON RandomSalt @@ -85,12 +87,19 @@ instance FromJSON StorableObject where -- ProofOfWork contains an arbitrary bytestring and is base64 encoded in -- the query string. instance ToHttpApiData ProofOfWork where - toUrlPiece (ProofOfWork b (RandomSalt s)) = s <> ":" <> b64 b + toUrlPiece (ProofOfWork b rid) = + fromRandomSalt (randomSalt rid) + <> ":" <> requestHMAC rid + <> ":" <> b64 b instance FromHttpApiData ProofOfWork where parseUrlPiece t = do - let (s, rest) = T.break (/= ':') t - b <- unb64 (T.drop 1 rest) - return (ProofOfWork b (RandomSalt s)) + let (salt, rest) = T.break (/= ':') t + let (hmac, rest') = T.break (/= ':') rest + b <- unb64 (T.drop 1 rest') + return $ ProofOfWork b $ RequestID + { randomSalt = RandomSalt salt + , requestHMAC = hmac + } b64 :: B.ByteString -> Text b64 v = T.decodeUtf8 $ Raaz.toByteString (Raaz.encode v :: Raaz.Base64) |