From 7c0ee62c70e25c52351b1275eaf8bed7663c8884 Mon Sep 17 00:00:00 2001 From: Aapo Talvensaari Date: Tue, 16 Mar 2021 13:45:16 +0200 Subject: [PATCH] [fork] kong-lapis v1.8.3.1 --- ...1.rockspec => kong-lapis-1.8.3.1-1.rockspec | 18 +++++++----------- lapis/csrf.lua | 2 +- lapis/csrf.moon | 2 +- lapis/spec/request.lua | 2 +- lapis/spec/request.moon | 2 +- lapis/util/encoding.lua | 2 +- lapis/util/encoding.moon | 2 +- 7 files changed, 13 insertions(+), 17 deletions(-) rename lapis-dev-1.rockspec => kong-lapis-1.8.3.1-1.rockspec (94%) diff --git a/lapis-dev-1.rockspec b/kong-lapis-1.8.3.1-1.rockspec similarity index 94% rename from lapis-dev-1.rockspec rename to kong-lapis-1.8.3.1-1.rockspec index 9823a24a..0c285822 100644 --- a/lapis-dev-1.rockspec +++ b/kong-lapis-1.8.3.1-1.rockspec @@ -1,30 +1,27 @@ -package = "lapis" -version = "dev-1" +package = "kong-lapis" +version = "1.8.3.1-1" source = { - url = "git://github.com/leafo/lapis.git" + url = "git://github.com/Kong/lapis.git", + branch = "v1.8.3.1" } description = { - summary = "A web framework for MoonScript & Lua", - homepage = "http://leafo.net/lapis", - maintainer = "Leaf Corcoran ", + summary = "A fork of leafo/lapis for Kong", + maintainer = "Thibault Charbonnier ", license = "MIT" } dependencies = { - "lua", - "ansicolors", "date", "etlua", "loadkit", "lpeg", - "lua-cjson", - "luaossl", "luafilesystem", "luasocket", "pgmoon", + "lua-resty-openssl", } build = { @@ -113,4 +110,3 @@ build = { bin = { "bin/lapis" } }, } - diff --git a/lapis/csrf.lua b/lapis/csrf.lua index 3135efc2..99af9b81 100644 --- a/lapis/csrf.lua +++ b/lapis/csrf.lua @@ -4,7 +4,7 @@ do local _obj_0 = require("lapis.util.encoding") encode_base64, encode_with_secret, decode_with_secret = _obj_0.encode_base64, _obj_0.encode_with_secret, _obj_0.decode_with_secret end -local openssl_rand = require("openssl.rand") +local openssl_rand = require("resty.openssl.rand") local config = require("lapis.config").get() local cookie_name = tostring(config.session_name) .. "_token" local generate_token diff --git a/lapis/csrf.moon b/lapis/csrf.moon index e5be463b..25ba7135 100644 --- a/lapis/csrf.moon +++ b/lapis/csrf.moon @@ -2,7 +2,7 @@ json = require "cjson" import encode_base64, encode_with_secret, decode_with_secret from require "lapis.util.encoding" -openssl_rand = require "openssl.rand" +openssl_rand = require "resty.openssl.rand" config = require"lapis.config".get! cookie_name = "#{config.session_name}_token" diff --git a/lapis/spec/request.lua b/lapis/spec/request.lua index dbe6315a..c9f339cf 100644 --- a/lapis/spec/request.lua +++ b/lapis/spec/request.lua @@ -168,7 +168,7 @@ mock_request = function(app_cls, url, opts) return ngx.print("\n") end, md5 = function(str) - local digest = require("openssl.digest") + local digest = require("resty.openssl.digest") return hex((digest.new("md5")):final(str)) end, header = out_headers, diff --git a/lapis/spec/request.moon b/lapis/spec/request.moon index e3da579f..c3a17b8f 100644 --- a/lapis/spec/request.moon +++ b/lapis/spec/request.moon @@ -124,7 +124,7 @@ mock_request = (app_cls, url, opts={}) -> ngx.print "\n" md5: (str) -> - digest = require "openssl.digest" + digest = require "resty.openssl.digest" hex((digest.new "md5")\final str) header: out_headers diff --git a/lapis/util/encoding.lua b/lapis/util/encoding.lua index e34bd206..f2f902a3 100644 --- a/lapis/util/encoding.lua +++ b/lapis/util/encoding.lua @@ -1,6 +1,6 @@ local encode_base64, decode_base64, hmac_sha1 local config = require("lapis.config").get() -local openssl_hmac = require("openssl.hmac") +local openssl_hmac = require("resty.openssl.hmac") if ngx then do local _obj_0 = ngx diff --git a/lapis/util/encoding.moon b/lapis/util/encoding.moon index 0f1ab694..9906d5d0 100644 --- a/lapis/util/encoding.moon +++ b/lapis/util/encoding.moon @@ -2,7 +2,7 @@ local encode_base64, decode_base64, hmac_sha1 config = require"lapis.config".get! -openssl_hmac = require "openssl.hmac" +openssl_hmac = require "resty.openssl.hmac" if ngx {:encode_base64, :decode_base64, :hmac_sha1} = ngx