Allow to configure auto logout after browser inactivity #20298

juliushaertl · 2020-04-03T20:54:55Z

With this a a browser will automatically log out the user after no activity during session_lifetime even if the session_keepalive is enabled.

lib/private/Template/JSConfigHelper.php

skjnldsv

Clever approach! Code looks great!

rullzer · 2020-04-06T19:04:21Z

/compile amend /

skjnldsv · 2020-04-07T06:13:01Z

Jsunit says no

"message": "Error: Could not find initial state config of core\nat core/js/dist/main.js:279:1669",
--
997 | "str": "Error: Could not find initial state config of core\nat core/js/dist/main.js:279:1669"
998 | }
999 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.225 secs / 0 secs)
1000 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1001 | {
1002 | "message": "ReferenceError: Can't find variable: OC\nat core/js/tests/specHelper.js:90:3",
1003 | "str": "ReferenceError: Can't find variable: OC\nat core/js/tests/specHelper.js:90:3"
1004 | }
1005 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.227 secs / 0 secs)
1006 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1007 | {
1008 | "message": "ReferenceError: Can't find variable: $\nat core/js/public/publicpage.js:21:3247",
1009 | "str": "ReferenceError: Can't find variable: $\nat core/js/public/publicpage.js:21:3247"
1010 | }
1011 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.228 secs / 0 secs)
1012 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1013 | {
1014 | "message": "ReferenceError: Can't find variable: OC\nat core/js/setupchecks.js:1:31696",
1015 | "str": "ReferenceError: Can't find variable: OC\nat core/js/setupchecks.js:1:31696"
1016 | }
1017 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.228 secs / 0 secs)
1018 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1019 | {
1020 | "message": "ReferenceError: Can't find variable: OCA\nat core/search/js/search.js:21:15042",
1021 | "str": "ReferenceError: Can't find variable: OCA\nat core/search/js/search.js:21:15042"
1022 | }
1023 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.229 secs / 0 secs)
1024 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1025 | {
1026 | "message": "ReferenceError: Can't find variable: OC\nat core/js/mimetype.js:19:8990",
1027 | "str": "ReferenceError: Can't find variable: OC\nat core/js/mimetype.js:19:8990"
1028 | }
1029 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.229 secs / 0 secs)
1030 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1031 | {
1032 | "message": "ReferenceError: Can't find variable: OC\nat core/js/mimetypelist.js:1:646",
1033 | "str": "ReferenceError: Can't find variable: OC\nat core/js/mimetypelist.js:1:646"
1034 | }
1035 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.23 secs / 0 secs)
1036 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1037 | {
1038 | "message": "ReferenceError: Can't find variable: OC\nat core/js/files/fileinfo.js:1:5480",
1039 | "str": "ReferenceError: Can't find variable: OC\nat core/js/files/fileinfo.js:1:5480"
1040 | }
1041 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.23 secs / 0 secs)
1042 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1043 | {
1044 | "message": "ReferenceError: Can't find variable: OC\nat core/js/files/client.js:1:72403",
1045 | "str": "ReferenceError: Can't find variable: OC\nat core/js/files/client.js:1:72403"
1046 | }
1047 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.231 secs / 0 secs)
1048 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1049 | {
1050 | "message": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtags.js:1:4240",
1051 | "str": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtags.js:1:4240"
1052 | }
1053 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.231 secs / 0 secs)
1054 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1055 | {
1056 | "message": "ReferenceError: Can't find variable: Handlebars\nat core/js/systemtags/templates.js:1:29032",
1057 | "str": "ReferenceError: Can't find variable: Handlebars\nat core/js/systemtags/templates.js:1:29032"
1058 | }
1059 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.231 secs / 0 secs)
1060 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1061 | {
1062 | "message": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagmodel.js:1:3585",
1063 | "str": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagmodel.js:1:3585"
1064 | }
1065 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.233 secs / 0 secs)
1066 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1067 | {
1068 | "message": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagscollection.js:1:6710",
1069 | "str": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagscollection.js:1:6710"
1070 | }
1071 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.233 secs / 0 secs)
1072 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1073 | {
1074 | "message": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagsmappingcollection.js:1:4799",
1075 | "str": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagsmappingcollection.js:1:4799"
1076 | }
1077 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.234 secs / 0 secs)
1078 | PhantomJS 2.1.1 (Linux 0.0.0) ERROR
1079 | {
1080 | "message": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagsinputfield.js:1:35435",
1081 | "str": "ReferenceError: Can't find variable: OC\nat core/js/systemtags/systemtagsinputfield.js:1:35435"
1082 | }
1083 | PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.234 secs / 0 secs)

