Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5461)

Unified Diff: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

Issue 1983433002: Add timeout for SAML webcam logins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@saml-ui
Patch Set: fix comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/screen_gaia_signin.js
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
index 4c60e44b4aca827fd883bf3c6446e6444c260618..4abf255e226e5ad08acc32f6e7a75d63650396d0 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -27,6 +27,11 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
// online.
/** @const */ var IDLE_TIME_CHECK_FREQUENCY = 5 * 1000;
+ // Amount of time allowed for video based SAML logins, to prevent a site
+ // from keeping the camera on indefinitely. This is a hard deadline and
+ // it will not be extended by user activity.
+ /** @const */ var VIDEO_LOGIN_TIMEOUT = 180 * 1000;
+
/**
* The modes this screen can be in.
* @enum {integer}
@@ -82,6 +87,13 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
loadAnimationGuardTimer_: undefined,
/**
+ * Timer id of the video login timer.
+ * @type {number}
+ * @private
+ */
+ videoTimer_: undefined,
+
+ /**
* Whether we've processed 'showView' message - either from GAIA or from
* guard timer.
* @type {boolean}
@@ -624,6 +636,16 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
},
/**
+ * Clean up from a video-enabled SAML flow.
+ */
+ clearVideoTimer_: function() {
+ if (this.videoTimer_ !== undefined) {
+ clearTimeout(this.videoTimer_);
+ this.videoTimer_ = undefined;
+ }
+ },
+
+ /**
* Invoked when the authDomain property is changed on the GAIA host.
*/
onAuthDomainChange_: function() {
@@ -635,6 +657,12 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
*/
onVideoEnabledChange_: function() {
this.updateSamlNotice_();
+ if (this.gaiaAuthHost_.videoEnabled && this.videoTimer_ === undefined) {
+ this.videoTimer_ = setTimeout(this.cancel.bind(this),
+ VIDEO_LOGIN_TIMEOUT);
+ } else {
+ this.clearVideoTimer_();
+ }
},
/**
@@ -855,6 +883,7 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
// Clear any error messages that were shown before login.
Oobe.clearErrors();
+ this.clearVideoTimer_();
this.authCompleted_ = true;
this.updateControlsState();
},
@@ -948,6 +977,7 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
* Called when user canceled signin.
*/
cancel: function() {
+ this.clearVideoTimer_();
if (!this.navigation_.refreshVisible && !this.navigation_.closeVisible)
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698