feature: enabled the FFI-based API for 'ngx.encode_base64' and 'ngx.decode_base64' in the stream subsystem.

Author: thibaultcha

lib/resty/core.lua

@@ -10,10 +10,10 @@ require "resty.core.misc"
 require "resty.core.hash"
 require "resty.core.uri"
 require "resty.core.exit"
+require "resty.core.base64"
 
 
 if subsystem == 'http' then
-    require "resty.core.base64"
     require "resty.core.var"
     require "resty.core.ctx"
     require "resty.core.request"

lib/resty/core/base64.lua

@@ -1,29 +1,54 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
+local ffi = require "ffi"
 local base = require "resty.core.base"
 
-local ffi_string = ffi.string
+
 local C = ffi.C
+local ffi_string = ffi.string
 local ngx = ngx
 local type = type
-local tostring = tostring
 local error = error
+local floor = math.floor
+local tostring = tostring
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
-local floor = math.floor
+local subsystem = ngx.config.subsystem
 
 
-ffi.cdef[[
+local ngx_lua_ffi_encode_base64
+local ngx_lua_ffi_decode_base64
+
+
+if subsystem == "http" then
+    ffi.cdef[[
     size_t ngx_http_lua_ffi_encode_base64(const unsigned char *src,
                                           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);
-]]
+    ]]
+
+    ngx_lua_ffi_encode_base64 = C.ngx_http_lua_ffi_encode_base64
+    ngx_lua_ffi_decode_base64 = C.ngx_http_lua_ffi_decode_base64
+
+elseif subsystem == "stream" then
+    ffi.cdef[[
+    size_t ngx_stream_lua_ffi_encode_base64(const unsigned char *src,
+                                            size_t len, unsigned char *dst,
+                                            int no_padding);
+
+    int ngx_stream_lua_ffi_decode_base64(const unsigned char *src,
+                                         size_t len, unsigned char *dst,
+                                         size_t *dlen);
+    ]]
+
+    ngx_lua_ffi_encode_base64 = C.ngx_stream_lua_ffi_encode_base64
+    ngx_lua_ffi_decode_base64 = C.ngx_stream_lua_ffi_decode_base64
+end
 
 
 local function base64_encoded_length(len, no_padding)
@@ -57,8 +82,7 @@ ngx.encode_base64 = function (s, no_padding)
 
     local dlen = base64_encoded_length(slen, no_padding_bool)
     local dst = get_string_buf(dlen)
-    local r_dlen = C.ngx_http_lua_ffi_encode_base64(s, slen, dst,
-                                                    no_padding_int)
+    local r_dlen = ngx_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
@@ -78,7 +102,7 @@ ngx.decode_base64 = function (s)
     -- print("dlen: ", tonumber(dlen))
     local dst = get_string_buf(dlen)
     local pdlen = get_size_ptr()
-    local ok = C.ngx_http_lua_ffi_decode_base64(s, slen, dst, pdlen)
+    local ok = ngx_lua_ffi_decode_base64(s, slen, dst, pdlen)
     if ok == 0 then
         return nil
     end