From 4da38e547240b7ce3ce0313c998c90ec3c323d28 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Wed, 17 Aug 2016 21:18:17 +0200
Subject: [PATCH 1/2] Check if a domain name is valid

---
 php/auth.php |  8 ++++++++
 php/func.php | 10 ++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 php/func.php

diff --git a/php/auth.php b/php/auth.php
index 1447296f..93ab86fc 100644
--- a/php/auth.php
+++ b/php/auth.php
@@ -1,4 +1,5 @@
 <?php
+require('func.php');
 $ERRORLOG = getenv('PHP_ERROR_LOG');
 if (empty($ERRORLOG)) {
     $ERRORLOG = '/var/log/lighttpd/error.log';
@@ -49,4 +50,11 @@ if(!isset($_SESSION['token'], $_POST['token']) || !hash_equals($_SESSION['token'
     log_and_die("Wrong token");
 }
 
+if(isset($_POST['domain'])){
+    $validDomain = is_valid_domain_name($_POST['domain']);
+    if(!$validDomain){
+        log_and_die($_POST['domain']. ' is not a valid domain');
+    }
+}
+
 ?>
diff --git a/php/func.php b/php/func.php
new file mode 100644
index 00000000..060b4f43
--- /dev/null
+++ b/php/func.php
@@ -0,0 +1,10 @@
+<?php
+
+function is_valid_domain_name($domain_name)
+{
+    return (preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name) &&  //valid chars check
+        preg_match("/^.{1,253}$/", $domain_name) && //overall length check
+        preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name)); //length of each label
+}
+
+?>
\ No newline at end of file

From 8182a0da57f784d4d44fa02affb8e69e49fb268f Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 19 Aug 2016 20:02:08 -0400
Subject: [PATCH 2/2] Show failure message if domain was invalid

---
 js/pihole/list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/pihole/list.js b/js/pihole/list.js
index 652607b5..3f2e2d74 100644
--- a/js/pihole/list.js
+++ b/js/pihole/list.js
@@ -85,7 +85,8 @@ function add() {
         method: "post",
         data: {"domain":domain.val(), "list":list_type, "token":token},
         success: function(response) {
-          if (response.indexOf("not a valid argument")>=0) {
+          if (response.indexOf("not a valid argument") >= 0 ||
+              response.indexOf("is not a valid domain") >= 0) {
             alFailure.show();
             alFailure.delay(1000).fadeOut(2000, function() {
                 alFailure.hide();