X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUrl.php;h=6b9870f0c1bb468ebafd67e2d71123411f598a0c;hb=62f5a7581380da7885025498de10e9a20c45b358;hp=c166ff6ef03f6023c2bf895279f8eb8940736ba9;hpb=521f0e65cf055846067688a685c5890d3d55185f;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/Url.php b/application/Url.php
index c166ff6e..6b9870f0 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -62,21 +62,31 @@ function add_trailing_slash($url)
 {
     return $url . (!endsWith($url, '/') ? '/' : '');
 }
+
 /**
- * Converts an URL with an IDN host to a ASCII one.
+ * Replace not whitelisted protocols by 'http://' from given URL.
  *
- * @param string $url Input URL.
+ * @param string $url       URL to clean
+ * @param array  $protocols List of allowed protocols (aside from http(s)).
  *
- * @return string converted URL.
+ * @return string URL with allowed protocol
  */
-function url_with_idn_to_ascii($url)
+function whitelist_protocols($url, $protocols)
 {
-    $parts = parse_url($url);
-    $parts['host'] = idn_to_ascii($parts['host']);
-
-    $httpUrl = new \http\Url($parts);
-    return $httpUrl->toString();
+    if (startsWith($url, '?') || startsWith($url, '/')) {
+        return $url;
+    }
+    $protocols = array_merge(['http', 'https'], $protocols);
+    $protocol = preg_match('#^(\w+):/?/?#', $url, $match);
+    // Protocol not allowed: we remove it and replace it with http
+    if ($protocol === 1 && ! in_array($match[1], $protocols)) {
+        $url = str_replace($match[0], 'http://', $url);
+    } elseif ($protocol !== 1) {
+        $url = 'http://' . $url;
+    }
+    return $url;
 }
+
 /**
  * URL representation and cleanup utilities
  *
@@ -108,7 +118,10 @@ class Url
         'utm_',
 
         // ATInternet
-        'xtor='
+        'xtor=',
+
+        // Other
+        'campaign_'
     );
 
     private static $annoyingFragments = array(
@@ -247,7 +260,7 @@ class Url
         if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) {
             return $out;
         }
-        $asciiHost = idn_to_ascii($this->parts['host']);
+        $asciiHost = idn_to_ascii($this->parts['host'], 0, INTL_IDNA_VARIANT_UTS46);
         return str_replace($this->parts['host'], $asciiHost, $out);
     }