From c6ce8faadce8178dd9c7f50dd27d5ea16e8fd90d Mon Sep 17 00:00:00 2001
From: Joachim Metz <joachim.metz@gmail.com>
Date: Sun, 5 May 2024 06:52:06 +0200
Subject: [PATCH] Changes for nsrlsvr end-to-end tests

---
 config/end_to_end/nsrlsvr.Dockerfile   | 32 +++++++++++
 config/linux/ubuntu_install_nsrlsvr.sh | 74 --------------------------
 2 files changed, 32 insertions(+), 74 deletions(-)
 create mode 100644 config/end_to_end/nsrlsvr.Dockerfile
 delete mode 100755 config/linux/ubuntu_install_nsrlsvr.sh

diff --git a/config/end_to_end/nsrlsvr.Dockerfile b/config/end_to_end/nsrlsvr.Dockerfile
new file mode 100644
index 0000000000..88a8d37cf8
--- /dev/null
+++ b/config/end_to_end/nsrlsvr.Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:noble
+MAINTAINER Log2Timeline <log2timeline-dev@go
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Combining the apt-get commands into a single run reduces the size of the resulting image.
+# The apt-get installations below are interdependent and need to be done in sequence.
+RUN apt-get -y update && \
+    apt-get -y install apt-transport-https apt-utils && \
+    apt-get -y install libterm-readline-gnu-perl software-properties-common && \
+    apt-get -y install locales
+
+# Set terminal to UTF-8 by default.
+RUN locale-gen en_US.UTF-8
+RUN update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
+# Install nsrlsvr.
+RUN add-apt-repository ppa:gift/dev -y && \
+    apt-get update -q && \
+    apt-get install -y nsrlsvr-server
+
+# Initialize nsrlsvr hashes.txt file.
+RUN mkdir -p /var/share/nsrlsvr && \
+    mkdir -p /usr/share/nsrlsvr && \
+    touch /usr/share/nsrlsvr/hashes.txt
+
+WORKDIR /home/test/
+
+# Clean up apt-get cache files.
+RUN apt-get clean && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
diff --git a/config/linux/ubuntu_install_nsrlsvr.sh b/config/linux/ubuntu_install_nsrlsvr.sh
deleted file mode 100755
index 1327789a51..0000000000
--- a/config/linux/ubuntu_install_nsrlsvr.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-#
-# Script to install nsrlsvr on Ubuntu from the GIFT PPA.
-
-AUXILIARY_DATA_PATH="/media/auxiliary";
-
-# Exit on error.
-set -e
-
-# Install and configure nsrlsvr
-sudo add-apt-repository ppa:gift/dev -y
-sudo apt-get update -q
-sudo apt-get install -y curl net-tools nsrlsvr-server unzip
-
-sudo mkdir -p /var/share/nsrlsvr
-
-if [ -f "${AUXILIARY_DATA_PATH}/nsrlsvr/hashes.txt" ];
-then
-	cp -f "${AUXILIARY_DATA_PATH}/nsrlsvr/hashes.txt" /var/share/nsrlsvr;
-fi
-
-# Have nsrlupdate generate /var/share/nsrlsvr/hashes.txt
-if [ ! -f /var/share/nsrlsvr/hashes.txt ];
-then
-	if [ -f "${AUXILIARY_DATA_PATH}/nsrlsvr/NSRLFile.txt" ];
-	then
-		cp -f "${AUXILIARY_DATA_PATH}/nsrlsvr/NSRLFile.txt" .
-	fi
-
-	if [ ! -f NSRLFile.txt ];
-	then
-		if [ -f "${AUXILIARY_DATA_PATH}/nsrlsvr/rds_modernm.zip" ];
-		then
-			cp -f "${AUXILIARY_DATA_PATH}/nsrlsvr/rds_modernm.zip" .
-		fi
-
-		if [ ! -f rds_modernm.zip ];
-		then
-			# Download the minimum RDS hash set.
-			# Note that rds_modernm.zip is approximate 2 GiB in size.
-			curl -o rds_modernm.zip https://s3.amazonaws.com/rds.nsrl.nist.gov/RDS/rds_2024.03.1/RDS_2024.03.1_modern_minimal.zip
-		fi
-
-		if [ ! -f rds_modernm.zip ];
-		then
-			echo "Missing: rds_modernm.zip";
-
-			exit 1
-		fi
-		# Note that NSRLFile.txt is approximate 4 GiB in size.
-		unzip -x rds_modernm.zip rds_modernm/NSRLFile.txt
-
-		mv rds_modernm/NSRLFile.txt .
-	fi
-
-	if [ ! -f NSRLFile.txt ];
-	then
-		echo "Missing: NSRLFile.txt";
-
-		exit 1
-	fi
-
-	# Build the nsrlsvr hashes.txt file
-	sudo mkdir -p /usr/share/nsrlsvr
-	sudo touch /usr/share/nsrlsvr/hashes.txt
-	sudo /usr/bin/python3 /usr/bin/nsrlupdate NSRLFile.txt
-fi
-
-# For the sake of verbosity have nsrlsvr test its set up first
-time sudo /usr/bin/nsrlsvr --dry-run
-
-# Run nsrlsvr listening on port 9120
-sudo /usr/bin/nsrlsvr -p 9120
-