|
@@ -102,7 +102,7 @@ discard block |
|
|
block discarded – undo |
|
102
|
102
|
// $this->certificateManager->getAbsoluteBundlePath() tries to instantiate |
|
103
|
103
|
// a view |
|
104
|
104
|
if ($this->config->getSystemValue('installed', false) === false) { |
|
105
|
|
- return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; |
|
|
105
|
+ return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt'; |
|
106
|
106
|
} |
|
107
|
107
|
|
|
108
|
108
|
return $this->certificateManager->getAbsoluteBundlePath(); |
|
@@ -132,7 +132,7 @@ discard block |
|
|
block discarded – undo |
|
132
|
132
|
|
|
133
|
133
|
$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', ''); |
|
134
|
134
|
if ($proxyUserPwd !== '' && $proxyUserPwd !== null) { |
|
135
|
|
- $proxyHost = $proxyUserPwd . '@' . $proxyHost; |
|
|
135
|
+ $proxyHost = $proxyUserPwd.'@'.$proxyHost; |
|
136
|
136
|
} |
|
137
|
137
|
|
|
138
|
138
|
$proxy = [ |
|
@@ -178,13 +178,13 @@ discard block |
|
|
block discarded – undo |
|
178
|
178
|
throw new LocalServerException('Host violates local access rules'); |
|
179
|
179
|
} |
|
180
|
180
|
|
|
181
|
|
- if ((bool)filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { |
|
|
181
|
+ if ((bool) filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { |
|
182
|
182
|
$this->logger->warning("Host $host was not connected to because it violates local access rules"); |
|
183
|
183
|
throw new LocalServerException('Host violates local access rules'); |
|
184
|
184
|
} |
|
185
|
185
|
|
|
186
|
186
|
// Also check for IPv6 IPv4 nesting, because that's not covered by filter_var |
|
187
|
|
- if ((bool)filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) { |
|
|
187
|
+ if ((bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) { |
|
188
|
188
|
$delimiter = strrpos($host, ':'); // Get last colon |
|
189
|
189
|
$ipv4Address = substr($host, $delimiter + 1); |
|
190
|
190
|
|