From a3663da90eb09c7e65c8a6444423269e57af84eb Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Mon, 13 Jan 2014 10:50:26 +0000
Subject: [PATCH] Exposed mg_send_digest_auth_request(). Exported conn->content
to Lua
---
mongoose.c | 21 +++++++++++++--------
mongoose.h | 1 +
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index becc2a146..8c93d34b7 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2628,15 +2628,15 @@ static void send_options(struct connection *conn) {
#endif // NO_DAV
#ifndef NO_AUTH
-static void send_authorization_request(struct connection *conn) {
- conn->mg_conn.status_code = 401;
- mg_printf(&conn->mg_conn,
+void mg_send_digest_auth_request(struct mg_connection *c) {
+ struct connection *conn = (struct connection *) c;
+ c->status_code = 401;
+ mg_printf(c,
"HTTP/1.1 401 Unauthorized\r\n"
"WWW-Authenticate: Digest qop=\"auth\", "
"realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
conn->server->config_options[AUTH_DOMAIN],
(unsigned long) time(NULL));
- close_local_endpoint(conn);
}
// Use the global passwords file, if specified by auth_gpass option,
@@ -2963,7 +2963,7 @@ static int is_authorized_for_dav(struct connection *conn) {
return authorized;
}
-static int is_dangerous_dav_request(const struct connection *conn) {
+static int is_dav_mutation(const struct connection *conn) {
const char *s = conn->mg_conn.request_method;
return s && (!strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
!strcmp(s, "MKCOL"));
@@ -3186,6 +3186,10 @@ static void prepare_lua_environment(struct mg_connection *ri, lua_State *L) {
reg_string(L, "query_string", ri->query_string);
reg_string(L, "remote_ip", ri->remote_ip);
reg_int(L, "remote_port", ri->remote_port);
+ lua_pushstring(L, "content");
+ lua_pushlstring(L, ri->content == NULL ? "" : ri->content, 0);
+ lua_rawset(L, -3);
+ reg_int(L, "content_len", ri->content_len);
reg_int(L, "num_headers", ri->num_headers);
lua_pushstring(L, "http_headers");
lua_newtable(L);
@@ -3310,9 +3314,10 @@ static void open_local_endpoint(struct connection *conn) {
} else if (conn->server->config_options[DOCUMENT_ROOT] == NULL) {
send_http_error(conn, 404, NULL);
#ifndef NO_AUTH
- } else if ((!is_dangerous_dav_request(conn) && !is_authorized(conn, path)) ||
- (is_dangerous_dav_request(conn) && !is_authorized_for_dav(conn))) {
- send_authorization_request(conn);
+ } else if ((!is_dav_mutation(conn) && !is_authorized(conn, path)) ||
+ (is_dav_mutation(conn) && !is_authorized_for_dav(conn))) {
+ mg_send_digest_auth_request(&conn->mg_conn);
+ close_local_endpoint(conn);
#endif
#ifndef NO_DAV
} else if (!strcmp(conn->mg_conn.request_method, "PROPFIND")) {
diff --git a/mongoose.h b/mongoose.h
index dc1c65e52..0b644c9c6 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -97,6 +97,7 @@ int mg_parse_header(const char *hdr, const char *var_name, char *buf, size_t);
void *mg_start_thread(void *(*func)(void *), void *param);
char *mg_md5(char buf[33], ...);
int mg_authorize_digest(struct mg_connection *c, FILE *fp);
+void mg_send_digest_auth_request(struct mg_connection *conn);
#ifdef __cplusplus
}
--
GitLab