meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

fix gopass_stage

Browse source
This commit is contained in:
jem 2020-06-04 12:48:18 +02:00
parent 610737e458
commit a57826b2a2
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/python/ddadevops/aws_rds_pg_mixin.py
View file

@ -40,37 +40,28 @@ class AwsRdsPgMixin(DevopsBuild):
return result return result
def alter_db_user_password(self, gopass_path): def alter_db_user_password(self, gopass_path):
user_name = gopass_field_from_path( user_name = gopass_field_from_path(gopass_path, 'user')
self.gopass_stage() + gopass_path, 'user') user_old_password = gopass_field_from_path(gopass_path, 'old-password')
user_old_password = gopass_field_from_path( user_new_password = gopass_password_from_path(gopass_path)
self.gopass_stage() + gopass_path, 'old-password')
user_new_password = gopass_password_from_path(
self.gopass_stage() + gopass_path)
self.execute_pg_rds_sql(user_name, user_old_password, self.execute_pg_rds_sql(user_name, user_old_password,
"ALTER ROLE " + user_name + " WITH PASSWORD '" + user_new_password + "';") "ALTER ROLE " + user_name + " WITH PASSWORD '" + user_new_password + "';")
print("changed password:", self.gopass_stage(), ',', user_name) print("changed password:", user_name)
def add_new_user(self, gopass_path_superuser, gopass_path_new_user, group_role): def add_new_user(self, gopass_path_superuser, gopass_path_new_user, group_role):
superuser_name = gopass_field_from_path( superuser_name = gopass_field_from_path(gopass_path_superuser, 'user')
self.gopass_stage() + gopass_path_superuser, 'user') superuser_password = gopass_password_from_path(gopass_path_superuser)
superuser_password = gopass_password_from_path( new_user_name = gopass_field_from_path(gopass_path_new_user, 'user')
self.gopass_stage() + gopass_path_superuser) new_user_password = gopass_password_from_path(gopass_path_new_user)
new_user_name = gopass_field_from_path(
self.gopass_stage() + gopass_path_new_user, 'user')
new_user_password = gopass_password_from_path(
self.gopass_stage() + gopass_path_new_user)
self.execute_pg_rds_sql(superuser_name, superuser_password, self.execute_pg_rds_sql(superuser_name, superuser_password,
"CREATE ROLE " + new_user_name + " WITH LOGIN INHERIT PASSWORD '" + new_user_password + "';" + "CREATE ROLE " + new_user_name + " WITH LOGIN INHERIT PASSWORD '" + new_user_password + "';" +
"GRANT " + group_role + " TO " + new_user_name + ";") "GRANT " + group_role + " TO " + new_user_name + ";")
print("created user:", self.gopass_stage(), ',', new_user_name) print("created user:", new_user_name)
def deactivate_user(self, gopass_path_superuser, to_remove_user_name): def deactivate_user(self, gopass_path_superuser, to_remove_user_name):
superuser_name = gopass_field_from_path( superuser_name = gopass_field_from_path(gopass_path_superuser, 'user')
self.gopass_stage() + gopass_path_superuser, 'user') superuser_password = gopass_password_from_path(gopass_path_superuser)
superuser_password = gopass_password_from_path(
self.gopass_stage() + gopass_path_superuser)
owned_by_wrong_user = self.execute_pg_rds_sql(superuser_name, superuser_password, owned_by_wrong_user = self.execute_pg_rds_sql(superuser_name, superuser_password,
"SELECT count(*) FROM pg_class c, pg_user u WHERE c.relowner = u.usesysid " + "SELECT count(*) FROM pg_class c, pg_user u WHERE c.relowner = u.usesysid " +