juliushaertl · 2020-04-09T09:32:19Z

@ChristophWurst @skjnldsv Any idea how i could properly mock the loadState call in the legacy js tests?

Otherwise I'd just add a fallback to OC.config in https://github.com/nextcloud/server/pull/20298/files#diff-ec0ce8cb7acc57624086f5f4b6a47998R30 as a quick fix 🙈

skjnldsv · 2020-04-09T09:54:35Z

@ChristophWurst @skjnldsv Any idea how i could properly mock the loadState call in the legacy js tests?

oh wow 🙈
Do the quick fix I guess, Is it later fixable by cleaning?

ChristophWurst · 2020-04-09T14:34:10Z

@ChristophWurst @skjnldsv Any idea how i could properly mock the loadState call in the legacy js tests?

I'm afraid you can't 😢

skjnldsv · 2020-04-11T06:25:39Z

I guess this will be for 20 ?

rullzer · 2020-04-20T17:53:27Z

config/config.sample.php

+ *
+ * Defaults to ``false``
+ */
+'auto_logout' => false,


We should probably make sure that if this is set to true we don't generate a remember me cookie

6052f82 should to the trick, please have a look

ChristophWurst

Looks good otherwise!

core/src/session-heartbeat.js

Signed-off-by: Julius Härtl <jus@bitgrid.net>

rullzer · 2020-04-23T17:42:14Z

Guess this is good to go
mind to rebase @juliushaertl then we can do the merge :)

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl · 2020-04-23T18:21:34Z

So this took me quite some time to figure out why the legacy jsunit tests failed. I pushed a workaround for now (see a143e36 for details), but ideally we should move those tests to the new chai/sinon tests. I'll give that a try in a follow up.

Signed-off-by: Julius Härtl <jus@bitgrid.net>

skjnldsv · 2020-04-24T06:59:08Z

I pushed a workaround for now

It passed

skjnldsv · 2020-04-27T06:38:43Z

So, this recently broke viewer's tests ^^

server/lib/private/Template/JSConfigHelper.php

