Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
d1d41d65
Unverified
Commit
d1d41d65
authored
2 years ago
by
Ngoc Khuat
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix returns 500 when exception is thrown from handle-page middleware (#27526)
* fix throwing exceptions in handle-paging mw
parent
500571a0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/server/handler.clj
+3
-2
3 additions, 2 deletions
src/metabase/server/handler.clj
test/metabase/server/middleware/offset_paging_test.clj
+42
-32
42 additions, 32 deletions
test/metabase/server/middleware/offset_paging_test.clj
with
45 additions
and
34 deletions
src/metabase/server/handler.clj
+
3
−
2
View file @
d1d41d65
...
...
@@ -50,8 +50,8 @@
#
'mw.browser-cookie/ensure-browser-id-cookie
; add cookie to identify browser; add `:browser-id` to the request
#
'mw.security/add-security-headers
; Add HTTP headers to API responses to prevent them from being cached
#
'mw.json/wrap-json-body
; extracts json POST body and makes it avaliable on request
#
'mw.json/wrap-streamed-json-response
; middleware to automatically serialize suitable objects as JSON in responses
#
'mw.offset-paging/handle-paging
; binds per-request parameters to handle paging
#
'mw.json/wrap-streamed-json-response
; middleware to automatically serialize suitable objects as JSON in responses
#
'wrap-keyword-params
; converts string keys in :params to keyword keys
#
'wrap-params
; parses GET and POST params as :query-params/:form-params and both as :params
#
'mw.misc/maybe-set-site-url
; set the value of `site-url` if it hasn't been set yet
...
...
@@ -68,7 +68,8 @@
#
'mw.ssl/redirect-to-https-middleware
])
;; ▲▲▲ PRE-PROCESSING ▲▲▲ happens from BOTTOM-TO-TOP
(
defn-
apply-middleware
[
handler
]
(
defn-
apply-middleware
[
handler
]
(
reduce
(
fn
[
handler
middleware-fn
]
(
middleware-fn
handler
))
...
...
This diff is collapsed.
Click to expand it.
test/metabase/server/middleware/offset_paging_test.clj
+
42
−
32
View file @
d1d41d65
(
ns
metabase.server.middleware.offset-paging-test
(
:require
[
cheshire.core
:as
json
]
[
clojure.java.io
:as
io
]
[
clojure.test
:refer
:all
]
[
metabase.server.handler
:as
handler
]
[
metabase.server.middleware.offset-paging
:as
mw.offset-paging
]
[
ring.middleware.keyword-params
:refer
[
wrap-keyword-params
]]
[
ring.middleware.params
:refer
[
wrap-params
]]
[
metabase.server.middleware.security
:as
mw.security
]
[
ring.mock.request
:as
ring.mock
]
[
ring.util.response
:as
response
]
[
schema.core
:as
s
]))
[
ring.util.response
:as
response
])
(
:import
(
java.io
PipedInputStream
)))
(
defn-
handler
[
request
]
(
let
[
handler*
(
->
(
fn
[
request
respond
_
]
(
respond
(
response/response
{
:limit
mw.offset-paging/*limit*
:offset
mw.offset-paging/*offset*
:paged?
mw.offset-paging/*paged?*
:params
(
:params
request
)})))
mw.offset-paging/handle-paging
wrap-keyword-params
wrap-params
)
respond
identity
raise
(
fn
[
e
]
(
throw
e
))]
(
let
[
handler
(
fn
[
request
respond
_
]
(
respond
(
response/response
{
:limit
mw.offset-paging/*limit*
:offset
mw.offset-paging/*offset*
:paged?
mw.offset-paging/*paged?*
:params
(
:params
request
)})))
handler*
(
#
'handler/apply-middleware
handler
)
respond
identity
raise
(
fn
[
e
]
(
throw
e
))]
(
handler*
request
respond
raise
)))
(
defn-
read-response
"Responses from our hanlders are inputstream, this is read the stream into real body."
[
response
]
(
update
response
:body
(
fn
[
body
]
(
if
(
instance?
PipedInputStream
body
)
(
with-open
[
r
(
io/reader
body
)]
(
json/parse-stream
r
))
body
))))
(
deftest
paging-test
(
testing
"no paging params"
(
is
(
=
{
:status
200
:headers
{}
:body
{
:limit
nil
:offset
nil
:paged?
false
:params
{}}}
(
handler
(
ring.mock/request
:get
"/"
)))))
(
is
(
=?
{
:status
200
:body
{
"limit"
nil
"offset"
nil
"paged?"
false
"params"
{}}}
(
read-response
(
handler
(
ring.mock/request
:get
"/"
))))))
(
testing
"w/ paging params"
(
is
(
=
{
:status
200
:headers
{}
:body
{
:limit
1
00
:offset
200
:paged?
true
:params
{
:whatever
"true"
}
}}
(
handler
(
ring.mock/request
:get
"/"
{
:offset
"200"
,
:limit
"100"
,
:whatever
"true"
})))))
(
is
(
=
?
{
:status
200
:body
{
"limit"
100
"offset"
2
00
"paged?"
true
"params"
{
"whatever"
"true"
}}}
(
read-response
(
handler
(
ring.mock/request
:get
"/"
{
:offset
"200"
,
:limit
"100"
,
:whatever
"true"
}
))))))
(
testing
"invalid params"
(
is
(
schema
=
{
:status
(
s/eq
400
)
:headers
s/Any
:body
{
:
message
#
"Error parsing paging parameters.*"
s/Keyword
s/Any
}}
(
handler
(
ring.mock/request
:get
"/"
{
:offset
"abc"
,
:limit
"100"
}))))))
(
is
(
=
?
{
:status
400
:headers
(
mw.security/security-headers
)
:body
{
"
message
"
#
"Error parsing paging parameters.*"
}}
(
read-response
(
handler
(
ring.mock/request
:get
"/"
{
:offset
"abc"
,
:limit
"100"
}))))))
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment