You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
115 lines
3.8 KiB
115 lines
3.8 KiB
From 59b6d50061f3c8e5858230a881267014e8395594 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 4388f286d..75e9836e9 100644 |
|
--- a/js/misc/smartcardManager.js |
|
+++ b/js/misc/smartcardManager.js |
|
@@ -113,6 +113,13 @@ var SmartcardManager = new Lang.Class({ |
|
return false; |
|
|
|
return true; |
|
+ }, |
|
+ |
|
+ loggedInWithToken: function() { |
|
+ if (this._loginToken) |
|
+ return true; |
|
+ |
|
+ return false; |
|
} |
|
|
|
}); |
|
-- |
|
2.14.2 |
|
|
|
|
|
From b25d32c8fef60dec567f05e6681214a6995656fc 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 bae46bfe0..a44184c17 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', |
|
Lang.bind(this, this._updateDefaultService)); |
|
- 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', |
|
Lang.bind(this, this._checkForSmartcard)); |
|
this._smartcardRemovedId = this._smartcardManager.connect('smartcard-removed', |
|
@@ -413,7 +414,9 @@ var ShellUserVerifier = new Lang.Class({ |
|
}, |
|
|
|
_updateDefaultService: function() { |
|
- 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.14.2 |
|
|
|
|
|
From 3309c476c6815e03f17359155f565118a2ad57b2 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 a44184c17..83a12fb6c 100644 |
|
--- a/js/gdm/util.js |
|
+++ b/js/gdm/util.js |
|
@@ -336,6 +336,8 @@ var ShellUserVerifier = new Lang.Class({ |
|
else if (this._preemptingService == SMARTCARD_SERVICE_NAME) |
|
this._preemptingService = null; |
|
|
|
+ this._updateDefaultService(); |
|
+ |
|
this.emit('smartcard-status-changed'); |
|
} |
|
}, |
|
-- |
|
2.14.2 |
|
|
|
|