Add support for reset saved password. Fixes #3074

This commit is contained in:
Akshay Joshi
2018-07-27 14:36:42 +05:30
parent 00139f7750
commit 0138dee989
8 changed files with 126 additions and 13 deletions

View File

@@ -137,7 +137,9 @@ class ServerModule(sg.ServerGroupPluginModule):
db=manager.db,
user=manager.user_info if connected else None,
in_recovery=in_recovery,
wal_pause=wal_paused
wal_pause=wal_paused,
is_password_saved=True if server.password is not None
else False
)
@property
@@ -248,7 +250,8 @@ class ServerNode(PGChildNodeView):
'wal_replay': [{
'delete': 'pause_wal_replay', 'put': 'resume_wal_replay'
}],
'check_pgpass': [{'get': 'check_pgpass'}]
'check_pgpass': [{'get': 'check_pgpass'}],
'reset_server_password': [{'put': 'reset_server_password'}]
})
EXP_IP4 = "^\s*((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\." \
"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\." \
@@ -357,7 +360,9 @@ class ServerNode(PGChildNodeView):
db=manager.db,
user=manager.user_info if connected else None,
in_recovery=in_recovery,
wal_pause=wal_paused
wal_pause=wal_paused,
is_password_saved=True if server.password is not None
else False
)
)
@@ -410,7 +415,9 @@ class ServerNode(PGChildNodeView):
db=manager.db,
user=manager.user_info if connected else None,
in_recovery=in_recovery,
wal_pause=wal_paused
wal_pause=wal_paused,
is_password_saved=True if server.password is not None
else False
)
)
@@ -1440,5 +1447,40 @@ class ServerNode(PGChildNodeView):
)
)
def reset_server_password(self, gid, sid):
"""
This function is used to remove database server password stored into
the pgAdmin's db file.
:param gid:
:param sid:
:return:
"""
try:
server = Server.query.filter_by(
user_id=current_user.id, id=sid
).first()
if server is None:
return make_json_response(
success=0,
info=gettext("Could not find the required server.")
)
setattr(server, 'password', None)
db.session.commit()
except Exception as e:
current_app.logger.error(
"Unable to reset password.\nError: {0}".format(str(e))
)
return internal_server_error(errormsg=str(e))
return make_json_response(
success=1,
info=gettext("Reset server password successfully."),
data={'is_password_saved': False}
)
ServerNode.register_node_view(blueprint)

View File

@@ -107,6 +107,17 @@ define('pgadmin.node.server', [
applies: ['tools', 'context'], callback: 'resume_wal_replay',
category: 'wal_replay_resume', priority: 8, label: gettext('Resume Replay of WAL'),
icon: 'fa fa-play-circle', enable : 'wal_resume_enabled',
},{
name: 'reset_server_password', node: 'server', module: this,
applies: ['file', 'context'], callback: 'reset_server_password',
label: gettext('Reset server password'), icon: 'fa fa-eraser',
enable: function(node) {
if (node && node._type === 'server' &&
node.connected !== true && node.is_password_saved) {
return true;
}
return false;
},
}]);
_.bindAll(this, 'connection_lost');
@@ -596,6 +607,46 @@ define('pgadmin.node.server', [
t.unload(i);
});
},
/* Reset stored database server password */
reset_server_password: function(args){
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined;
if (!d)
return false;
Alertify.confirm(
gettext('Reset server password'),
S(
gettext('Are you sure you want to reset the stored password for server %s?')
).sprintf(d.label).value(),
function() {
$.ajax({
url: obj.generate_url(i, 'reset_server_password', d, true),
method:'PUT',
})
.done(function(res) {
if (res.success == 1) {
Alertify.success(res.info);
t.itemData(i).is_password_saved=res.data.is_password_saved;
}
else {
Alertify.error(res.info);
}
})
.fail(function(xhr, status, error) {
Alertify.pgRespErrorNotify(xhr, error);
});
},
function() { return true; }
);
return false;
},
},
model: pgAdmin.Browser.Node.Model.extend({
defaults: {