@@ -162,7 +162,7 @@ |
||
| 162 | 162 | */ |
| 163 | 163 | public function setAuthor($author) { |
| 164 | 164 | if (!is_string($author) || isset($author[64])) { |
| 165 | - throw new \InvalidArgumentException('The given author user is invalid'. serialize($author)); |
|
| 165 | + throw new \InvalidArgumentException('The given author user is invalid'.serialize($author)); |
|
| 166 | 166 | } |
| 167 | 167 | $this->author = (string) $author; |
| 168 | 168 | return $this; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | $this->consumers = []; |
| 115 | - foreach($this->consumersClosures as $consumer) { |
|
| 115 | + foreach ($this->consumersClosures as $consumer) { |
|
| 116 | 116 | $c = $consumer(); |
| 117 | 117 | if ($c instanceof IConsumer) { |
| 118 | 118 | $this->consumers[] = $c; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $this->extensions = []; |
| 136 | - foreach($this->extensionsClosures as $extension) { |
|
| 136 | + foreach ($this->extensionsClosures as $extension) { |
|
| 137 | 137 | $e = $extension(); |
| 138 | 138 | if ($e instanceof IExtension) { |
| 139 | 139 | $this->extensions[] = $e; |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | return array(null, null); |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - return array(' and ((' . implode(') or (', $conditions) . '))', $parameters); |
|
| 672 | + return array(' and (('.implode(') or (', $conditions).'))', $parameters); |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | /** |
@@ -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 | |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | $maxCharIndex = strlen($characters) - 1; |
| 78 | 78 | $randomString = ''; |
| 79 | 79 | |
| 80 | - while($length > 0) { |
|
| 80 | + while ($length > 0) { |
|
| 81 | 81 | $randomNumber = \random_int(0, $maxCharIndex); |
| 82 | 82 | $randomString .= $characters[$randomNumber]; |
| 83 | 83 | $length--; |
@@ -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 | } |