aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/sasl.lua2
-rw-r--r--util/uuid.lua37
2 files changed, 34 insertions, 5 deletions
diff --git a/util/sasl.lua b/util/sasl.lua
index 54715613..7f023321 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -138,7 +138,6 @@ local function new_digest_md5(realm, password_handler)
local object = { mechanism = "DIGEST-MD5", realm = realm, password_handler = password_handler};
- --TODO: something better than math.random would be nice, maybe OpenSSL's random number generator
object.nonce = generate_uuid();
object.step = 0;
object.nonce_count = {};
@@ -249,7 +248,6 @@ local function new_anonymous(realm, password_handler)
function object.feed(self, message)
return "success"
end
- --TODO: From XEP-0175 "It is RECOMMENDED for the node identifier to be a UUID as specified in RFC 4122 [5]." So util.uuid() should (or have an option to) behave as specified in RFC 4122.
object["username"] = generate_uuid()
return object
end
diff --git a/util/uuid.lua b/util/uuid.lua
index fd21dfcc..eca35134 100644
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -7,13 +7,44 @@
--
-
local m_random = math.random;
local tostring = tostring;
+local os_time = os.time;
+local os_clock = os.clock;
+local sha1 = require "util.hashes".sha1;
+
module "uuid"
+local last_uniq_time = 0;
+local function uniq_time()
+ local new_uniq_time = os_time();
+ if last_uniq_time >= new_uniq_time then new_uniq_time = last_uniq_time + 1; end
+ last_uniq_time = new_uniq_time;
+ return new_uniq_time;
+end
+
+local function new_random(x)
+ return sha1(x..os_clock()..tostring({}), true);
+end
+
+local buffer = new_random(uniq_time());
+local function _seed(x)
+ buffer = new_random(buffer..x);
+end
+local function get_nibbles(n)
+ if #buffer < n then seed(uniq_time()); end
+ local r = buffer:sub(0, n);
+ buffer = buffer:sub(n+1);
+ return r;
+end
+local function get_twobits()
+ return ("%x"):format(get_nibbles(1):byte() % 4 + 8);
+end
+
function generate()
- return tostring(m_random(0, 99999999));
+ -- generate RFC 4122 complaint UUIDs (version 4 - random)
+ return get_nibbles(8).."-"..get_nibbles(4).."-4"..get_nibbles(3).."-"..(get_twobits())..get_nibbles(3).."-"..get_nibbles(12);
end
+seed = _seed;
-return _M; \ No newline at end of file
+return _M;