lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support IDN in aliases. (#3107)

Browse Source
This commit is contained in:
Alexander Shursha 2019-01-16 11:53:55 +03:00 committed by Ad Schellevis
parent 5a1b1d50f0
commit f3dad94b38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php
View File

@ -214,7 +214,7 @@ class Util
*/
public static function isDomain($domain)
{
$pattern = '/^(?:(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$/i';
$pattern = '/^(?:(?:[a-z\pL0-9]|[a-z\pL0-9][a-z\pL0-9\-]*[a-z\pL0-9])\.)*(?:[a-z\pL0-9]|[a-z\pL0-9][a-z\pL0-9\-]*[a-z\pL0-9])$/iu';
if (preg_match($pattern, $domain)) {
return true;
}

6
src/opnsense/service/templates/OPNsense/Filter/filter_tables.conf
View File

@ -16,11 +16,11 @@
{% if alias.enabled|default('0') == '0'%}
<address></address>
{% elif alias.type.startswith('urltable') %}
<url>{{ alias.content|e }}</url>
<url>{{ alias.content|e|encode_idna }}</url>
{% elif alias.type.startswith('url') %}
<aliasurl>{{ alias.content|e }}</aliasurl>
<aliasurl>{{ alias.content|e|encode_idna }}</aliasurl>
{% elif alias.content %}
<address>{{ alias.content|e }}</address>
<address>{{ alias.content|e|encode_idna }}</address>
{% endif %}{% if alias.proto %}
<proto>{{ alias.proto|e }}</proto>
{% endif %}{% if alias.updatefreq %}