Switch py2neo to neo4j, fix some STIX issues.

Makefile

@@ -39,19 +39,22 @@ start: check-env
 		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml up --wait -d
 
 stop: check-env
-		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml down
+		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml down --remove-orphans
 
 stop_purge: check-env
-		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml down -v
+		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml down --remove-orphans -v
 
 rebuild: build stop start
 
+rebuild_purge: build stop_purge start
+
 restart: stop start
 
-web_attack: check-env
-		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec target /bin/bash -c "ipset add allowlist attacker"
-		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec attacker /bin/bash -c "source ./attacker/bin/activate && python -m unittest discover -s ./tests/ -p 'test_*.py'"
-		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec target /bin/bash -c "ipset del allowlist attacker"
+# Not currently working, but want to fix in the future
+# web_attack: check-env
+# 		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec target /bin/bash -c "ipset add allowlist attacker"
+# 		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec attacker /bin/bash -c "source ./attacker/bin/activate && python -m unittest discover -s ./tests/ -p 'test_*.py'"
+# 		@docker compose -f docker-compose.yml -f docker-compose-emu.yml exec target /bin/bash -c "ipset del allowlist attacker"
 
 logs: check-env
 		@docker compose -f docker-compose.yml -f docker-compose-${MODE}.yml logs -f

attacker/Dockerfile

@@ -2,18 +2,19 @@ FROM kalilinux/kali-rolling:latest
 
 USER root
 
+# Use the Cloudflare Mirror (see http://http.kali.org/README?mirrorlist)
+ENV APT_MIRROR="kali.download/kali/"
+RUN sed --in-place --regexp-extended "s#http.kali.org/kali#${APT_MIRROR}#g" /etc/apt/sources.list
+
+# Recommend kali-linux-headless package, but very large so not installing here
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
         build-essential \
-        chromium \
-        chromium-driver \
-        kali-linux-headless \
-        libffi-dev \
+        nmap \
         openssh-server \
         python3-dev \
         python3-pip \
-        python3-selenium \
         python3-venv
 
 RUN ssh-keygen -A