Scim: Change log level to Warning & format filter logs (#1331)

Author: smatting

libs/hscim/src/Web/Scim/Filter.hs

@@ -49,6 +49,7 @@ module Web.Scim.Filter
     pSubAttr,
     pFilter,
     rAttrPath,
+    rCompareOp,
     rValuePath,
     rSubAttr,
     compareStr,

services/spar/src/Spar/Scim/User.hs

@@ -52,11 +52,13 @@ import Control.Monad.Trans.Except (mapExceptT)
 import Control.Monad.Trans.Maybe (MaybeT (MaybeT), runMaybeT)
 import Crypto.Hash (Digest, SHA256, hashlazy)
 import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Text as Aeson
 import Data.Handle (Handle (Handle), parseHandle)
 import Data.Id (Id (..), TeamId, UserId, idToText)
 import Data.Json.Util (UTCTimeMillis, fromUTCTimeMillis, toUTCTimeMillis)
 import Data.String.Conversions (cs)
 import qualified Data.Text as Text
+import qualified Data.UUID as UUID
 import qualified Data.UUID.V4 as UUID
 import Imports
 import Network.URI (URI, parseURI)
@@ -72,6 +74,7 @@ import System.Logger.Message (Msg)
 import qualified URI.ByteString as URIBS
 import Util.Logging (logFunction, logHandle, logTeam, logUser, sha256String)
 import qualified Web.Scim.Class.User as Scim
+import Web.Scim.Filter (Filter (..), rAttrPath, rCompareOp)
 import qualified Web.Scim.Filter as Scim
 import qualified Web.Scim.Handler as Scim
 import qualified Web.Scim.Schema.Common as Scim
@@ -98,7 +101,7 @@ instance Scim.UserDB ST.SparTag Spar where
     logScim
       ( logFunction "Spar.Scim.User.getUsers"
           . logTokenInfo tokeninfo
-          . Log.msg ("filters: " <> show filter')
+          . logFilter filter'
       )
       $ do
         mIdpConfig <- maybe (pure Nothing) (lift . wrapMonadClient . Data.getIdPConfig) stiIdP
@@ -310,7 +313,7 @@ logScim context action =
               case Scim.detail e of
                 Just d -> d
                 Nothing -> cs (Aeson.encode e)
-        Log.err $ context . Log.msg errorMsg
+        Log.warn $ context . Log.msg errorMsg
         pure (Left e)
       Right x -> do
         Log.info $ context . Log.msg @Text "call without exception"
@@ -783,6 +786,21 @@ scimFindUserByEmail mIdpConfig stiTeam email = do
         inspar = wrapMonadClient $ Data.lookupScimExternalId eml
         inbrig = userId . accountUser <$$> Brig.getBrigUserByEmail eml
 
+logFilter :: Filter -> (Msg -> Msg)
+logFilter (FilterAttrCompare attr op val) =
+  Log.msg $ "filter:" <> rAttrPath attr <> " " <> rCompareOp op <> " " <> rCompValue val
+  where
+    rCompValue :: Scim.CompValue -> Text
+    rCompValue = \case
+      Scim.ValNull -> "null"
+      Scim.ValBool True -> "true"
+      Scim.ValBool False -> "false"
+      Scim.ValNumber n -> cs $ Aeson.encodeToLazyText (Aeson.Number n)
+      Scim.ValString s ->
+        "sha256 "
+          <> sha256String s
+          <> (if isJust (UUID.fromText s) then " original is a UUID" else "")
+
 {- TODO: might be useful later.
 ~~~~~~~~~~~~~~~~~~~~~~~~~