Skip to content
Snippets Groups Projects
Commit e374df4b authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Minor formatting issues.

parent 9c3d26ab
No related branches found
No related tags found
No related merge requests found
...@@ -68,7 +68,9 @@ class Auth ...@@ -68,7 +68,9 @@ class Auth
$as = new \SimpleSAML_Auth_Simple('admin'); $as = new \SimpleSAML_Auth_Simple('admin');
$as->login(); $as->login();
} else { } else {
throw new \SimpleSAML_Error_Exception('Cannot find "admin" auth source, and admin privileges are required.'); throw new \SimpleSAML_Error_Exception(
'Cannot find "admin" auth source, and admin privileges are required.'
);
} }
} }
} }
\ No newline at end of file
...@@ -71,21 +71,28 @@ class System ...@@ -71,21 +71,28 @@ class System
{ {
$globalConfig = \SimpleSAML_Configuration::getInstance(); $globalConfig = \SimpleSAML_Configuration::getInstance();
$tempDir = rtrim($globalConfig->getString('tempdir', sys_get_temp_dir().DIRECTORY_SEPARATOR.'simplesaml'), $tempDir = rtrim(
DIRECTORY_SEPARATOR); $globalConfig->getString(
'tempdir',
sys_get_temp_dir().DIRECTORY_SEPARATOR.'simplesaml'
),
DIRECTORY_SEPARATOR
);
if (!is_dir($tempDir)) { if (!is_dir($tempDir)) {
if (!mkdir($tempDir, 0700, true)) { if (!mkdir($tempDir, 0700, true)) {
$error = error_get_last(); $error = error_get_last();
throw new \SimpleSAML_Error_Exception('Error creating temporary directory "'.$tempDir. throw new \SimpleSAML_Error_Exception(
'": '.$error['message']); 'Error creating temporary directory "'.$tempDir.'": '.$error['message']
);
} }
} elseif (function_exists('posix_getuid')) { } elseif (function_exists('posix_getuid')) {
// check that the owner of the temp directory is the current user // check that the owner of the temp directory is the current user
$stat = lstat($tempDir); $stat = lstat($tempDir);
if ($stat['uid'] !== posix_getuid()) { if ($stat['uid'] !== posix_getuid()) {
throw new \SimpleSAML_Error_Exception('Temporary directory "'.$tempDir. throw new \SimpleSAML_Error_Exception(
'" does not belong to the current user.'); 'Temporary directory "'.$tempDir.'" does not belong to the current user.'
);
} }
} }
...@@ -174,24 +181,27 @@ class System ...@@ -174,24 +181,27 @@ class System
$res = @file_put_contents($tmpFile, $data); $res = @file_put_contents($tmpFile, $data);
if ($res === false) { if ($res === false) {
$error = error_get_last(); $error = error_get_last();
throw new \SimpleSAML_Error_Exception('Error saving file "'.$tmpFile. throw new \SimpleSAML_Error_Exception(
'": '.$error['message']); 'Error saving file "'.$tmpFile.'": '.$error['message']
);
} }
if (self::getOS() !== self::WINDOWS) { if (self::getOS() !== self::WINDOWS) {
if (!chmod($tmpFile, $mode)) { if (!chmod($tmpFile, $mode)) {
unlink($tmpFile); unlink($tmpFile);
$error = error_get_last(); $error = error_get_last();
throw new \SimpleSAML_Error_Exception('Error changing file mode of "'.$tmpFile. throw new \SimpleSAML_Error_Exception(
'": '.$error['message']); 'Error changing file mode of "'.$tmpFile.'": '.$error['message']
);
} }
} }
if (!rename($tmpFile, $filename)) { if (!rename($tmpFile, $filename)) {
unlink($tmpFile); unlink($tmpFile);
$error = error_get_last(); $error = error_get_last();
throw new \SimpleSAML_Error_Exception('Error moving "'.$tmpFile.'" to "'. throw new \SimpleSAML_Error_Exception(
$filename.'": '.$error['message']); 'Error moving "'.$tmpFile.'" to "'.$filename.'": '.$error['message']
);
} }
} }
} }
...@@ -230,7 +230,7 @@ class XML ...@@ -230,7 +230,7 @@ class XML
try { try {
$doc = \SAML2_DOMDocumentFactory::fromString($xml); $doc = \SAML2_DOMDocumentFactory::fromString($xml);
} catch(\Exception $e) { } catch (\Exception $e) {
throw new \DOMException('Error parsing XML string.'); throw new \DOMException('Error parsing XML string.');
} }
...@@ -405,7 +405,7 @@ class XML ...@@ -405,7 +405,7 @@ class XML
try { try {
$dom = \SAML2_DOMDocumentFactory::fromString($xml); $dom = \SAML2_DOMDocumentFactory::fromString($xml);
$res = true; $res = true;
} catch(Exception $e) { } catch (Exception $e) {
$res = false; $res = false;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment