116 lines
3.8 KiB
Diff
116 lines
3.8 KiB
Diff
|
From 483ac09afb6503432e48bc30a57194a490ec98c9 Mon Sep 17 00:00:00 2001
|
||
|
From: Ray Strode <rstrode@redhat.com>
|
||
|
Date: Mon, 28 Sep 2015 10:57:02 -0400
|
||
|
Subject: [PATCH 1/3] smartcardManager: add way to detect if user logged using
|
||
|
(any) token
|
||
|
|
||
|
If a user uses a token at login time, we need to make sure they continue
|
||
|
to use the token at unlock time.
|
||
|
|
||
|
As a prerequisite for addressing that problem we need to know up front
|
||
|
if a user logged in with a token at all.
|
||
|
|
||
|
This commit adds the necessary api to detect that case.
|
||
|
---
|
||
|
js/misc/smartcardManager.js | 7 +++++++
|
||
|
1 file changed, 7 insertions(+)
|
||
|
|
||
|
diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js
|
||
|
index 60808b371..a9a748fb3 100644
|
||
|
--- a/js/misc/smartcardManager.js
|
||
|
+++ b/js/misc/smartcardManager.js
|
||
|
@@ -112,6 +112,13 @@ var SmartcardManager = new Lang.Class({
|
||
|
return false;
|
||
|
|
||
|
return true;
|
||
|
+ },
|
||
|
+
|
||
|
+ loggedInWithToken() {
|
||
|
+ if (this._loginToken)
|
||
|
+ return true;
|
||
|
+
|
||
|
+ return false;
|
||
|
}
|
||
|
|
||
|
});
|
||
|
--
|
||
|
2.20.1
|
||
|
|
||
|
|
||
|
From 5da6b6393ac89eaae91d2b250fb432c7e1cbe676 Mon Sep 17 00:00:00 2001
|
||
|
From: Ray Strode <rstrode@redhat.com>
|
||
|
Date: Mon, 28 Sep 2015 19:56:53 -0400
|
||
|
Subject: [PATCH 2/3] gdm: only unlock with smartcard, if smartcard used for
|
||
|
login
|
||
|
|
||
|
If a smartcard is used for login, we need to make sure the smartcard
|
||
|
gets used for unlock, too.
|
||
|
---
|
||
|
js/gdm/util.js | 7 +++++--
|
||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/js/gdm/util.js b/js/gdm/util.js
|
||
|
index 261e1e433..3d6d69c10 100644
|
||
|
--- a/js/gdm/util.js
|
||
|
+++ b/js/gdm/util.js
|
||
|
@@ -134,7 +134,6 @@ var ShellUserVerifier = new Lang.Class({
|
||
|
this._settings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
|
||
|
this._settings.connect('changed',
|
||
|
this._updateDefaultService.bind(this));
|
||
|
- this._updateDefaultService();
|
||
|
|
||
|
this._fprintManager = Fprint.FprintManager();
|
||
|
this._smartcardManager = SmartcardManager.getSmartcardManager();
|
||
|
@@ -146,6 +145,8 @@ var ShellUserVerifier = new Lang.Class({
|
||
|
this.smartcardDetected = false;
|
||
|
this._checkForSmartcard();
|
||
|
|
||
|
+ this._updateDefaultService();
|
||
|
+
|
||
|
this._smartcardInsertedId = this._smartcardManager.connect('smartcard-inserted',
|
||
|
this._checkForSmartcard.bind(this));
|
||
|
this._smartcardRemovedId = this._smartcardManager.connect('smartcard-removed',
|
||
|
@@ -412,7 +413,9 @@ var ShellUserVerifier = new Lang.Class({
|
||
|
},
|
||
|
|
||
|
_updateDefaultService() {
|
||
|
- if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
|
||
|
+ if (this._smartcardManager.loggedInWithToken())
|
||
|
+ this._defaultService = SMARTCARD_SERVICE_NAME;
|
||
|
+ else if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
|
||
|
this._defaultService = PASSWORD_SERVICE_NAME;
|
||
|
else if (this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
|
||
|
this._defaultService = SMARTCARD_SERVICE_NAME;
|
||
|
--
|
||
|
2.20.1
|
||
|
|
||
|
|
||
|
From 1d6de184a8bfbd54b9472eea822380b89f70509a Mon Sep 17 00:00:00 2001
|
||
|
From: Ray Strode <rstrode@redhat.com>
|
||
|
Date: Mon, 28 Sep 2015 19:57:36 -0400
|
||
|
Subject: [PATCH 3/3] gdm: update default service when smartcard inserted
|
||
|
|
||
|
Early on at start up we may not know if a smartcard is
|
||
|
available. Make sure we reupdate the default service
|
||
|
after we get a smartcard insertion event.
|
||
|
---
|
||
|
js/gdm/util.js | 2 ++
|
||
|
1 file changed, 2 insertions(+)
|
||
|
|
||
|
diff --git a/js/gdm/util.js b/js/gdm/util.js
|
||
|
index 3d6d69c10..f5f9d5e5d 100644
|
||
|
--- a/js/gdm/util.js
|
||
|
+++ b/js/gdm/util.js
|
||
|
@@ -335,6 +335,8 @@ var ShellUserVerifier = new Lang.Class({
|
||
|
else if (this._preemptingService == SMARTCARD_SERVICE_NAME)
|
||
|
this._preemptingService = null;
|
||
|
|
||
|
+ this._updateDefaultService();
|
||
|
+
|
||
|
this.emit('smartcard-status-changed');
|
||
|
}
|
||
|
},
|
||
|
--
|
||
|
2.20.1
|
||
|
|