Lines 97 to 107 in cbd2086

    
           public function __construct(IL10N $l, 
        
           							Defaults $defaults, 
        
           							IAppManager $appManager, 
        
           							ISession $session, 
        
           							$currentUser, 
        
           							IConfig $config, 
        
           							IGroupManager $groupManager, 
        
           							IniGetWrapper $iniWrapper, 
        
           							IURLGenerator $urlGenerator, 
        
           							CapabilitiesManager $capabilitiesManager, 
        
           							IInitialStateService $initialStateService) {

Requires 11 arguments, while 10 are passed here:

server/core/Controller/OCJSController.php

Lines 81 to 92 in 5bf3d1b

    
           $this->helper = new JSConfigHelper( 
        
           	$l10nFactory->get('lib'), 
        
           	$defaults, 
        
           	$appManager, 
        
           	$session, 
        
           	$userSession->getUser(), 
        
           	$config, 
        
           	$groupManager, 
        
           	$iniWrapper, 
        
           	$urlGenerator, 
        
           	$capabilitiesManager 
        
           );

skjnldsv · 2020-04-27T06:41:07Z

Fixing

skjnldsv · 2020-04-27T06:42:38Z

Fix in #20678

juliushaertl added enhancement 3. to review Waiting for reviews labels Apr 3, 2020

juliushaertl added this to the Nextcloud 19 milestone Apr 3, 2020

juliushaertl requested review from rullzer, ChristophWurst, blizzz and skjnldsv April 3, 2020 20:54

skjnldsv reviewed Apr 3, 2020

View reviewed changes

lib/private/Template/JSConfigHelper.php Show resolved Hide resolved

skjnldsv approved these changes Apr 3, 2020

View reviewed changes

rullzer mentioned this pull request Apr 4, 2020

19 beta 2 #20303

Merged

80 tasks

blizzz approved these changes Apr 6, 2020

View reviewed changes

rullzer force-pushed the enh/noid/auto-logout branch from 95d587a to c21af6d Compare April 6, 2020 19:03

npmbuildbot-nextcloud bot force-pushed the enh/noid/auto-logout branch from c21af6d to e311a21 Compare April 6, 2020 19:13

skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 7, 2020

rullzer mentioned this pull request Apr 9, 2020

19 beta 3 #20386

Merged

59 tasks

skjnldsv removed the 4. to release Ready to be released and/or waiting for tests to finish label Apr 11, 2020

This was referenced Apr 15, 2020

19 beta 4 #20506

Merged

19 Beta 5 #20510

Merged

rullzer reviewed Apr 20, 2020

View reviewed changes

juliushaertl force-pushed the enh/noid/auto-logout branch 2 times, most recently from efc016c to 6052f82 Compare April 21, 2020 08:56

ChristophWurst reviewed Apr 21, 2020

View reviewed changes

core/src/session-heartbeat.js Show resolved Hide resolved

rullzer mentioned this pull request Apr 23, 2020

19 beta 6 #20611

Merged

11 tasks

juliushaertl added 4 commits April 23, 2020 19:12

Provide config though initial state service

cbd2086

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add config for auto logout after browser inactivity

9e7f8b8

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add config fallback for legacy tests

84330f1

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Do not create remember me cookie

2eadf9d

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Make sure that the legacy jsunit tests can still inject OC.config

a143e36

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl force-pushed the enh/noid/auto-logout branch from 6052f82 to a143e36 Compare April 23, 2020 18:20

Bump bundles

96db35e

Signed-off-by: Julius Härtl <jus@bitgrid.net>

ChristophWurst approved these changes Apr 24, 2020

View reviewed changes

blizzz merged commit d458fcd into master Apr 24, 2020

blizzz deleted the enh/noid/auto-logout branch April 24, 2020 11:20

skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Apr 27, 2020

skjnldsv mentioned this pull request Apr 27, 2020

Fix missing argument in JSConfigHelper #20678

Merged

szaimen mentioned this pull request Apr 27, 2020

Lock a session with a pin after browser inactivity #20695

Closed

kesselb mentioned this pull request Aug 17, 2021

Make inactive Account logout #11828

Closed

joshtrichards mentioned this pull request Jul 8, 2023

Description of auto_logout could be more clear. nextcloud/documentation#7244

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to configure auto logout after browser inactivity #20298

Allow to configure auto logout after browser inactivity #20298

juliushaertl commented Apr 3, 2020

skjnldsv left a comment

rullzer commented Apr 6, 2020

skjnldsv commented Apr 7, 2020

juliushaertl commented Apr 9, 2020

skjnldsv commented Apr 9, 2020

ChristophWurst commented Apr 9, 2020

skjnldsv commented Apr 11, 2020

rullzer Apr 20, 2020

juliushaertl Apr 21, 2020

ChristophWurst left a comment

rullzer commented Apr 23, 2020

juliushaertl commented Apr 23, 2020

skjnldsv commented Apr 24, 2020

skjnldsv commented Apr 27, 2020

skjnldsv commented Apr 27, 2020

skjnldsv commented Apr 27, 2020

Allow to configure auto logout after browser inactivity #20298

Allow to configure auto logout after browser inactivity #20298

Conversation

juliushaertl commented Apr 3, 2020

skjnldsv left a comment

Choose a reason for hiding this comment

rullzer commented Apr 6, 2020

skjnldsv commented Apr 7, 2020

juliushaertl commented Apr 9, 2020

skjnldsv commented Apr 9, 2020

ChristophWurst commented Apr 9, 2020

skjnldsv commented Apr 11, 2020

rullzer Apr 20, 2020

Choose a reason for hiding this comment

juliushaertl Apr 21, 2020

Choose a reason for hiding this comment

ChristophWurst left a comment

Choose a reason for hiding this comment

rullzer commented Apr 23, 2020

juliushaertl commented Apr 23, 2020

skjnldsv commented Apr 24, 2020

skjnldsv commented Apr 27, 2020

skjnldsv commented Apr 27, 2020

skjnldsv commented Apr 27, 2020