Changeset 782 for branches/1.1dev/lib

Timestamp:

Mar 3, 2023 4:39:34 AM (14 months ago)

Author:

anonymous

Message:

Backporting a few things from codebase 2.x

File:

• branches/1.1dev/lib/App.inc.php (modified) (4 diffs)

branches/1.1dev/lib/App.inc.php

@@ -308 +308 @@
         return false;
     }
-    if ($url == absoluteMe()) {
+    if ($url == absoluteMe() || $url == getenv('REQUEST_URI')) {
         // The URL we are directing to is not the current page.
-        logMsg(sprintf('Boomerang URL not valid, same as absoluteMe: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
+        logMsg(sprintf('Boomerang URL not valid, same as absoluteMe or REQUEST_URI: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
         return false;
     }
@@ -343 +343 @@
         if (isset($id) && isset($_SESSION['_boomerang']['url'][$id])) {
             $url = $_SESSION['_boomerang']['url'][$id];
+            logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             $url = end($_SESSION['_boomerang']['url']);
+            logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         }
     } else if (isset($default_url)) {
         $url = $default_url;
-    } else if (!refererIsMe()) {
+    } else if (!refererIsMe() && '' != getenv('HTTP_REFERER')) {
         // Ensure that the redirecting page is not also the referrer.
         $url = getenv('HTTP_REFERER');
+        logMsg(sprintf('dieBoomerangURL(%s) using referrer: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
     } else {
         $url = '';
+        logMsg(sprintf('dieBoomerangURL(%s) using empty: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
     }
 
@@ -862 +866 @@
 function absoluteMe()
 {
-    $protocol = ('on' == getenv('HTTPS')) ? 'https://' : 'http://';
-    return $protocol . getenv('HTTP_HOST') . getenv('REQUEST_URI');
+    $safe_http_host = preg_replace('/[^a-z\d.:-]/', '', getenv('HTTP_HOST'));
+    return sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host, getenv('REQUEST_URI'));
 }
 
@@ -876 +880 @@
 function refererIsMe($exclude_query=false)
 {
+    $current_url = absoluteMe();
+    $referrer_url = getenv('HTTP_REFERER');
+
+    // If one of the hostnames is an IP address, compare only the path of both.
+    if (preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', parse_url($current_url, PHP_URL_HOST)) || preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', parse_url($referrer_url, PHP_URL_HOST))) {
+        $current_url = preg_replace('@^https?://[^/]+@u', '', $current_url);
+        $referrer_url = preg_replace('@^https?://[^/]+@u', '', $referrer_url);
+    }
+
     if ($exclude_query) {
-        return (stripQuery(absoluteMe()) == stripQuery(getenv('HTTP_REFERER')));
+        return (stripQuery($current_url) == stripQuery($referrer_url));
     } else {
-        return (absoluteMe() == getenv('HTTP_REFERER'));
-    }
-}
-
-?>
+        logMsg(sprintf('refererIsMe comparison: %s == %s', $current_url, $referrer_url), LOG_DEBUG, __FILE__, __LINE__);
+        return ($current_url == $referrer_url);
+    }
+}