feature: ngx.escape_uri: added new optional 'type' argument not_component argument for pure URI escaping (still defauls to URI component escaping).

Signed-off-by: Yichun Zhang (agentzh) <[email protected]>

Author: zhuizhuhaomeng

src/ngx_stream_lua_string.c

@@ -441,18 +441,20 @@ ngx_stream_lua_ffi_unescape_uri(const u_char *src, size_t len, u_char *dst)
 
 
 size_t
-ngx_stream_lua_ffi_uri_escaped_length(const u_char *src, size_t len)
+ngx_stream_lua_ffi_uri_escaped_length(const u_char *src, size_t len,
+    int type)
 {
     return len + 2 * ngx_stream_lua_escape_uri(NULL, (u_char *) src, len,
-                                               NGX_ESCAPE_URI_COMPONENT);
+                                               type);
 }
 
 
 void
-ngx_stream_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
+ngx_stream_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst,
+    int type)
 {
     ngx_stream_lua_escape_uri(dst, (u_char *) src, len,
-                              NGX_ESCAPE_URI_COMPONENT);
+                              type);
 }
 
 

src/ngx_stream_lua_util.c

@@ -1641,13 +1641,13 @@ ngx_stream_lua_escape_uri(u_char *dst, u_char *src, size_t size,
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
 
                     /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0xfc00886d, /* 1111 1100 0000 0000  1000 1000 0110 1101 */
+        0x80000029, /* 1000 0000 0000 0000  0000 0000 0010 1001 */
 
                     /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x78000000, /* 0111 1000 0000 0000  0000 0000 0000 0000 */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
 
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0xa8000000, /* 1010 1000 0000 0000  0000 0000 0000 0000 */
+        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
 
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */

t/006-escape.t

@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua::Stream;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3);
+plan tests => repeat_each() * (blocks() * 3 + 3);
 
 no_long_string();
 
@@ -108,3 +108,64 @@ abc
 32
 --- no_error_log
 [error]
+
+
+
+=== TEST 11: escape type
+--- stream_server_config
+    content_by_lua_block {
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 0))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 1))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 2))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 3))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 4))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 5))
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 6))
+    }
+--- stream_response
+https://www.google.com/%3Ft=abc@%20:
+https://www.google.com/%3Ft=abc@%20:
+https%3A%2F%2Fwww.google.com%2F%3Ft%3Dabc%40%20%3A
+https://www.google.com/?t=abc@%20:
+https://www.google.com/?t=abc@%20:
+https://www.google.com/?t=abc@%20:
+https://www.google.com/?t=abc@%20:
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: escape type error
+--- stream_server_config
+    content_by_lua_block {
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", true))
+    }
+--- stream_response
+--- error_log eval
+qr/\[error\] \d+#\d+: \*\d+ lua entry thread aborted: runtime error: "type" is not a number/
+--- no_error_log
+[alert]
+
+
+=== TEST 13: escape type out of range
+--- stream_server_config
+    content_by_lua_block {
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", -1))
+    }
+--- stream_response
+--- error_log eval
+qr/\[error\] \d+#\d+: \*\d+ lua entry thread aborted: runtime error: "type" -1 out of range/
+--- no_error_log
+[alert]
+
+
+=== TEST 14: escape type error
+--- stream_server_config
+    content_by_lua_block {
+        ngx.say(ngx.escape_uri("https://www.google.com/?t=abc@ :", 100))
+    }
+--- stream_response
+--- error_log eval
+qr/\[error\] \d+#\d+: \*\d+ lua entry thread aborted: runtime error: "type" 100 out of range/
+--- no_error_log
+[alert]