Skip to content

file: enforce Basic Auth realms for URL-prefix handlers #31

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

Open
hauke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

file: enforce Basic Auth realms for URL-prefix handlers #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,20 @@ static char *uh_handle_alias(char *old_url)
return old_url;
}

static bool uh_auth_check_url(struct client *cl, const char *url)
{
static const struct blobmsg_policy policy = {
"authorization", BLOBMSG_TYPE_STRING
};
struct blob_attr *tb;
const char *auth;

blobmsg_parse(&policy, 1, &tb, blob_data(cl->hdr.head), blob_len(cl->hdr.head));
auth = tb ? blobmsg_data(tb) : NULL;

return uh_auth_check(cl, url, auth, NULL, NULL);
}

void uh_handle_request(struct client *cl)
{
struct http_request *req = &cl->request;
Expand All @@ -976,8 +990,15 @@ void uh_handle_request(struct client *cl)

req->redirect_status = 200;
d = dispatch_find(url, NULL);
if (d)
if (d) {
/* check_url handlers (lua, ucode, ubus) are dispatched here,
* before the file/CGI path that performs uh_auth_check().
* Enforce any matching Basic Auth realm so these handlers are
* protected consistently with static files and CGI scripts. */
if (!uh_auth_check_url(cl, url))
return;
return uh_invoke_handler(cl, d, url, NULL);
}

if (__handle_file_request(cl, url, false))
return;
Expand Down