[CAD-2176] errors endpoint doesn't validate poolId properly.

input-output-hk · Nov 22, 2020 · 3f7af77 · 3f7af77
1 parent 9dd40f6
commit 3f7af77
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 26 deletions.
diff --git a/smash-servant-types/smash-servant-types.cabal b/smash-servant-types/smash-servant-types.cabal
@@ -43,6 +43,9 @@ library
     , base                         >=4.7   && <5
     , bytestring
     , cardano-prelude
+    , cardano-api
+    , cardano-db-sync
+    , base16-bytestring
     , persistent
     , servant
     , servant-server

diff --git a/smash-servant-types/src/Cardano/SMASH/Types.hs b/smash-servant-types/src/Cardano/SMASH/Types.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DerivingStrategies    #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 
-
 module Cardano.SMASH.Types
     ( ApplicationUser (..)
     , ApplicationUsers (..)
@@ -40,31 +39,36 @@ module Cardano.SMASH.Types
 
 import           Cardano.Prelude
 
-import           Control.Monad.Fail            (fail)
-
-import           Data.Aeson                    (FromJSON (..), ToJSON (..),
-                                                object, withObject, (.:), (.=))
-import qualified Data.Aeson                    as Aeson
-import           Data.Aeson.Encoding           (unsafeToEncoding)
-import qualified Data.Aeson.Types              as Aeson
-import           Data.Time.Clock               (UTCTime)
-import qualified Data.Time.Clock.POSIX         as Time
-import           Data.Time.Format              (defaultTimeLocale, formatTime,
-                                                parseTimeM)
-
-import           Data.Swagger                  (NamedSchema (..),
-                                                ToParamSchema (..),
-                                                ToSchema (..))
-import           Data.Text.Encoding            (encodeUtf8Builder)
-
-import           Servant                       (FromHttpApiData (..),
-                                                MimeUnrender (..), OctetStream)
-
+import           Control.Monad.Fail              (fail)
+
+import           Data.Aeson                      (FromJSON (..), ToJSON (..),
+                                                  object, withObject, (.:),
+                                                  (.=))
+import qualified Data.Aeson                      as Aeson
+import           Data.Aeson.Encoding             (unsafeToEncoding)
+import qualified Data.Aeson.Types                as Aeson
+import qualified Data.ByteString.Char8           as BSC
+import           Data.Time.Clock                 (UTCTime)
+import qualified Data.Time.Clock.POSIX           as Time
+import           Data.Time.Format                (defaultTimeLocale, formatTime,
+                                                  parseTimeM)
+
+import           Data.Swagger                    (NamedSchema (..),
+                                                  ToParamSchema (..),
+                                                  ToSchema (..))
+import           Data.Text.Encoding              (encodeUtf8Builder)
+
+import           Servant                         (FromHttpApiData (..),
+                                                  MimeUnrender (..),
+                                                  OctetStream)
+
+import           Cardano.Api.Typed               hiding (PoolId)
 import           Cardano.SMASH.DBSync.Db.Error
 import           Cardano.SMASH.DBSync.Db.Types
 
-import qualified Data.ByteString.Lazy          as BL
-import qualified Data.Text.Encoding            as E
+import qualified Data.ByteString.Base16          as B16
+import qualified Data.ByteString.Lazy            as BL
+import qualified Data.Text.Encoding              as E
 
 -- | The basic @Configuration@.
 data Configuration = Configuration
@@ -135,10 +139,19 @@ checkIfUserValid (ApplicationUsers applicationUsers) applicationUser@(Applicatio
 instance FromHttpApiData TickerName where
     parseUrlPiece tickerName = Right $ TickerName tickerName
 
--- TODO(KS): Temporarily, validation!?
+-- Currently deserializing from safe types, unwrapping and wrapping it up again.
+-- The underlying DB representation is HEX.
 instance FromHttpApiData PoolId where
-    parseUrlPiece poolId = Right $ PoolId poolId
-    --TODO: parse hex or bech32
+    parseUrlPiece poolId =
+        case pHexStakePoolId poolId of
+            Nothing -> Left "Unable to parse pool id. Wrong format."
+            Just poolId' -> Right . PoolId . decodeUtf8 . B16.encode . serialiseToRawBytes $ poolId'
+
+      where
+        -- e5cb8a89cabad2cb22ea85423bcbbe270f292be3dbe838948456d3ae
+        pHexStakePoolId :: Text -> Maybe (Hash StakePoolKey)
+        pHexStakePoolId =
+            deserialiseFromRawBytesHex (AsHash AsStakePoolKey) . BSC.pack . toS
 
 instance ToSchema PoolMetadataHash where
   declareNamedSchema _ =