@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @return string |
| 53 | 53 | */ |
| 54 | 54 | public function getNonce() { |
| 55 | - if($this->nonce === '') { |
|
| 55 | + if ($this->nonce === '') { |
|
| 56 | 56 | $this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue()); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/', |
| 72 | 72 | ]; |
| 73 | 73 | |
| 74 | - if($this->request->isUserAgent($browserWhitelist)) { |
|
| 74 | + if ($this->request->isUserAgent($browserWhitelist)) { |
|
| 75 | 75 | return true; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function getDefaultPolicy() { |
| 45 | 45 | $defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy(); |
| 46 | - foreach($this->policies as $policy) { |
|
| 46 | + foreach ($this->policies as $policy) { |
|
| 47 | 47 | $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy); |
| 48 | 48 | } |
| 49 | 49 | return $defaultPolicy; |
@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | public function mergePolicies(ContentSecurityPolicy $defaultPolicy, |
| 60 | 60 | EmptyContentSecurityPolicy $originalPolicy) { |
| 61 | - foreach((object)(array)$originalPolicy as $name => $value) { |
|
| 61 | + foreach ((object) (array) $originalPolicy as $name => $value) { |
|
| 62 | 62 | $setter = 'set'.ucfirst($name); |
| 63 | - if(is_array($value)) { |
|
| 63 | + if (is_array($value)) { |
|
| 64 | 64 | $getter = 'get'.ucfirst($name); |
| 65 | 65 | $currentValues = is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : []; |
| 66 | 66 | $defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value)))); |
@@ -50,9 +50,9 @@ |
||
| 50 | 50 | * @return string |
| 51 | 51 | */ |
| 52 | 52 | public function getEncryptedValue() { |
| 53 | - if($this->encryptedValue === '') { |
|
| 53 | + if ($this->encryptedValue === '') { |
|
| 54 | 54 | $sharedSecret = random_bytes(strlen($this->value)); |
| 55 | - $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret); |
|
| 55 | + $this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | return $this->encryptedValue; |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | */ |
| 56 | 56 | public function getToken() { |
| 57 | 57 | $token = $this->session->get('requesttoken'); |
| 58 | - if(empty($token)) { |
|
| 58 | + if (empty($token)) { |
|
| 59 | 59 | throw new \Exception('Session does not contain a requesttoken'); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | * @return CsrfToken |
| 54 | 54 | */ |
| 55 | 55 | public function getToken() { |
| 56 | - if(!is_null($this->csrfToken)) { |
|
| 56 | + if (!is_null($this->csrfToken)) { |
|
| 57 | 57 | return $this->csrfToken; |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - if($this->sessionStorage->hasToken()) { |
|
| 60 | + if ($this->sessionStorage->hasToken()) { |
|
| 61 | 61 | $value = $this->sessionStorage->getToken(); |
| 62 | 62 | } else { |
| 63 | 63 | $value = $this->tokenGenerator->generateToken(); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @return bool |
| 96 | 96 | */ |
| 97 | 97 | public function isTokenValid(CsrfToken $token) { |
| 98 | - if(!$this->sessionStorage->hasToken()) { |
|
| 98 | + if (!$this->sessionStorage->hasToken()) { |
|
| 99 | 99 | return false; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -54,19 +54,19 @@ |
||
| 54 | 54 | |
| 55 | 55 | // If string starts with "file://" ignore the certificate |
| 56 | 56 | $query = 'file://'; |
| 57 | - if(strtolower(substr($data, 0, strlen($query))) === $query) { |
|
| 57 | + if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
| 58 | 58 | throw new \Exception('Certificate could not get parsed.'); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $info = openssl_x509_parse($data); |
| 62 | - if(!is_array($info)) { |
|
| 62 | + if (!is_array($info)) { |
|
| 63 | 63 | throw new \Exception('Certificate could not get parsed.'); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
| 67 | 67 | $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
| 68 | - $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
| 69 | - $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
| 68 | + $this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt); |
|
| 69 | + $this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt); |
|
| 70 | 70 | $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
| 71 | 71 | $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
| 72 | 72 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @return bool |
| 78 | 78 | */ |
| 79 | 79 | public function verify(array $data) { |
| 80 | - if(isset($data['message']) |
|
| 80 | + if (isset($data['message']) |
|
| 81 | 81 | && isset($data['signature']) |
| 82 | 82 | && isset($data['message']['signer']) |
| 83 | 83 | ) { |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | $userId = substr($data['message']['signer'], 0, $location); |
| 86 | 86 | |
| 87 | 87 | $user = $this->userManager->get($userId); |
| 88 | - if($user !== null) { |
|
| 88 | + if ($user !== null) { |
|
| 89 | 89 | $key = $this->keyManager->getKey($user); |
| 90 | - return (bool)openssl_verify( |
|
| 90 | + return (bool) openssl_verify( |
|
| 91 | 91 | json_encode($data['message']), |
| 92 | 92 | base64_decode($data['signature']), |
| 93 | 93 | $key->getPublic(), |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @return string |
| 66 | 66 | */ |
| 67 | 67 | private function buildFileNameWithSuffix($absolutePath, $postFix = '') { |
| 68 | - if($postFix !== '') { |
|
| 69 | - $postFix = '.' . ltrim($postFix, '.'); |
|
| 68 | + if ($postFix !== '') { |
|
| 69 | + $postFix = '.'.ltrim($postFix, '.'); |
|
| 70 | 70 | $postFix = str_replace(['\\', '/'], '', $postFix); |
| 71 | 71 | $absolutePath .= '-'; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - return $absolutePath . $postFix; |
|
| 74 | + return $absolutePath.$postFix; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | // If a postfix got specified sanitize it and create a postfixed |
| 93 | 93 | // temporary file |
| 94 | - if($postFix !== '') { |
|
| 94 | + if ($postFix !== '') { |
|
| 95 | 95 | $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix); |
| 96 | 96 | touch($fileNameWithPostfix); |
| 97 | 97 | chmod($fileNameWithPostfix, 0600); |
@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | $this->current[] = $uniqueFileName; |
| 128 | 128 | |
| 129 | 129 | // Build a name without postfix |
| 130 | - $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix); |
|
| 130 | + $path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix); |
|
| 131 | 131 | mkdir($path, 0700); |
| 132 | 132 | $this->current[] = $path; |
| 133 | 133 | |
| 134 | - return $path . '/'; |
|
| 134 | + return $path.'/'; |
|
| 135 | 135 | } else { |
| 136 | 136 | $this->log->warning( |
| 137 | 137 | 'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions', |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | if ($dh) { |
| 191 | 191 | while (($file = readdir($dh)) !== false) { |
| 192 | 192 | if (substr($file, 0, 7) === self::TMP_PREFIX) { |
| 193 | - $path = $this->tmpBaseDir . '/' . $file; |
|
| 193 | + $path = $this->tmpBaseDir.'/'.$file; |
|
| 194 | 194 | $mtime = filemtime($path); |
| 195 | 195 | if ($mtime < $cutOfTime) { |
| 196 | 196 | $files[] = $path; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public static function register($debug=false) { |
|
| 43 | + public static function register($debug = false) { |
|
| 44 | 44 | $handler = new ErrorHandler(); |
| 45 | 45 | |
| 46 | 46 | if ($debug) { |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | //Fatal errors handler |
| 63 | 63 | public static function onShutdown() { |
| 64 | 64 | $error = error_get_last(); |
| 65 | - if($error && self::$logger) { |
|
| 65 | + if ($error && self::$logger) { |
|
| 66 | 66 | //ob_end_clean(); |
| 67 | - $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line']; |
|
| 67 | + $msg = $error['message'].' at '.$error['file'].'#'.$error['line']; |
|
| 68 | 68 | self::$logger->critical(self::removePassword($msg), array('app' => 'PHP')); |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public static function onException($exception) { |
| 78 | 78 | $class = get_class($exception); |
| 79 | 79 | $msg = $exception->getMessage(); |
| 80 | - $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine(); |
|
| 80 | + $msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine(); |
|
| 81 | 81 | self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -86,14 +86,14 @@ discard block |
||
| 86 | 86 | if (error_reporting() === 0) { |
| 87 | 87 | return; |
| 88 | 88 | } |
| 89 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
| 89 | + $msg = $message.' at '.$file.'#'.$line; |
|
| 90 | 90 | self::$logger->error(self::removePassword($msg), array('app' => 'PHP')); |
| 91 | 91 | |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | //Recoverable handler which catch all errors, warnings and notices |
| 95 | 95 | public static function onAll($number, $message, $file, $line) { |
| 96 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
| 96 | + $msg = $message.' at '.$file.'#'.$line; |
|
| 97 | 97 | self::$logger->debug(self::removePassword($msg), array('app' => 'PHP')); |
| 98 | 98 | |
| 99 | 99 | } |