From e76a679d9894847b6716f2ffe07f1bb1ea83db58 Mon Sep 17 00:00:00 2001
From: Connor Nelson <Connor@ConnorNelson.com>
Date: Mon, 6 Jan 2025 14:48:22 -0700
Subject: [PATCH] Update to simple challenge image

---
 dojo.yml                    | 4 ++--
 welcome/challenge/solve     | 2 +-
 welcome/desktop-paste/.init | 5 +++--
 welcome/desktop-paste/solve | 2 +-
 welcome/desktop/.init       | 3 +++
 welcome/desktop/solve       | 2 +-
 welcome/flag/solve          | 2 +-
 welcome/persist-1/solve     | 2 +-
 welcome/persist-2/solve     | 2 +-
 welcome/practice/solve      | 2 +-
 welcome/restart/.init       | 3 +++
 welcome/restart/solve       | 2 +-
 welcome/sensai/.init        | 2 ++
 welcome/sensai/solve        | 2 +-
 welcome/vscode/.init        | 3 +++
 welcome/vscode/solve        | 2 +-
 16 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 welcome/desktop/.init
 create mode 100644 welcome/restart/.init
 create mode 100644 welcome/vscode/.init

diff --git a/dojo.yml b/dojo.yml
index f1be2f0..effe669 100644
--- a/dojo.yml
+++ b/dojo.yml
@@ -4,11 +4,11 @@ name: Getting Started
 
 type: welcome
 
-image: pwncollege/challenge-legacy:latest
-
 award:
   belt: white
 
+image: pwncollege/challenge-simple
+
 modules:
   - id: welcome
   - id: discord
diff --git a/welcome/challenge/solve b/welcome/challenge/solve
index 4b0b1e3..b0fb16b 100644
--- a/welcome/challenge/solve
+++ b/welcome/challenge/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/kick-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/desktop-paste/.init b/welcome/desktop-paste/.init
index 8b85f7a..08d4e44 100644
--- a/welcome/desktop-paste/.init
+++ b/welcome/desktop-paste/.init
@@ -1,4 +1,5 @@
 #!/bin/bash
 
-stat /bin/sudo | grep Access.*755 || echo "PRACTICE" > /challenge/.secret
-chmod 700 /challenge/.secret
+echo 'source /challenge/.bashrc' >> /etc/bashrc
+
+chmod 400 /challenge/.secret
diff --git a/welcome/desktop-paste/solve b/welcome/desktop-paste/solve
index 2748542..1803076 100755
--- a/welcome/desktop-paste/solve
+++ b/welcome/desktop-paste/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/karate-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/desktop/.init b/welcome/desktop/.init
new file mode 100644
index 0000000..ff3e32f
--- /dev/null
+++ b/welcome/desktop/.init
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 'source /challenge/.bashrc' >> /etc/bashrc
diff --git a/welcome/desktop/solve b/welcome/desktop/solve
index e3909d2..6dbb183 100755
--- a/welcome/desktop/solve
+++ b/welcome/desktop/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/karate-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/flag/solve b/welcome/flag/solve
index 372fb11..212db0a 100644
--- a/welcome/flag/solve
+++ b/welcome/flag/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/kick-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/persist-1/solve b/welcome/persist-1/solve
index a3612aa..7781e95 100644
--- a/welcome/persist-1/solve
+++ b/welcome/persist-1/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://ascii.co.uk/art/karate
 
diff --git a/welcome/persist-2/solve b/welcome/persist-2/solve
index f672aa6..ac3409c 100644
--- a/welcome/persist-2/solve
+++ b/welcome/persist-2/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://ascii.co.uk/art/karate
 
diff --git a/welcome/practice/solve b/welcome/practice/solve
index 8434b78..68fb4bc 100644
--- a/welcome/practice/solve
+++ b/welcome/practice/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/kung-fu-ascii-art
 
diff --git a/welcome/restart/.init b/welcome/restart/.init
new file mode 100644
index 0000000..ff3e32f
--- /dev/null
+++ b/welcome/restart/.init
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 'source /challenge/.bashrc' >> /etc/bashrc
diff --git a/welcome/restart/solve b/welcome/restart/solve
index ca03fba..7d8a688 100755
--- a/welcome/restart/solve
+++ b/welcome/restart/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/karate-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/sensai/.init b/welcome/sensai/.init
index dc848a1..44fca6d 100644
--- a/welcome/sensai/.init
+++ b/welcome/sensai/.init
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+echo 'source /challenge/.bashrc' >> /etc/bashrc
+
 chmod 4711 /challenge/solve
diff --git a/welcome/sensai/solve b/welcome/sensai/solve
index b830c50..249af3b 100755
--- a/welcome/sensai/solve
+++ b/welcome/sensai/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://www.asciiart.eu/electronics/light-bulbs
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done
diff --git a/welcome/vscode/.init b/welcome/vscode/.init
new file mode 100644
index 0000000..ff3e32f
--- /dev/null
+++ b/welcome/vscode/.init
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 'source /challenge/.bashrc' >> /etc/bashrc
diff --git a/welcome/vscode/solve b/welcome/vscode/solve
index 7c3aeb4..eabeacd 100755
--- a/welcome/vscode/solve
+++ b/welcome/vscode/solve
@@ -1,4 +1,4 @@
-#!/opt/pwn.college/bash
+#!/usr/bin/exec-suid -- /bin/bash -p
 
 # art from https://emojicombos.com/karate-ascii-art
 cat <<END | while read LINE; do echo "$LINE"; sleep 0.1; done