From 66434e4559d207c8645f3d84a53c8009343d3b7f Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 27 Sep 2019 15:08:41 -0400
Subject: [PATCH] hlint suggested changes
---
src/PaymentServer/Issuer.hs | 2 +-
src/PaymentServer/Main.hs | 4 +--
src/PaymentServer/Ristretto.hs | 51 +++++++++++++++++-----------------
3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/PaymentServer/Issuer.hs b/src/PaymentServer/Issuer.hs
index 939910c..1041d76 100644
--- a/src/PaymentServer/Issuer.hs
+++ b/src/PaymentServer/Issuer.hs
@@ -48,7 +48,7 @@ data ChallengeBypass =
-- | An issuer accepts a list of blinded tokens and returns signatures of
-- those tokens along with proof that it used a particular key to construct
-- the signatures.
-type Issuer = [BlindedToken] -> (Either Text ChallengeBypass)
+type Issuer = [BlindedToken] -> Either Text ChallengeBypass
-- | trivialIssue makes up and returns some nonsense values that satisfy the
-- structural requirements but not the semantic ones.
diff --git a/src/PaymentServer/Main.hs b/src/PaymentServer/Main.hs
index 2613964..8c52604 100644
--- a/src/PaymentServer/Main.hs
+++ b/src/PaymentServer/Main.hs
@@ -111,11 +111,11 @@ main =
case (issuer, signingKey) of
(Trivial, Nothing) -> Right trivialIssue
(Ristretto, Just key) -> Right $ ristrettoIssue key
- otherwise -> Left "invalid options"
+ _ -> Left "invalid options"
getDatabase ServerConfig{ database, databasePath } =
case (database, databasePath) of
(Memory, Nothing) -> Right memory
- otherwise -> Left "invalid options"
+ _ -> Left "invalid options"
in do
config <- execParser opts
case getIssuer config of
diff --git a/src/PaymentServer/Ristretto.hs b/src/PaymentServer/Ristretto.hs
index 4927860..a296833 100644
--- a/src/PaymentServer/Ristretto.hs
+++ b/src/PaymentServer/Ristretto.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ForeignFunctionInterface #-}
{-# LANGUAGE EmptyDataDecls #-}
@@ -90,7 +89,7 @@ data RistrettoFailure
ristretto
:: Text -- ^ The base64 encoded signing key.
-> [Text] -- ^ A list of the base64 blinded tokens.
- -> (Either RistrettoFailure Issuance) -- ^ Left for an error, otherwise
+ -> Either RistrettoFailure Issuance -- ^ Left for an error, otherwise
-- Right with the ristretto results
ristretto textSigningKey textTokens =
let
@@ -109,17 +108,17 @@ ristretto textSigningKey textTokens =
extractKeyMaterial :: String -> IO (Either RistrettoFailure (Ptr C_SigningKey, Ptr C_PublicKey))
extractKeyMaterial stringSigningKey = do
cStringSigningKey <- newCString stringSigningKey
- case cStringSigningKey == nullPtr of
- True -> return $ Left SigningKeyAllocation
- False -> do
+ if cStringSigningKey == nullPtr
+ then return $ Left SigningKeyAllocation
+ else do
signingKey <- signing_key_decode_base64 cStringSigningKey
- case signingKey == nullPtr of
- True -> return $ Left SigningKeyDecoding
- False -> do
+ if signingKey == nullPtr
+ then return $ Left SigningKeyDecoding
+ else do
publicKey <- signing_key_get_public_key signingKey
- case publicKey == nullPtr of
- True -> return $ Left PublicKeyLookup
- False -> return $ Right (signingKey, publicKey)
+ if publicKey == nullPtr
+ then return $ Left PublicKeyLookup
+ else return $ Right (signingKey, publicKey)
in
unsafePerformIO $ do
keys <- extractKeyMaterial stringSigningKey
@@ -127,26 +126,26 @@ ristretto textSigningKey textTokens =
Left err -> return $ Left err
Right (signingKey, publicKey) -> do
cStringEncodedPublicKey <- public_key_encode_base64 publicKey
- case cStringEncodedPublicKey == nullPtr of
- True -> return $ Left PublicKeyEncoding
- False -> do
+ if cStringEncodedPublicKey == nullPtr
+ then return $ Left PublicKeyEncoding
+ else do
encodedPublicKey <- peekCString cStringEncodedPublicKey
cStringTokens <- mapM newCString stringTokens
- case any (== nullPtr) cStringTokens of
- True -> return $ Left BlindedTokenAllocation
- False -> do
+ if nullPtr `elem` cStringTokens
+ then return $ Left BlindedTokenAllocation
+ else do
blindedTokens <- mapM blinded_token_decode_base64 cStringTokens
- case any (== nullPtr) blindedTokens of
- True -> return $ Left BlindedTokenDecoding
- False -> do
+ if nullPtr `elem` blindedTokens
+ then return $ Left BlindedTokenDecoding
+ else do
signedTokens <- mapM (signing_key_sign signingKey) blindedTokens
- case any (== nullPtr) signedTokens of
- True -> return $ Left TokenSigning
- False -> do
+ if nullPtr `elem` signedTokens
+ then return $ Left TokenSigning
+ else do
encodedCStringSignedTokens <- mapM signed_token_encode_base64 signedTokens
- case any (== nullPtr) encodedCStringSignedTokens of
- True -> return $ Left SignedTokenEncoding
- False -> do
+ if nullPtr `elem` encodedCStringSignedTokens
+ then return $ Left SignedTokenEncoding
+ else do
encodedSignedTokens <- mapM peekCString encodedCStringSignedTokens
encodedProof <- newEncodedProof blindedTokens signedTokens signingKey
return . Right $ Issuance (pack encodedPublicKey) (map pack encodedSignedTokens) (pack encodedProof)
--
GitLab