Skip to content

file: enforce auth realms on plugin-dispatched URL prefixes #35

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
JuliusBairaktaris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

file: enforce auth realms on plugin-dispatched URL prefixes #35

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
39 changes: 38 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,39 @@ static char *uh_handle_alias(char *old_url)
return old_url;
}

/*
* Handlers registered with .check_url (ubus, lua, ucode) are dispatched straight
* from uh_handle_request(), which never reaches __handle_file_request() - the only
* caller of uh_auth_check(). An auth realm covering such a prefix would therefore
* never be enforced. Evaluate the realm here, on the same URL the dispatcher
* matched, before handing the request to the plugin.
*/
static bool
uh_dispatch_auth_check(struct client *cl, const char *url)
{
static const struct blobmsg_policy hdr_policy[] = {
{ "authorization", BLOBMSG_TYPE_STRING },
};
struct blob_attr *tb[ARRAY_SIZE(hdr_policy)];
char *user, *pass;
const char *auth;

blobmsg_parse(hdr_policy, ARRAY_SIZE(hdr_policy), tb,
blob_data(cl->hdr.head), blob_len(cl->hdr.head));

auth = tb[0] ? blobmsg_data(tb[0]) : NULL;

if (!uh_auth_check(cl, url, auth, &user, &pass))
return false;

if (user && pass) {
blobmsg_add_string(&cl->hdr, "http-auth-user", user);
blobmsg_add_string(&cl->hdr, "http-auth-pass", pass);
}

return true;
}

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

req->redirect_status = 200;
d = dispatch_find(url, NULL);
if (d)
if (d) {
if (!uh_dispatch_auth_check(cl, url))
return;

return uh_invoke_handler(cl, d, url, NULL);
}

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