From 6b15e8c423ac0fe1c6a0c6e411469decd643290c Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 20 Sep 2020 08:58:04 -0400
Subject: [PATCH] Fix highlighting of good/bad hostnames in "My rules" pane

Related feedback:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1249#issuecomment-695755743
---
 src/js/codemirror/ubo-dynamic-filtering.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/js/codemirror/ubo-dynamic-filtering.js b/src/js/codemirror/ubo-dynamic-filtering.js
index 158e583bd..18235eded 100644
--- a/src/js/codemirror/ubo-dynamic-filtering.js
+++ b/src/js/codemirror/ubo-dynamic-filtering.js
@@ -56,12 +56,25 @@ CodeMirror.defineMode('ubo-dynamic-filtering', ( ) => {
         'allow',
         'noop',
     ]);
-    const reIsNotHostname = /[:/#?*]/;
+    const hnValidator = new URL(self.location.href);
+    const reBadHn = /[%]|^\.|\.$/;
     const slices = [];
     let sliceIndex = 0;
     const tokens = [];
     let tokenIndex = 0;
 
+    const isValidHostname = hnin => {
+        if ( hnin === '*' ) { return true; }
+        hnValidator.hostname = '_';
+        try {
+            hnValidator.hostname = hnin;
+        } catch(_) {
+            return false;
+        }
+        const hnout = hnValidator.hostname;
+        return hnout !== '_' && hnout !== '' && reBadHn.test(hnout) === false;
+    };
+
     const isSwitchRule = ( ) => {
         const token = tokens[0];
         return token.charCodeAt(token.length-1) === 0x3A /* ':' */;
@@ -111,7 +124,7 @@ CodeMirror.defineMode('ubo-dynamic-filtering', ( ) => {
                 if ( this.sortType === 0 ) { return 'sortkey'; }
                 return null;
             }
-            if ( reIsNotHostname.test(token) && token !== '*' ) {
+            if ( isValidHostname(token) === false ) {
                 return skipToEnd(stream, 'error');
             }
             if ( this.sortType === 1 ) { return 'sortkey'; }
@@ -120,14 +133,13 @@ CodeMirror.defineMode('ubo-dynamic-filtering', ( ) => {
         // Field 2: hostname or url
         if ( tokenIndex === 2 ) {
             if ( isSwitchRule(tokens[0]) ) {
-                if ( reIsNotHostname.test(token) && token !== '*' ) {
+                if ( isValidHostname(token) === false  ) {
                     return skipToEnd(stream, 'error');
                 }
                 if ( this.sortType === 1 ) { return 'sortkey'; }
             }
             if (
-                reIsNotHostname.test(token) &&
-                token !== '*' &&
+                isValidHostname(token) === false &&
                 isURLRule(token) === false
             ) {
                 return skipToEnd(stream, 'error');