Merge branch 'release/v1.1.2'

change hmac

Author: linsir

ngx-lua-images/Benchmark.md renamed to Benchmark.md

@@ -0,0 +1,64 @@
+local _M = {}
+
+function _M.s3run()
+
+    -- Hashing functions
+    local access_key = 'HXKJ2FLL7BAWENBMP0HF'
+    local secret_key = 'DEeFyCPlBKK2vS7DPJDeeozNiF5WAjL7pVMNpDlO'
+    local encode_base64 = ngx.encode_base64
+    local hmac_sha1     = ngx.hmac_sha1
+    local md5           = ngx.md5
+
+    local method = 'POST'
+    local destination = '/'
+    local content_type = ''
+    local timestamp = os.date("!%a, %d %b %Y %H:%M:%S +0000")
+
+    local StringToSign = method..string.char(10)..string.char(10)..content_type..string.char(10)..timestamp..string.char(10)..destination
+
+    local signature = encode_base64(hmac_sha1(secret_key, StringToSign))
+    signature = 'AWS' .. ' ' .. access_key .. ':' .. signature
+    -- ngx.say(signature)
+    local hmac = require "resty.hmac"
+    local hm, err = hmac:new(secret_key)
+    headerstr, err = hm:generate_headers("AWS", access_key, "sha1", StringToSign)
+    signed = headerstr["auth"]
+    -- ngx.say(signed)
+
+    bucket = ngx.var.arg_b
+    file = ngx.var.arg_f
+    content = ngx.var.arg_c
+    del = ngx.var.arg_d
+    create = ngx.var.arg_cr
+
+    local cephs3 = require("cephs3")
+    local app = cephs3:new(config.access_key, config.secret_key)
+
+    if (bucket and create ) then
+        local data = app:create_bucket(bucket)
+        ngx.say(data)
+    elseif ((not file) and (not del) and bucket) then
+        app:get_all_objs(bucket)
+
+    elseif (file and bucket and content) then
+        local url = app:create_obj(bucket, file, content)
+        ngx.say(url)
+    elseif (bucket and file and del) then
+        local data = app:del_obj(bucket, file)
+        ngx.say(data)
+    elseif ((not file) and bucket and del) then
+        local data = app:del_bucket(bucket)
+        ngx.say(data)
+    elseif (not del and bucket and file) then
+        -- local exsite = app:check_for_existance(bucket, file)
+        -- ngx.say(exsite)
+        local data = app:get_obj(bucket, file)
+        ngx.say(data)
+    else
+        app:get_all_buckets()
+    end
+
+
+end
+
+return _M

ngx-lua-images/lua/app.lua

@@ -175,10 +175,10 @@ function _M.run()
         ngx.log(ngx.INFO, "cut_name: ", key)
         local data = cache.get_img(key)
         if data then
-            ngx.status = 304
+            -- ngx.status = 304
             ngx.header["Content-Type"] = "image/jpeg"
             ngx.print(data)
-            ngx.exit(304)
+            -- ngx.exit(304)
         else
             response_from_ceph(bucket, file, cut_name, w, h, g, x, y, r, p, q, f)
         end

ngx-lua-images/lua/main.lua

@@ -3,9 +3,10 @@
 
 -- local http = require"resty.http"
 local cjson = require "cjson"
-local hmac = require "resty.hmac"
+-- local hmac = require "resty.hmac"
 local os = require "os"
 
+
 config = {
     host = 'http://192.168.2.99',
     access_key = 'HXKJ2FLL7BAWENBMP0HF',
@@ -60,19 +61,22 @@ function _M.generate_auth_headers(self, method, destination, content_type)
 
     local timestamp = os.date("!%a, %d %b %Y %H:%M:%S +0000")
 
-    local hm, err = hmac:new(self.key)
     local StringToSign = method..string.char(10)..string.char(10)..content_type..string.char(10)..timestamp..string.char(10)..destination
+    local signed = ngx.encode_base64(ngx.hmac_sha1(self.key, StringToSign))
+    signed = 'AWS' .. ' ' .. self.id .. ':' .. signed
+
+    -- local hm, err = hmac:new(self.key)
+    -- headerstr, err = hm:generate_headers("AWS", self.id, "sha1", StringToSign)
+    -- signed = headerstr["auth"]
 
-    headerstr, err = hm:generate_headers("AWS", self.id, "sha1", StringToSign)
-    signed = headerstr["auth"]
+    headers = {}
+    headers['auth'] = signed
+    headers['Content-Type'] = content_type
+    headers['date'] = timestamp
 
-    -- headers = {}
-    -- headers['Authorization'] = signed
-    -- headers['Content-Type'] = content_type
-    -- headers['Date'] = timestamp
+    -- ngx.say(cjson.encode(headers))
 
-    -- ngx.say(timestamp, cjson.encode(headers))
-    return headerstr
+    return headers
 end
 
 function _M.get_all_buckets(self)