Add support UTF-8 domain names in black, white and exclude lists. (opnsense#1892)

Author: Alexander Shursha

Makefile

@@ -106,6 +106,7 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			php${CORE_PHP}-filter \
 			php${CORE_PHP}-gettext \
 			php${CORE_PHP}-hash \
+			php${CORE_PHP}-intl \
 			php${CORE_PHP}-json \
 			php${CORE_PHP}-ldap \
 			php${CORE_PHP}-mcrypt \

src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php

@@ -240,4 +240,73 @@ public function fetchRBCronAction()
 
         return $result;
     }
+
+    /**
+     * get action
+     * @return array
+     */
+    public function getAction()
+    {
+        $result = parent::getAction();
+        if (isset($result['proxy']['forward']['acl']['whiteList'])) {
+            $result['proxy']['forward']['acl']['whiteList'] = self::decode($result['proxy']['forward']['acl']['whiteList']);
+        }
+        if (isset($result['proxy']['forward']['acl']['blackList'])) {
+            $result['proxy']['forward']['acl']['blackList'] = self::decode($result['proxy']['forward']['acl']['blackList']);
+        }
+        if (isset($result['proxy']['forward']['icap']['exclude'])) {
+            $result['proxy']['forward']['icap']['exclude'] = self::decode($result['proxy']['forward']['icap']['exclude']);
+        }
+        return $result;
+    }
+
+    /**
+     * set action
+     * @return array status
+     */
+    public function setAction()
+    {
+        $result = parent::setAction();
+        $mdlProxy = $this->getModel();
+        if (isset($mdlProxy->forward->acl->whiteList)) {
+            $mdlProxy->forward->acl->whiteList = self::decode($mdlProxy->forward->acl->whiteList);
+        }
+        if (isset($mdlProxy->forward->acl->blackList)) {
+            $mdlProxy->forward->acl->blackList = self::decode($mdlProxy->forward->acl->blackList);
+        }
+        if (isset($mdlProxy->forward->icap->exclude)) {
+            $mdlProxy->forward->icap->exclude = self::decode($mdlProxy->forward->icap->exclude);
+        }
+        return $result;
+    }
+
+    /**
+     * Encode a given UTF-8 domain name
+     * @param    string   Domain name (UTF-8 or UCS-4)
+     * @return   string   Encoded Domain name (ACE string)
+     */
+    public static function encode($domains)
+    {
+        $result = array();
+        foreach (explode(",", $domains) as $domain) {
+            if ($domain != "") {
+                $result[] = ($domain[0] == "." ? "." : "") . idn_to_ascii($domain);
+            }
+        }
+        return implode(",", $result);
+    }
+
+    /**
+     * Decode a given ACE domain name
+     * @param    string   Domain name (ACE string)
+     * @return   string   Decoded Domain name (UTF-8 or UCS-4)
+     */
+    public static function decode($domains)
+    {
+        $result = array();
+        foreach ($domains as $domain => $element) {
+            $result[idn_to_utf8($domain)] = array('value' => idn_to_utf8($element['value']), 'selected' => $element['selected']);
+        }
+        return $result;
+    }
 }