Remove insecure and dangerous relaxed auth mode

3 files changed, 22 insertions, 11 deletions

diff --git a/docker/.gitignore b/docker/.gitignore
index e69de29..fb43ecf 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -0,0 +1,3 @@
+id_rsa_docker*
+dmap2-A.csv.query
+dmap2-B.csv.query
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3cc5f6a..1ca59be 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,13 +2,20 @@
 # The container can be used for developing and testing
 # Purposes
 
-FROM fedora:34
-RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver
+FROM fedora:35
+RUN mkdir -p /etc/dserver /var/run/dserver/cache /var/log/dserver
 
 ADD ./dtail.json /etc/dserver/dtail.json
+# TODO: Compile dserver in a container as well, as otherwise might have glibc
+# errors.
 ADD ./dserver /usr/local/bin/dserver
 ADD ./mapr_testdata.log /var/log/mapr_testdata.log
 
+# Normal Linux user (simulates someone who want's to use DTail)
+RUN useradd fred
+ADD ./id_rsa_docker.pub /var/run/dserver/cache/fred.authorized_keys
+
+# DTail server user
 RUN useradd dserver
 RUN chown -R dserver /var/run/dserver /var/log/dserver
 USER dserver
@@ -16,4 +23,4 @@ USER dserver
 WORKDIR /var/run/dserver
 EXPOSE 2222/tcp
 
-CMD ["/usr/local/bin/dserver", "-RELAXED_AUTH_I_AM_REALLY_SURE", "-cfg", "/etc/dserver/dtail.json"]
+CMD ["/usr/local/bin/dserver", "-cfg", "/etc/dserver/dtail.json"]
diff --git a/docker/Makefile b/docker/Makefile
index aace8d3..a2ee81a 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -2,6 +2,7 @@ all: build
 testrun: build spinup dcat spindown
 serverfarm: spindown build spinup
 build:
+	sh -c 'yes | ssh-keygen -t rsa -f id_rsa_docker'
 	cp ../integrationtests/mapr_testdata.log .
 	cp ../dserver .
 	docker build . -t dserver:develop
@@ -14,20 +15,20 @@ spindown:
 spinup1:
 	docker run -p 2222:2222 dserver:develop
 dtail:
-	../dtail --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG
+	../dtail --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG
 dtail2:
-	../dtail --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG --query 'from stats select max($$goroutines),count($$hostname),$$hostname,last($$time) group by $$hostname order by max($$goroutines)'
+	../dtail --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG --query 'from stats select max($$goroutines),count($$hostname),$$hostname,last($$time) group by $$hostname order by max($$goroutines)'
 dgrep:
-	../dgrep --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
+	../dgrep --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
 dcat:
-	../dcat --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
+	../dcat --user fred --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
 dcat_notrust:
-	../dcat --servers serverlist.txt --files '/etc/passwd'
+	../dcat --user fred --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd'
 dmap:
-	../dmap --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg($$goroutines),max($$goroutines),min($$goroutines),last($$goroutines),count($$hostname),$$hostname group by $$hostname order by avg($$goroutines)'
+	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg($$goroutines),max($$goroutines),min($$goroutines),last($$goroutines),count($$hostname),$$hostname group by $$hostname order by avg($$goroutines)'
 test: dmap_test dmap2_test
 dmap_test:
-	../dmap --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
-	../dmap --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-B.csv'
+	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
+	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-B.csv'
 	@echo Expecting zero diff!
 	diff -u <(sort dmap2-A.csv) <(sort dmap2-B.csv)