feature: ngx.encode_base64() now supports the (optional) no_padding argument. thanks Shuxin Yang for the patch in #4.

Author: agentzh

lib/resty/core/base.lua

@@ -17,9 +17,9 @@ local FREE_LIST_REF = 0
 
 if not ngx.config
    or not ngx.config.ngx_lua_version
-   or ngx.config.ngx_lua_version < 9011
+   or ngx.config.ngx_lua_version < 9016
 then
-    error("ngx_lua 0.9.11+ required")
+    error("ngx_lua 0.9.16+ required")
 end
 
 

lib/resty/core/base64.lua

@@ -21,33 +21,49 @@ local tonumber = tonumber
 
 ffi.cdef[[
     size_t ngx_http_lua_ffi_encode_base64(const unsigned char *src,
-                                          size_t len, unsigned char *dst);
+                                          size_t len, unsigned char *dst,
+                                          int no_padding);
 
     int ngx_http_lua_ffi_decode_base64(const unsigned char *src,
                                        size_t len, unsigned char *dst,
                                        size_t *dlen);
 ]]
 
 
-local function base64_encoded_length(len)
-    return floor((len + 2) / 3) * 4
+local function base64_encoded_length(len, no_padding)
+    return no_padding and floor((len * 8 + 5) / 6) or
+           floor((len + 2) / 3) * 4
 end
 
 
-ngx.encode_base64 = function (s)
+ngx.encode_base64 = function (s, no_padding)
     if type(s) ~= 'string' then
         if not s then
             s = ''
         else
             s = tostring(s)
         end
     end
+
     local slen = #s
-    local dlen = base64_encoded_length(slen)
-    -- print("dlen: ", tonumber(dlen))
+    local no_padding_bool = false;
+    local no_padding_int = 0;
+
+    if no_padding then
+        if no_padding ~= true then
+            return error("boolean argument only")
+        end
+
+        no_padding_bool = true
+        no_padding_int  = 1;
+    end
+
+    local dlen = base64_encoded_length(slen, no_padding_bool)
     local dst = get_string_buf(dlen)
-    dlen = C.ngx_http_lua_ffi_encode_base64(s, slen, dst)
-    return ffi_string(dst, dlen)
+    local r_dlen = C.ngx_http_lua_ffi_encode_base64(s, slen, dst,
+                                                    no_padding_int)
+    -- if dlen ~= r_dlen then error("discrepancy in len") end
+    return ffi_string(dst, r_dlen)
 end
 
 

t/encode-base64.t

@@ -178,3 +178,51 @@ qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
 [error]
  -- NYI:
 
+
+
+=== TEST 7: set base64 (number) without padding (explicitly specified)
+--- http_config eval: $::HttpConfig
+--- config
+    location = /base64 {
+        content_by_lua '
+            local s
+            for i = 1, 200 do
+                s = ngx.encode_base64(3.14, true)
+            end
+            ngx.say(s)
+        ';
+    }
+--- request
+GET /base64
+--- response_body
+My4xNA
+--- error_log eval
+qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
+--- no_error_log
+[error]
+ -- NYI:
+
+
+
+=== TEST 8: set base64 (number) with padding (explictly specified)
+--- http_config eval: $::HttpConfig
+--- config
+    location = /base64 {
+        content_by_lua '
+            local s
+            for i = 1, 200 do
+                s = ngx.encode_base64(3.14, false)
+            end
+            ngx.say(s)
+        ';
+    }
+--- request
+GET /base64
+--- response_body
+My4xNA==
+--- error_log eval
+qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
+--- no_error_log
+[error]
+ -- NYI:
+