brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loginDialog: Close conflicting session dialog after 60 secs

Browse Source 
When the stop conflicting session dialog is opened, use a timeout of 60
seconds to close it.
This is an attempt to keep security in the situation where the user leaves,
the system is left unsupervised and the dialog is opened; allowing anyone
to stop the old session and start a new session.

When the dialog is closed by the timeout, a notification apperars informing
about that.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3134>
This commit is contained in:
Joan Torres 2024-02-12 18:10:25 +01:00 committed by Ray Strode
parent df84854d90
commit 578878e759
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/gdm/loginDialog.js
View File

@ -36,6 +36,7 @@ import * as GdmUtil from './util.js';
import * as Layout from '../ui/layout.js'; import * as Layout from '../ui/layout.js';
import * as LoginManager from '../misc/loginManager.js'; import * as LoginManager from '../misc/loginManager.js';
import * as Main from '../ui/main.js'; import * as Main from '../ui/main.js';
import * as MessageTray from '../ui/messageTray.js';
import * as ModalDialog from '../ui/modalDialog.js'; import * as ModalDialog from '../ui/modalDialog.js';
import * as PopupMenu from '../ui/popupMenu.js'; import * as PopupMenu from '../ui/popupMenu.js';
import * as Realmd from './realmd.js'; import * as Realmd from './realmd.js';
@ -44,6 +45,7 @@ import * as UserWidget from '../ui/userWidget.js';
const _FADE_ANIMATION_TIME = 250; const _FADE_ANIMATION_TIME = 250;
const _SCROLL_ANIMATION_TIME = 500; const _SCROLL_ANIMATION_TIME = 500;
const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0; const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
const _CONFLICTING_SESSION_DIALOG_TIMEOUT = 60;
export const UserListItem = GObject.registerClass({ export const UserListItem = GObject.registerClass({
Signals: {'activate': {}}, Signals: {'activate': {}},
@ -1071,6 +1073,22 @@ export const LoginDialog = GObject.registerClass({
}, this); }, this);
} }
_notifyConflictingSessionDialogClosed(userName) {
const source = new MessageTray.SystemNotificationSource();
Main.messageTray.add(source);
this._conflictingSessionNotification = new MessageTray.Notification(source,
_('Stop conflicting session dialog closed'),
_('Try to login again to start a session for user %s.').format(userName));
this._conflictingSessionNotification.setUrgency(MessageTray.Urgency.CRITICAL);
this._conflictingSessionNotification.setTransient(true);
this._conflictingSessionNotification.connect('destroy', () => {
this._conflictingSessionNotification = null;
});
source.showNotification(this._conflictingSessionNotification);
}
_showConflictingSessionDialog(serviceName, conflictingSession) { _showConflictingSessionDialog(serviceName, conflictingSession) {
let conflictingSessionDialog = new ConflictingSessionDialog(conflictingSession, let conflictingSessionDialog = new ConflictingSessionDialog(conflictingSession,
this._greeterSessionProxy, this._greeterSessionProxy,
@ -1092,6 +1110,17 @@ export const LoginDialog = GObject.registerClass({
} }
}, conflictingSessionDialog); }, conflictingSessionDialog);
const closeDialogTimeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, _CONFLICTING_SESSION_DIALOG_TIMEOUT, () => {
this._notifyConflictingSessionDialogClosed(this._user.get_user_name());
conflictingSessionDialog.close();
this._authPrompt.reset();
return GLib.SOURCE_REMOVE;
});
conflictingSessionDialog.connect('closed', () => {
GLib.source_remove(closeDialogTimeoutId);
});
conflictingSessionDialog.open(); conflictingSessionDialog.open();
} }
@ -1333,6 +1362,9 @@ export const LoginDialog = GObject.registerClass({
this._updateCancelButton(); this._updateCancelButton();
if (this._conflictingSessionNotification)
this._conflictingSessionNotification.destroy();
const batch = new Batch.ConcurrentBatch(this, [ const batch = new Batch.ConcurrentBatch(this, [
GdmUtil.cloneAndFadeOutActor(this._userSelectionBox), GdmUtil.cloneAndFadeOutActor(this._userSelectionBox),
this._beginVerificationForItem(activatedItem), this._beginVerificationForItem(activatedItem),