From 0930b1ada8d821fbc381907bfbb01f572000b747 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyasthomas@gmail.com>
Date: Fri, 3 Jan 2020 21:07:41 +0530
Subject: [PATCH] :bug: Better URL validation, Fixed #471

---
 pages/realtime.vue | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pages/realtime.vue b/pages/realtime.vue
index 5aaf17851c5..8e918ee4a37 100644
--- a/pages/realtime.vue
+++ b/pages/realtime.vue
@@ -209,28 +209,28 @@ export default {
   },
   computed: {
     urlValid() {
-      const pattern = new RegExp(
-        "^(wss?:\\/\\/)?" +
-          "((([a-z\\d]([a-z\\d-]*[a-z:@\\d])*)\\.)+[a-z]{2,}|" +
-          "((\\d{1,3}\\.){3}\\d{1,3}))" +
-          "(\\:\\d+)?(\\/[-a-z\\d%_.~+@]*)*" +
-          "(\\?[:\\;&a-z\\d%_.~+=-]*)?" +
-          "(\\#[-a-z\\d_]*)?$",
-        "i"
+      const protocol = "^(wss?:\\/\\/)?";
+      const validIP = new RegExp(
+        protocol +
+          "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
       );
-      return pattern.test(this.url);
+      const validHostname = new RegExp(
+        protocol +
+          "(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]).)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9/])$"
+      );
+      return validIP.test(this.url) || validHostname.test(this.url);
     },
     serverValid() {
-      const pattern = new RegExp(
-        "^(http(s)?:\\/\\/)?" +
-          "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" +
-          "((\\d{1,3}\\.){3}\\d{1,3}))" +
-          "(\\:\\d+)?(\\/[-a-z\\d%_.~+@]*)*" +
-          "(\\?[:\\;&a-z\\d%_.~+=-]*)?" +
-          "(\\#[-a-z\\d_]*)?$",
-        "i"
+      const protocol = "^(https?:\\/\\/)?";
+      const validIP = new RegExp(
+        protocol +
+          "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
+      );
+      const validHostname = new RegExp(
+        protocol +
+          "(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]).)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9/])$"
       );
-      return pattern.test(this.server);
+      return validIP.test(this.server) || validHostname.test(this.server);
     }
   },
   methods: {