4.17.11

vanderbilt-redcap · Oct 10, 2022 · be4ea2b · be4ea2b
1 parent ecff00c
commit be4ea2b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/CareerDev.php b/CareerDev.php
@@ -16,7 +16,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "4.17.9";
+		return "4.17.11";
 	}
 
 	public static function getLockFile($pid) {

diff --git a/classes/Sanitizer.php b/classes/Sanitizer.php
@@ -5,6 +5,9 @@
 require_once(__DIR__ . '/ClassLoader.php');
 
 class Sanitizer {
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeJSON($str) {
         /**
          * @psalm-taint-escape html
@@ -19,6 +22,9 @@ public static function sanitizeJSON($str) {
         return "";
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeREDCapData($data) {
         $data = self::sanitizeArray($data, FALSE);
         for ($i = 0; $i < count($data); $i++) {
@@ -40,6 +46,9 @@ public static function sanitizeInteger($int) {
         }
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeURL($url) {
         $url = filter_var($url, FILTER_SANITIZE_URL);
         $url = self::sanitize($url);
@@ -54,12 +63,18 @@ public static function sanitizeURL($url) {
         }
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizePid($pid) {
         $pid = filter_var($pid, FILTER_VALIDATE_INT);
         $pid = self::sanitize($pid);
         return $pid;
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     private static function sanitizeRecursive($datum) {
         if (is_array($datum)) {
             $newData = [];
@@ -73,6 +88,9 @@ private static function sanitizeRecursive($datum) {
         }
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeDate($date) {
         $date = self::sanitize($date);
         if (DateManagement::isDate($date)) {
@@ -82,6 +100,9 @@ public static function sanitizeDate($date) {
         }
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeWithoutChangingQuotes($str) {
         if (is_numeric($str)) {
             $str = (string) $str;
@@ -132,6 +153,9 @@ public static function sanitizeArray($ary, $stripHTML = TRUE) {
         }
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeWithoutStrippingHTML($str, $encodeQuotes = TRUE) {
         /**
          * @psalm-taint-escape html
@@ -145,10 +169,16 @@ public static function sanitizeWithoutStrippingHTML($str, $encodeQuotes = TRUE)
         return $str;
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitizeCohort($cohortName) {
         return Cohorts::sanitize($cohortName);
     }
 
+    /**
+     * @psalm-taint-specialize
+     */
     public static function sanitize($origStr) {
         if (REDCapManagement::isValidToken($origStr)) {
             $module = Application::getModule();
@@ -174,6 +204,9 @@ public static function sanitize($origStr) {
     }
 
     # requestedRecord is from GET/POST
+    /**
+     * @psalm-taint-specialize
+     */
     public static function getSanitizedRecord($requestedRecord, $records) {
         foreach ($records as $r) {
             if ($r == $requestedRecord) {