diff options
Diffstat (limited to 'src/http/modules/ngx_http_dav_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_dav_module.c | 249 |
1 files changed, 207 insertions, 42 deletions
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c index 1b982044f..e60b8cf34 100644 --- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -13,11 +13,15 @@ typedef struct { ngx_uint_t methods; + ngx_flag_t create_full_put_path; } ngx_http_dav_loc_conf_t; static ngx_int_t ngx_http_dav_handler(ngx_http_request_t *r); static void ngx_http_dav_put_handler(ngx_http_request_t *r); +static ngx_int_t ngx_http_dav_error(ngx_http_request_t *, ngx_err_t err, + ngx_int_t not_found, char *failed, u_char *path); +static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r, u_char *path); static void *ngx_http_dav_create_loc_conf(ngx_conf_t *cf); static char *ngx_http_dav_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); @@ -28,6 +32,7 @@ static ngx_conf_bitmask_t ngx_http_dav_methods_mask[] = { { ngx_string("off"), NGX_HTTP_DAV_OFF }, { ngx_string("put"), NGX_HTTP_PUT }, { ngx_string("delete"), NGX_HTTP_DELETE }, + { ngx_string("mkcol"), NGX_HTTP_MKCOL }, { ngx_null_string, 0 } }; @@ -41,6 +46,13 @@ static ngx_command_t ngx_http_dav_commands[] = { offsetof(ngx_http_dav_loc_conf_t, methods), &ngx_http_dav_methods_mask }, + { ngx_string("create_full_put_path"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_dav_loc_conf_t, create_full_put_path), + NULL }, + ngx_null_command }; @@ -79,8 +91,10 @@ ngx_module_t ngx_http_dav_module = { static ngx_int_t ngx_http_dav_handler(ngx_http_request_t *r) { + char *failed; ngx_int_t rc; ngx_str_t path; + ngx_file_info_t fi; ngx_http_dav_loc_conf_t *dlcf; /* TODO: Win32 */ @@ -102,10 +116,15 @@ ngx_http_dav_handler(ngx_http_request_t *r) return NGX_DECLINED; } + if (r->headers_in.content_length_n < 0) { + return NGX_HTTP_BAD_REQUEST; + } + r->request_body_in_file_only = 1; r->request_body_in_persistent_file = 1; r->request_body_delete_incomplete_file = 1; r->request_body_file_group_access = 1; + r->request_body_file_log_level = 0; rc = ngx_http_read_client_request_body(r, ngx_http_dav_put_handler); @@ -117,8 +136,14 @@ ngx_http_dav_handler(ngx_http_request_t *r) case NGX_HTTP_DELETE: - if (r->uri.data[r->uri.len - 1] == '/') { - return NGX_DECLINED; + if (r->headers_in.content_length_n > 0) { + return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; + } + + rc = ngx_http_discard_body(r); + + if (rc != NGX_OK && rc != NGX_AGAIN) { + return rc; } ngx_http_map_uri_to_path(r, &path, 0); @@ -126,14 +151,83 @@ ngx_http_dav_handler(ngx_http_request_t *r) ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http delete filename: \"%s\"", path.data); - if (ngx_delete_file(path.data) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, - ngx_delete_file_n " \"%s\" failed", path.data); + if (ngx_file_info(path.data, &fi) != -1) { + + if (ngx_is_dir(&fi)) { + + if (r->uri.data[r->uri.len - 1] != '/' + || r->headers_in.depth == NULL + || r->headers_in.depth->value.len != sizeof("infinity") - 1 + || ngx_strcmp(r->headers_in.depth->value.data, "infinity") + != 0) + { + return NGX_HTTP_BAD_REQUEST; + } + + if (ngx_delete_dir(path.data) != NGX_FILE_ERROR) { + return NGX_HTTP_NO_CONTENT; + } - return NGX_HTTP_INTERNAL_SERVER_ERROR; + failed = ngx_delete_dir_n; + + } else { + + if (r->uri.data[r->uri.len - 1] == '/') { + return NGX_HTTP_BAD_REQUEST; + } + + if (r->headers_in.depth + && r->headers_in.depth->value.len == 1 + && r->headers_in.depth->value.data[0] == '1') + { + return NGX_HTTP_BAD_REQUEST; + } + + if (ngx_delete_file(path.data) != NGX_FILE_ERROR) { + return NGX_HTTP_NO_CONTENT; + } + + failed = ngx_delete_file_n; + } + + } else { + failed = ngx_file_info_n; } - return NGX_HTTP_NO_CONTENT; + return ngx_http_dav_error(r, ngx_errno, NGX_HTTP_NOT_FOUND, failed, + path.data); + + case NGX_HTTP_MKCOL: + + if (r->uri.data[r->uri.len - 1] != '/') { + return NGX_DECLINED; + } + + if (r->headers_in.content_length_n > 0) { + return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; + } + + rc = ngx_http_discard_body(r); + + if (rc != NGX_OK && rc != NGX_AGAIN) { + return rc; + } + + ngx_http_map_uri_to_path(r, &path, 0); + + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http mkcol path: \"%s\"", path.data); + + if (ngx_create_dir(path.data) != NGX_FILE_ERROR) { + if (ngx_http_dav_location(r, path.data) != NGX_OK) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + return NGX_HTTP_CREATED; + } + + return ngx_http_dav_error(r, ngx_errno, NGX_HTTP_CONFLICT, + ngx_create_dir_n, path.data); } return NGX_DECLINED; @@ -143,12 +237,11 @@ ngx_http_dav_handler(ngx_http_request_t *r) static void ngx_http_dav_put_handler(ngx_http_request_t *r) { - u_char *location; - ngx_err_t err; - ngx_str_t *temp, path; - ngx_uint_t status; - ngx_file_info_t fi; - ngx_http_core_loc_conf_t *clcf; + ngx_err_t err; + ngx_str_t *temp, path; + ngx_uint_t status; + ngx_file_info_t fi; + ngx_http_dav_loc_conf_t *dlcf; ngx_http_map_uri_to_path(r, &path, 0); @@ -164,12 +257,34 @@ ngx_http_dav_put_handler(ngx_http_request_t *r) status = NGX_HTTP_NO_CONTENT; } + if (ngx_is_dir(&fi)) { + ngx_http_finalize_request(r, NGX_HTTP_CONFLICT); + return; + } + if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) { goto ok; } err = ngx_errno; + if (err == NGX_ENOENT) { + + dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); + + if (dlcf->create_full_put_path) { + err = ngx_create_full_path(path.data); + + if (err == 0) { + if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) { + goto ok; + } + + err = ngx_errno; + } + } + } + #if (NGX_WIN32) if (err == NGX_EEXIST) { @@ -185,52 +300,97 @@ ngx_http_dav_put_handler(ngx_http_request_t *r) #endif - ngx_log_error(NGX_LOG_CRIT, r->connection->log, err, - ngx_rename_file_n " \"%s\" failed", path.data); - - ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + ngx_http_finalize_request(r, ngx_http_dav_error(r, err, NGX_HTTP_CONFLICT, + ngx_rename_file_n, + path.data)); return; ok: if (status == NGX_HTTP_CREATED) { - - r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t)); - if (r->headers_out.location == NULL) { + if (ngx_http_dav_location(r, path.data) != NGX_OK) { ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return; } + } - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + r->headers_out.status = status; + r->header_only = 1; - if (!clcf->alias && clcf->root_lengths == NULL) { - location = path.data + clcf->root.len; + ngx_http_finalize_request(r, ngx_http_send_header(r)); + return; +} - } else { - location = ngx_palloc(r->pool, r->uri.len); - if (location == NULL) { - ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); - return; - } - ngx_memcpy(location, r->uri.data, r->uri.len); - } +static ngx_int_t +ngx_http_dav_error(ngx_http_request_t *r, ngx_err_t err, ngx_int_t not_found, + char *failed, u_char *path) +{ + ngx_int_t rc; + ngx_uint_t level; + + if (err == NGX_ENOENT || err == NGX_ENOTDIR || err == NGX_ENAMETOOLONG) { + level = NGX_LOG_ERR; + rc = not_found; + + } else if (err == NGX_EACCES || err == NGX_EPERM) { + level = NGX_LOG_ERR; + rc = NGX_HTTP_FORBIDDEN; - /* - * we do not need to set the r->headers_out.location->hash and - * r->headers_out.location->key fields - */ + } else if (err == NGX_EEXIST) { + level = NGX_LOG_ERR; + rc = NGX_HTTP_NOT_ALLOWED; - r->headers_out.location->value.len = r->uri.len; - r->headers_out.location->value.data = location; + } else if (err == NGX_ENOSPC) { + level = NGX_LOG_CRIT; + rc = NGX_HTTP_INSUFFICIENT_STORAGE; + } else { + level = NGX_LOG_CRIT; + rc = NGX_HTTP_INTERNAL_SERVER_ERROR; } - r->headers_out.status = status; - r->header_only = 1; + ngx_log_error(level, r->connection->log, err, + "%s \"%s\" failed", failed, path); - ngx_http_finalize_request(r, ngx_http_send_header(r)); - return; + return rc; +} + + +static ngx_int_t +ngx_http_dav_location(ngx_http_request_t *r, u_char *path) +{ + u_char *location; + ngx_http_core_loc_conf_t *clcf; + + r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t)); + if (r->headers_out.location == NULL) { + return NGX_ERROR; + } + + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + + if (!clcf->alias && clcf->root_lengths == NULL) { + location = path + clcf->root.len; + + } else { + location = ngx_palloc(r->pool, r->uri.len); + if (location == NULL) { + return NGX_ERROR; + } + + ngx_memcpy(location, r->uri.data, r->uri.len); + } + + /* + * we do not need to set the r->headers_out.location->hash and + * r->headers_out.location->key fields + */ + + r->headers_out.location->value.len = r->uri.len; + r->headers_out.location->value.data = location; + + return NGX_OK; } @@ -250,6 +410,8 @@ ngx_http_dav_create_loc_conf(ngx_conf_t *cf) * conf->methods = 0; */ + conf->create_full_put_path = NGX_CONF_UNSET; + return conf; } @@ -261,7 +423,10 @@ ngx_http_dav_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_http_dav_loc_conf_t *conf = child; ngx_conf_merge_bitmask_value(conf->methods, prev->methods, - (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF)); + (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF)); + + ngx_conf_merge_value(conf->create_full_put_path, prev->create_full_put_path, + 0); return NGX_CONF_OK; } |