mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
Support HTTP digest authentication for the http manager interface.
(closes issue #10961) Reported by: ys Patches: digest_auth_r148468_v5.diff uploaded by ys (license 281) SVN branch http://svn.digium.com/svn/asterisk/team/group/manager_http_auth Tested by: ys, twilson, tilghman Review: http://reviewboard.digium.com/r/223/ Reviewed by: tilghman,russellb,mmichelson git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -156,7 +156,6 @@ static int process_message(GMimeMessage *message, const char *post_dir)
|
||||
return cbinfo.count;
|
||||
}
|
||||
|
||||
|
||||
/* Find a sequence of bytes within a binary array. */
|
||||
static int find_sequence(char * inbuf, int inlen, char * matchbuf, int matchlen)
|
||||
{
|
||||
@@ -292,10 +291,9 @@ static int readmimefile(FILE * fin, FILE * fout, char * boundary, int contentlen
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *ser, const struct ast_http_uri *urih, const char *uri, enum ast_http_method method, struct ast_variable *vars, struct ast_variable *headers, int *status, char **title, int *contentlength)
|
||||
static int http_post_callback(struct ast_tcptls_session_instance *ser, const struct ast_http_uri *urih, const char *uri, enum ast_http_method method, struct ast_variable *get_vars, struct ast_variable *headers)
|
||||
{
|
||||
struct ast_variable *var;
|
||||
struct ast_variable *var, *cookies;
|
||||
unsigned long ident = 0;
|
||||
FILE *f;
|
||||
int content_len = 0;
|
||||
@@ -304,41 +302,45 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
|
||||
int message_count = 0;
|
||||
char * boundary_marker = NULL;
|
||||
|
||||
if (method != AST_HTTP_POST) {
|
||||
ast_http_error(ser, 501, "Not Implemented", "Attempt to use unimplemented / unsupported method");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!astman_is_authed(ast_http_manid_from_vars(headers))) {
|
||||
ast_http_error(ser, 403, "Access Denied", "Sorry, I cannot let you do that, Dave.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!urih) {
|
||||
return ast_http_error((*status = 400),
|
||||
(*title = ast_strdup("Missing URI handle")),
|
||||
NULL, "There was an error parsing the request");
|
||||
ast_http_error(ser, 400, "Missing URI handle", "There was an error parsing the request");
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (var = vars; var; var = var->next) {
|
||||
if (strcasecmp(var->name, "mansession_id")) {
|
||||
continue;
|
||||
cookies = ast_http_get_cookies(headers);
|
||||
for (var = cookies; var; var = var->next) {
|
||||
if (!strcasecmp(var->name, "mansession_id")) {
|
||||
sscanf(var->value, "%lx", &ident);
|
||||
break;
|
||||
}
|
||||
|
||||
if (sscanf(var->value, "%lx", &ident) != 1) {
|
||||
return ast_http_error((*status = 400),
|
||||
(*title = ast_strdup("Bad Request")),
|
||||
NULL, "The was an error parsing the request.");
|
||||
}
|
||||
|
||||
if (!astman_verify_session_writepermissions(ident, EVENT_FLAG_CONFIG)) {
|
||||
return ast_http_error((*status = 401),
|
||||
(*title = ast_strdup("Unauthorized")),
|
||||
NULL, "You are not authorized to make this request.");
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
if (cookies) {
|
||||
ast_variables_destroy(cookies);
|
||||
}
|
||||
|
||||
if (!var) {
|
||||
return ast_http_error((*status = 401),
|
||||
(*title = ast_strdup("Unauthorized")),
|
||||
NULL, "You are not authorized to make this request.");
|
||||
if (ident == 0) {
|
||||
ast_http_error(ser, 401, "Unauthorized", "You are not authorized to make this request.");
|
||||
return -1;
|
||||
}
|
||||
if (!astman_verify_session_writepermissions(ident, EVENT_FLAG_CONFIG)) {
|
||||
ast_http_error(ser, 401, "Unauthorized", "You are not authorized to make this request.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!(f = tmpfile())) {
|
||||
ast_log(LOG_ERROR, "Could not create temp file.\n");
|
||||
return NULL;
|
||||
ast_http_error(ser, 500, "Internal server error", "Could not create temp file.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (var = headers; var; var = var->next) {
|
||||
@@ -348,8 +350,8 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
|
||||
if ((sscanf(var->value, "%u", &content_len)) != 1) {
|
||||
ast_log(LOG_ERROR, "Invalid Content-Length in POST request!\n");
|
||||
fclose(f);
|
||||
|
||||
return NULL;
|
||||
ast_http_error(ser, 500, "Internal server error", "Invalid Content-Length in POST request!");
|
||||
return -1;
|
||||
}
|
||||
ast_debug(1, "Got a Content-Length of %d\n", content_len);
|
||||
} else if (!strcasecmp(var->name, "Content-Type")) {
|
||||
@@ -367,15 +369,15 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
|
||||
ast_log(LOG_DEBUG, "Cannot find boundary marker in POST request.\n");
|
||||
}
|
||||
fclose(f);
|
||||
|
||||
return NULL;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (fseek(f, SEEK_SET, 0)) {
|
||||
ast_log(LOG_ERROR, "Failed to seek temp file back to beginning.\n");
|
||||
fclose(f);
|
||||
|
||||
return NULL;
|
||||
ast_http_error(ser, 500, "Internal server error", "Failed to seek temp file back to beginning.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
post_dir = urih->data;
|
||||
@@ -385,24 +387,20 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
|
||||
if (!message) {
|
||||
ast_log(LOG_ERROR, "Error parsing MIME data\n");
|
||||
|
||||
return ast_http_error((*status = 400),
|
||||
(*title = ast_strdup("Bad Request")),
|
||||
NULL, "The was an error parsing the request.");
|
||||
ast_http_error(ser, 400, "Bad Request", "The was an error parsing the request.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!(message_count = process_message(message, ast_str_buffer(post_dir)))) {
|
||||
ast_log(LOG_ERROR, "Invalid MIME data, found no parts!\n");
|
||||
g_object_unref(message);
|
||||
return ast_http_error((*status = 400),
|
||||
(*title = ast_strdup("Bad Request")),
|
||||
NULL, "The was an error parsing the request.");
|
||||
ast_http_error(ser, 400, "Bad Request", "The was an error parsing the request.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
g_object_unref(message);
|
||||
|
||||
return ast_http_error((*status = 200),
|
||||
(*title = ast_strdup("OK")),
|
||||
NULL, "File successfully uploaded.");
|
||||
ast_http_error(ser, 200, "OK", "File successfully uploaded.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __ast_http_post_load(int reload)
|
||||
@@ -450,8 +448,6 @@ static int __ast_http_post_load(int reload)
|
||||
ast_str_set(&ds, 0, "%s/%s", prefix, v->value);
|
||||
urih->data = ds;
|
||||
urih->has_subtree = 0;
|
||||
urih->supports_get = 0;
|
||||
urih->supports_post = 1;
|
||||
urih->callback = http_post_callback;
|
||||
urih->key = __FILE__;
|
||||
urih->mallocd = urih->dmallocd = 1;
|
||||
|
Reference in New Issue
Block a user