networkAgent: pass VPN hints to auth dialogs
Indicate to NetworkManager that the Shell's agent supports VPN hints, and pass those hints to VPN auth dialogs that also indicate that they support hints. VPN plugins can request new secrets, for example if the previous ones are incorrect (eg, user mis-typed the password) or some other reason (next token code required to re-sync a hardware token). The specific secret that the VPN wants, and a VPN-specific message, are passed in hints from the plugin, to NetworkManager, to the agent (GNOME Shell) and then to the auth dialog. https://bugzilla.gnome.org/show_bug.cgi?id=737592
This commit is contained in:
parent
e6cd112379
commit
926de53c0c
@ -380,6 +380,12 @@ const VPNRequestHandler = new Lang.Class({
|
|||||||
argv.push('-i');
|
argv.push('-i');
|
||||||
if (flags & NMClient.SecretAgentGetSecretsFlags.REQUEST_NEW)
|
if (flags & NMClient.SecretAgentGetSecretsFlags.REQUEST_NEW)
|
||||||
argv.push('-r');
|
argv.push('-r');
|
||||||
|
if (authHelper.supportsHints) {
|
||||||
|
for (let i = 0; i < hints.length; i++) {
|
||||||
|
argv.push('-t');
|
||||||
|
argv.push(hints[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this._newStylePlugin = authHelper.externalUIMode;
|
this._newStylePlugin = authHelper.externalUIMode;
|
||||||
|
|
||||||
@ -598,7 +604,9 @@ const NetworkAgent = new Lang.Class({
|
|||||||
Name: 'NetworkAgent',
|
Name: 'NetworkAgent',
|
||||||
|
|
||||||
_init: function() {
|
_init: function() {
|
||||||
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent' });
|
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
|
||||||
|
capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
|
||||||
|
});
|
||||||
|
|
||||||
this._dialogs = { };
|
this._dialogs = { };
|
||||||
this._vpnRequests = { };
|
this._vpnRequests = { };
|
||||||
@ -698,16 +706,23 @@ const NetworkAgent = new Lang.Class({
|
|||||||
let service = keyfile.get_string('VPN Connection', 'service');
|
let service = keyfile.get_string('VPN Connection', 'service');
|
||||||
let binary = keyfile.get_string('GNOME', 'auth-dialog');
|
let binary = keyfile.get_string('GNOME', 'auth-dialog');
|
||||||
let externalUIMode = false;
|
let externalUIMode = false;
|
||||||
|
let hints = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
|
externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
|
||||||
} catch(e) { } // ignore errors if key does not exist
|
} catch(e) { } // ignore errors if key does not exist
|
||||||
|
|
||||||
|
try {
|
||||||
|
hints = keyfile.get_boolean('GNOME', 'supports-hints');
|
||||||
|
} catch(e) { } // ignore errors if key does not exist
|
||||||
|
|
||||||
let path = binary;
|
let path = binary;
|
||||||
if (!GLib.path_is_absolute(path)) {
|
if (!GLib.path_is_absolute(path)) {
|
||||||
path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
|
path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
|
if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
|
||||||
this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };
|
this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode, supportsHints: hints };
|
||||||
else
|
else
|
||||||
throw new Error('VPN plugin at %s is not executable'.format(path));
|
throw new Error('VPN plugin at %s is not executable'.format(path));
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
|
Loading…
Reference in New Issue
Block a user