projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_tls: Remove some redundant variable declarations
[prosody.git]
/
util
/
sasl.lua
diff --git
a/util/sasl.lua
b/util/sasl.lua
index 9df74c1be8e243665d3745cef380ddb801ce6be0..9c8fff7804a28edd6b7e4e430b846d3d23093696 100644
(file)
--- a/
util/sasl.lua
+++ b/
util/sasl.lua
@@
-14,23
+14,19
@@
local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
-local tostring = tostring;
local st = require "util.stanza";
local set = require "util.set";
local array = require "util.array";
local st = require "util.stanza";
local set = require "util.set";
local array = require "util.array";
+local to_unicode = require "util.encodings".idna.to_unicode;
+
+local tostring = tostring;
local pairs, ipairs = pairs, ipairs;
local t_insert, t_concat = table.insert, table.concat;
local pairs, ipairs = pairs, ipairs;
local t_insert, t_concat = table.insert, table.concat;
-local to_unicode = require "util.encodings".idna.to_unicode;
local s_match = string.match;
local s_match = string.match;
-local gmatch = string.gmatch
-local string = string
-local math = require "math"
local type = type
local error = error
local type = type
local error = error
-local print = print
local setmetatable = setmetatable;
local assert = assert;
local setmetatable = setmetatable;
local assert = assert;
-local dofile = dofile;
local require = require;
require "util.iterators"
local require = require;
require "util.iterators"
@@
-87,21
+83,27
@@
end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile, forbidden)
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile, forbidden)
- sasl_i = {profile = profile};
+
local
sasl_i = {profile = profile};
sasl_i.realm = realm;
sasl_i.realm = realm;
- s = setmetatable(sasl_i, method);
- s:forbidden(sasl_i, forbidden)
+ local s = setmetatable(sasl_i, method);
+ if forbidden == nil then forbidden = {} end
+ s:forbidden(forbidden)
return s;
end
return s;
end
+-- get a fresh clone with the same realm, profiles and forbidden mechanisms
+function method:clean_clone()
+ return new(self.realm, self.profile, self:forbidden())
+end
+
-- set the forbidden mechanisms
-- set the forbidden mechanisms
-function method:forbidden(
forbidden
)
- if
forbidden
then
+function method:forbidden(
restrict
)
+ if
restrict
then
-- set forbidden
-- set forbidden
- self.
forbidden = set.new(forbidden
);
+ self.
restrict = set.new(restrict
);
else
-- get forbidden
else
-- get forbidden
- return array.collect(self.
forbidden
:items());
+ return array.collect(self.
restrict
:items());
end
end
end
end
@@
-111,7
+113,7
@@
function method:mechanisms()
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
- if not s
asl_i.forbidden
:contains(mechanism) then
+ if not s
elf.restrict
:contains(mechanism) then
mechanisms[mechanism] = true;
end
end
mechanisms[mechanism] = true;
end
end