Apply contex-aware encoding to the rest of the program.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "report/AUThReport"]
+	path = report/AUThReport
+	url = ssh://git@git.hoo2.net:222/hoo2/AUThReport.git

passman-dev/php/passman/dashboard.php

@@ -26,12 +26,23 @@ if(isset($_POST['new_website'], $_POST['new_username'], $_POST['new_password'])
 	$new_username = trim($_POST["new_username"]);
 	$new_password = trim($_POST["new_password"]);
 
-	// Insert new web site
-	$sql_query = "INSERT INTO websites (login_user_id,web_url,web_username,web_password) VALUES " .
-				"((SELECT id FROM login_users WHERE username='{$username}'),'{$new_website}','{$new_username}','{$new_password}');";
+	// Insert new web site using a prepared statement to prevent SQL injection.
+	$sql_query = "INSERT INTO websites (login_user_id, web_url, web_username, web_password) VALUES " .
+				"((SELECT id FROM login_users WHERE username = ?), ?, ?, ?)";
+
+	$stmt = $conn->prepare($sql_query);
+	if ($stmt === false) {
+		$conn->close();
+		die("Prepare failed.");
+	}
+
+	$stmt->bind_param("ssss", $username, $new_website, $new_username, $new_password);
 	//echo $sql_query;
-	$result = $conn->query($sql_query);
-	$conn -> close();
+
+	$result = $stmt->execute();
+	$stmt->close();
+	$conn->close();
+
 
 	// After processing, redirect to the same page to clear the form
 	unset($_POST['new_website']);
@@ -45,11 +56,25 @@ if(isset($_POST['new_website'], $_POST['new_username'], $_POST['new_password'])
 if(isset($_POST['delete_website']) && trim($_POST["websiteid"] != '')) {
 	$webid = trim($_POST["websiteid"]);
 
+	// Cast to int to avoid unexpected input and use a prepared statement to prevent SQL injection.
+	$webid = (int)trim($_POST["websiteid"]);
+
 	// Delete selected web site
-	$sql_query = "DELETE FROM websites WHERE webid='{$webid}';";
+	$sql_query = "DELETE FROM websites WHERE webid = ?";
+
+	$stmt = $conn->prepare($sql_query);
+	if ($stmt === false) {
+		$conn->close();
+		die("Prepare failed.");
+	}
+
+	$stmt->bind_param("i", $webid);
 	//echo $sql_query;
-	$result = $conn->query($sql_query);
-	$conn -> close();
+
+	$result = $stmt->execute();
+	$stmt->close();
+	$conn->close();
+
 
 	// After processing, redirect to the same page to clear the form
 	unset($_POST['websiteid']);
@@ -57,22 +82,40 @@ if(isset($_POST['delete_website']) && trim($_POST["websiteid"] != '')) {
 	exit();
 }
 
-// Display list of user's web sites
-$sql_query = "SELECT * FROM websites INNER JOIN login_users ON websites.login_user_id=login_users.id WHERE login_users.username='{$username}';";
+// Display list of user's web sites using a prepared statement to prevent SQL injection.
+$sql_query = "SELECT * FROM websites INNER JOIN login_users ON websites.login_user_id=login_users.id WHERE login_users.username = ?";
 //echo $sql_query;
-$result = $conn->query($sql_query);
+
+$stmt = $conn->prepare($sql_query);
+if ($stmt === false) {
+    $conn->close();
+    die("Prepare failed.");
+}
+
+$stmt->bind_param("s", $username);
+$stmt->execute();
+$result = $stmt->get_result();
+$stmt->close();
+
 
 //echo htmlspecialchars($username);
-echo "<h3>Entries of " . $username . "</h3>";
+$safe_username = htmlspecialchars($username, ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+echo "<h3>Entries of " . $safe_username . "</h3>";
 
 if (!empty($result) && $result->num_rows >= 1) {
 	while ($row = $result -> fetch_assoc()) {
+		// Escape output to prevent stored XSS (DB content must be treated as untrusted).
+		$safe_url  = htmlspecialchars($row["web_url"], ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+		$safe_user = htmlspecialchars($row["web_username"], ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+		$safe_pass = htmlspecialchars($row["web_password"], ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+		$webid_safe = (int)$row["webid"];
+
 		echo "<table border=0>";
-		echo	"<tr style='background-color: #f4f4f4;'><td colspan=2>" . $row["web_url"] . "</td></tr>" . 
-				"<tr><td>Username: " . $row["web_username"] . "</td><td>Password: " . $row["web_password"] . "</td></tr>";
+		echo	"<tr style='background-color: #f4f4f4;'><td colspan=2>" . $safe_url . "</td></tr>" . 
+				"<tr><td>Username: " . $safe_user . "</td><td>Password: " . $safe_pass  . "</td></tr>";
 
 		echo	"<tr><td><form method='POST' style='height: 3px'>" . 
-				"<input type='hidden' name='websiteid' value='" . $row["webid"] . "'>" .
+				"<input type='hidden' name='websiteid' value='" . $webid_safe . "'>" .
 				"<button type='submit' name='delete_website'>Delete</button></form></td></tr>";
 
 		echo	"<tr><td colspan=2 style=height: 20px;></td></tr>";

passman-dev/php/passman/login.php

@@ -26,16 +26,22 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
 		// }
 		require_once __DIR__ . "/config.php";
 
-		// xxx' OR 1=1; -- '
-		$sql_query = "SELECT * FROM login_users WHERE username='{$username}' AND password='{$password}';";
-		//echo $sql_query;
+		// SQL injection mitigation: use a prepared statement with bound parameters.
+		// User input is treated strictly as data, not as part of the SQL syntax.
+		$stmt = $conn->prepare("SELECT id FROM login_users WHERE username = ? AND password = ?");
 
-		// Check if the credentials are valid
-		$result = $conn->query($sql_query);
+		if ($stmt === false) {
+			// Fail closed (do not leak details in production).
+			die("Prepare failed.");
+		}
+
+		$stmt->bind_param("ss", $username, $password);
+		$stmt->execute();
+		$stmt->store_result();   // Needed to use $stmt->num_rows
 		unset($_POST['username']);
 		unset($_POST['password']);
 
-		if (!empty($result) && $result->num_rows >= 1) {
+		if ($stmt->num_rows >= 1) {
 			// Regenerate session ID to prevent session fixation!
 			//session_regenerate_id(true);
 
@@ -48,8 +54,8 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
 			//	$_SESSION['user_id'] = $row['id'];
 			//}
 
-			// Free result set
-			$result -> free_result();
+			// Close
+			$stmt->close();
 			$conn -> close();
 
 			// Redirect to a dashboard page
@@ -58,7 +64,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
 		} else {
 			$login_message = "Invalid username or password";
 		}
-
+		$stmt->close();
 		$conn -> close();
 	}
 }

passman-dev/php/passman/notes.php

@@ -50,13 +50,24 @@ if(isset($_POST['new_note']) && trim($_POST['new_note']) !='') {
 	//$sql_query = "INSERT INTO notes (login_user_id,note) VALUES " .
 	//			 "((SELECT id FROM login_users WHERE username='{$username}'),('{$new_note}'));";
 
+    // Insert new note using a prepared statement to prevent SQL injection.
     $sql_query = "INSERT INTO notes (login_user_id, note) ".
-				 "VALUES ((SELECT id FROM login_users WHERE username='{$username}'), '{$new_note}')";
+                "VALUES ((SELECT id FROM login_users WHERE username = ?), ?)";
 
+    $stmt = $conn->prepare($sql_query);
+    if ($stmt === false) {
+        // Fail closed (do not leak DB details).
+        $conn->close();
+        die("Prepare failed.");
+    }
+
+    $stmt->bind_param("ss", $username, $new_note);
     //echo $sql_query;
 
-	$result = $conn->query($sql_query);
-	$conn -> close();
+    $result = $stmt->execute();
+    $stmt->close();
+    $conn->close();
+
 
 	// After processing, redirect to the same page to clear the form
 	unset($_POST['new_note']);
@@ -73,12 +84,17 @@ echo "<h3>List of notes/comments</h3>";
 
 if (!empty($result) && $result->num_rows >= 1) {
     while ($row = $result -> fetch_assoc()) {
+        // Escape output to prevent stored XSS (DB content must be treated as untrusted).
+        $safe_note = htmlspecialchars($row["note"], ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+        $safe_user = htmlspecialchars($row["username"], ENT_QUOTES | ENT_SUBSTITUTE, "UTF-8");
+
         echo "<div class='note'>";
-		echo	"<div class='note-content'>" . $row["note"] . "</div>";
-		echo	"<div class='note-signature'> by " . $row["username"] . "</div>";
+        echo    "<div class='note-content'>" . $safe_note . "</div>";
+        echo    "<div class='note-signature'> by " . $safe_user . "</div>";
         echo "</div>";
     }
 
+
 	// Free result set
 	$result -> free_result();
 } else {

passman-dev/php/passman/register.php

@@ -29,11 +29,19 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
 		//}
 		require_once __DIR__ . "/config.php";
 
-		// Insert a new user
-		$sql_query = "INSERT INTO login_users (username,password) VALUES ('{$new_username}','{$new_password}');";
-		//echo $sql_query;
+		// Insert a new user using a prepared statement to prevent SQL injection.
+		$sql_query = "INSERT INTO login_users (username, password) VALUES (?, ?)";
+
+		$stmt = $conn->prepare($sql_query);
+		if ($stmt === false) {
+			$login_message = "Database error (prepare failed).";
+			$result = false;
+		} else {
+			$stmt->bind_param("ss", $new_username, $new_password);
+			$result = $stmt->execute();
+			$stmt->close();
+		}
 
-		$result = $conn->query($sql_query);
 
 		unset($_POST['new_username']);
 		unset($_POST['new_password']);

passman-dev/php/passman/xss/stolencookies.txt

@@ -0,0 +1,3 @@
+
+PHPSESSID=2c215dd41fe1090a5da5d0f3adc6ba64
+PHPSESSID=2c215dd41fe1090a5da5d0f3adc6ba64

passman-dev/php/xss/stolencookies.txt

@@ -1,2 +0,0 @@
-PHPSESSID=knjfug3u4gavdas9o4eupe38l1; seclab_user=u1
-seclab_user=u1; PHPSESSID=o1mg400lipd2mck69kpfnl6p5s

report/.gitignore

@@ -0,0 +1,6 @@
+# Report related files
+*.aux
+*.out
+*.log
+*.synctex.gz
+_minted-report/*