Changeset 580 for trunk/lib

Timestamp:

Feb 27, 2017 2:23:41 PM (7 years ago)

Author:

anonymous

Message:

Added base65() function. Made refererIsMe() smarter about ignoring hostnames containing IP address (which may occur if site is behine reverse-proxy and result in redirect loop). Added curl timeout to httpExists().

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

trunk/lib/Utilities.inc.php

@@ -809 +809 @@
  * Converts a PHP Array into encoded URL arguments and return them in a string.
  *
+ * Todo: probably update to use the built-in http_build_query().
+ *
  * @param  mixed $data        An array to transverse recursively, or a string
  *                            to use directly to create url arguments.
@@ -1059 +1061 @@
         break;
     }
+}
+
+/*
+* Generates a base-65-encoded sha512 hash of $string truncated to $length.
+*
+* @access   public
+* @param    string  $string Input string to hash.
+* @param    int     $length Length of output hash string.
+* @return   string          String of hash.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @version  1.0
+* @since    03 Apr 2016 19:48:49
+*/
+function hash64($string, $length=18)
+{
+    return mb_substr(preg_replace('/[^\w]/', '', base64_encode(hash('sha512', $string, true))), 0, $length);
 }
 
@@ -1375 +1393 @@
 function refererIsMe($exclude_query=false)
 {
+    $current_url = absoluteMe();
+    $referer_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?://[^/]+@', '', $current_url);
+        $referer_url = preg_replace('@^https?://[^/]+@', '', $referer_url);
+    }
+
     if ($exclude_query) {
-        return (stripQuery(absoluteMe()) == stripQuery(getenv('HTTP_REFERER')));
-    } else {
-        return (absoluteMe() == getenv('HTTP_REFERER'));
+        return (stripQuery($current_url) == stripQuery($referer_url));
+    } else {
+        $app =& App::getInstance();
+        $app->logMsg(sprintf('refererIsMe comparison: %s == %s', $current_url, $referer_url), LOG_DEBUG, __FILE__, __LINE__);
+        return ($current_url == $referer_url);
     }
 }
@@ -1395 +1424 @@
 {
     $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 2);
     curl_setopt($ch, CURLOPT_NOBODY, true);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);