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

[fix] Remove extra end line of the cmd run with popen

Browse source
This commit is contained in:
ljf 2018-08-29 02:55:02 +02:00
parent 3e94b09d3b
commit 410ba2e4a7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
helpers.lua
View file

@ -602,7 +602,7 @@ function secure_cmd_password(cmd, password, start)
-- Check password validity -- Check password validity
math.randomseed( os.time() ) math.randomseed( os.time() )
local tmp_file = "/tmp/ssowat_"..math.random() local tmp_file = "/tmp/ssowat_"..math.random()
local w_pwd = io.popen("("..cmd..") tee -a "..tmp_file, 'w') local w_pwd = io.popen("("..cmd..") | tee -a "..tmp_file, 'w')
w_pwd:write(password) w_pwd:write(password)
-- This second write is just to validate the password question -- This second write is just to validate the password question
-- Do not remove -- Do not remove
@ -610,6 +610,9 @@ function secure_cmd_password(cmd, password, start)
w_pwd:close() w_pwd:close()
local r_pwd = io.open(tmp_file, 'r') local r_pwd = io.open(tmp_file, 'r')
text = r_pwd:read "*a" text = r_pwd:read "*a"
if text:sub(-1, -1) == "\n" then
text = text:sub(1, -2)
end
r_pwd:close() r_pwd:close()
os.remove(tmp_file) os.remove(tmp_file)
return text return text
@ -647,7 +650,7 @@ function edit_user()
-- Check password validity -- Check password validity
local result_msg = secure_cmd_password("python /usr/lib/moulinette/yunohost/utils/password.py", args.newpassword) local result_msg = secure_cmd_password("python /usr/lib/moulinette/yunohost/utils/password.py", args.newpassword)
validation_error = true validation_error = true
ngx.log(ngx.STDERR, result_msg)
if result_msg == 'password_advice' or result_msg == nil or result_msg == "" then if result_msg == 'password_advice' or result_msg == nil or result_msg == "" then
validation_error = nil validation_error = nil
end end