Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Feeds
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Feeds
Commits
44257b80
Commit
44257b80
authored
8 months ago
by
wn_
Browse files
Options
Downloads
Patches
Plain Diff
Move side effects out of the 'Sessions' constructor.
parent
c7cc3c92
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
classes/Sessions.php
+19
-6
19 additions, 6 deletions
classes/Sessions.php
include/sessions.php
+2
-0
2 additions, 0 deletions
include/sessions.php
with
21 additions
and
6 deletions
classes/Sessions.php
+
19
−
6
View file @
44257b80
<?php
require_once
'lib/gettext/gettext.inc.php'
;
// TODO: look into making this behave closer to what SessionHandlerInterface intends
/**
* @todo look into making this behave closer to what SessionHandlerInterface intends
*/
class
Sessions
implements
\SessionHandlerInterface
{
private
int
$session_expire
;
private
string
$session_name
;
public
function
__construct
()
{
$this
->
session_expire
=
min
(
2147483647
-
time
()
-
1
,
max
(
\Config
::
get
(
\Config
::
SESSION_COOKIE_LIFETIME
),
86400
));
$this
->
session_name
=
\Config
::
get
(
\Config
::
SESSION_NAME
);
$this
->
session_expire
=
min
(
2147483647
-
time
()
-
1
,
max
(
Config
::
get
(
Config
::
SESSION_COOKIE_LIFETIME
),
86400
));
$this
->
session_name
=
Config
::
get
(
Config
::
SESSION_NAME
);
}
if
(
\Config
::
is_server_https
())
{
/**
* Adjusts session-related PHP configuration options
*/
public
function
configure
():
void
{
if
(
Config
::
is_server_https
())
{
ini_set
(
'session.cookie_secure'
,
'true'
);
}
...
...
@@ -19,10 +26,15 @@ class Sessions implements \SessionHandlerInterface {
ini_set
(
'session.use_only_cookies'
,
'true'
);
ini_set
(
'session.gc_maxlifetime'
,
$this
->
session_expire
);
ini_set
(
'session.cookie_lifetime'
,
'0'
);
}
// prolong PHP session cookie
/**
* Extend the validity of the PHP session cookie (if it exists)
* @return bool Whether the new cookie was set successfully
*/
public
function
extend_session
():
bool
{
if
(
isset
(
$_COOKIE
[
$this
->
session_name
]))
{
setcookie
(
$this
->
session_name
,
return
setcookie
(
$this
->
session_name
,
$_COOKIE
[
$this
->
session_name
],
time
()
+
$this
->
session_expire
,
ini_get
(
'session.cookie_path'
),
...
...
@@ -30,6 +42,7 @@ class Sessions implements \SessionHandlerInterface {
ini_get
(
'session.cookie_secure'
),
ini_get
(
'session.cookie_httponly'
));
}
return
false
;
}
public
function
open
(
string
$path
,
string
$name
):
bool
{
...
...
This diff is collapsed.
Click to expand it.
include/sessions.php
+
2
−
0
View file @
44257b80
...
...
@@ -5,6 +5,8 @@ require_once 'autoload.php';
require_once
'errorhandler.php'
;
$sessions
=
new
\Sessions
;
$sessions
->
configure
();
$sessions
->
extend_session
();
if
(
\Config
::
get_schema_version
()
>=
0
)
{
session_set_save_handler
(
$sessions
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment