Changeset 783 for trunk

Timestamp:

Mar 6, 2023 8:19:20 PM (14 months ago)

Author:

anonymous

Message:

Rename function. Minor fixes.

File:

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

trunk/lib/Utilities.inc.php

@@ -1017 +1017 @@
 * @since    09 Jun 2022 07:50:49
 */
-function base64_encode_url($string) {
+function base64EncodeURL($string) {
     return str_replace(['+','/','='], ['-','_',''], base64_encode($string));
 }
-function base64_decode_url($string) {
+function base64DecodeURL($string) {
     return base64_decode(str_replace(['-','_'], ['+','/'], $string));
 }
@@ -1373 +1373 @@
 function verifySignature($signed_val, $salt=null, $length=18)
 {
+    $app =& App::getInstance();
+
     // Strip the value from the signed value.
     $val = removeSignature($signed_val);
+    if ('' == $val) {
+        // Removing the signature failed because it was empty or did not contain a hyphen.
+        $app->logMsg(sprintf('Invalid signature ("%s" is not a valid signed value).', $signed_val), LOG_DEBUG, __FILE__, __LINE__);
+        return false;
+    }
     // If the signed value matches the original signed value we consider the value safe.
     if ('' != $signed_val && $signed_val == addSignature($val, $salt, $length)) {
@@ -1380 +1387 @@
         return true;
     } else {
-        $app =& App::getInstance();
         // A signature mismatch might occur if the signing_key is not the same across all environments, apache, cli, etc.
-        $app->logMsg(sprintf('Failed signature (%s should be %s).', $signed_val, addSignature($val, $salt, $length)), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Invalid signature (%s should be %s).', $signed_val, addSignature($val, $salt, $length)), LOG_DEBUG, __FILE__, __LINE__);
         return false;
     }
@@ -1443 +1449 @@
     if (!isset($_SERVER['REMOTE_ADDR'])) {
         // In some cases this won't be set, e.g., CLI scripts.
-        return null;
+        return '';
     }