Completed
Push — master ( c65848...a5c801 )
by Blizzz
112:32 queued 99:32
created
lib/private/Security/TrustedDomainHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 			return true;
82 82
 		}
83 83
 		// Reject misformed domains in any case
84
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
84
+		if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) {
85 85
 			return false;
86 86
 		}
87 87
 		// Match, allowing for * wildcards
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 			if (gettype($trusted) !== 'string') {
90 90
 				break;
91 91
 			}
92
-			$regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
92
+			$regex = '/^'.join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))).'$/';
93 93
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
94 94
  				return true;
95 95
  			}
Please login to merge, or discard this patch.
lib/private/Security/Hasher.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		$this->config = $config;
63 63
 
64 64
 		$hashingCost = $this->config->getSystemValue('hashingCost', null);
65
-		if(!is_null($hashingCost)) {
65
+		if (!is_null($hashingCost)) {
66 66
 			$this->options['cost'] = $hashingCost;
67 67
 		}
68 68
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return string Hash of the message with appended version parameter
77 77
 	 */
78 78
 	public function hash($message) {
79
-		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
79
+		return $this->currentVersion.'|'.password_hash($message, PASSWORD_DEFAULT, $this->options);
80 80
 	}
81 81
 
82 82
 	/**
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	protected function splitHash($prefixedHash) {
88 88
 		$explodedString = explode('|', $prefixedHash, 2);
89
-		if(sizeof($explodedString) === 2) {
90
-			if((int)$explodedString[0] > 0) {
91
-				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
89
+		if (sizeof($explodedString) === 2) {
90
+			if ((int) $explodedString[0] > 0) {
91
+				return array('version' => (int) $explodedString[0], 'hash' => $explodedString[1]);
92 92
 			}
93 93
 		}
94 94
 
@@ -103,13 +103,13 @@  discard block
 block discarded – undo
103 103
 	 * @return bool Whether $hash is a valid hash of $message
104 104
 	 */
105 105
 	protected function legacyHashVerify($message, $hash, &$newHash = null) {
106
-		if(empty($this->legacySalt)) {
106
+		if (empty($this->legacySalt)) {
107 107
 			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
108 108
 		}
109 109
 
110 110
 		// Verify whether it matches a legacy PHPass or SHA1 string
111 111
 		$hashLength = strlen($hash);
112
-		if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
112
+		if ($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
113 113
 			$hashLength === 40 && hash_equals($hash, sha1($message))) {
114 114
 			$newHash = $this->hash($message);
115 115
 			return true;
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 	 * @return bool Whether $hash is a valid hash of $message
127 127
 	 */
128 128
 	protected function verifyHashV1($message, $hash, &$newHash = null) {
129
-		if(password_verify($message, $hash)) {
130
-			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
129
+		if (password_verify($message, $hash)) {
130
+			if (password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
131 131
 				$newHash = $this->hash($message);
132 132
 			}
133 133
 			return true;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	public function verify($message, $hash, &$newHash = null) {
146 146
 		$splittedHash = $this->splitHash($hash);
147 147
 
148
-		if(isset($splittedHash['version'])) {
148
+		if (isset($splittedHash['version'])) {
149 149
 			switch ($splittedHash['version']) {
150 150
 				case 1:
151 151
 					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);
Please login to merge, or discard this patch.
lib/private/Security/CSRF/CsrfToken.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
lib/private/Security/CSRF/TokenStorage/SessionStorage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/private/Security/CSRF/CsrfTokenManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/private/Security/Crypto.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 	 * @return string Calculated HMAC
69 69
 	 */
70 70
 	public function calculateHMAC($message, $password = '') {
71
-		if($password === '') {
71
+		if ($password === '') {
72 72
 			$password = $this->config->getSystemValue('secret');
73 73
 		}
74 74
 
75 75
 		// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
76
-		$password = hash('sha512', $password . 'a');
76
+		$password = hash('sha512', $password.'a');
77 77
 
78 78
 		$hash = new Hash('sha512');
79 79
 		$hash->setKey($password);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @return string Authenticated ciphertext
88 88
 	 */
89 89
 	public function encrypt($plaintext, $password = '') {
90
-		if($password === '') {
90
+		if ($password === '') {
91 91
 			$password = $this->config->getSystemValue('secret');
92 92
 		}
93 93
 		$this->cipher->setPassword($password);
@@ -109,13 +109,13 @@  discard block
 block discarded – undo
109 109
 	 * @throws \Exception If the HMAC does not match
110 110
 	 */
111 111
 	public function decrypt($authenticatedCiphertext, $password = '') {
112
-		if($password === '') {
112
+		if ($password === '') {
113 113
 			$password = $this->config->getSystemValue('secret');
114 114
 		}
115 115
 		$this->cipher->setPassword($password);
116 116
 
117 117
 		$parts = explode('|', $authenticatedCiphertext);
118
-		if(sizeof($parts) !== 3) {
118
+		if (sizeof($parts) !== 3) {
119 119
 			throw new \Exception('Authenticated ciphertext could not be decoded.');
120 120
 		}
121 121
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$this->cipher->setIV($iv);
127 127
 
128
-		if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
128
+		if (!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
129 129
 			throw new \Exception('HMAC does not match.');
130 130
 		}
131 131
 
Please login to merge, or discard this patch.
lib/private/Security/SecureRandom.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
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--;
Please login to merge, or discard this patch.
lib/private/Security/Certificate.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,19 +54,19 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
lib/private/Security/IdentityProof/Signer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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(),
Please login to merge, or discard this patch.