Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't call session_start() after ini_set() #3315

Merged
merged 1 commit into from
May 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/Icinga/Web/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Session
public static function create(BaseSession $session = null)
{
if ($session === null) {
self::$session = new PhpSession();
self::$session = PhpSession::create();
} else {
self::$session = $session;
}
Expand Down
37 changes: 37 additions & 0 deletions library/Icinga/Web/Session/Php72Session.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php
/* Icinga Web 2 | (c) 2017 Icinga Development Team | GPLv2+ */

namespace Icinga\Web\Session;

use Icinga\Application\Logger;
use Icinga\Exception\ConfigurationError;
use Icinga\Web\Cookie;

/**
* Session implementation in PHP
*/
class Php72Session extends PhpSession
{
/**
* Open a PHP session
*/
protected function open()
{
session_name($this->sessionName);

$cookie = new Cookie('bogus');
session_set_cookie_params(
0,
$cookie->getPath(),
$cookie->getDomain(),
$cookie->isSecure(),
true
);

session_start(array(
'use_cookies' => true,
'use_only_cookies' => true,
'use_trans_sid' => false
));
}
}
15 changes: 15 additions & 0 deletions library/Icinga/Web/Session/PhpSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,21 @@ class PhpSession extends Session
*/
protected $sessionName = 'Icingaweb2';

/**
* Create a new PHPSession object using the provided options (if any)
*
* @param array $options An optional array of ini options to set
*
* @return static
*
* @throws ConfigurationError
* @see http://php.net/manual/en/session.configuration.php
*/
public static function create(array $options = null)
{
return version_compare(PHP_VERSION, '7.2.0') < 0 ? new self($options) : new Php72Session($options);
}

/**
* Create a new PHPSession object using the provided options (if any)
*
Expand Down
2 changes: 1 addition & 1 deletion test/php/library/Icinga/Web/Session/PhpSessionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ private function getSession()
if (!is_writable('/tmp')) {
$this->markTestSkipped('Could not write to session directory');
}
return new PhpSession(
return PhpSession::create(
array(
'use_cookies' => false,
'save_path' => '/tmp',
Expand Down