1) Fixed an issue where the user is not warned if Kerberos ticket expiration

is less than 30 min while initiating a global backup. Fixes #6444

2) Ensure that proper identification should be there when the server is
   connected using Kerberos or without Kerberos. Fixes #6445
This commit is contained in:
Khushboo Vashi
2021-05-14 12:33:01 +05:30
committed by Akshay Joshi
parent 7ed97eeec4
commit 7275ce906e
6 changed files with 47 additions and 3 deletions
@@ -255,6 +255,7 @@ class ServerModule(sg.ServerGroupPluginModule):
user_name=server.username,
shared=server.shared,
is_kerberos_conn=bool(server.kerberos_conn),
gss_authenticated=manager.gss_authenticated
)
@property
@@ -549,7 +550,8 @@ class ServerNode(PGChildNodeView):
errmsg=errmsg,
user_name=server.username,
shared=server.shared,
is_kerberos_conn=bool(server.kerberos_conn)
is_kerberos_conn=bool(server.kerberos_conn),
gss_authenticated=manager.gss_authenticated
)
)
@@ -617,7 +619,8 @@ class ServerNode(PGChildNodeView):
errmsg=errmsg,
shared=server.shared,
user_name=server.username,
is_kerberos_conn=bool(server.kerberos_conn)
is_kerberos_conn=bool(server.kerberos_conn),
gss_authenticated=manager.gss_authenticated
),
)
@@ -991,6 +994,8 @@ class ServerNode(PGChildNodeView):
if server.tunnel_identity_file else None,
'tunnel_authentication': tunnel_authentication,
'kerberos_conn': bool(server.kerberos_conn),
'gss_authenticated': manager.gss_authenticated,
'gss_encrypted': manager.gss_encrypted
}
return ajax_response(response)
@@ -1162,6 +1167,8 @@ class ServerNode(PGChildNodeView):
if manager and manager.version
else None,
is_kerberos_conn=bool(server.kerberos_conn),
gss_authenticated=manager.gss_authenticated if
manager and manager.gss_authenticated else False
)
)
@@ -1478,6 +1485,7 @@ class ServerNode(PGChildNodeView):
'is_tunnel_password_saved': True
if server.tunnel_password is not None else False,
'is_kerberos_conn': bool(server.kerberos_conn),
'gss_authenticated': manager.gss_authenticated
}
)
@@ -910,6 +910,16 @@ define('pgadmin.node.server', [
group: gettext('Connection'), 'options': {
'onText': gettext('True'), 'offText': gettext('False'), 'size': 'mini',
}
},{
id: 'gss_authenticated', label: gettext('GSS authenticated?'), type: 'switch',
group: gettext('Connection'), 'options': {
'onText': gettext('True'), 'offText': gettext('False'), 'size': 'mini',
}, mode: ['properties'], visible: 'isConnected'
},{
id: 'gss_encrypted', label: gettext('GSS encrypted?'), type: 'switch',
group: gettext('Connection'), 'options': {
'onText': gettext('True'), 'offText': gettext('False'), 'size': 'mini',
}, mode: ['properties'], visible: 'isConnected',
},{
id: 'password', label: gettext('Password'), type: 'password', maxlength: null,
group: gettext('Connection'), control: 'input', mode: ['create'],