Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
71d89c86
Commit
71d89c86
authored
Jun 30, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump idle timeout to 24 hours for emulab classic users (but not admin
users).
parent
5d18e619
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
configure
configure
+1
-1
configure.ac
configure.ac
+1
-1
www/tbauth.php3
www/tbauth.php3
+5
-4
No files found.
configure
View file @
71d89c86
...
...
@@ -5731,7 +5731,7 @@ if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN
=
".
$OURDOMAIN
"
fi
if
test
-z
"
$TBAUTHTIMEOUT
"
;
then
TBAUTHTIMEOUT
=
"
216
00"
TBAUTHTIMEOUT
=
"
864
00"
fi
if
test
-z
"
$WWW
"
;
then
WWW
=
"
$WWWHOST
"
...
...
configure.ac
View file @
71d89c86
...
...
@@ -791,7 +791,7 @@ if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN=".$OURDOMAIN"
fi
if test -z "$TBAUTHTIMEOUT"; then
TBAUTHTIMEOUT="
216
00"
TBAUTHTIMEOUT="
864
00"
fi
if test -z "$WWW"; then
WWW="$WWWHOST"
...
...
www/tbauth.php3
View file @
71d89c86
...
...
@@ -32,7 +32,6 @@ $CHECKLOGIN_UID = 0;
$CHECKLOGIN_IDX
=
null
;
$CHECKLOGIN_NOLOGINS
=
-
1
;
$CHECKLOGIN_WIKINAME
=
""
;
$CHECKLOGIN_IDLETIME
=
0
;
$CHECKLOGIN_HASHKEY
=
null
;
$CHECKLOGIN_HASHHASH
=
null
;
$CHECKLOGIN_USER
=
null
;
...
...
@@ -356,7 +355,6 @@ function LoginStatus() {
$CHECKLOGIN_STATUS
=
CHECKLOGIN_TIMEDOUT
;
return
$CHECKLOGIN_STATUS
;
}
$CHECKLOGIN_IDLETIME
=
time
()
-
(
$timeout
-
$TBAUTHTIMEOUT
);
#
# We know the login has not expired. The problem is that we might not
...
...
@@ -1013,7 +1011,8 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
# the new hash value. If the user is already logged in, thats
# okay; just update it in place with a new hash and timeout.
#
$timeout
=
$now
+
$TBAUTHTIMEOUT
;
# One hour initially, it will get bumped as soon as they hit another page.
$timeout
=
$now
+
3600
;
$hashkey
=
GENHASH
();
# See note in CrossLogin() in db/User.pm.in. Do not change this.
$crc
=
bin2hex
(
mhash
(
MHASH_CRC32
,
$hashkey
));
...
...
@@ -1347,7 +1346,9 @@ function BumpLogoutTime()
global
$TBAUTHTIMEOUT
,
$CHECKLOGIN_HASHKEY
,
$CHECKLOGIN_IDX
;
if
(
!
is_null
(
$CHECKLOGIN_HASHKEY
))
{
$timeout
=
time
()
+
$TBAUTHTIMEOUT
;
$timeout
=
time
()
+
(
ISADMINISTRATOR
()
?
3600
*
24
:
$TBAUTHTIMEOUT
);
$TBAUTHTIMEOUT
;
DBQueryFatal
(
"UPDATE login set timeout='
$timeout
' "
.
"where uid_idx='
$CHECKLOGIN_IDX
' and "
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment