diff --git a/services/phew/Dockerfile b/services/phew/Dockerfile index d6fd39a..c8b210d 100644 --- a/services/phew/Dockerfile +++ b/services/phew/Dockerfile @@ -27,7 +27,11 @@ COPY ./src /home/ctfuser/chall/src COPY ./start.sh /start.sh RUN chmod +x /start.sh /home/ctfuser/chall/src/run.sh -RUN chown -R root:root /home/ctfuser/chall && chmod -R 555 /home/ctfuser/chall +RUN chown -R root:root /home/ctfuser/chall && \ + chmod -R 555 /home/ctfuser/chall && \ + chown ctfuser:ctfuser /home/ctfuser/chall/src/Pailier.py && \ + chmod 755 /home/ctfuser/chall/src/Pailier.py EXPOSE 8000 22 CMD ["/start.sh"] + diff --git a/services/phew/dist/chall.py b/services/phew/dist/chall.py index da38716..64d2935 100644 --- a/services/phew/dist/chall.py +++ b/services/phew/dist/chall.py @@ -3,7 +3,7 @@ import signal from Pailier import * from Crypto.Util.number import * -signal.alarm(45) +signal.alarm(50) with open("/flag.txt", "rb") as f: flag = f.read() flag = bytes_to_long(flag) diff --git a/services/phew/src/chall.py b/services/phew/src/chall.py index da38716..64d2935 100644 --- a/services/phew/src/chall.py +++ b/services/phew/src/chall.py @@ -3,7 +3,7 @@ import signal from Pailier import * from Crypto.Util.number import * -signal.alarm(45) +signal.alarm(50) with open("/flag.txt", "rb") as f: flag = f.read() flag = bytes_to_long(flag) diff --git a/services/sheesh/Dockerfile b/services/sheesh/Dockerfile index 04a3a37..bce1805 100644 --- a/services/sheesh/Dockerfile +++ b/services/sheesh/Dockerfile @@ -2,8 +2,8 @@ FROM python:3.12-slim ARG PASSWORD=root ENV DEBIAN_FRONTEND=noninteractive -ENV HOME=/home/ctf -WORKDIR /home/ctf/chall +ENV HOME=/home/ctfuser +WORKDIR /home/ctfuser/chall RUN apt-get update && apt-get install -y --no-install-recommends \ openssh-server \ @@ -15,19 +15,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ bash \ && rm -rf /var/lib/apt/lists/* -RUN useradd -m -d /home/ctf -s /bin/bash ctf && \ - echo "ctf:${PASSWORD}" | chpasswd +RUN useradd -m -d /home/ctfuser -s /bin/bash ctfuser && \ + echo "ctfuser:${PASSWORD}" | chpasswd RUN mkdir -p /var/run/sshd COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -COPY ./src /home/ctf/chall/src +COPY ./src /home/ctfuser/chall/src COPY ./start.sh /start.sh -RUN chmod +x /start.sh /home/ctf/chall/src/run.sh +RUN chmod +x /start.sh /home/ctfuser/chall/src/run.sh -RUN chown -R root:root /home/ctf/chall && chmod -R 555 /home/ctf/chall +RUN chown -R root:root /home/ctfuser/chall && \ + chmod -R 555 /home/ctfuser/chall && \ + chown ctfuser:ctfuser /home/ctfuser/chall/src/chall.py && \ + chmod 755 /home/ctfuser/chall/src/chall.py EXPOSE 8000 22 CMD ["/start.sh"]