flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix code style and len error

Browse Source
pull/611/head
lijunlong 5 years ago
parent cbb6f0f131
commit 17e194a128
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
patches/nginx-1.17.8-set_uri_security_issue.patch
Unescape Escape View File

@ -1,5 +1,5 @@
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 282d6ee9..e889540d 100644 index 282d6ee..899e11e 100644
--- a/src/http/modules/ngx_http_static_module.c --- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c
@@ -58,6 +58,8 @@ ngx_http_static_handler(ngx_http_request_t *r) @@ -58,6 +58,8 @@ ngx_http_static_handler(ngx_http_request_t *r)
@ -11,20 +11,21 @@ index 282d6ee9..e889540d 100644
if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD|NGX_HTTP_POST))) { if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD|NGX_HTTP_POST))) {
return NGX_HTTP_NOT_ALLOWED; return NGX_HTTP_NOT_ALLOWED;
@@ -162,9 +164,20 @@ ngx_http_static_handler(ngx_http_request_t *r) @@ -162,9 +164,21 @@ ngx_http_static_handler(ngx_http_request_t *r)
*last = '/'; *last = '/';
+ escape = 2 * ngx_escape_uri(NULL, location, len, NGX_ESCAPE_URI); + escape = 2 * ngx_escape_uri(NULL, location, len, NGX_ESCAPE_URI);
+ if (escape > 0) { + if (escape > 0) {
+ uri = ngx_pnalloc(r->pool, len + 2 * escape); + uri = ngx_pnalloc(r->pool, len + escape);
+ if (uri == NULL) { + if (uri == NULL) {
+ return NGX_ERROR; + return NGX_ERROR;
+ } + }
+ ngx_escape_uri(uri, location, len, NGX_ESCAPE_URI); + ngx_escape_uri(uri, location, len, NGX_ESCAPE_URI);
+ location = uri; + location = uri;
+ len += 2 * escape; + len += escape;
+ } + }
+
} else { } else {
+ escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len, NGX_ESCAPE_URI); + escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len, NGX_ESCAPE_URI);
if (r->args.len) { if (r->args.len) {
@ -33,13 +34,14 @@ index 282d6ee9..e889540d 100644
} }
location = ngx_pnalloc(r->pool, len); location = ngx_pnalloc(r->pool, len);
@@ -173,7 +186,11 @@ ngx_http_static_handler(ngx_http_request_t *r) @@ -173,7 +187,12 @@ ngx_http_static_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
- last = ngx_copy(location, r->uri.data, r->uri.len); - last = ngx_copy(location, r->uri.data, r->uri.len);
+ if (escape > 0) { + if (escape > 0) {
+ last = (u_char *)ngx_escape_uri(location, r->uri.data, r->uri.len, NGX_ESCAPE_URI); + last = (u_char *) ngx_escape_uri(location, r->uri.data, r->uri.len, NGX_ESCAPE_URI);
+
+ } else { + } else {
+ last = ngx_copy(location, r->uri.data, r->uri.len); + last = ngx_copy(location, r->uri.data, r->uri.len);
+ } + }

Write Preview
Loading…
Cancel
Save