From 223090c0e431511dacdea3eb77c0ac9d1ee0518b Mon Sep 17 00:00:00 2001
From: mad <mad@nativenet.ch>
Date: Sun, 23 Sep 2018 15:51:44 +0200
Subject: [PATCH] no drive should stay no drive in web. Createkey, gitignore

---
 .gitignore    | 2 ++
 nlvmi         | 9 ++++++++-
 web/index.php | 6 +++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..275ece2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.key
+*.crt
diff --git a/nlvmi b/nlvmi
index e294bf7..116bd3b 100755
--- a/nlvmi
+++ b/nlvmi
@@ -102,7 +102,10 @@ function createdb {
     fi
     checkdb && echo "DB creation successful!" || (echo "Failed to create the DB"; exit 1)
 }
-
+#create signing key
+function createkey {
+	openssl req -nodes -x509 -sha256 -newkey rsa:4096 -keyout "nlvmi_priv.key" -out "nlvmi_sign.crt" -days 9999 -subj "/CN=nlvmi_signing"
+}
 #autostart VMs
 function vmautostart {
 	if [ $DATABASETYPE == "sqlite" ]; then
@@ -291,6 +294,10 @@ if [ $# -gt 0 ]; then
 				echo "not allowed";
 			fi
 		fi
+	elif [ $1 == "createkey" ]; then
+		if [ ! -z $MASTERSERVER ]; then
+			createkey
+		fi
 	fi
 else
     checkdb
diff --git a/web/index.php b/web/index.php
index bd2f47b..248f047 100644
--- a/web/index.php
+++ b/web/index.php
@@ -42,7 +42,7 @@ function serverdepropdown($server, $val, $what){
             echo "<a class=dropdown-item href=\"javascript:dropdown('".$what."button','$file[$lastpart]')\">$file[$lastpart]</a>";
         }
     }
-    echo "$enddiv</div></div></div><input type=hidden id=".$what."buttonh name=$what value=$val>";
+    echo "$enddiv</div></div></div><input type=hidden id=".$what."buttonh name=$what value=\"$val\">";
 }
 function formatbuttons($label, $val){
     echo "<div class=row><div class=col>$label</div><div class=col><div class=dropdown><button class=\"btn btn-secondary dropdown-toggle\" type=button id=".$label."button$label data-toggle=dropdown aria-haspopup=true aria-expanded=false>$val</button>";
@@ -290,6 +290,8 @@ if (isset($_SESSION['username'])){
                     $rvalue = clean($_REQUEST[$rkey]);
                     if ($rvalue == "x86_64"){
                         $rvalue = "qemu-system-x86_64";
+                    } elseif ((preg_match('/no drive/', $rvalue))||($rvalue == "no cdrom")){
+                        $rvalue = "";
                     }
                     $sqlc .= "$rkey,";
                     $sqlv .= "'$rvalue',";    
@@ -318,6 +320,8 @@ if (isset($_SESSION['username'])){
                     }
                     if ($rvalue == "x86_64"){
                         $rvalue = "qemu-system-x86_64";
+                    } elseif ((preg_match('/no drive/', $rvalue))||($rvalue == "no cdrom")){
+                        $rvalue = "";
                     }
                     $sql .= " $rkey='$rvalue',";
                 }