hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-15 09:22:43 +03:00
Code Issues Projects Releases Wiki Activity

server: improve logging around HTTP Exception errors for Actions and Remote Schemas

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8937
GitOrigin-RevId: fb6b3a4786cf5ffd42bf608c7743d5b8852cbf47
This commit is contained in:
pranshi06 2023-05-03 13:24:46 +05:30 committed by hasura-bot
parent 824648b49a
commit 1de2bf7d70
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src-lib/Hasura/GraphQL/Execute/Action.hs
View File

@ -613,7 +613,7 @@ callWebhook
Left e ->
throw500WithDetail "http exception when calling webhook" $
J.toJSON $
ActionInternalError (J.toJSON $ HttpException e) requestInfo Nothing
ActionInternalError (getHttpExceptionJson (ShowErrorInfo True) $ HttpException e) requestInfo Nothing
Right responseWreq -> do
-- TODO(SOLOMON): Remove 'wreq'
let responseBody = responseWreq ^. Wreq.responseBody

2
server/src-lib/Hasura/GraphQL/RemoteServer.hs
View File

@ -491,7 +491,7 @@ throwRemoteSchemaHttp ::
throwRemoteSchemaHttp urlEnvRecord exception =
throwError $
(baseError urlEnvRecord)
{ qeInternal = Just $ ExtraInternal $ J.toJSON $ HttpException exception
{ qeInternal = Just $ ExtraInternal $ getHttpExceptionJson (ShowErrorInfo True) $ HttpException exception
}
where
baseError val = err400 RemoteSchemaError (httpExceptMsg val)

50
server/src-lib/Hasura/HTTP.hs
View File

@ -122,40 +122,40 @@ newtype ShowHeadersAndEnvVarInfo = ShowHeadersAndEnvVarInfo {unShowHeadersAndEnv
serializeHTTPExceptionWithErrorMessage :: ShowHeadersAndEnvVarInfo -> HTTP.HttpException -> Text
serializeHTTPExceptionWithErrorMessage (ShowHeadersAndEnvVarInfo isShowHeaderAndEnvVarInfo) = \case
HTTP.HttpExceptionRequest _ err -> case err of
HTTP.StatusCodeException response _ -> "response status code indicated failure" <> (tshow . HTTP.statusCode $ HTTP.responseStatus response)
HTTP.TooManyRedirects redirects -> "too many redirects: " <> tshow (length redirects) <> " redirects"
HTTP.OverlongHeaders -> "overlong headers"
HTTP.ResponseTimeout -> "response timeout"
HTTP.ConnectionTimeout -> "connection timeout"
HTTP.ConnectionFailure exn -> "connection failure: " <> serializeExceptionForDebugging exn
HTTP.InvalidStatusLine statusLine -> "invalid status line: " <> fromUtf8 statusLine
HTTP.StatusCodeException response _ -> "Response status code indicated failure" <> (tshow . HTTP.statusCode $ HTTP.responseStatus response)
HTTP.TooManyRedirects redirects -> "Too many redirects: " <> tshow (length redirects) <> " redirects"
HTTP.OverlongHeaders -> "Overlong headers"
HTTP.ResponseTimeout -> "Response timeout"
HTTP.ConnectionTimeout -> "Connection timeout"
HTTP.ConnectionFailure exn -> "Connection failure: " <> serializeExceptionForDebugging exn
HTTP.InvalidStatusLine statusLine -> "Invalid HTTP status line: " <> fromUtf8 statusLine
HTTP.InvalidHeader header ->
if isShowHeaderAndEnvVarInfo
then "invalid header: " <> fromUtf8 header
else "invalid Header"
then "Invalid header: " <> fromUtf8 header
else "Invalid Header"
HTTP.InvalidRequestHeader requestHeader ->
if isShowHeaderAndEnvVarInfo
then "invalid request header: " <> fromUtf8 requestHeader
else "invalid request header"
then "Invalid request header: " <> fromUtf8 requestHeader
else "Invalid request header"
HTTP.InternalException exn -> case fromException exn of
Just (Restricted.ConnectionRestricted _ _) -> "blocked connection to private IP address: " <> serializeExceptionForDebugging exn
Nothing -> "internal error: " <> serializeExceptionForDebugging exn
HTTP.ProxyConnectException proxyHost port status -> "proxy connection to " <> fromUtf8 proxyHost <> ":" <> tshow port <> " returned response with status code that indicated failure: " <> tshow (HTTP.statusCode status)
HTTP.NoResponseDataReceived -> "no response data received"
Just (Restricted.ConnectionRestricted _ _) -> "Blocked connection to private IP address: " <> serializeExceptionForDebugging exn
Nothing -> "Internal error: " <> serializeExceptionForDebugging exn
HTTP.ProxyConnectException proxyHost port status -> "Proxy connection to " <> fromUtf8 proxyHost <> ":" <> tshow port <> " returned response with status code that indicated failure: " <> tshow (HTTP.statusCode status)
HTTP.NoResponseDataReceived -> "No response data received"
HTTP.TlsNotSupported -> "TLS not supported"
HTTP.WrongRequestBodyStreamSize expected actual -> "wrong request body stream size. expected: " <> tshow expected <> ", actual: " <> tshow actual
HTTP.ResponseBodyTooShort expected actual -> "response body too short. expected: " <> tshow expected <> ", actual: " <> tshow actual
HTTP.InvalidChunkHeaders -> "invalid chunk headers"
HTTP.IncompleteHeaders -> "incomplete headers"
HTTP.InvalidDestinationHost host -> "invalid destination host: " <> fromUtf8 host
HTTP.WrongRequestBodyStreamSize expected actual -> "Wrong request body stream size. expected: " <> tshow expected <> ", actual: " <> tshow actual
HTTP.ResponseBodyTooShort expected actual -> "Response body too short. expected: " <> tshow expected <> ", actual: " <> tshow actual
HTTP.InvalidChunkHeaders -> "Invalid chunk headers"
HTTP.IncompleteHeaders -> "Incomplete headers"
HTTP.InvalidDestinationHost host -> "Invalid destination host: " <> fromUtf8 host
HTTP.HttpZlibException exn -> "HTTP zlib error: " <> serializeExceptionForDebugging exn
HTTP.InvalidProxyEnvironmentVariable name value ->
if isShowHeaderAndEnvVarInfo
then "invalid proxy environment variable: " <> name <> "=" <> value
else "invalid proxy environment variable: " <> name
HTTP.ConnectionClosed -> "connection closed"
HTTP.InvalidProxySettings err' -> "invalid proxy settings: " <> err'
HTTP.InvalidUrlException url' reason -> "invalid url: " <> T.pack url' <> "; reason: " <> T.pack reason
then "Invalid proxy environment variable: " <> name <> "=" <> value
else "Invalid proxy environment variable: " <> name
HTTP.ConnectionClosed -> "Connection closed"
HTTP.InvalidProxySettings err' -> "Invalid proxy settings: " <> err'
HTTP.InvalidUrlException url' reason -> "Invalid url: " <> T.pack url' <> "; reason: " <> T.pack reason
where
fromUtf8 = TE.decodeUtf8With TE.lenientDecode