nuttycom/aftok - Change 4FDQGIXN3Z4J55DILCSI5EOLIIA7R5CADTGFMW5X7N7MH6JIMBWAC

Make payment request retrieval key an opaque 32-bit hash.

Created by Kris Nuttycombe on February 25, 2017

4FDQGIXN3Z4J55DILCSI5EOLIIA7R5CADTGFMW5X7N7MH6JIMBWAC

Dependencies

In channels

main

Change contents

Insertion in aftok.cabal at line 41 [4.1]
[3.99]
[3.99]
```
    , blake2
```

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 9 [7.456]

[5.1043]

[6.511]

import qualified Crypto.Hash.BLAKE2.BLAKE2b           as B2
import           Crypto.Random.Types                  (MonadRandom, getRandomBytes)

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 26 [7.456]

B:BD[8.1829] → [6.653:722]

import           Network.Haskoin.Crypto               (addrToBase58)

[8.1829]

[7.1011]

import           Network.Haskoin.Crypto               (addrToBase58, encodeBase58Check)

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 47 [7.456]

[9.1927]


instance MonadRandom QDBM where
  getRandomBytes = QDBM . lift . lift . getRandomBytes

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 51 [7.456]
[9.1928]
[9.1928]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 486 [7.456]

[10.896]

  keyBytes <- getRandomBytes 64 
  let prBytes = req ^. (paymentRequest . to (runPut . encodeMessage))
      urlKey  = decodeUtf8 . encodeBase58Check $ B2.hash 32 keyBytes prBytes

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 491 [7.456]

B:BD[10.959] → [11.3357:3476]

    \(subscription_id, event_id, request_data, request_time, billing_date) \
    \VALUES (?, ?, ?, ?, ?) RETURNING id"

[10.959]

[3.6158]

    \(subscription_id, event_id, request_data, url_key, request_time, billing_date) \
    \VALUES (?, ?, ?, ?, ?, ?) RETURNING id"

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 495 [7.456]
∅:D[6.1566] → [10.1120:1180]
B:BD[10.1120] → [10.1120:1180]
```
    , req ^. (paymentRequest . to (runPut . encodeMessage))
```
[6.1566]
[11.3477]
```
    , prBytes
    , urlKey
```
Replacement in lib/Aftok/Database/PostgreSQL.hs at line 501 [7.456]
B:BD[6.1568] → [12.1555:1589]
```
pgEval (FindPaymentRequest rid) =
```
[6.1568]
[11.3604]
```
pgEval (FindPaymentRequest (PaymentKey k)) =
```
Replacement in lib/Aftok/Database/PostgreSQL.hs at line 505 [7.456]
B:BD[11.3743] → [11.3743:3796]
```
  \WHERE id = ?"
  (Only (rid ^. _PaymentRequestId))
```
[11.3743]
[12.1590]
```
  \WHERE url_key = ?"
  (Only k)
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 516 [7.456]

B:BD[2.750] → [2.750:886]

  let rowp :: RowParser (PaymentRequestId, PaymentRequest, B.Subscription, B.Billable)
      rowp = (,,,) <$> idParser PaymentRequestId

[2.750]

[2.886]

  let rowp :: RowParser (PaymentKey, PaymentRequest, B.Subscription, B.Billable)
      rowp = (,,,) <$> (PaymentKey <$> field)

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 522 [7.456]
B:BD[2.1028] → [2.1028:1048]
```
      "SELECT id, \
```
[2.1028]
[2.1048]
```
      "SELECT r.url_key, \
```
Deletion in lib/Aftok/Database.hs at line 60 [4.4936]
B:BD[11.5032] → [11.5032:5107]
```
  FindPaymentRequest    :: PaymentRequestId -> DBOp (Maybe PaymentRequest)
```

Insertion in lib/Aftok/Database.hs at line 62 [4.4936]

[2.1929]

[11.5194]

  FindPaymentRequest    :: PaymentKey -> DBOp (Maybe PaymentRequest)

Insertion in lib/Aftok/Database.hs at line 205 [4.4936]

[6.1595]

[2.2092]

findPaymentRequest :: (MonadDB m) => PaymentKey -> m (Maybe PaymentRequest)
findPaymentRequest = liftdb . FindPaymentRequest

Replacement in lib/Aftok/Json.hs at line 235 [13.19]

