Item14405: Honor ForceDefaultUrlHost in Foswiki::Request->url()

Ensure that protocol sticks to https rather than depending on the status of the Request->secure() flag, which is masked by a proxy server.
foswiki · May 23, 2017 · de3aafc · de3aafc
1 parent a3fb8a4
commit de3aafc
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/core/lib/Foswiki/Request.pm b/core/lib/Foswiki/Request.pm
@@ -294,9 +294,16 @@ sub url {
     }
     $name =~ s(//+)(/)g;
     if ($full) {
-        my $vh = $this->header('X-Forwarded-Host') || $this->header('Host');
-        $url =
-          $vh ? $this->protocol . '://' . $vh : $Foswiki::cfg{DefaultUrlHost};
+        if ( $Foswiki::cfg{ForceDefaultUrlHost} ) {
+            $url = $Foswiki::cfg{DefaultUrlHost};
+        }
+        else {
+            my $vh = $this->header('X-Forwarded-Host') || $this->header('Host');
+            $url =
+                $vh
+              ? $this->protocol . '://' . $vh
+              : $Foswiki::cfg{DefaultUrlHost};
+        }
         return $url if $base;
         $url .= $name;
     }