From 35fa42ca56b33073713a2cdc5c3c169d89067d31 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 30 May 2013 10:18:51 -0400 Subject: [PATCH] misc: add code to use settings-daemon smartcard service gnome-settings-daemon monitors smartcard insertion and removal events on the system and then exports a model of the current smartcard topology over the bus using the D-Bus ObjectManager interface. This commit adds the support code needed in gnome-shell to talk to the gnome-settings-daemon service. A future commit will use this code to inform the login screen when a user inserts a smartcard (so it can react appropriately) https://bugzilla.gnome.org/show_bug.cgi?id=683437 --- js/Makefile.am | 1 + js/misc/smartcardManager.js | 117 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 js/misc/smartcardManager.js diff --git a/js/Makefile.am b/js/Makefile.am index ea3f44552..f9a1474c4 100644 --- a/js/Makefile.am +++ b/js/Makefile.am @@ -35,6 +35,7 @@ nobase_dist_js_DATA = \ misc/modemManager.js \ misc/objectManager.js \ misc/params.js \ + misc/smartcardManager.js \ misc/util.js \ perf/core.js \ ui/altTab.js \ diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js new file mode 100644 index 000000000..644b033b2 --- /dev/null +++ b/js/misc/smartcardManager.js @@ -0,0 +1,117 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +const Gio = imports.gi.Gio; +const Lang = imports.lang; +const Shell = imports.gi.Shell; +const Signals = imports.signals; + +const ObjectManager = imports.misc.objectManager; + +const SmartcardTokenIface = + + + + +; + +let _smartcardManager = null; + +function getSmartcardManager() { + if (_smartcardManager == null) + _smartcardManager = new SmartcardManager(); + + return _smartcardManager; +} + +const SmartcardManager = new Lang.Class({ + Name: 'SmartcardManager', + _init: function() { + this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session, + name: "org.gnome.SettingsDaemon.Smartcard", + objectPath: '/org/gnome/SettingsDaemon/Smartcard', + knownInterfaces: [ SmartcardTokenIface ], + onLoaded: Lang.bind(this, this._onLoaded) }); + this._insertedTokens = {}; + this._loginToken = null; + }, + + _onLoaded: function() { + let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token'); + + for (let i = 0; i < tokens.length; i++) + this._addToken(tokens[i]); + + this._objectManager.connect('interface-added', Lang.bind(this, function(objectManager, interfaceName, proxy) { + if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token') + this._addToken(proxy); + })); + + this._objectManager.connect('interface-removed', Lang.bind(this, function(objectManager, interfaceName, proxy) { + if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token') + this._removeToken(proxy); + })); + }, + + _updateToken: function(token) { + let objectPath = token.get_object_path(); + + delete this._insertedTokens[objectPath]; + + if (token.IsInserted) + this._insertedTokens[objectPath] = token; + + if (token.UsedToLogin) + this._loginToken = token; + }, + + _addToken: function(token) { + this._updateToken(token); + + token.connect('g-properties-changed', + Lang.bind(this, function(proxy, properties) { + if ('IsInserted' in properties.deep_unpack()) { + this._updateToken(token); + + if (token.IsInserted) { + this.emit('smartcard-inserted', token); + } else { + this.emit('smartcard-removed', token); + } + } + })); + + // Emit a smartcard-inserted at startup if it's already plugged in + if (token.IsInserted) + this.emit('smartcard-inserted', token); + }, + + _removeToken: function(token) { + let objectPath = token.get_object_path(); + + if (this._insertedTokens[objectPath] == token) { + delete this._insertedTokens[objectPath]; + this.emit('smartcard-removed', token); + } + + if (this._loginToken == token) + this._loginToken = null; + + token.disconnectAll(); + }, + + hasInsertedTokens: function() { + return Object.keys(this._insertedTokens).length > 0; + }, + + hasInsertedLoginToken: function() { + if (!this._loginToken) + return false; + + if (!this._loginToken.IsInserted) + return false; + + return true; + } + +}); +Signals.addSignalMethods(SmartcardManager.prototype);