changes and bugfixes

This commit is contained in:
dodger 2022-05-10 11:20:19 +02:00
parent aa85a3b78b
commit c856d5462f
Signed by: dodger
GPG Key ID: F6701F6CB4D1C826

View File

@ -52,11 +52,13 @@ declare
_invokingfunction text := ''; _invokingfunction text := '';
_matches text; _matches text;
_password_lifetime integer := 120 ; -- specify password lifetime in days _password_lifetime integer := 120 ; -- specify password lifetime in days
_retval INTEGER; _retval integer;
_expiration_date numeric ; _expiration_epoch numeric ;
_expiration_date timestamp ;
begin begin
select extract(epoch from localtimestamp) into _expiration_date; select extract(epoch from localtimestamp) into _expiration_epoch;
select _expiration_date+(_password_lifetime*24*60*60) into _expiration_date; select _expiration_epoch+(_password_lifetime*24*60*60) into _expiration_epoch;
select to_timestamp(_expiration_epoch) into _expiration_date ;
select query into _invokingfunction from pg_stat_activity where pid = pg_backend_pid() ; select query into _invokingfunction from pg_stat_activity where pid = pg_backend_pid() ;
-- first, checking the invoking function -- first, checking the invoking function
@ -65,7 +67,8 @@ begin
-- then checking the regex for the password -- then checking the regex for the password
_matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\([[:space:]]{0,}''([[:alnum:]]|@|\\$|#|%|\\^|&|\\*|\\(|\\)|\\_|\\+|\\{|\\}|\\||<|>|\\?|=|!){11,100}''[[:space:]]{0,}\\)[[:space:]]{0,};' , 'i'); _matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\([[:space:]]{0,}''([[:alnum:]]|@|\\$|#|%|\\^|&|\\*|\\(|\\)|\\_|\\+|\\{|\\}|\\||<|>|\\?|=|!){11,100}''[[:space:]]{0,}\\)[[:space:]]{0,};' , 'i');
if _matches IS NOT NULL then if _matches IS NOT NULL then
EXECUTE format('ALTER ROLE %I WITH PASSWORD %L VALID UNTIL to_timestamp(%L) ;', _usename, _thepassword, _expiration_date); -- EXECUTE format('ALTER ROLE %I WITH PASSWORD %L VALID UNTIL to_timestamp(%L) ;', _usename, _thepassword, _expiration_date);
EXECUTE format('ALTER ROLE %I WITH PASSWORD %L VALID UNTIL %L ;', _usename, _thepassword, _expiration_date);
-- INTO _retval; -- INTO _retval;
RETURN 0; RETURN 0;
else else
@ -90,6 +93,9 @@ $BODY$;
-- ALTER FUNCTION dba.change_valid_until(text, text) OWNER TO dba; -- ALTER FUNCTION dba.change_valid_until(text, text) OWNER TO dba;
REVOKE EXECUTE ON FUNCTION dba.change_valid_until(text, text) From PUBLIC; REVOKE EXECUTE ON FUNCTION dba.change_valid_until(text, text) From PUBLIC;
drop function if exists dba.change_my_password ;
CREATE OR REPLACE FUNCTION dba.change_my_password(_password text) CREATE OR REPLACE FUNCTION dba.change_my_password(_password text)
RETURNS integer RETURNS integer
SECURITY INVOKER SECURITY INVOKER
@ -109,6 +115,7 @@ begin
raise exception 'This function should not be run by user postgres' raise exception 'This function should not be run by user postgres'
using errcode = '22024' -- 22023 = "invalid_parameter_value' using errcode = '22024' -- 22023 = "invalid_parameter_value'
, detail = 'Use a named user only.' ; , detail = 'Use a named user only.' ;
return 1;
end if; end if;
if length(_password) < _min_password_length then if length(_password) < _min_password_length then
@ -118,15 +125,27 @@ begin
using errcode = '22023' -- 22023 = "invalid_parameter_value' using errcode = '22023' -- 22023 = "invalid_parameter_value'
, detail = 'Please check your password.' , detail = 'Please check your password.'
, hint = 'Password must be at least ' || _min_password_length || ' characters.'; , hint = 'Password must be at least ' || _min_password_length || ' characters.';
return 1;
end if; end if;
select client_addr into _useraddress from pg_stat_activity where pid = pg_backend_pid() ; select client_addr into _useraddress from pg_stat_activity where pid = pg_backend_pid() ;
select application_name into _userapp from pg_stat_activity where pid = pg_backend_pid() ; select application_name into _userapp from pg_stat_activity where pid = pg_backend_pid() ;
PERFORM dba.change_valid_until(_usename, _password) ; --PERFORM dba.change_valid_until(_usename, _password) ;
insert into dba.pwdhistory SELECT dba.change_valid_until(_usename, _password)
(usename, usename_addres, application_name, password, changed_on) INTO _retval;
values (_usename, _useraddress, _userapp, md5(_password),now()); if _retval = 0 then
insert into dba.pwdhistory
(usename, usename_addres, application_name, password, changed_on)
values (_usename, _useraddress, _userapp, md5(_password),now());
raise notice 'Password changed' ;
else
raise exception 'Could not change expiration date, please check'
using errcode = '22023' -- 22023 = "invalid_parameter_value'
, detail = 'contact the dba' ;
return 1;
end if;
return 0; return 0;
end end