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

nginx-zauth-module: Do not try to read the access token from query params #4175

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

nginx-zauth-module: Do not try to read the access token from query params #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed274f2
nginx-zauth-module: Do not try to read the access token from query pa…
akshaymankar Jul 30, 2024
9cc1fe1
changelog
akshaymankar Jul 30, 2024
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: 2 additions & 0 deletions changelog.d/1-api-changes/nginz-no-query-params
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Passing the access_token in the query params is not supported anymore. Please
use the `Authorization` header to specify the token.
28 changes: 0 additions & 28 deletions services/nginz/third_party/nginx-zauth-module/zauth_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ static ngx_int_t zauth_and_oauth_handle_request (ngx_http_request_t *);

// Request Inspection
static ZauthResult token_from_header (ngx_str_t const *, ZauthToken **);
static ZauthResult token_from_query (ngx_str_t const *, ZauthToken **);
static ZauthContext * alloc_zauth_context (ngx_http_request_t * r, ZauthToken *);
static ZauthContext * alloc_oauth_context (ngx_http_request_t * r, char *);
static ngx_int_t setup_zauth_context (ngx_http_request_t * , ZauthContext *);
Expand Down Expand Up @@ -455,17 +454,6 @@ static ngx_int_t zauth_parse_request (ngx_http_request_t * r) {

if (r->headers_in.authorization != NULL) {
res = token_from_header(&r->headers_in.authorization->value, &tkn);
} else if (r->args.len > 0) {
ngx_str_t query;
query.data = ngx_pnalloc(r->pool, r->args.len);
if (query.data == NULL) {
return NGX_ERROR;
}
u_char* writer = query.data;
u_char* reqargs = r->args.data;
ngx_unescape_uri(&writer, &reqargs, r->args.len, 0);
query.len = writer - query.data;
res = token_from_query(&query, &tkn);
} else {
ngx_str_t name = ngx_string("zprovider");
ngx_str_t cookie = ngx_null_string;
Expand Down Expand Up @@ -502,22 +490,6 @@ static ZauthResult token_from_header (ngx_str_t const * hdr, ZauthToken ** t) {
}
}

static ZauthResult token_from_query (ngx_str_t const * query, ZauthToken ** t) {
uint8_t const * start = memmem(query->data, query->len, "access_token=", 13);

if (start == NULL) {
return ZAUTH_PARSE_ERROR;
}

uint8_t const * token_start = start + 13; // length of "access_token="
size_t token_len = query->len - (token_start - query->data);
uint8_t const * token_end = memchr(token_start, '&', token_len);

return token_end == NULL
? zauth_token_parse(token_start, token_len, t)
: zauth_token_parse(token_start, token_end - token_start, t);
}

// Variables ////////////////////////////////////////////////////////////////

static ngx_int_t zauth_variables (ngx_conf_t * conf) {
Expand Down
Loading