B:BD[2.4205] → [2.4205:4274]

    [ ["payment_request_id" .= idJSON _PaymentRequestId (view _1 r)]

[2.4205]

[2.4274]

    [ ["payment_request_id" .= view (_1 . _PaymentKey) r]

Insertion in lib/Aftok/Payments/Types.hs at line 19 [3.10545]
[12.2433]
[3.10816]
```
import           Network.Haskoin.Crypto (decodeBase58Check)
```
Insertion in lib/Aftok/Payments/Types.hs at line 28 [3.10545]
[3.11036]
[3.11036]
```
newtype PaymentKey = PaymentKey Text deriving (Eq)
makePrisms ''PaymentKey
```

Replacement in lib/Aftok/Payments/Types.hs at line 51 [3.10545]

B:BD[3.11452] → [2.4565:4642]

type BillDetail = (PaymentRequestId, PaymentRequest, Subscription, Billable)

[3.11452]

[2.4642]

type BillDetail = (PaymentKey, PaymentRequest, Subscription, Billable)

Insertion in lib/Aftok/Payments/Types.hs at line 63 [3.10545]

[12.2572]

parsePaymentKey :: ByteString -> Maybe PaymentKey
parsePaymentKey bs = (PaymentKey . decodeUtf8) <$> decodeBase58Check bs

Replacement in server/Aftok/Snaplet/Payments.hs at line 5 [8.9762]
B:BD[2.5783] → [2.5783:5835]
```
import           Control.Lens        (view, _1, _2)
```
[2.5783]
[2.5835]
```
import           Control.Lens        (view)
```
Insertion in server/Aftok/Snaplet/Payments.hs at line 13 [8.9762]
[2.6028]
[8.9900]
```
import           Aftok.Database
```

Replacement in server/Aftok/Snaplet/Payments.hs at line 27 [8.9762]

∅:D[2.6438] → [8.10077:10100]

B:BD[8.10077] → [8.10077:10100]

B:BD[8.10100] → [2.6439:6832]

  uid <- requireUserId
  sid <- requireId "subscriptionId" SubscriptionId
  rid <- requireId "paymentRequestId" PaymentRequestId
  now <- liftIO $ C.getCurrentTime
  requests <- snapEval $ findPayableRequests uid sid now
  let prMay = fmap (view (_2 . paymentRequest)) . headMay $ filter ((==) rid . view _1) requests
  maybe (snapError 404 $ "Outstanding payment request not found for id " <> tshow rid) pure prMay

[2.6438]

[3.17952]

  pkBytes <- requireParam "paymentRequestKey" 
  pkey <- maybe 
          (snapError 400 $ "parameter paymentRequestKey is formatted incorrectly.") pure 
          (parsePaymentKey pkBytes)
  prMay <- snapEval $ findPaymentRequest pkey
  maybe (snapError 404 $ "Outstanding payment request not found for key " <> (view _PaymentKey pkey))
        (pure . view paymentRequest)
        prMay

Insertion in server/Aftok/Snaplet.hs at line 64 [14.1088]

[9.11977]

[2.7127]

requireParam :: MonadSnap m => Text -> m ByteString
requireParam name = do
  maybeBytes <- getParam (encodeUtf8 name)
  maybe (snapError 400 $ "Parameter "<> tshow name <>" is required") pure maybeBytes

Replacement in server/Aftok/Snaplet.hs at line 74 [14.1088]

B:BD[9.12064] → [2.7338:7381]

∅:D[2.7381] → [9.12094:12366]

B:BD[9.12094] → [9.12094:12366]

  maybeBytes <- getParam (encodeUtf8 name)
  case maybeBytes of
    Nothing -> snapError 400 $ "Parameter "<> tshow name <>" is required"
    Just bytes -> either
      (const . snapError 400 $ "Value of parameter "<> tshow name <>" could not be parsed to a valid value.")
      pure
      (parseOnly parser bytes)

[9.12064]

[2.7382]

  bytes <- requireParam name
  either
    (const . snapError 400 $ "Value of parameter "<> tshow name <>" could not be parsed to a valid value.")
    pure
    (parseOnly parser bytes)

Replacement in server/Main.hs at line 87 [15.5188]

B:BD[2.8473] → [2.8473:8577]

            , ("subscriptions/:subscriptionId/payment_requests/:paymentRequestId", paymentRequestRoute)

[2.8473]

[16.4299]

            , ("pay/:paymentRequestKey", paymentRequestRoute)

Make payment request retrieval key an opaque 32-bit hash.

Dependencies

In channels

Change contents

Insertion in aftok.cabal at line 41 [4.1]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 9 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 26 [7.456]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 47 [7.456]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 51 [7.456]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 486 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 491 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 495 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 501 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 505 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 516 [7.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 522 [7.456]

Deletion in lib/Aftok/Database.hs at line 60 [4.4936]

Insertion in lib/Aftok/Database.hs at line 62 [4.4936]

Insertion in lib/Aftok/Database.hs at line 205 [4.4936]

Replacement in lib/Aftok/Json.hs at line 235 [13.19]

Insertion in lib/Aftok/Payments/Types.hs at line 19 [3.10545]

Insertion in lib/Aftok/Payments/Types.hs at line 28 [3.10545]