feature: resty.core.uri: ngx.escape_uri: add optional argument 'type'.

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

Author: zhuizhuhaomeng

lib/resty/core/uri.lua

@@ -18,14 +18,18 @@ local ngx_lua_ffi_escape_uri
 local ngx_lua_ffi_unescape_uri
 local ngx_lua_ffi_uri_escaped_length
 
+local NGX_ESCAPE_URI = 0
+local NGX_ESCAPE_URI_COMPONENT = 2
+local NGX_ESCAPE_MAIL_AUTH = 6
+
 
 if subsystem == "http" then
     ffi.cdef[[
     size_t ngx_http_lua_ffi_uri_escaped_length(const unsigned char *src,
-                                               size_t len);
+                                               size_t len, int type);
 
     void ngx_http_lua_ffi_escape_uri(const unsigned char *src, size_t len,
-                                     unsigned char *dst);
+                                     unsigned char *dst, int type);
 
     size_t ngx_http_lua_ffi_unescape_uri(const unsigned char *src,
                                          size_t len, unsigned char *dst);
@@ -38,10 +42,10 @@ if subsystem == "http" then
 elseif subsystem == "stream" then
     ffi.cdef[[
     size_t ngx_stream_lua_ffi_uri_escaped_length(const unsigned char *src,
-                                                 size_t len);
+                                                 size_t len, int type);
 
     void ngx_stream_lua_ffi_escape_uri(const unsigned char *src, size_t len,
-                                       unsigned char *dst);
+                                       unsigned char *dst, int type);
 
     size_t ngx_stream_lua_ffi_unescape_uri(const unsigned char *src,
                                            size_t len, unsigned char *dst);
@@ -53,22 +57,38 @@ elseif subsystem == "stream" then
 end
 
 
-ngx.escape_uri = function (s)
+ngx.escape_uri = function (s, esc_type)
     if type(s) ~= 'string' then
         if not s then
             s = ''
+
         else
             s = tostring(s)
         end
     end
+
+    if esc_type == nil then
+        esc_type = NGX_ESCAPE_URI_COMPONENT
+
+    else
+        if type(esc_type) ~= 'number' then
+            error("\"type\" is not number", 3)
+        end
+
+        if esc_type < NGX_ESCAPE_URI or esc_type > NGX_ESCAPE_MAIL_AUTH then
+            error("\"type\" " .. esc_type .. " out of range", 3)
+        end
+    end
+
     local slen = #s
-    local dlen = ngx_lua_ffi_uri_escaped_length(s, slen)
+    local dlen = ngx_lua_ffi_uri_escaped_length(s, slen, esc_type)
+
     -- print("dlen: ", tonumber(dlen))
     if dlen == slen then
         return s
     end
     local dst = get_string_buf(dlen)
-    ngx_lua_ffi_escape_uri(s, slen, dst)
+    ngx_lua_ffi_escape_uri(s, slen, dst, esc_type)
     return ffi_string(dst, dlen)
 end