Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simplesamlphp
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Perun
Perun ProxyIdP
v1
simplesamlphp
Commits
a48e10f6
Commit
a48e10f6
authored
9 years ago
by
Jaime Perez Crespo
Browse files
Options
Downloads
Patches
Plain Diff
Make sure sessions are saved always before any output is sent to the browser. This fixes #260.
parent
ac3510e6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/SimpleSAML/Session.php
+59
-13
59 additions, 13 deletions
lib/SimpleSAML/Session.php
with
59 additions
and
13 deletions
lib/SimpleSAML/Session.php
+
59
−
13
View file @
a48e10f6
...
...
@@ -74,6 +74,14 @@ class SimpleSAML_Session
private
$dirty
=
false
;
/**
* Tells the session object that the save callback has been registered and there's no need to register it again.
*
* @var bool
*/
private
$callback_registered
=
false
;
/**
* This is an array of objects which will expire automatically after a set time. It is used
* where one needs to store some information - for example a logout request, but doesn't
...
...
@@ -139,7 +147,7 @@ class SimpleSAML_Session
$this
->
trackid
=
bin2hex
(
openssl_random_pseudo_bytes
(
5
));
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
// initialize data for session check function if defined
$globalConfig
=
SimpleSAML_Configuration
::
getInstance
();
...
...
@@ -285,17 +293,22 @@ class SimpleSAML_Session
}
/**
* Destructor for this class. It will save the session to the session handler
* in case the session has been marked as dirty. Do nothing otherwise.
* Save the session to the store.
*
* This method saves the session to the session handler in case it has been marked as dirty.
*
* WARNING: please do not use this method directly unless you really need to and know what you are doing. Use
* markDirty() instead.
*/
public
function
__destruct
()
public
function
save
()
{
if
(
!
$this
->
dirty
)
{
// session hasn't changed
-
don't bother saving it
// session hasn't changed
,
don't bother saving it
return
;
}
$this
->
dirty
=
false
;
$this
->
callback_registered
=
false
;
$sh
=
SimpleSAML_SessionHandler
::
getSessionHandler
();
...
...
@@ -310,6 +323,39 @@ class SimpleSAML_Session
}
}
/**
* Mark this session as dirty.
*
* This method will register a callback to save the session right before any output is sent to the browser.
*/
public
function
markDirty
()
{
$this
->
dirty
=
true
;
if
(
!
function_exists
(
'header_register_callback'
))
{
// PHP version < 5.4, can't register the callback
return
;
}
if
(
$this
->
callback_registered
)
{
// we already have a shutdown callback registered for this object, no need to add another one
return
;
}
$this
->
callback_registered
=
header_register_callback
(
array
(
$this
,
'save'
));
}
/**
* Destroy the session.
*
* Destructor for this class. It will save the session to the session handler
* in case the session has been marked as dirty. Do nothing otherwise.
*/
public
function
__destruct
()
{
$this
->
save
();
}
/**
* Retrieve the session ID of this session.
*
...
...
@@ -385,7 +431,7 @@ class SimpleSAML_Session
SimpleSAML_Logger
::
debug
(
'Session: doLogin("'
.
$authority
.
'")'
);
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
if
(
isset
(
$this
->
authData
[
$authority
]))
{
// we are already logged in, log the user out first
...
...
@@ -443,7 +489,7 @@ class SimpleSAML_Session
return
;
}
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
$this
->
callLogoutHandlers
(
$authority
);
unset
(
$this
->
authData
[
$authority
]);
...
...
@@ -554,7 +600,7 @@ class SimpleSAML_Session
assert
(
'isset($this->authData[$authority])'
);
assert
(
'is_int($expire) || is_null($expire)'
);
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
if
(
$expire
===
null
)
{
$globalConfig
=
SimpleSAML_Configuration
::
getInstance
();
...
...
@@ -587,7 +633,7 @@ class SimpleSAML_Session
}
$this
->
authData
[
$authority
][
'LogoutHandlers'
][]
=
$logout_handler
;
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
}
/**
...
...
@@ -612,7 +658,7 @@ class SimpleSAML_Session
}
unset
(
$this
->
dataStore
[
$type
][
$id
]);
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
}
/**
...
...
@@ -677,7 +723,7 @@ class SimpleSAML_Session
$this
->
dataStore
[
$type
][
$id
]
=
$dataInfo
;
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
}
/**
...
...
@@ -836,7 +882,7 @@ class SimpleSAML_Session
$this
->
associations
[
$idp
][
$association
[
'id'
]]
=
$association
;
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
}
...
...
@@ -899,7 +945,7 @@ class SimpleSAML_Session
unset
(
$this
->
associations
[
$idp
][
$associationId
]);
$this
->
dirty
=
true
;
$this
->
markDirty
()
;
}
...
...
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