Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-radicale2: Avoid losing password hash

Browse source 
This fixes a case where one could lose an already exising password hash
when changing another users' password or creating a new user.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
This commit is contained in:
Daniel F. Dickinson 2019-01-16 19:11:26 -05:00
parent 8fc68bee2c
commit 8a72536448
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua
View file

@ -135,33 +135,19 @@ function encpass(self, section)
return encvalue and encvalue.encrypted_password
end
pass.parse = function(self, section, novld)
local encvalue
if self:cfgvalue(section) then
if not plainpass:cfgvalue(section) then
return Value.parse(self, section)
else
encvalue = encpass(self, section)
if encvalue then
self.formvalue = function(self, section)
return encvalue
end
return Value.parse(self, section, novld)
else
self.formvalue = self.cfgvalue
return Value.parse(self, section, novld)
end
end
pass.cfgvalue = function(self, section)
if not plainpass:formvalue(section) then
return Value.cfgvalue(self, section)
else
encvalue = encpass(self, section)
if encvalue then
self.formvalue = function(self, section)
return encvalue
end
return Value.parse(self, section, novld)
else
return nil
end
return Value.formvalue(self, section)
end
end
pass.formvalue = function(self, section)
if not plainpass:formvalue(section) then
return Value.formvalue(self, section)
else
return encpass(self, section) or Value.formvalue(self, section)
end
end