summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth.c26
-rw-r--r--file.c13
-rw-r--r--uhttpd.h3
3 files changed, 31 insertions, 11 deletions
diff --git a/auth.c b/auth.c
index 0c4872f..69ccf46 100644
--- a/auth.c
+++ b/auth.c
@@ -73,7 +73,8 @@ void uh_auth_add(const char *path, const char *user, const char *pass)
list_add(&new->list, &auth_realms);
}
-bool uh_auth_check(struct client *cl, struct path_info *pi)
+bool uh_auth_check(struct client *cl, const char *path, const char *auth,
+ char **uptr, char **pptr)
{
struct http_request *req = &cl->request;
struct auth_realm *realm;
@@ -82,8 +83,14 @@ bool uh_auth_check(struct client *cl, struct path_info *pi)
char *pass = NULL;
int plen;
- if (pi->auth && !strncasecmp(pi->auth, "Basic ", 6)) {
- const char *auth = pi->auth + 6;
+ if (uptr)
+ *uptr = NULL;
+
+ if (pptr)
+ *pptr = NULL;
+
+ if (auth && !strncasecmp(auth, "Basic ", 6)) {
+ auth += 6;
uh_b64decode(uh_buf, sizeof(uh_buf), auth, strlen(auth));
pass = strchr(uh_buf, ':');
@@ -94,14 +101,14 @@ bool uh_auth_check(struct client *cl, struct path_info *pi)
}
req->realm = NULL;
- plen = strlen(pi->name);
+ plen = strlen(path);
list_for_each_entry(realm, &auth_realms, list) {
int rlen = strlen(realm->path);
if (plen < rlen)
continue;
- if (strncasecmp(pi->name, realm->path, rlen) != 0)
+ if (strncasecmp(path, realm->path, rlen) != 0)
continue;
req->realm = realm;
@@ -120,8 +127,15 @@ bool uh_auth_check(struct client *cl, struct path_info *pi)
if (user_match &&
(!strcmp(pass, realm->pass) ||
- !strcmp(crypt(pass, realm->pass), realm->pass)))
+ !strcmp(crypt(pass, realm->pass), realm->pass))) {
+ if (uptr)
+ *uptr = user;
+
+ if (pptr)
+ *pptr = pass;
+
return true;
+ }
uh_http_header(cl, 401, "Authorization Required");
ustream_printf(cl->us,
diff --git a/file.c b/file.c
index 047b4da..e20071b 100644
--- a/file.c
+++ b/file.c
@@ -795,6 +795,7 @@ static bool __handle_file_request(struct client *cl, char *url)
struct dispatch_handler *d;
struct blob_attr *tb[__HDR_MAX];
struct path_info *pi;
+ char *user, *pass;
pi = uh_path_lookup(cl, url);
if (!pi)
@@ -804,11 +805,15 @@ static bool __handle_file_request(struct client *cl, char *url)
return true;
blobmsg_parse(hdr_policy, __HDR_MAX, tb, blob_data(cl->hdr.head), blob_len(cl->hdr.head));
- if (tb[HDR_AUTHORIZATION])
- pi->auth = blobmsg_data(tb[HDR_AUTHORIZATION]);
+ if (tb[HDR_AUTHORIZATION]) {
+ if (!uh_auth_check(cl, pi->name, blobmsg_data(tb[HDR_AUTHORIZATION]), &user, &pass))
+ return true;
- if (!uh_auth_check(cl, pi))
- return true;
+ if (user && pass) {
+ blobmsg_add_string(&cl->hdr, "http-auth-user", user);
+ blobmsg_add_string(&cl->hdr, "http-auth-pass", pass);
+ }
+ }
d = dispatch_find(url, pi);
if (d)
diff --git a/uhttpd.h b/uhttpd.h
index fe05f0d..b358a0b 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -300,7 +300,8 @@ void uh_client_read_cb(struct client *cl);
void uh_client_notify_state(struct client *cl);
void uh_auth_add(const char *path, const char *user, const char *pass);
-bool uh_auth_check(struct client *cl, struct path_info *pi);
+bool uh_auth_check(struct client *cl, const char *path, const char *auth,
+ char **uptr, char **pptr);
void uh_close_listen_fds(void);
void uh_close_fds(void);