Skip to content

KeyPackage validation: Add detailled error #2858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smatting merged 1 commit into from
Nov 21, 2022
Merged

KeyPackage validation: Add detailled error #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions services/galley/src/Galley/API/MLS/Message.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,14 +695,14 @@ processExternalCommit qusr mSenderClient lconv cm epoch groupId action updatePat
& note (mlsProtocolError "An invalid key package in the update path")

-- validate and update mapping in brig
mCid <-
eithCid <-
nkpresClientIdentity
<$$> validateAndAddKeyPackageRef
NewKeyPackage
{ nkpConversation = Data.convId <$> qUntagged lconv,
nkpKeyPackage = KeyPackageData (rmRaw newKeyPackage)
}
cid <- mCid & note (mlsProtocolError "Tried to add invalid KeyPackage")
cid <- either (\errMsg -> throw (mlsProtocolError ("Tried to add invalid KeyPackage: " <> errMsg))) pure eithCid

unless (cidQualifiedUser cid == qusr) $
throw . mlsProtocolError $
Expand Down Expand Up @@ -968,14 +968,14 @@ applyProposal convId (AddProposal kp) = do
addKeyPackageMapping :: Local ConvId -> KeyPackageRef -> KeyPackageData -> Sem r ClientIdentity
addKeyPackageMapping lconv ref kpdata = do
-- validate and update mapping in brig
mCid <-
eithCid <-
nkpresClientIdentity
<$$> validateAndAddKeyPackageRef
NewKeyPackage
{ nkpConversation = qUntagged lconv,
nkpKeyPackage = kpdata
}
cid <- mCid & note (mlsProtocolError "Tried to add invalid KeyPackage")
cid <- either (\errMsg -> throw (mlsProtocolError ("Tried to add invalid KeyPackage: " <> errMsg))) pure eithCid
let qcid = cidQualifiedClient cid
let qusr = fst <$> qcid
-- update mapping in galley
Expand Down
2 changes: 1 addition & 1 deletion services/galley/src/Galley/Effects/BrigAccess.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ data BrigAccess m a where
GetClientByKeyPackageRef :: KeyPackageRef -> BrigAccess m (Maybe ClientIdentity)
GetLocalMLSClients :: Local UserId -> SignatureSchemeTag -> BrigAccess m (Set ClientInfo)
AddKeyPackageRef :: KeyPackageRef -> Qualified UserId -> ClientId -> Qualified ConvId -> BrigAccess m ()
ValidateAndAddKeyPackageRef :: NewKeyPackage -> BrigAccess m (Maybe NewKeyPackageResult)
ValidateAndAddKeyPackageRef :: NewKeyPackage -> BrigAccess m (Either Text NewKeyPackageResult)
UpdateKeyPackageRef :: KeyPackageUpdate -> BrigAccess m ()
UpdateSearchVisibilityInbound ::
Multi.TeamStatus SearchVisibilityInboundConfig ->
Expand Down
10 changes: 7 additions & 3 deletions services/galley/src/Galley/Intra/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import Data.Misc
import Data.Qualified
import qualified Data.Set as Set
import Data.Text.Encoding
import Data.Text.Lazy (toStrict)
import Galley.API.Error
import Galley.Effects
import Galley.Env
Expand All @@ -53,6 +54,7 @@ import qualified Network.HTTP.Types as HTTP
import Network.HTTP.Types.Method
import Network.HTTP.Types.Status
import Network.Wai.Utilities.Error hiding (Error)
import qualified Network.Wai.Utilities.Error as Error
import Polysemy
import Polysemy.Error
import Polysemy.Input
Expand Down Expand Up @@ -227,7 +229,7 @@ updateKeyPackageRef keyPackageRef =
. expect2xx
)

validateAndAddKeyPackageRef :: NewKeyPackage -> App (Maybe NewKeyPackageResult)
validateAndAddKeyPackageRef :: NewKeyPackage -> App (Either Text NewKeyPackageResult)
validateAndAddKeyPackageRef nkp = do
res <-
call
Expand All @@ -238,6 +240,8 @@ validateAndAddKeyPackageRef nkp = do
)
let statusCode = HTTP.statusCode (Rq.responseStatus res)
if
| statusCode `div` 100 == 2 -> Just <$> parseResponse (mkError status502 "server-error") res
| statusCode `div` 100 == 4 -> pure Nothing
| statusCode `div` 100 == 2 -> Right <$> parseResponse (mkError status502 "server-error") res
| statusCode `div` 100 == 4 -> do
err <- parseResponse (mkError status502 "server-error") res
pure (Left ("Error validating keypackage: " <> toStrict (Error.label err) <> ": " <> toStrict (Error.message err)))
| otherwise -> throwM (mkError status502 "server-error" "Unexpected http status returned from /i/mls/key-packages/add")