aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/datamanager.lua8
-rw-r--r--util/hmac.lua70
2 files changed, 74 insertions, 4 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 54cf1959..8e4b7828 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -62,7 +62,7 @@ end
local function callback(username, host, datastore, data)
for _, f in ipairs(callbacks) do
username, host, datastore, data = f(username, host, datastore, data);
- if not username then break; end
+ if username == false then break; end
end
return username, host, datastore, data;
@@ -123,7 +123,7 @@ function store(username, host, datastore, data)
end
username, host, datastore, data = callback(username, host, datastore, data);
- if not username then
+ if username == false then
return true; -- Don't save this data at all
end
@@ -147,7 +147,7 @@ end
function list_append(username, host, datastore, data)
if not data then return; end
- if callback and callback(username, host, datastore) then return true; end
+ if callback(username, host, datastore) == false then return true; end
-- save the datastore
local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+");
if not f then
@@ -165,7 +165,7 @@ function list_store(username, host, datastore, data)
if not data then
data = {};
end
- if callback and callback(username, host, datastore) then return true; end
+ if callback(username, host, datastore) == false then return true; end
-- save the datastore
local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+");
if not f then
diff --git a/util/hmac.lua b/util/hmac.lua
new file mode 100644
index 00000000..5f4467cf
--- /dev/null
+++ b/util/hmac.lua
@@ -0,0 +1,70 @@
+local hashes = require "util.hashes"
+local xor = require "bit".bxor
+
+local t_insert, t_concat = table.insert, table.concat;
+local s_char = string.char;
+
+module "hmac"
+
+local function arraystr(array)
+ local t = {}
+ for i = 1,#array do
+ t_insert(t, s_char(array[i]))
+ end
+
+ return t_concat(t)
+end
+
+--[[
+key
+ the key to use in the hash
+message
+ the message to hash
+hash
+ the hash function
+blocksize
+ the blocksize for the hash function in bytes
+hex
+ return raw hash or hexadecimal string
+--]]
+function hmac(key, message, hash, blocksize, hex)
+ local opad = {}
+ local ipad = {}
+
+ for i = 1,blocksize do
+ opad[i] = 0x5c
+ ipad[i] = 0x36
+ end
+
+ if #key > blocksize then
+ key = hash(key)
+ end
+
+ for i = 1,#key do
+ ipad[i] = xor(ipad[i],key:sub(i,i):byte())
+ opad[i] = xor(opad[i],key:sub(i,i):byte())
+ end
+
+ opad = arraystr(opad)
+ ipad = arraystr(ipad)
+
+ if hex then
+ return hash(opad..hash(ipad..message), true)
+ else
+ return hash(opad..hash(ipad..message))
+ end
+end
+
+function md5(key, message, hex)
+ return hmac(key, message, hashes.md5, 64, hex)
+end
+
+function sha1(key, message, hex)
+ return hmac(key, message, hashes.sha1, 64, hex)
+end
+
+function sha256(key, message, hex)
+ return hmac(key, message, hashes.sha256, 64, hex)
+end
+
+return _M