changes and bugfixes

passchanger.sql

@@ -39,6 +39,8 @@ ALTER TABLE IF EXISTS dba.pwdhistory
 -- ######################################
 -- ######################################
 
+drop function if exists dba.change_valid_until ;
+
 CREATE OR REPLACE FUNCTION dba.change_valid_until(_usename text)
     RETURNS integer
     SECURITY DEFINER
@@ -49,25 +51,21 @@ AS $BODY$
 declare
     _invokingfunction text := '';
     _matches text;
-    --_password_lifetime text := '120 days';  -- specify password lifetime
+    _password_lifetime integer := 120 ;  -- specify password lifetime in days
     _retval  INTEGER;
-    _expiration_date text;
+    _expiration_date numeric ;
 begin
-    select now() + interval '120 days' into _expiration_date ;
+    select extract(epoch from localtimestamp) into _expiration_date;
+    select _expiration_date+(_password_lifetime*24*60*60) into _expiration_date;
+
     select query into _invokingfunction from pg_stat_activity where pid = pg_backend_pid() ;
     -- first, checking the invoking function
---     raise notice 'Invoking function: %', _invokingfunction;
-    --_matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\(''([[:alnum:]]|@|\\$|#|%|\\^|&|\\*|\\(|\\)|\\_|\\+|\\{|\\}|\\||<|>|\\?|=|!){11,100}''\\)[[:space:]]{0,};' , 'i');
     _matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\(.*\\)[[:space:]]{0,};' , 'i');
---     raise notice 'Matches: %', _matches;
     if _matches IS NOT NULL then
       -- then checking the regex for the password
-      EXECUTE format('update pg_catalog.pg_authid set rolvaliduntil=now() + interval ''120 days'' where rolname=''%I'' ', _usename);
-      return 0;
-        _matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\(''([[:alnum:]]|@|\\$|#|%|\\^|&|\\*|\\(|\\)|\\_|\\+|\\{|\\}|\\||<|>|\\?|=|!){11,100}''\\)[[: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
-            --EXECUTE format('update pg_catalog.pg_authid set rolvaliduntil=now() + interval ''120 days'' where rolname=''%I'' ', _usename);
-            EXECUTE format('ALTER ROLE %I WITH PASSWORD %L VALID UNTIL now() + interval ''%I days'' ;', _usename, _thepassword, _password_lifetime);
+            EXECUTE format('update pg_catalog.pg_authid set rolvaliduntil=to_timestamp(%L) where rolname=%L ', _expiration_date, _usename);
             -- INTO _retval;
             RETURN 0;
         else
@@ -75,6 +73,7 @@ begin
             using errcode = '22023'  -- 22023 = "invalid_parameter_value'
             , detail = 'Check your generated password an try again'
             , hint = 'Read the official documentation' ;
+            RETURN 1;
         end if;
     else  
       -- also catches NULL
@@ -83,6 +82,7 @@ begin
       using errcode = '22023'  -- 22023 = "invalid_parameter_value'
           , detail = 'Please call dba.change_my_password function.'
           , hint = 'Invoked function: ' || _invokingfunction ;
+      RETURN 1;
     end if;
 end
 $BODY$;
@@ -102,12 +102,14 @@ declare
     _usename text := '';
     _useraddress text := '';
     _userapp text := '';
+    _retval integer ;
 begin
    select user into _usename;
    if user = 'postgres' then
       raise exception 'This function should not be run by user postgres'
       using errcode = '22024'  -- 22023 = "invalid_parameter_value'
           , detail = 'Use a named user only.' ;
+      return 1;
    end if;
 
    if length(_password) < _min_password_length then
@@ -117,19 +119,30 @@ begin
       using errcode = '22023'  -- 22023 = "invalid_parameter_value'
           , detail = 'Please check your password.'
           , hint = 'Password must be at least ' || _min_password_length || ' characters.';
+      return 1;
    end if;
 
    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() ;
 
+    --PERFORM dba.change_valid_until(_usename) ;
+    SELECT dba.change_valid_until(_usename)
+        INTO _retval;
     -- this will be executed by the username invoking this function
+    if _retval = 0 then
         EXECUTE format('ALTER USER %I WITH PASSWORD %L', _usename, _password);
-
-    PERFORM dba.change_valid_until(_usename) ;
         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;
 end
 $BODY$;

passchanger_rds.sql

@@ -39,7 +39,7 @@ ALTER TABLE IF EXISTS dba.pwdhistory
 -- ######################################
 -- ######################################
 
-drop function dba.change_valid_until ;
+drop function if exists dba.change_valid_until ;
 
 CREATE OR REPLACE FUNCTION dba.change_valid_until(_usename text, _thepassword text)
     RETURNS integer
@@ -51,22 +51,23 @@ AS $BODY$
 declare
     _invokingfunction text := '';
     _matches text;
-    --_password_lifetime text := '120 days';  -- specify password lifetime
-    _retval  INTEGER;
-    _expiration_date text;
+    _password_lifetime integer := 120 ;  -- specify password lifetime in days
+    _retval  integer;
+    _expiration_epoch numeric ;
+    _expiration_date timestamp ;
 begin
-    select now() + interval '120 days' into _expiration_date ;
+    select extract(epoch from localtimestamp) into _expiration_epoch;
+    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() ;
     -- first, checking the invoking function
     _matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\(.*\\)[[:space:]]{0,};' , 'i');
---     raise notice 'Matches: %', _matches;
     if _matches IS NOT NULL then
         -- 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');
-        -- catch-all regexp, avoid using it
-        -- _matches := regexp_matches(_invokingfunction, E'select dba\.change_my_password\\(.*\\)[[:space:]]{0,};' , 'i');
         if _matches IS NOT NULL then
-            --EXECUTE format('ALTER ROLE %I WITH PASSWORD %L VALID UNTIL now() + interval %L days ;', _usename, _thepassword, _password_lifetime);
+--            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;
             RETURN 0;
@@ -75,6 +76,7 @@ begin
             using errcode = '22023'  -- 22023 = "invalid_parameter_value'
             , detail = 'Check your generated password (' || _thepassword || ') an try again'
             , hint = 'Read the official documentation' ;
+            RETURN 1;
         end if;
     else  
       -- also catches NULL
@@ -83,6 +85,7 @@ begin
       using errcode = '22023'  -- 22023 = "invalid_parameter_value'
           , detail = 'Please call dba.change_my_password function.'
           , hint = 'Invoked function: ' || _invokingfunction ;
+      RETURN 1;
     end if;
 end
 $BODY$;
@@ -90,6 +93,9 @@ $BODY$;
 -- ALTER FUNCTION dba.change_valid_until(text, text) OWNER TO dba;
 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)
     RETURNS integer
     SECURITY INVOKER
@@ -102,12 +108,14 @@ declare
     _usename text := '';
     _useraddress text := '';
     _userapp text := '';
+    _retval integer ;
 begin
     select user into _usename;
     if user = 'postgres' then
         raise exception 'This function should not be run by user postgres'
         using errcode = '22024'  -- 22023 = "invalid_parameter_value'
           , detail = 'Use a named user only.' ;
+      return 1;
     end if;
 
     if length(_password) < _min_password_length then
@@ -117,16 +125,28 @@ begin
       using errcode = '22023'  -- 22023 = "invalid_parameter_value'
           , detail = 'Please check your password.'
           , hint = 'Password must be at least ' || _min_password_length || ' characters.';
+      return 1;
     end if;
 
     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() ;
 
-    PERFORM dba.change_valid_until(_usename, _password) ;
+    --PERFORM dba.change_valid_until(_usename, _password) ;
+    SELECT dba.change_valid_until(_usename, _password)
+        INTO _retval;
+    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;
 end
 $BODY$;