Skip to content
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

Jump to bottom

fix(meta): remove runtime.HttpBodyMarshaler from gateway stack #1277

Merged
merged 6 commits into from
Jan 18, 2023
Merged

fix(meta): remove runtime.HttpBodyMarshaler from gateway stack #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a9906a
test(meta): ensure unauthenticated meta requests return 401
GeorgeMac Jan 18, 2023
6d3b674
test(meta): add Accept header to unauthenticated meta requests
GeorgeMac Jan 18, 2023
ebd10ab
fix(meta): pass fallback handler to HttpBodyMarshaler
GeorgeMac Jan 18, 2023
8d2f433
refactor(meta): remove unnecessary marshalers
GeorgeMac Jan 18, 2023
83f2948
refactor(gateway): remove unnecessary exported marshallers
GeorgeMac Jan 18, 2023
9385f51
test(meta): pass Accept: application/json to API requests
GeorgeMac Jan 18, 2023
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
2 changes: 0 additions & 2 deletions internal/cmd/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ func NewHTTPServer(

// mount the metadata service to the chi router under /meta.
r.Mount("/meta", runtime.NewServeMux(
runtime.WithMarshalerOption("application/json", &runtime.HTTPBodyMarshaler{}),
runtime.WithMarshalerOption("application/json+pretty", &runtime.HTTPBodyMarshaler{}),
registerFunc(
ctx,
conn,
Expand Down
25 changes: 18 additions & 7 deletions test/api.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ uuid_str()
uuidgen
}

shakedownJSON() {
shakedown "$@" -H "Accept: application/json"
}

authedShakedown() {
shakedown "$@" -H "Authorization: Bearer ${FLIPT_TOKEN:-""}"
shakedownJSON "$@" -H "Authorization: Bearer ${FLIPT_TOKEN:-""}"
}

_curl() {
Expand Down Expand Up @@ -319,6 +323,13 @@ step_8_test_meta()

# ensure CSRF cookie is present
header_matches "Set-Cookie" "_gorilla_csrf"

# ensure unauthenticated request returns 401
shakedownJSON GET "/meta/info"
status 401

shakedownJSON GET "/meta/config"
status 401
fi
}

Expand All @@ -339,32 +350,32 @@ step_10_test_auths()
export FLIPT_TOKEN

# /auth/v1/method is always public
shakedown GET '/auth/v1/method' -H 'Content-Type: application/json'
shakedownJSON GET '/auth/v1/method'
status 200

# token should succeed when used via authorization header to list flags
# (both when auth is required and not)
authedShakedown GET '/api/v1/flags' -H 'Content-Type: application/json'
authedShakedown GET '/api/v1/flags'
status 200

# listing tokens includes the created token
authedShakedown GET "/auth/v1/tokens" -H 'Content-Type: application/json'
authedShakedown GET "/auth/v1/tokens"
status 200
matches "\"id\":\"${tokenID}\""

if [ -n "${TEST_FLIPT_API_AUTH_REQUIRED:-}" ]; then
# getting self using token returns expected ID
authedShakedown GET '/auth/v1/self' -H 'Content-Type: application/json'
authedShakedown GET '/auth/v1/self'
status 200
matches "\"id\":\"${tokenID}\""

# cookie based auth is configured and should also work
shakedown GET '/auth/v1/self' -H 'Content-Type: application/json' -H "Cookie: flipt_client_token=${FLIPT_TOKEN}"
shakedownJSON GET '/auth/v1/self' -H "Cookie: flipt_client_token=${FLIPT_TOKEN}"
status 200
matches "\"id\":\"${tokenID}\""
else
# there is no self when authentication is disabled
authedShakedown GET '/auth/v1/self' -H 'Content-Type: application/json'
authedShakedown GET '/auth/v1/self'
status 401
fi
}
Expand Down