YunoHost/SSOwat
1
0
Fork 0
mirror of https://github.com/YunoHost/SSOwat.git synced 2024-09-03 20:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'unstable' into testing

Browse source
This commit is contained in:
opi 2015-02-18 14:37:05 +01:00
commit e96bb3e8d8
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -7,7 +7,7 @@ Standards-Version: 3.9.1
Package: ssowat Package: ssowat
Architecture: all Architecture: all
Depends: yunohost-config-nginx, lua-ldap, lua-json Depends: yunohost-config-nginx, lua-ldap, lua-json, lua-rex-pcre
Homepage: http://www.yunohost.org Homepage: http://www.yunohost.org
Description: SSOWAT Description: SSOWAT
Websso for yunohost Websso for yunohost

11
helpers.lua
View file

@ -49,7 +49,9 @@ end
-- Set a cookie -- Set a cookie
function cook (cookie_str) function cook (cookie_str)
if not is_in_table(cookies, cookie_str) then
table.insert(cookies, cookie_str) table.insert(cookies, cookie_str)
end
end end
@ -591,8 +593,9 @@ function edit_user ()
end end
ldap:close() ldap:close()
-- TODO: updates to support the new TLDs? local rex = require "rex_pcre"
local mail_pattern = "[A-Za-z0-9%.%%%+%-]+@[A-Za-z0-9%.%%%+%-]+%.%w%w%w?%w?" local rex_flags = rex.flags()
local mail_re = rex.new([[^[\w\.-+%]+@([^\W_A-Z]+([\-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$]], rex_flags.UTF8 + rex_flags.UCP)
local mails = {} local mails = {}
@ -605,7 +608,7 @@ function edit_user ()
for k, mail in ipairs(mailalias) do for k, mail in ipairs(mailalias) do
if mail ~= "" then if mail ~= "" then
-- Check the mail pattern -- Check the mail pattern
if not mail:match(mail_pattern) then if not mail_re:match(mail) then
flash("fail", t("invalid_mail")..": "..mail) flash("fail", t("invalid_mail")..": "..mail)
return redirect(conf.portal_url.."edit.html") return redirect(conf.portal_url.."edit.html")
@ -638,7 +641,7 @@ function edit_user ()
local drops = {} local drops = {}
for k, mail in ipairs(maildrop) do for k, mail in ipairs(maildrop) do
if mail ~= "" then if mail ~= "" then
if not mail:match(mail_pattern) then if not mail_re:match(mail) then
flash("fail", t("invalid_mailforward")..": "..mail) flash("fail", t("invalid_mailforward")..": "..mail)
return redirect(conf.portal_url.."edit.html") return redirect(conf.portal_url.."edit.html")
end end