diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-12-02 10:48:41 +0100 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-12-09 20:39:00 +0000 |
| commit | 419df66251784ec63ac50fcc15165cd0f2a2e307 (patch) | |
| tree | f6c705db3ceb017e3d66c096d8929171bc8f9124 /lib/private/Security | |
| parent | 9d8c0c262b2202ee581f39e9cc6dae48777a9491 (diff) | |
| download | nextcloud-server-419df66251784ec63ac50fcc15165cd0f2a2e307.tar.gz nextcloud-server-419df66251784ec63ac50fcc15165cd0f2a2e307.zip | |
Move overwritehost check to isTrustedDomain
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Security')
| -rw-r--r-- | lib/private/Security/TrustedDomainHelper.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/Security/TrustedDomainHelper.php b/lib/private/Security/TrustedDomainHelper.php index 5237767d8ea..a05e0dcff2e 100644 --- a/lib/private/Security/TrustedDomainHelper.php +++ b/lib/private/Security/TrustedDomainHelper.php @@ -69,6 +69,11 @@ class TrustedDomainHelper { * have been configured */ public function isTrustedDomain($domainWithPort) { + // overwritehost is always trusted + if ($this->config->getSystemValue('overwritehost') !== '') { + return true; + } + $domain = $this->getDomainWithoutPort($domainWithPort); // Read trusted domains from config |