diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-06-05 12:52:23 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-06-05 12:52:23 +0200 |
| commit | e3031ae28be12b377f6a570f8048512b744d5951 (patch) | |
| tree | 827cd05b1593a0e57caccde62625d728516caeee | |
| parent | 564b0358f91df832afdf3a0fd27eaa349508c964 (diff) | |
| download | nextcloud-server-e3031ae28be12b377f6a570f8048512b744d5951.tar.gz nextcloud-server-e3031ae28be12b377f6a570f8048512b744d5951.zip | |
more reliable host detection for reverse proxy servers
| -rw-r--r-- | lib/base.php | 12 | ||||
| -rw-r--r-- | lib/helper.php | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index bdfd05e8f1d..b9c28119e32 100644 --- a/lib/base.php +++ b/lib/base.php @@ -367,16 +367,18 @@ class OC{ // CSRF protection if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer=''; - $protocol=OC_Helper::serverProtocol().'://'; + $refererhost=parse_url($referer); + if(isset($refererhost['host'])) $refererhost=$refererhost['host']; else $refererhost=''; + $server=OC_Helper::serverHost(); + $serverhost=parse_url($server); + if(isset($serverhost['host'])) $serverhost=$serverhost['host']; else $serverhost=''; if(!self::$CLI){ - $server=$protocol.OC_Helper::serverHost(); - if(($_SERVER['REQUEST_METHOD']=='POST') and (substr($referer,0,strlen($server))<>$server)) { - $url = $protocol.OC_Helper::serverProtocol().OC::$WEBROOT.'/index.php'; + if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) { + $url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php'; header("Location: $url"); exit(); } } - self::initSession(); self::initTemplateEngine(); self::checkUpgrade(); diff --git a/lib/helper.php b/lib/helper.php index aedac204058..decc1d61336 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -120,7 +120,7 @@ class OC_Helper { */ public static function linkToAbsolute( $app, $file ) { $urlLinkTo = self::linkTo( $app, $file ); - $urlLinkTo = OC_Helper::serverProtocol(). '://' . self::serverHost() . $urlLinkTo; + $urlLinkTo = self::serverProtocol(). '://' . self::serverHost() . $urlLinkTo; return $urlLinkTo; } |