From 756f9b734383e2831c1670c47da5b988b96114f3 Mon Sep 17 00:00:00 2001 From: wanglei <34475144@qqcom> Date: Thu, 16 Oct 2025 16:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=8F=92=E4=BB=B6=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BD=BF=E7=94=A8pgmoon=E6=8F=92=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E6=8F=90=E4=BE=9B=E7=9A=84?= =?UTF-8?q?id=E6=88=96=E8=80=85=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/nginx.conf | 5 +- conf/system/test.conf | 4 + logs/nginx.pid | 1 - src/api/api.lua | 28 +- src/api/system/user.lua | 11 +- src/config/database.lua | 6 +- src/service/system/user.lua | 79 ++- src/share/pgmoon.lua | 1 - src/share/pgmoon/arrays.lua | 196 ------ src/share/pgmoon/bit.lua | 67 -- src/share/pgmoon/cqueues.lua | 75 --- src/share/pgmoon/crypto.lua | 178 ------ src/share/pgmoon/hstore.lua | 72 --- src/share/pgmoon/init.lua | 1112 ---------------------------------- src/share/pgmoon/json.lua | 25 - src/share/pgmoon/socket.lua | 109 ---- src/share/pgmoon/util.lua | 46 -- src/test/testPostgres.lua | 6 +- 18 files changed, 95 insertions(+), 1926 deletions(-) create mode 100644 conf/system/test.conf delete mode 100644 logs/nginx.pid delete mode 100644 src/share/pgmoon.lua delete mode 100644 src/share/pgmoon/arrays.lua delete mode 100644 src/share/pgmoon/bit.lua delete mode 100644 src/share/pgmoon/cqueues.lua delete mode 100644 src/share/pgmoon/crypto.lua delete mode 100644 src/share/pgmoon/hstore.lua delete mode 100644 src/share/pgmoon/init.lua delete mode 100644 src/share/pgmoon/json.lua delete mode 100644 src/share/pgmoon/socket.lua delete mode 100644 src/share/pgmoon/util.lua diff --git a/conf/nginx.conf b/conf/nginx.conf index bb81f30..53f3559 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -worker_processes 1; +worker_processes 1; #nginx worker 数量 +error_log logs/error.log; #指定错误日志文件路径 #worker_rlimit_nofile 65535; @@ -26,5 +27,7 @@ http { } include 'system/user.conf'; + + include 'system/test.conf'; } } \ No newline at end of file diff --git a/conf/system/test.conf b/conf/system/test.conf new file mode 100644 index 0000000..ac50dd7 --- /dev/null +++ b/conf/system/test.conf @@ -0,0 +1,4 @@ +#测试接口文件 +location /testSQL { + content_by_lua_file '/home/frankly/work/AuthPlatform/src/test/testPostgres.lua'; +} \ No newline at end of file diff --git a/logs/nginx.pid b/logs/nginx.pid deleted file mode 100644 index 152873e..0000000 --- a/logs/nginx.pid +++ /dev/null @@ -1 +0,0 @@ -11428 diff --git a/src/api/api.lua b/src/api/api.lua index 1749044..3b7f251 100644 --- a/src/api/api.lua +++ b/src/api/api.lua @@ -6,46 +6,40 @@ local radix = require("resty.radixtree") local userApi = require("api.system.user") +--定义相关路由，前端接口url地址 local routes = { { paths = { "/api/user" }, - metadata = { "metadata /user" }, + metadata = { "metadata user" }, methods = { "GET", "POST" }, handler = userApi.get_allusers, }, { paths = { "/api/user/:id" }, - metadata = { "metadata /user/id" }, + metadata = { "metadata /api/user/id" }, methods = { "GET", "PUT", "DELETE" }, - handler = userApi.get_users, + handler = userApi.get_user, }, - { - paths = { "/api/admin/:name", "/api/superuser/:name" }, - metadata = { "metadata /admin/name" }, - methods = { "GET", "POST", "PUT" }, - filter_fun = function(vars, opts) - return vars["arg_access"] == "admin" - end - } } +-- 初始化路由 local rx, err = radix.new(routes) if not rx then - ngx.say("-----") - ngx.status = 404 ngx.say("Not Found") - --ngx.exit() + ngx.exit(ngx.HTTP_NOT_FOUND) end +--获取访问的uri地址 local uri = ngx.var.uri local opts = { method = ngx.var.request_method, + --vars = ngx.var, matched = {} } +-- 进行路由匹配和相关函数调用 local ok = rx:dispatch(uri, opts, opts.matched) if not ok then - ngx.status = 404 ngx.say("Not Found") - --ngx.exit() -end \ No newline at end of file + ngx.exit(ngx.HTTP_NOT_FOUND) +end diff --git a/src/api/system/user.lua b/src/api/system/user.lua index 25e396a..8212174 100644 --- a/src/api/system/user.lua +++ b/src/api/system/user.lua @@ -6,14 +6,17 @@ local _M = {} +local dao = require("service.system.user") + --获取所有用户信息 function _M.get_allusers() - + dao.getAllUser() end ---获取所有用户信息 -function _M.get_users(req) - +--根据用户id获取用户信息 +function _M.get_user(m) + local id = m.id + dao.getUser(id) end return _M \ No newline at end of file diff --git a/src/config/database.lua b/src/config/database.lua index 8f0b175..1718d8f 100644 --- a/src/config/database.lua +++ b/src/config/database.lua @@ -1,4 +1,4 @@ -local env = require('env') +local env = require('config.config') return { redis_prefix = 'Auth:', @@ -11,8 +11,8 @@ return { postgres = { host = env.POSTGRES.HOST, port = env.POSTGRES.PORT, - username = env.POSTGRES.USERNAME, + user = env.POSTGRES.USERNAME, password = env.POSTGRES.PASSWORD, - dbname = env.POSTGRES.DATABASE + database = env.POSTGRES.DATABASE }, } \ No newline at end of file diff --git a/src/service/system/user.lua b/src/service/system/user.lua index 8e88541..ff14600 100644 --- a/src/service/system/user.lua +++ b/src/service/system/user.lua @@ -4,24 +4,73 @@ --- DateTime: 2025/9/25 08:19 --- 业务逻辑 local cjson = require('cjson') -local pgmoon = require('pgmoon'); +local pgmoon = require('pgmoon') +local dbconf = require("config.database") local _M = {} --- 创建一个新的连接 -local conn = pgmoon.new(db_config.postgres) - --- 连接到数据库 -conn:connect(function(err) - if err then - print("Error connecting to database: ", err) - else - print("Connected to the PostgreSQL server.") +local function get_con(cfg) + -- 创建一个新的连接 + local conn = pgmoon.new(cfg); + ---- 连接到数据库 + local ok, err = conn:connect() + if not ok then + error("Connection failed: " .. err) + ngx.exit(ngx.HTTP_NOT_FOUND) end -end) - -function _M.getAllUser() - + --ngx.say("Connection success") + return conn end -return _M \ No newline at end of file +-- 查询数据表中的所有用户信息 +function _M.getAllUser() + --组装sql语句 + local sql = "select * from \"T_Users\"" + --获取数据库连接 + local conn = get_con(dbconf.postgres) + --设置数据库的编码格式 + --conn:exec("SET NAMES UTF8") + --执行数据库操作 + local res = conn:query(sql) + if not res then + error("Query failed: " .. err) + --ngx.say(err) + ngx.exit(ngx.HTTP_NOT_FOUND) + end + --整理数据库结果返回值 + for _, row in ipairs(res) do + for key, value in pairs(row) do + ngx.say(key .. ":" .. tostring(value)) + end + end + + --关闭数据库 + conn:disconnect() +end + +--根据用户id获取用户信息 +function _M.getUser(id) + --组装sql语句 + local sql = "select * from \"T_Users\" where id="..id + --获取数据库连接 + local conn = get_con(dbconf.postgres) + --设置数据库的编码格式 + --conn:exec("SET NAMES UTF8") + --执行数据库操作 + local res = conn:query(sql) + if not res then + error("Query failed: " .. err) + --ngx.say(err) + ngx.exit(ngx.HTTP_NOT_FOUND) + end + --整理数据库结果返回值 + for _, row in ipairs(res) do + for key, value in pairs(row) do + ngx.say(key .. ":" .. tostring(value)) + end + end + + --关闭数据库 + conn:disconnect() +end +return _M diff --git a/src/share/pgmoon.lua b/src/share/pgmoon.lua deleted file mode 100644 index a0761d5..0000000 --- a/src/share/pgmoon.lua +++ /dev/null @@ -1 +0,0 @@ -return require('pgmoon.init') diff --git a/src/share/pgmoon/arrays.lua b/src/share/pgmoon/arrays.lua deleted file mode 100644 index 3ca5771..0000000 --- a/src/share/pgmoon/arrays.lua +++ /dev/null @@ -1,196 +0,0 @@ -local OIDS = { - boolean = 1000, - number = 1231, - string = 1009, - array_json = 199, - array_jsonb = 3807 -} -local is_array -is_array = function(oid) - for k, v in pairs(OIDS) do - if v == oid then - return true - end - end - return false -end -local PostgresArray -do - local _class_0 - local _base_0 = { } - _base_0.__index = _base_0 - _class_0 = setmetatable({ - __init = function() end, - __base = _base_0, - __name = "PostgresArray" - }, { - __index = _base_0, - __call = function(cls, ...) - local _self_0 = setmetatable({}, _base_0) - cls.__init(_self_0, ...) - return _self_0 - end - }) - _base_0.__class = _class_0 - local self = _class_0 - self.__base.pgmoon_serialize = function(v, pg) - local escaped - do - local _accum_0 = { } - local _len_0 = 1 - for _index_0 = 1, #v do - local val = v[_index_0] - if val == pg.NULL then - _accum_0[_len_0] = "NULL" - else - local _exp_0 = type(val) - if "number" == _exp_0 then - _accum_0[_len_0] = tostring(val) - elseif "string" == _exp_0 then - _accum_0[_len_0] = '"' .. val:gsub('"', [[\"]]) .. '"' - elseif "boolean" == _exp_0 then - _accum_0[_len_0] = val and "t" or "f" - elseif "table" == _exp_0 then - local _oid, _value - do - local v_mt = getmetatable(val) - if v_mt then - if v_mt.pgmoon_serialize then - _oid, _value = v_mt.pgmoon_serialize(val, pg) - end - end - end - if _oid then - if is_array(_oid) then - _accum_0[_len_0] = _value - else - _accum_0[_len_0] = '"' .. _value:gsub('"', [[\"]]) .. '"' - end - else - return nil, "table does not implement pgmoon_serialize, can't serialize" - end - end - end - _len_0 = _len_0 + 1 - end - escaped = _accum_0 - end - local type_oid = 0 - for _index_0 = 1, #v do - local _continue_0 = false - repeat - do - local val = v[_index_0] - if val == pg.NULL then - _continue_0 = true - break - end - type_oid = OIDS[type(val)] or type_oid - break - end - _continue_0 = true - until true - if not _continue_0 then - break - end - end - return type_oid, "{" .. tostring(table.concat(escaped, ",")) .. "}" - end - PostgresArray = _class_0 -end -getmetatable(PostgresArray).__call = function(self, t) - return setmetatable(t, self.__base) -end -local default_escape_literal = nil -local insert, concat -do - local _obj_0 = table - insert, concat = _obj_0.insert, _obj_0.concat -end -local encode_array -do - local append_buffer - append_buffer = function(escape_literal, buffer, values) - for _index_0 = 1, #values do - local item = values[_index_0] - if type(item) == "table" and not getmetatable(item) then - insert(buffer, "[") - append_buffer(escape_literal, buffer, item) - buffer[#buffer] = "]" - insert(buffer, ",") - else - insert(buffer, escape_literal(item)) - insert(buffer, ",") - end - end - return buffer - end - encode_array = function(tbl, escape_literal) - escape_literal = escape_literal or default_escape_literal - if not (escape_literal) then - local Postgres - Postgres = require("pgmoon").Postgres - default_escape_literal = function(v) - return Postgres.escape_literal(nil, v) - end - escape_literal = default_escape_literal - end - local buffer = append_buffer(escape_literal, { - "ARRAY[" - }, tbl) - if buffer[#buffer] == "," then - buffer[#buffer] = "]" - else - insert(buffer, "]") - end - return concat(buffer) - end -end -local convert_values -convert_values = function(array, fn, pg) - for idx, v in ipairs(array) do - if type(v) == "table" then - convert_values(v, fn) - else - if v == "NULL" then - array[idx] = pg.NULL - elseif fn then - array[idx] = fn(v) - else - array[idx] = v - end - end - end - return array -end -local decode_array -do - local P, R, S, V, Ct, C, Cs - do - local _obj_0 = require("lpeg") - P, R, S, V, Ct, C, Cs = _obj_0.P, _obj_0.R, _obj_0.S, _obj_0.V, _obj_0.Ct, _obj_0.C, _obj_0.Cs - end - local g = P({ - "array", - array = Ct(V("open") * (V("value") * (P(",") * V("value")) ^ 0) ^ -1 * V("close")), - value = V("invalid_char") + V("string") + V("array") + V("literal"), - string = P('"') * Cs((P([[\\]]) / [[\]] + P([[\"]]) / [["]] + (P(1) - P('"'))) ^ 0) * P('"'), - literal = C((P(1) - S("},")) ^ 1), - invalid_char = S(" \t\r\n") / function() - return error("got unexpected whitespace") - end, - open = P("{"), - delim = P(","), - close = P("}") - }) - decode_array = function(str, convert_fn, pg) - local out = (assert(g:match(str), "failed to parse postgresql array")) - setmetatable(out, PostgresArray.__base) - return convert_values(out, convert_fn, (pg or require("pgmoon").Postgres)) - end -end -return { - encode_array = encode_array, - decode_array = decode_array, - PostgresArray = PostgresArray -} diff --git a/src/share/pgmoon/bit.lua b/src/share/pgmoon/bit.lua deleted file mode 100644 index 1b99ceb..0000000 --- a/src/share/pgmoon/bit.lua +++ /dev/null @@ -1,67 +0,0 @@ -local rshift, lshift, band, bxor -local load_code -load_code = function(str) - local sent = false - return pcall(load(function() - if sent then - return nil - end - sent = true - return str - end)) -end -local ok -ok, band = load_code([[ return function(a,b) - a = a & b - if a > 0x7FFFFFFF then - -- extend the sign bit - a = ~0xFFFFFFFF | a - end - return a - end -]]) -if ok then - local _ - _, bxor = load_code([[ return function(a,b) - a = a ~ b - if a > 0x7FFFFFFF then - -- extend the sign bit - a = ~0xFFFFFFFF | a - end - return a - end - ]]) - _, lshift = load_code([[ return function(x,y) - -- limit to 32-bit shifts - y = y % 32 - x = x << y - if x > 0x7FFFFFFF then - -- extend the sign bit - x = ~0xFFFFFFFF | x - end - return x - end - ]]) - _, rshift = load_code([[ return function(x,y) - y = y % 32 - -- truncate to 32-bit before applying shift - x = x & 0xFFFFFFFF - x = x >> y - if x > 0x7FFFFFFF then - x = ~0xFFFFFFFF | x - end - return x - end - ]]) -else - do - local _obj_0 = require("bit") - rshift, lshift, band, bxor = _obj_0.rshift, _obj_0.lshift, _obj_0.band, _obj_0.bxor - end -end -return { - rshift = rshift, - lshift = lshift, - band = band, - bxor = bxor -} diff --git a/src/share/pgmoon/cqueues.lua b/src/share/pgmoon/cqueues.lua deleted file mode 100644 index a43ebbf..0000000 --- a/src/share/pgmoon/cqueues.lua +++ /dev/null @@ -1,75 +0,0 @@ -local flatten -flatten = require("pgmoon.util").flatten -local CqueuesSocket -do - local _class_0 - local _base_0 = { - connect = function(self, host, port, opts) - local socket = require("cqueues.socket") - local errno = require("cqueues.errno") - self.sock = socket.connect({ - host = host, - port = port - }) - if self.timeout then - self.sock:settimeout(self.timeout) - end - self.sock:setmode("bn", "bn") - local success, err = self.sock:connect() - if not (success) then - return nil, errno.strerror(err) - end - return true - end, - starttls = function(self, ...) - return self.sock:starttls(...) - end, - getpeercertificate = function(self) - local ssl = assert(self.sock:checktls()) - return assert(ssl:getPeerCertificate(), "no peer certificate available") - end, - send = function(self, ...) - return self.sock:write(flatten(...)) - end, - receive = function(self, ...) - return self.sock:read(...) - end, - close = function(self) - return self.sock:close() - end, - settimeout = function(self, t) - if t then - t = t / 1000 - end - if self.sock then - return self.sock:settimeout(t) - else - self.timeout = t - end - end, - getreusedtimes = function(self) - return 0 - end, - setkeepalive = function(self) - return error("You attempted to call setkeepalive on a cqueues.socket. This method is only available for the ngx cosocket API for releasing a socket back into the connection pool") - end - } - _base_0.__index = _base_0 - _class_0 = setmetatable({ - __init = function() end, - __base = _base_0, - __name = "CqueuesSocket" - }, { - __index = _base_0, - __call = function(cls, ...) - local _self_0 = setmetatable({}, _base_0) - cls.__init(_self_0, ...) - return _self_0 - end - }) - _base_0.__class = _class_0 - CqueuesSocket = _class_0 -end -return { - CqueuesSocket = CqueuesSocket -} diff --git a/src/share/pgmoon/crypto.lua b/src/share/pgmoon/crypto.lua deleted file mode 100644 index 7aecf11..0000000 --- a/src/share/pgmoon/crypto.lua +++ /dev/null @@ -1,178 +0,0 @@ -local md5 -if ngx then - md5 = ngx.md5 -elseif pcall(function() - return require("openssl.digest") -end) then - local openssl_digest = require("openssl.digest") - local hex_char - hex_char = function(c) - return string.format("%02x", string.byte(c)) - end - local hex - hex = function(str) - return (str:gsub(".", hex_char)) - end - md5 = function(str) - return hex(openssl_digest.new("md5"):final(str)) - end -elseif pcall(function() - return require("crypto") -end) then - local crypto = require("crypto") - md5 = function(str) - return crypto.digest("md5", str) - end -else - md5 = function() - return error("Either luaossl (recommended) or LuaCrypto is required to calculate md5") - end -end -local hmac_sha256 -if pcall(function() - return require("openssl.hmac") -end) then - hmac_sha256 = function(key, str) - local openssl_hmac = require("openssl.hmac") - local hmac = assert(openssl_hmac.new(key, "sha256")) - hmac:update(str) - return assert(hmac:final()) - end -elseif pcall(function() - return require("resty.openssl.hmac") -end) then - hmac_sha256 = function(key, str) - local openssl_hmac = require("resty.openssl.hmac") - local hmac = assert(openssl_hmac.new(key, "sha256")) - hmac:update(str) - return assert(hmac:final()) - end -else - hmac_sha256 = function() - return error("Either luaossl or resty.openssl is required to calculate hmac sha256 digest") - end -end -local digest_sha256 -if pcall(function() - return require("openssl.digest") -end) then - digest_sha256 = function(str) - local digest = assert(require("openssl.digest").new("sha256")) - digest:update(str) - return assert(digest:final()) - end -elseif pcall(function() - return require("resty.sha256") -end) then - digest_sha256 = function(str) - local digest = assert(require("resty.sha256"):new()) - digest:update(str) - return assert(digest:final()) - end -elseif pcall(function() - return require("resty.openssl.digest") -end) then - digest_sha256 = function(str) - local digest = assert(require("resty.openssl.digest").new("sha256")) - digest:update(str) - return assert(digest:final()) - end -else - digest_sha256 = function() - return error("Either luaossl or resty.openssl is required to calculate sha256 digest") - end -end -local kdf_derive_sha256 -if pcall(function() - return require("openssl.kdf") -end) then - kdf_derive_sha256 = function(str, salt, i) - local openssl_kdf = require("openssl.kdf") - local decode_base64 - decode_base64 = require("pgmoon.util").decode_base64 - salt = decode_base64(salt) - local key, err = openssl_kdf.derive({ - type = "PBKDF2", - md = "sha256", - salt = salt, - iter = i, - pass = str, - outlen = 32 - }) - if not (key) then - return nil, "failed to derive pbkdf2 key: " .. tostring(err) - end - return key - end -elseif pcall(function() - return require("resty.openssl.kdf") -end) then - kdf_derive_sha256 = function(str, salt, i) - local openssl_kdf = require("resty.openssl.kdf") - local decode_base64 - decode_base64 = require("pgmoon.util").decode_base64 - salt = decode_base64(salt) - local key, err = openssl_kdf.derive({ - type = openssl_kdf.PBKDF2, - md = "sha256", - salt = salt, - pbkdf2_iter = i, - pass = str, - outlen = 32 - }) - if not (key) then - return nil, "failed to derive pbkdf2 key: " .. tostring(err) - end - return key - end -else - kdf_derive_sha256 = function() - return error("Either luaossl or resty.openssl is required to derive pbkdf2 key") - end -end -local random_bytes -if pcall(function() - return require("openssl.rand") -end) then - random_bytes = require("openssl.rand").bytes -elseif pcall(function() - return require("resty.random") -end) then - random_bytes = require("resty.random").bytes -elseif pcall(function() - return require("resty.openssl.rand") -end) then - random_bytes = require("resty.openssl.rand").bytes -else - random_bytes = function() - return error("Either luaossl or resty.openssl is required to generate random bytes") - end -end -local x509_digest -if pcall(function() - return require("openssl.x509") -end) then - local x509 = require("openssl.x509") - x509_digest = function(pem, hash_type) - return x509.new(pem, "PEM"):digest(hash_type, "s") - end -elseif pcall(function() - return require("resty.openssl.x509") -end) then - local x509 = require("resty.openssl.x509") - x509_digest = function(pem, hash_type) - return x509.new(pem, "PEM"):digest(hash_type) - end -else - x509_digest = function() - return error("Either luaossl or resty.openssl is required to calculate x509 digest") - end -end -return { - md5 = md5, - hmac_sha256 = hmac_sha256, - digest_sha256 = digest_sha256, - kdf_derive_sha256 = kdf_derive_sha256, - random_bytes = random_bytes, - x509_digest = x509_digest -} diff --git a/src/share/pgmoon/hstore.lua b/src/share/pgmoon/hstore.lua deleted file mode 100644 index b5cb4dd..0000000 --- a/src/share/pgmoon/hstore.lua +++ /dev/null @@ -1,72 +0,0 @@ -local PostgresHstore -do - local _class_0 - local _base_0 = { } - _base_0.__index = _base_0 - _class_0 = setmetatable({ - __init = function() end, - __base = _base_0, - __name = "PostgresHstore" - }, { - __index = _base_0, - __call = function(cls, ...) - local _self_0 = setmetatable({}, _base_0) - cls.__init(_self_0, ...) - return _self_0 - end - }) - _base_0.__class = _class_0 - PostgresHstore = _class_0 -end -getmetatable(PostgresHstore).__call = function(self, t) - return setmetatable(t, self.__base) -end -local encode_hstore -do - encode_hstore = function(tbl, escape_literal) - if not (escape_literal) then - local Postgres - Postgres = require("pgmoon").Postgres - local default_escape_literal - default_escape_literal = function(v) - return Postgres.escape_literal(nil, v) - end - escape_literal = default_escape_literal - end - local buffer = { } - for k, v in pairs(tbl) do - table.insert(buffer, '"' .. k .. '"=>"' .. v .. '"') - end - return escape_literal(table.concat(buffer, ", ")) - end -end -local decode_hstore -do - local P, R, S, V, Ct, C, Cs, Cg, Cf - do - local _obj_0 = require("lpeg") - P, R, S, V, Ct, C, Cs, Cg, Cf = _obj_0.P, _obj_0.R, _obj_0.S, _obj_0.V, _obj_0.Ct, _obj_0.C, _obj_0.Cs, _obj_0.Cg, _obj_0.Cf - end - local g = P({ - "hstore", - hstore = Cf(Ct("") * (V("pair") * (V("delim") * V("pair")) ^ 0) ^ -1, rawset) * -1, - pair = Cg(V("value") * "=>" * (V("value") + V("null"))), - value = V("invalid_char") + V("string"), - string = P('"') * Cs((P([[\\]]) / [[\]] + P([[\"]]) / [["]] + (P(1) - P('"'))) ^ 0) * P('"'), - null = C('NULL'), - invalid_char = S(" \t\r\n") / function() - return error("got unexpected whitespace") - end, - delim = P(", ") - }) - decode_hstore = function(str, convert_fn) - local out = (assert(g:match(str), "failed to parse postgresql hstore")) - setmetatable(out, PostgresHstore.__base) - return out - end -end -return { - encode_hstore = encode_hstore, - decode_hstore = decode_hstore, - PostgresHstore = PostgresHstore -} diff --git a/src/share/pgmoon/init.lua b/src/share/pgmoon/init.lua deleted file mode 100644 index e42d642..0000000 --- a/src/share/pgmoon/init.lua +++ /dev/null @@ -1,1112 +0,0 @@ -local socket = require("pgmoon.socket") -local insert -insert = table.insert -local rshift, lshift, band, bxor -do - local _obj_0 = require("pgmoon.bit") - rshift, lshift, band, bxor = _obj_0.rshift, _obj_0.lshift, _obj_0.band, _obj_0.bxor -end -local unpack = table.unpack or unpack -local DEBUG = false -local VERSION = "1.16.0" -local _len -_len = function(thing, t) - if t == nil then - t = type(thing) - end - local _exp_0 = t - if "string" == _exp_0 then - return #thing - elseif "table" == _exp_0 then - local l = 0 - for _index_0 = 1, #thing do - local inner = thing[_index_0] - local inner_t = type(inner) - if inner_t == "string" then - l = l + #inner - else - l = l + _len(inner, inner_t) - end - end - return l - else - return error("don't know how to calculate length of " .. tostring(t)) - end -end -local _debug_msg -_debug_msg = function(str) - return require("moon").dump((function() - local _accum_0 = { } - local _len_0 = 1 - for p in str:gmatch("[^%z]+") do - _accum_0[_len_0] = p - _len_0 = _len_0 + 1 - end - return _accum_0 - end)()) -end -local flipped -flipped = function(t) - local keys - do - local _accum_0 = { } - local _len_0 = 1 - for k in pairs(t) do - _accum_0[_len_0] = k - _len_0 = _len_0 + 1 - end - keys = _accum_0 - end - for _index_0 = 1, #keys do - local key = keys[_index_0] - t[t[key]] = key - end - return t -end -local MSG_TYPE_F = flipped({ - password = "p", - query = "Q", - parse = "P", - bind = "B", - describe = "D", - execute = "E", - close = "C", - sync = "S", - terminate = "X" -}) -local MSG_TYPE_B = flipped({ - auth = "R", - parameter_status = "S", - backend_key = "K", - ready_for_query = "Z", - parse_complete = "1", - bind_complete = "2", - close_complete = "3", - row_description = "T", - data_row = "D", - command_complete = "C", - error = "E", - notice = "N", - notification = "A" -}) -local ERROR_TYPES = flipped({ - severity = "S", - code = "C", - message = "M", - position = "P", - detail = "D", - schema = "s", - table = "t", - constraint = "n" -}) -local PG_TYPES = { - [16] = "boolean", - [17] = "bytea", - [20] = "number", - [21] = "number", - [23] = "number", - [700] = "number", - [701] = "number", - [1700] = "number", - [114] = "json", - [3802] = "json", - [1000] = "array_boolean", - [1005] = "array_number", - [1007] = "array_number", - [1016] = "array_number", - [1021] = "array_number", - [1022] = "array_number", - [1231] = "array_number", - [1009] = "array_string", - [1015] = "array_string", - [1002] = "array_string", - [1014] = "array_string", - [2951] = "array_string", - [199] = "array_json", - [3807] = "array_json" -} -local NULL = "\0" -local tobool -tobool = function(str) - return str == "t" -end -local Postgres -do - local _class_0 - local _base_0 = { - convert_null = false, - NULL = { - "NULL" - }, - PG_TYPES = PG_TYPES, - default_config = { - application_name = "pgmoon", - user = "postgres", - host = "127.0.0.1", - port = "5432", - ssl = false - }, - type_serializers = { - string = function(self, v) - return 25, v - end, - boolean = function(self, v) - return 16, v and "t" or "f" - end, - number = function(self, v) - return 1700, tostring(v) - end, - table = function(self, v) - do - local v_mt = getmetatable(v) - if v_mt then - if v_mt.pgmoon_serialize then - return v_mt.pgmoon_serialize(v, self) - end - end - end - return nil, "table does not implement pgmoon_serialize, can't serialize" - end - }, - type_deserializers = { - json = function(self, val, name) - local decode_json - decode_json = require("pgmoon.json").decode_json - return decode_json(val) - end, - bytea = function(self, val, name) - return self:decode_bytea(val) - end, - array_boolean = function(self, val, name) - local decode_array - decode_array = require("pgmoon.arrays").decode_array - return decode_array(val, tobool, self) - end, - array_number = function(self, val, name) - local decode_array - decode_array = require("pgmoon.arrays").decode_array - return decode_array(val, tonumber, self) - end, - array_string = function(self, val, name) - local decode_array - decode_array = require("pgmoon.arrays").decode_array - return decode_array(val, nil, self) - end, - array_json = function(self, val, name) - local decode_array - decode_array = require("pgmoon.arrays").decode_array - local decode_json - decode_json = require("pgmoon.json").decode_json - return decode_array(val, decode_json, self) - end, - hstore = function(self, val, name) - local decode_hstore - decode_hstore = require("pgmoon.hstore").decode_hstore - return decode_hstore(val) - end - }, - set_type_oid = function(self, a, b) - print("pgmoon: WARNING: set_type_oid is deprecated for set_type_deserializer") - return self:set_type_deserializer(a, b) - end, - set_type_deserializer = function(self, oid, name, deserializer) - if not (rawget(self, "PG_TYPES")) then - do - local _tbl_0 = { } - for k, v in pairs(self.PG_TYPES) do - _tbl_0[k] = v - end - self.PG_TYPES = _tbl_0 - end - end - self.PG_TYPES[assert(tonumber(oid))] = name - if deserializer then - if not (rawget(self, "type_deserializers")) then - do - local _tbl_0 = { } - for k, v in pairs(self.type_deserializers) do - _tbl_0[k] = v - end - self.type_deserializers = _tbl_0 - end - end - self.type_deserializers[name] = deserializer - end - end, - setup_hstore = function(self) - local res = unpack(self:query("SELECT oid FROM pg_type WHERE typname = 'hstore'")) - assert(res, "hstore oid not found") - return self:set_type_deserializer(tonumber(res.oid), "hstore") - end, - connect = function(self) - local connect_opts - local _exp_0 = self.sock_type - if "nginx" == _exp_0 then - connect_opts = { - pool = self.config.pool_name or tostring(self.config.host) .. ":" .. tostring(self.config.port) .. ":" .. tostring(self.config.database) .. ":" .. tostring(self.config.user), - pool_size = self.config.pool_size, - backlog = self.config.backlog - } - end - local ok, err = self.sock:connect(self.config.host, self.config.port, connect_opts) - if not (ok) then - return nil, err - end - if self.sock:getreusedtimes() == 0 then - if self.config.ssl then - local success - success, err = self:send_ssl_message() - if not (success) then - return nil, err - end - end - local success - success, err = self:send_startup_message() - if not (success) then - return nil, err - end - success, err = self:auth() - if not (success) then - return nil, err - end - success, err = self:wait_until_ready() - if not (success) then - return nil, err - end - end - return true - end, - settimeout = function(self, ...) - return self.sock:settimeout(...) - end, - disconnect = function(self) - self:send_message(MSG_TYPE_F.terminate, { }) - return self.sock:close() - end, - keepalive = function(self, ...) - return self.sock:setkeepalive(...) - end, - create_cqueues_openssl_context = function(self) - if not (self.config.ssl_verify ~= nil or self.config.cert or self.config.key or self.config.ssl_version) then - return - end - local ssl_context = require("openssl.ssl.context") - local out = ssl_context.new(self.config.ssl_version) - if self.config.ssl_verify == true then - out:setVerify(ssl_context.VERIFY_PEER) - end - if self.config.ssl_verify == false then - out:setVerify(ssl_context.VERIFY_NONE) - end - if self.config.cert then - out:setCertificate(self.config.cert) - end - if self.config.key then - out:setPrivateKey(self.config.key) - end - return out - end, - create_luasec_opts = function(self) - return { - key = self.config.key, - certificate = self.config.cert, - cafile = self.config.cafile, - protocol = self.config.ssl_version, - verify = self.config.ssl_verify and "peer" or "none" - } - end, - auth = function(self) - local t, msg = self:receive_message() - if not (t) then - return nil, msg - end - if not (MSG_TYPE_B.auth == t) then - if MSG_TYPE_B.error == t then - return nil, self:parse_error(msg) - end - error("unexpected message during auth: " .. tostring(t)) - end - local auth_type = self:decode_int(msg, 4) - local _exp_0 = auth_type - if 0 == _exp_0 then - return true - elseif 3 == _exp_0 then - return self:cleartext_auth(msg) - elseif 5 == _exp_0 then - return self:md5_auth(msg) - elseif 10 == _exp_0 then - return self:scram_sha_256_auth(msg) - else - return error("don't know how to auth: " .. tostring(auth_type)) - end - end, - cleartext_auth = function(self, msg) - assert(self.config.password, "missing password, required for connect") - self:send_message(MSG_TYPE_F.password, { - self.config.password, - NULL - }) - return self:check_auth() - end, - scram_sha_256_auth = function(self, msg) - assert(self.config.password, "missing password, required for connect") - local random_bytes, x509_digest - do - local _obj_0 = require("pgmoon.crypto") - random_bytes, x509_digest = _obj_0.random_bytes, _obj_0.x509_digest - end - local rand_bytes = assert(random_bytes(18)) - local encode_base64 - encode_base64 = require("pgmoon.util").encode_base64 - local c_nonce = encode_base64(rand_bytes) - local nonce = "r=" .. c_nonce - local saslname = "" - local username = "n=" .. saslname - local client_first_message_bare = username .. "," .. nonce - local plus = false - local bare = false - if msg:match("SCRAM%-SHA%-256%-PLUS") then - plus = true - elseif msg:match("SCRAM%-SHA%-256") then - bare = true - else - error("unsupported SCRAM mechanism name: " .. tostring(msg)) - end - local gs2_cbind_flag - local gs2_header - local cbind_input - local mechanism_name - if bare then - gs2_cbind_flag = "n" - gs2_header = gs2_cbind_flag .. ",," - cbind_input = gs2_header - mechanism_name = "SCRAM-SHA-256" .. NULL - elseif plus then - local cb_name = "tls-server-end-point" - gs2_cbind_flag = "p=" .. cb_name - gs2_header = gs2_cbind_flag .. ",," - mechanism_name = "SCRAM-SHA-256-PLUS" .. NULL - local cbind_data - do - if self.sock_type == "cqueues" then - local openssl_x509 = self.sock:getpeercertificate() - cbind_data = openssl_x509:digest("sha256", "s") - else - local pem, signature - if self.sock_type == "nginx" then - local ssl = require("resty.openssl.ssl").from_socket(self.sock) - local server_cert = ssl:get_peer_certificate() - pem, signature = server_cert:to_PEM(), server_cert:get_signature_name() - else - local server_cert = self.sock:getpeercertificate() - pem, signature = server_cert:pem(), server_cert:getsignaturename() - end - signature = signature:lower() - local _, with_sig - _, _, with_sig = signature:find("%-with%-(.*)") - if with_sig then - signature = with_sig - end - if signature:match("^md5") or signature:match("^sha1") or signature:match("sha1$") then - signature = "sha256" - end - cbind_data = assert(x509_digest(pem, signature)) - end - end - cbind_input = gs2_header .. cbind_data - end - local client_first_message = gs2_header .. client_first_message_bare - self:send_message(MSG_TYPE_F.password, { - mechanism_name, - self:encode_int(#client_first_message), - client_first_message - }) - local t - t, msg = self:receive_message() - if not (t) then - return nil, msg - end - local server_first_message = msg:sub(5) - local int32 = self:decode_int(msg, 4) - if int32 == nil or int32 ~= 11 then - return nil, "server_first_message error: " .. msg - end - local channel_binding = "c=" .. encode_base64(cbind_input) - nonce = server_first_message:match("([^,]+)") - if not (nonce) then - return nil, "malformed server message (nonce)" - end - local client_final_message_without_proof = channel_binding .. "," .. nonce - local xor - xor = function(a, b) - local result - do - local _accum_0 = { } - local _len_0 = 1 - for i = 1, #a do - local x = a:byte(i) - local y = b:byte(i) - if not (x and y) then - return nil - end - local _value_0 = string.char(bxor(x, y)) - _accum_0[_len_0] = _value_0 - _len_0 = _len_0 + 1 - end - result = _accum_0 - end - return table.concat(result) - end - local salt = server_first_message:match(",s=([^,]+)") - if not (salt) then - return nil, "malformed server message (salt)" - end - local i = server_first_message:match(",i=(.+)") - if not (i) then - return nil, "malformed server message (iteraton count)" - end - if tonumber(i) < 4096 then - return nil, "the iteration-count sent by the server is less than 4096" - end - local kdf_derive_sha256, hmac_sha256, digest_sha256 - do - local _obj_0 = require("pgmoon.crypto") - kdf_derive_sha256, hmac_sha256, digest_sha256 = _obj_0.kdf_derive_sha256, _obj_0.hmac_sha256, _obj_0.digest_sha256 - end - local salted_password, err = kdf_derive_sha256(self.config.password, salt, tonumber(i)) - if not (salted_password) then - return nil, err - end - local client_key - client_key, err = hmac_sha256(salted_password, "Client Key") - if not (client_key) then - return nil, err - end - local stored_key - stored_key, err = digest_sha256(client_key) - if not (stored_key) then - return nil, err - end - local auth_message = tostring(client_first_message_bare) .. "," .. tostring(server_first_message) .. "," .. tostring(client_final_message_without_proof) - local client_signature - client_signature, err = hmac_sha256(stored_key, auth_message) - if not (client_signature) then - return nil, err - end - local proof = xor(client_key, client_signature) - if not (proof) then - return nil, "failed to generate the client proof" - end - local client_final_message = tostring(client_final_message_without_proof) .. ",p=" .. tostring(encode_base64(proof)) - self:send_message(MSG_TYPE_F.password, { - client_final_message - }) - t, msg = self:receive_message() - if not (t) then - return nil, msg - end - local server_key - server_key, err = hmac_sha256(salted_password, "Server Key") - if not (server_key) then - return nil, err - end - local server_signature - server_signature, err = hmac_sha256(server_key, auth_message) - if not (server_signature) then - return nil, err - end - server_signature = encode_base64(server_signature) - local sent_server_signature = msg:match("v=([^,]+)") - if server_signature ~= sent_server_signature then - return nil, "authentication exchange unsuccessful" - end - return self:check_auth() - end, - md5_auth = function(self, msg) - local md5 - md5 = require("pgmoon.crypto").md5 - local salt = msg:sub(5, 8) - assert(self.config.password, "missing password, required for connect") - self:send_message(MSG_TYPE_F.password, { - "md5", - md5(md5(self.config.password .. self.config.user) .. salt), - NULL - }) - return self:check_auth() - end, - check_auth = function(self) - local t, msg = self:receive_message() - if not (t) then - return nil, msg - end - local _exp_0 = t - if MSG_TYPE_B.error == _exp_0 then - return nil, self:parse_error(msg) - elseif MSG_TYPE_B.auth == _exp_0 then - return true - else - return error("unknown response from auth") - end - end, - query = function(self, q, ...) - if select("#", ...) > 0 then - return self:extended_query(q, ...) - else - return self:simple_query(q) - end - end, - simple_query = function(self, q) - if q:find(NULL) then - return nil, "invalid null byte in query" - end - self:send_message(MSG_TYPE_F.query, { - q, - NULL - }) - return self:receive_query_result() - end, - extended_query = function(self, q, ...) - if q:find(NULL) then - return nil, "invalid null byte in query" - end - local num_params = select("#", ...) - local parse_data = { - NULL, - q, - NULL, - self:encode_int(num_params, 2) - } - local bind_data = { - NULL, - NULL, - self:encode_int(0, 2), - self:encode_int(num_params, 2) - } - for idx = 1, num_params do - local v = select(idx, ...) - if v == self.NULL or v == nil then - insert(parse_data, self:encode_int(0)) - insert(bind_data, self:encode_int(-1)) - else - local v_type = type(v) - local type_oid, value_bytes - do - local fn = self.type_serializers[v_type] - if fn then - local _oid, _value_or_err, _third = fn(self, v) - if _oid == nil then - local full_error = "pgmoon: param " .. tostring(idx) .. ": " .. tostring(_value_or_err or "failed to serialize type: " .. tostring(v_type)) - return nil, full_error - end - if _third ~= nil then - return nil, "pgmoon: param " .. tostring(idx) .. ": please do not return a third value from serializer function, we may use this value in the future for binary formats" - end - type_oid, value_bytes = _oid, _value_or_err - else - type_oid, value_bytes = 0, tostring(v) - end - end - insert(parse_data, self:encode_int(type_oid)) - insert(bind_data, self:encode_int(#value_bytes)) - insert(bind_data, value_bytes) - end - end - insert(bind_data, self:encode_int(0, 2)) - self:send_messages({ - { - MSG_TYPE_F.parse, - parse_data - }, - { - MSG_TYPE_F.bind, - bind_data - }, - { - MSG_TYPE_F.describe, - { - "P", - NULL - } - }, - { - MSG_TYPE_F.execute, - { - NULL, - self:encode_int(0) - } - }, - { - MSG_TYPE_F.close, - { - "P", - NULL - } - }, - { - MSG_TYPE_F.sync, - { } - } - }) - return self:receive_query_result() - end, - receive_query_result = function(self) - local row_desc, data_rows, command_complete, err_msg - local result, notifications, notices - local num_queries = 0 - while true do - local t, msg = self:receive_message() - if not (t) then - return nil, msg - end - local _exp_0 = t - if MSG_TYPE_B.data_row == _exp_0 then - if not (data_rows) then - data_rows = { } - end - insert(data_rows, msg) - elseif MSG_TYPE_B.row_description == _exp_0 then - row_desc = msg - elseif MSG_TYPE_B.error == _exp_0 then - err_msg = msg - elseif MSG_TYPE_B.notice == _exp_0 then - if not (notices) then - notices = { } - end - insert(notices, (self:parse_error(msg))) - elseif MSG_TYPE_B.command_complete == _exp_0 then - command_complete = msg - local next_result = self:format_query_result(row_desc, data_rows, command_complete) - num_queries = num_queries + 1 - if num_queries == 1 then - result = next_result - elseif num_queries == 2 then - result = { - result, - next_result - } - else - insert(result, next_result) - end - row_desc, data_rows, command_complete = nil - elseif MSG_TYPE_B.ready_for_query == _exp_0 then - break - elseif MSG_TYPE_B.notification == _exp_0 then - if not (notifications) then - notifications = { } - end - insert(notifications, self:parse_notification(msg)) - elseif MSG_TYPE_B.parse_complete == _exp_0 or MSG_TYPE_B.bind_complete == _exp_0 or MSG_TYPE_B.close_complete == _exp_0 then - local _ = nil - else - if DEBUG then - print("Unhandled message in query result: " .. tostring(t)) - end - end - end - if err_msg then - return nil, self:parse_error(err_msg), result, num_queries, notifications, notices - end - return result, num_queries, notifications, notices - end, - wait_for_notification = function(self) - while true do - local t, msg = self:receive_message() - if not (t) then - return nil, msg - end - local _exp_0 = t - if MSG_TYPE_B.notification == _exp_0 then - return self:parse_notification(msg) - end - end - end, - format_query_result = function(self, row_desc, data_rows, command_complete) - local command, affected_rows - if command_complete then - command = command_complete:match("^%w+") - affected_rows = tonumber(command_complete:match("(%d+)%z$")) - end - if row_desc then - if not (data_rows) then - return { } - end - local fields = self:parse_row_desc(row_desc) - local num_rows = #data_rows - for i = 1, num_rows do - data_rows[i] = self:parse_data_row(data_rows[i], fields) - end - if affected_rows and command ~= "SELECT" then - data_rows.affected_rows = affected_rows - end - return data_rows - end - if affected_rows then - return { - affected_rows = affected_rows - } - else - return true - end - end, - parse_error = function(self, err_msg) - local severity, message, detail, position - local error_data = { } - local offset = 1 - while offset <= #err_msg do - local t = err_msg:sub(offset, offset) - local str = err_msg:match("[^%z]+", offset + 1) - if not (str) then - break - end - offset = offset + (2 + #str) - do - local field = ERROR_TYPES[t] - if field then - error_data[field] = str - end - end - local _exp_0 = t - if ERROR_TYPES.severity == _exp_0 then - severity = str - elseif ERROR_TYPES.message == _exp_0 then - message = str - elseif ERROR_TYPES.position == _exp_0 then - position = str - elseif ERROR_TYPES.detail == _exp_0 then - detail = str - end - end - local msg = tostring(severity) .. ": " .. tostring(message) - if position then - msg = tostring(msg) .. " (" .. tostring(position) .. ")" - end - if detail then - msg = tostring(msg) .. "\n" .. tostring(detail) - end - return msg, error_data - end, - parse_row_desc = function(self, row_desc) - local num_fields = self:decode_int(row_desc:sub(1, 2)) - local offset = 3 - local fields - do - local _accum_0 = { } - local _len_0 = 1 - for i = 1, num_fields do - local name = row_desc:match("[^%z]+", offset) - offset = offset + #name + 1 - local data_type = self:decode_int(row_desc:sub(offset + 6, offset + 6 + 3)) - data_type = self.PG_TYPES[data_type] or "string" - local format = self:decode_int(row_desc:sub(offset + 16, offset + 16 + 1)) - assert(0 == format, "don't know how to handle format") - offset = offset + 18 - local _value_0 = { - name, - data_type - } - _accum_0[_len_0] = _value_0 - _len_0 = _len_0 + 1 - end - fields = _accum_0 - end - return fields - end, - parse_data_row = function(self, data_row, fields) - local num_fields = self:decode_int(data_row:sub(1, 2)) - local out = { } - local offset = 3 - for i = 1, num_fields do - local _continue_0 = false - repeat - local field = fields[i] - if not (field) then - _continue_0 = true - break - end - local field_name, field_type - field_name, field_type = field[1], field[2] - local len = self:decode_int(data_row:sub(offset, offset + 3)) - offset = offset + 4 - if len < 0 then - if self.convert_null then - out[field_name] = self.NULL - end - _continue_0 = true - break - end - local value = data_row:sub(offset, offset + len - 1) - offset = offset + len - local _exp_0 = field_type - if "number" == _exp_0 then - value = tonumber(value) - elseif "boolean" == _exp_0 then - value = value == "t" - elseif "string" == _exp_0 then - local _ = nil - else - do - local fn = self.type_deserializers[field_type] - if fn then - value = fn(self, value, field_type) - end - end - end - out[field_name] = value - _continue_0 = true - until true - if not _continue_0 then - break - end - end - return out - end, - parse_notification = function(self, msg) - local pid = self:decode_int(msg:sub(1, 4)) - local offset = 4 - local channel, payload = msg:match("^([^%z]+)%z([^%z]*)%z$", offset + 1) - if not (channel) then - error("parse_notification: failed to parse notification") - end - return { - operation = "notification", - pid = pid, - channel = channel, - payload = payload - } - end, - wait_until_ready = function(self) - while true do - local t, msg = self:receive_message() - if not (t) then - return nil, msg - end - if MSG_TYPE_B.error == t then - return nil, self:parse_error(msg) - end - if MSG_TYPE_B.ready_for_query == t then - break - end - end - return true - end, - receive_message = function(self) - local prefix, err = self.sock:receive(5) - if not (prefix) then - return nil, "receive_message: failed to get type: " .. tostring(err) - end - local t = prefix:sub(1, 1) - local len = prefix:sub(2) - len = self:decode_int(len) - len = len - 4 - local msg = self.sock:receive(len) - return t, msg - end, - send_startup_message = function(self) - assert(self.config.user, "missing user for connect") - assert(self.config.database, "missing database for connect") - local data = { - self:encode_int(196608), - "user", - NULL, - self.config.user, - NULL, - "database", - NULL, - self.config.database, - NULL, - "application_name", - NULL, - self.config.application_name, - NULL, - NULL - } - return self.sock:send({ - self:encode_int(_len(data) + 4), - data - }) - end, - send_ssl_message = function(self) - local success, err = self.sock:send({ - self:encode_int(8), - self:encode_int(80877103) - }) - if not (success) then - return nil, err - end - local t - t, err = self.sock:receive(1) - if not (t) then - return nil, err - end - if t == MSG_TYPE_B.parameter_status then - local _exp_0 = self.sock_type - if "nginx" == _exp_0 then - return self.sock:sslhandshake(false, nil, self.config.ssl_verify) - elseif "luasocket" == _exp_0 then - return self.sock:sslhandshake(self.config.luasec_opts or self:create_luasec_opts()) - elseif "cqueues" == _exp_0 then - return self.sock:starttls(self.config.cqueues_openssl_context or self:create_cqueues_openssl_context()) - else - return error("don't know how to do ssl handshake for socket type: " .. tostring(self.sock_type)) - end - elseif t == MSG_TYPE_B.error or self.config.ssl_required then - return nil, "the server does not support SSL connections" - else - return true - end - end, - send_messages = function(self, messages) - local data - do - local _accum_0 = { } - local _len_0 = 1 - for _index_0 = 1, #messages do - local _des_0 = messages[_index_0] - local message_type, message_data - message_type, message_data = _des_0[1], _des_0[2] - local len = _len(message_data) - len = len + 4 - local _value_0 = { - message_type, - self:encode_int(len), - message_data - } - _accum_0[_len_0] = _value_0 - _len_0 = _len_0 + 1 - end - data = _accum_0 - end - return self.sock:send(data) - end, - send_message = function(self, t, data, len) - if len == nil then - len = _len(data) - end - len = len + 4 - return self.sock:send({ - t, - self:encode_int(len), - data - }) - end, - decode_int = function(self, str, bytes) - if bytes == nil then - bytes = #str - end - local _exp_0 = str - if "\0\0" == _exp_0 or "\0\0\0\0" == _exp_0 then - return 0 - end - local _exp_1 = bytes - if 4 == _exp_1 then - local d, c, b, a = str:byte(1, 4) - return a + lshift(b, 8) + lshift(c, 16) + lshift(d, 24) - elseif 2 == _exp_1 then - local b, a = str:byte(1, 2) - return a + lshift(b, 8) - else - return error("don't know how to decode " .. tostring(bytes) .. " byte(s)") - end - end, - encode_int = function(self, n, bytes) - if bytes == nil then - bytes = 4 - end - if n == 0 then - if bytes == 2 then - return "\0\0" - end - if bytes == 4 then - return "\0\0\0\0" - end - end - local _exp_0 = bytes - if 4 == _exp_0 then - local a = band(n, 0xff) - local b = band(rshift(n, 8), 0xff) - local c = band(rshift(n, 16), 0xff) - local d = band(rshift(n, 24), 0xff) - return string.char(d, c, b, a) - elseif 2 == _exp_0 then - local a = band(n, 0xff) - local b = band(rshift(n, 8), 0xff) - return string.char(b, a) - else - return error("don't know how to encode " .. tostring(bytes) .. " byte(s)") - end - end, - decode_bytea = function(self, str) - if str:sub(1, 2) == '\\x' then - return str:sub(3):gsub('..', function(hex) - return string.char(tonumber(hex, 16)) - end) - else - return str:gsub('\\(%d%d%d)', function(oct) - return string.char(tonumber(oct, 8)) - end) - end - end, - encode_bytea = function(self, str) - return string.format("E'\\\\x%s'", str:gsub('.', function(byte) - return string.format('%02x', string.byte(byte)) - end)) - end, - escape_identifier = function(self, ident) - return '"' .. (tostring(ident):gsub('"', '""')) .. '"' - end, - escape_literal = function(self, val) - if val == (self and self.NULL or Postgres.NULL) then - return "NULL" - end - local _exp_0 = type(val) - if "number" == _exp_0 then - return tostring(val) - elseif "string" == _exp_0 then - return "'" .. tostring((val:gsub("'", "''"))) .. "'" - elseif "boolean" == _exp_0 then - return val and "TRUE" or "FALSE" - end - return error("don't know how to escape value: " .. tostring(val)) - end, - __tostring = function(self) - return "" - end - } - _base_0.__index = _base_0 - _class_0 = setmetatable({ - __init = function(self, _config) - if _config == nil then - _config = { } - end - self._config = _config - self.config = setmetatable({ }, { - __index = function(t, key) - local value = self._config[key] - if value == nil then - return self.default_config[key] - else - return value - end - end - }) - self.convert_null = self.config.convert_null - self.sock, self.sock_type = socket.new(self.config.socket_type) - end, - __base = _base_0, - __name = "Postgres" - }, { - __index = _base_0, - __call = function(cls, ...) - local _self_0 = setmetatable({}, _base_0) - cls.__init(_self_0, ...) - return _self_0 - end - }) - _base_0.__class = _class_0 - Postgres = _class_0 -end -return { - Postgres = Postgres, - new = Postgres, - VERSION = VERSION -} diff --git a/src/share/pgmoon/json.lua b/src/share/pgmoon/json.lua deleted file mode 100644 index c7872cb..0000000 --- a/src/share/pgmoon/json.lua +++ /dev/null @@ -1,25 +0,0 @@ -local default_escape_literal = nil -local encode_json -encode_json = function(tbl, escape_literal) - escape_literal = escape_literal or default_escape_literal - local json = require("cjson") - if not (escape_literal) then - local Postgres - Postgres = require("pgmoon").Postgres - default_escape_literal = function(v) - return Postgres.escape_literal(nil, v) - end - escape_literal = default_escape_literal - end - local enc = json.encode(tbl) - return escape_literal(enc) -end -local decode_json -decode_json = function(str) - local json = require("cjson") - return json.decode(str) -end -return { - encode_json = encode_json, - decode_json = decode_json -} diff --git a/src/share/pgmoon/socket.lua b/src/share/pgmoon/socket.lua deleted file mode 100644 index 8db4fc1..0000000 --- a/src/share/pgmoon/socket.lua +++ /dev/null @@ -1,109 +0,0 @@ -local create_luasocket -do - local flatten - flatten = require("pgmoon.util").flatten - local proxy_mt = { - __index = function(self, key) - local sock = self.sock - local original = sock[key] - if type(original) == "function" then - local fn - fn = function(_, ...) - return original(sock, ...) - end - self[key] = fn - return fn - else - return original - end - end - } - local method_overrides - method_overrides = { - send = function(self, ...) - return self.sock:send(flatten(...)) - end, - settimeout = function(self, t) - if t then - t = t / 1000 - end - return self.sock:settimeout(t) - end, - setkeepalive = function(self) - return error("You attempted to call setkeepalive on a LuaSocket socket. This method is only available for the ngx cosocket API for releasing a socket back into the connection pool") - end, - getreusedtimes = function(self, t) - return 0 - end, - sslhandshake = function(self, opts) - if opts == nil then - opts = { } - end - local ssl = require("ssl") - local params = { - mode = "client", - protocol = "any", - verify = "none", - options = { - "all", - "no_sslv2", - "no_sslv3", - "no_tlsv1" - } - } - for k, v in pairs(opts) do - params[k] = v - end - local sec_sock, err = ssl.wrap(self.sock, params) - if not (sec_sock) then - return false, err - end - local success - success, err = sec_sock:dohandshake() - if not (success) then - return false, err - end - for k, v in pairs(self) do - if not method_overrides[k] and type(v) == "function" then - self[k] = nil - end - end - self.sock = sec_sock - return true - end - } - create_luasocket = function(...) - local socket = require("socket") - local proxy = { - sock = socket.tcp(...) - } - for k, v in pairs(method_overrides) do - proxy[k] = v - end - return setmetatable(proxy, proxy_mt) - end -end -return { - create_luasocket = create_luasocket, - new = function(socket_type) - if socket_type == nil then - if ngx and ngx.get_phase() ~= "init" then - socket_type = "nginx" - else - socket_type = "luasocket" - end - end - local socket - local _exp_0 = socket_type - if "nginx" == _exp_0 then - socket = ngx.socket.tcp() - elseif "luasocket" == _exp_0 then - socket = create_luasocket() - elseif "cqueues" == _exp_0 then - socket = require("pgmoon.cqueues").CqueuesSocket() - else - socket = error("got unknown or unset socket type: " .. tostring(socket_type)) - end - return socket, socket_type - end -} diff --git a/src/share/pgmoon/util.lua b/src/share/pgmoon/util.lua deleted file mode 100644 index 9752404..0000000 --- a/src/share/pgmoon/util.lua +++ /dev/null @@ -1,46 +0,0 @@ -local flatten -do - local __flatten - __flatten = function(t, buffer) - local _exp_0 = type(t) - if "string" == _exp_0 then - buffer[#buffer + 1] = t - elseif "number" == _exp_0 then - buffer[#buffer + 1] = tostring(t) - elseif "table" == _exp_0 then - for _index_0 = 1, #t do - local thing = t[_index_0] - __flatten(thing, buffer) - end - end - end - flatten = function(t) - local buffer = { } - __flatten(t, buffer) - return table.concat(buffer) - end -end -local encode_base64, decode_base64 -if ngx then - do - local _obj_0 = ngx - encode_base64, decode_base64 = _obj_0.encode_base64, _obj_0.decode_base64 - end -else - local b64, unb64 - do - local _obj_0 = require("mime") - b64, unb64 = _obj_0.b64, _obj_0.unb64 - end - encode_base64 = function(...) - return (b64(...)) - end - decode_base64 = function(...) - return (unb64(...)) - end -end -return { - flatten = flatten, - encode_base64 = encode_base64, - decode_base64 = decode_base64 -} diff --git a/src/test/testPostgres.lua b/src/test/testPostgres.lua index 51ab976..ef4ff4d 100644 --- a/src/test/testPostgres.lua +++ b/src/test/testPostgres.lua @@ -46,18 +46,16 @@ local function test() ngx.say("Connection success") -- 执行查询 - local res, err = db:query("SELECT * FROM tbl_user") + local res, err = db:query("SELECT * FROM \"T_Users\"") if not res then error("Query failed: " .. err) end ngx.say(err) for _, row in ipairs(res) do for key, value in pairs(row) do - ngx.say(key .. ":" .. value) + ngx.say(key .. ":" .. tostring(value)) end end - --local rest, err1 = db:query("SELECT version()") - --ngx.say(rest) --关闭数据库 db:disconnect()