aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorJulien Tanguy <julien.tanguy@jhome.fr>2015-07-08 18:13:14 +0200
committerJulien Tanguy <julien.tanguy@jhome.fr>2015-07-08 19:16:46 +0200
commitc830f7c2cf925ce340f4097d76ea2a3bc94cb4a6 (patch)
tree21a98f3a5129c4ef8efbca8c9f6b1e76290d536f /test
parent1dcd44f350f9842027b498e89ae586275047a3d3 (diff)
downloadhmacaroons-c830f7c2cf925ce340f4097d76ea2a3bc94cb4a6.tar.gz
hmacaroons-c830f7c2cf925ce340f4097d76ea2a3bc94cb4a6.tar.zst
hmacaroons-c830f7c2cf925ce340f4097d76ea2a3bc94cb4a6.zip
Rewrite Verifier with Validation
Diffstat (limited to 'test')
-rw-r--r--test/Crypto/Macaroon/Verifier/Tests.hs59
1 files changed, 14 insertions, 45 deletions
diff --git a/test/Crypto/Macaroon/Verifier/Tests.hs b/test/Crypto/Macaroon/Verifier/Tests.hs
index 101fa26..4a9295f 100644
--- a/test/Crypto/Macaroon/Verifier/Tests.hs
+++ b/test/Crypto/Macaroon/Verifier/Tests.hs
@@ -16,7 +16,8 @@ import Data.List
16import qualified Data.ByteString.Char8 as B8 16import qualified Data.ByteString.Char8 as B8
17import Test.Tasty 17import Test.Tasty
18-- import Test.Tasty.HUnit 18-- import Test.Tasty.HUnit
19import Test.Tasty.QuickCheck 19import Test.Tasty.QuickCheck hiding (Success, Failure)
20import Data.Either
20 21
21import Crypto.Macaroon 22import Crypto.Macaroon
22import Crypto.Macaroon.Verifier 23import Crypto.Macaroon.Verifier
@@ -25,7 +26,6 @@ import Crypto.Macaroon.Instances
25 26
26tests :: TestTree 27tests :: TestTree
27tests = testGroup "Crypto.Macaroon.Verifier" [ sigs 28tests = testGroup "Crypto.Macaroon.Verifier" [ sigs
28 , firstParty
29 ] 29 ]
30 30
31{- 31{-
@@ -45,52 +45,21 @@ m2 = addFirstPartyCaveat "test = caveat" m
45m3 :: Macaroon 45m3 :: Macaroon
46m3 = addFirstPartyCaveat "value = 42" m2 46m3 = addFirstPartyCaveat "value = 42" m2
47 47
48exTC = verifyExact "test" "caveat" (many' letter_ascii) <???> "test = caveat" 48-- exTC = verifyExact "test" "caveat" (many' letter_ascii)
49exTZ = verifyExact "test" "bleh" (many' letter_ascii) <???> "test = bleh" 49-- exTZ = verifyExact "test" "bleh" (many' letter_ascii)
50exV42 = verifyExact "value" 42 decimal <???> "value = 42" 50-- exV42 = verifyExact "value" 42 decimal
51exV43 = verifyExact "value" 43 decimal <???> "value = 43" 51-- exV43 = verifyExact "value" 43 decimal
52 52
53funTCPre = verifyFun "test" ("cav" `isPrefixOf`) (many' letter_ascii) <???> "test startsWith cav" 53-- funTCPre = verifyFun "test" (string "test = " *> many' letter_ascii)
54funTV43lte = verifyFun "value" (<= 43) decimal <???> "value <= 43" 54-- (\e -> if "cav" `isPrefixOf` e then Right e else Left "Does not start with cav" )
55-- funTV43lte = verifyFun "value" (string "value = " *> decimal)
56-- (\v -> if v <= 43 then Right v else Left "Greater than 43")
55 57
56allvs = [exTC, exTZ, exV42, exV43, funTCPre, funTV43lte] 58-- allvs = [exTC, exTZ, exV42, exV43, funTCPre, funTV43lte]
57 59
58{- 60{-
59 - Tests 61 - Tests
60 -} 62 -}
61sigs = testProperty "Signatures" $ \sm -> verifySig (secret sm) (macaroon sm) == Ok 63sigs = testProperty "Signatures" $ \sm -> verifySig (secret sm) (macaroon sm) == Right (macaroon sm)
62 64
63firstParty = testGroup "First party caveats" [ 65-- TODO: Re-do tests
64 testGroup "Pure verifiers" [
65 testProperty "Zero caveat" $
66 forAll (sublistOf allvs) (\vs -> Ok == verifyCavs vs m)
67 , testProperty "One caveat" $
68 forAll (sublistOf allvs) (\vs -> disjoin [
69 Ok == verifyCavs vs m2 .&&. any (`elem` vs) [exTC,funTCPre] .&&. (exTZ `notElem` vs)
70 , Failed === verifyCavs vs m2
71 ])
72 , testProperty "Two Exact" $
73 forAll (sublistOf allvs) (\vs -> disjoin [
74 Ok == verifyCavs vs m3 .&&.
75 any (`elem` vs) [exTC,funTCPre] .&&. (exTZ `notElem` vs) .&&.
76 any (`elem` vs) [exV42,funTV43lte] .&&. (exV43 `notElem` vs)
77 , Failed === verifyCavs vs m3
78 ])
79 ]
80 , testGroup "Pure verifiers with sig" [
81 testProperty "Zero caveat" $
82 forAll (sublistOf allvs) (\vs -> Ok == verifyMacaroon sec vs m)
83 , testProperty "One caveat" $
84 forAll (sublistOf allvs) (\vs -> disjoin [
85 Ok == verifyMacaroon sec vs m2 .&&. any (`elem` vs) [exTC,funTCPre] .&&. (exTZ `notElem` vs)
86 , Failed === verifyMacaroon sec vs m2
87 ])
88 , testProperty "Two Exact" $
89 forAll (sublistOf allvs) (\vs -> disjoin [
90 Ok == verifyMacaroon sec vs m3 .&&.
91 any (`elem` vs) [exTC,funTCPre] .&&. (exTZ `notElem` vs) .&&.
92 any (`elem` vs) [exV42,funTV43lte] .&&. (exV43 `notElem` vs)
93 , Failed === verifyMacaroon sec vs m3
94 ])
95 ]
96 ]