Fixed CR and made some other small improvements

Author: ShayNehmad

Dockerfile

@@ -16,48 +16,44 @@ RUN apt install -y \
 	tmux
 
 # Create the required users. The game master is the `git` account, and the player is the user's account
-# TODO - change the gamemaster password?
-# TODO - change the gamemaster username to git?
-RUN useradd --comment "GameMaster account" --create-home --password $(mkpasswd -m sha-512 gamemaster) gamemaster
-RUN useradd --comment "Player account" --create-home --password $(mkpasswd -m sha-512 player) --shell /bin/zsh player
+RUN useradd --comment "GameMaster account" --create-home --password $(mkpasswd -m sha-512 94+wings+STRONG+mountain+35) gamemaster
+RUN useradd --comment "Player account" --create-home --password $(mkpasswd -m sha-512 player) --shell $(which zsh) player
 
 # Set up the player's SSH keys and copy the public key to /tmp
 COPY build/player_entrypoint.sh /home/player
-RUN ls -Rla /home/player
 RUN chown player:player /home/player/player_entrypoint.sh
 RUN chmod 770 /home/player/player_entrypoint.sh
-RUN ls -Rla /home/player
 RUN su -c "/home/player/player_entrypoint.sh" - player
+COPY build/player_zshrc.sh /home/player/.zshrc
+RUN chown player:player /home/player/.zshrc
+RUN chmod 770 /home/player/.zshrc
 
 RUN mkdir /var/run/sshd
 RUN echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config
 RUN echo 'ClientAliveCountMax 10' >>  /etc/ssh/sshd_config
-COPY build/ssh_banner.txt /etc/banner
-RUN echo 'Banner /etc/banner' >> /etc/ssh/sshd_config
+COPY build/login_banner.txt /etc/motd
 
-# Set up the git server so that the player can run git clone gamemaster@localhost:/home/gamemaster/game-repo
-RUN git clone --bare https://github.com/ShayNehmad/make-git-better-levels.git /home/gamemaster/game-repo
+# Set up the git server so that the player can run git clone gamemaster@localhost:/home/gamemaster/ctf-repo
+RUN git clone --bare https://github.com/ShayNehmad/make-git-better-levels.git /home/gamemaster/ctf-repo
 # This file adds the player's ssh public key from before
 COPY build/gamemaster_entrypoint.sh /home/gamemaster
 RUN chown gamemaster:gamemaster /home/gamemaster/gamemaster_entrypoint.sh
 RUN chmod 770 /home/gamemaster/gamemaster_entrypoint.sh
 RUN su -c "/home/gamemaster/gamemaster_entrypoint.sh" - gamemaster
 # Set up the hooks for the actual gameplay in the repo
-COPY levels/checkers /home/gamemaster/game-repo/hooks/checkers
-COPY scripts/generate-pre-receive-hook/output/pre-receive /home/gamemaster/game-repo/hooks
+COPY levels/checkers /home/gamemaster/ctf-repo/hooks/checkers
+COPY scripts/generate-pre-receive-hook/output/pre-receive /home/gamemaster/ctf-repo/hooks
 # Make sure that gamemaster owns all of their files
 RUN chown -R gamemaster:gamemaster /home/gamemaster
 
-# Now that we're done with gamemaster's setup we can change his shell to git shell 
+# Now that we're done with gamemaster's setup we can change their shell to git shell and block their home directory
 RUN chsh gamemaster -s $(which git-shell)
+RUN chmod 700 -R /home/gamemaster
 
 # Cleanup
 RUN rm -rf /tmp/*
 RUN rm -rf /home/player/player_entrypoint.sh
 
-# Some debug messages
-RUN ls -Rla /home
-
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 

build/ssh_banner.txt renamed to build/login_banner.txt

@@ -16,9 +16,13 @@
     \__\/         \__\/                                 \__\/         \__\/    
 
 
-	   A CTF challenge by Shay Nehmad 
+	   A git CTF challenge by Shay Nehmad 
 	   Visit https://mrnice.dev
 
 This is a game server. Please try to not mess it up ¯\_(ツ)_/¯
 If you find any issues, let me know @ShayNehmad on Twitter.
 
+To start playing, clone the game repository by running:
+
+    git clone gamemaster@localhost:~/ctf-repo
+

build/player_entrypoint.sh

@@ -13,8 +13,7 @@ cat ~/.ssh/id_rsa.pub >> /tmp/id_rsa.player.pub
 
 echo "Setting up zsh"
 sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-echo "ZSH_THEME=\"agnoster\"" >> ~/.zshrc
-echo "plugins=( git )" >> ~/.zshrc
+
 
 git config --global user.email "[email protected]"
 git config --global user.name "CTF player"

build/player_zshrc.sh

@@ -0,0 +1,6 @@
+export ZSH="/home/player/.oh-my-zsh"
+ZSH_THEME="juanghurtado"
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+