Add flag 2 (#1)

* Now we're talking

* Testing flags

* Small fixes

* FLAG2 working! Removed flag 3

* Flag 2 is working, let's try making the challenge archive

* Remove comment from Cargo.toml

* How did that go?

* Weird

Author: Vianpyro

.dockerignore

@@ -0,0 +1,4 @@
+.git/
+target/
+solution/
+*.md

.github/workflows/package.yml

@@ -0,0 +1,127 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - 'flag*'
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  docker:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest
+
+      - name: Build and push
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  release-assets:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
+            | sh -s -- -y --default-toolchain none --profile minimal
+
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+      - name: Verify Rust version
+        run: |
+          rustc --version
+          rustc --version | grep "1.79.0"
+
+      - name: Build challenge
+        run: |
+          cargo build --release
+
+      - name: Verify required files
+        run: |
+          test -f Dockerfile
+          test -f libc.so.6
+          test -f ld-linux-x86-64.so.2
+          test -f rust-toolchain.toml
+          test -f src/lib.rs
+          test -f src/main.rs
+
+      - name: Verify binary
+        run: |
+          file target/release/nanolog
+
+      - name: Verify challenge starts with bundled libc
+        run: |
+          chmod +x target/release/nanolog
+          chmod +x ld-linux-x86-64.so.2
+
+          timeout 3 \
+            ./ld-linux-x86-64.so.2 \
+            --library-path . \
+            ./target/release/nanolog \
+            || true
+
+      - name: Create distribution archive
+        run: |
+          mkdir -p dist/src
+
+          cp Dockerfile dist/
+          cp rust-toolchain.toml dist/
+
+          cp libc.so.6 dist/
+          cp ld-linux-x86-64.so.2 dist/
+
+          cp target/release/nanolog dist/
+
+          cp src/lib.rs dist/src/
+          cp src/main.rs dist/src/
+
+          tar -czf nanolog-${{ github.ref_name }}.tar.gz -C dist .
+
+      - name: Create release
+        uses: softprops/action-gh-release@v3
+        with:
+          generate_release_notes: true
+          body: |
+            ## Docker image
+
+            ```
+            docker pull ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+            ```
+
+            ## Run
+
+            ```
+            docker run --rm -p 1337:1337 \
+              ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+            ```
+
+          files: |
+            nanolog-${{ github.ref_name }}.tar.gz

.github/workflows/release.yml

@@ -3,8 +3,19 @@ name: Rust
 on:
   push:
     branches: [ "main" ]
+    paths:
+      - "**/.github/workflows/release.yml"
+      - "**/*.rs"
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
   pull_request:
     branches: [ "main" ]
+    paths:
+      - "**/.github/workflows/release.yml"
+      - "**/*.rs"
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
+  workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/rust.yml

@@ -1,2 +1,3 @@
 /target
 .env
+*.so*

.gitignore

@@ -7,7 +7,8 @@ edition = "2021"
 heap-debug = []
 
 [profile.release]
-opt-level = 0
+strip = "symbols"
+opt-level = 3
 debug = true
 lto = false
 codegen-units = 1

Cargo.toml

@@ -1,15 +1,20 @@
 FROM ubuntu:22.04 AS build
 
 RUN apt-get update && apt-get install -y \
-        curl build-essential ca-certificates \
+    curl build-essential ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
-        | sh -s -- -y --default-toolchain none --profile minimal
+    | sh -s -- -y --default-toolchain none --profile minimal
+
 ENV PATH="/root/.cargo/bin:${PATH}"
 
+ARG FLAG2
+RUN printf '%s\n' "${FLAG2}" > /flag && chmod 444 /flag
+
 COPY . /build/
 WORKDIR /build
+
 RUN cargo build --release
 
 FROM ubuntu:22.04
@@ -19,11 +24,14 @@ RUN apt-get update && apt-get install -y socat \
     && useradd -m -s /bin/bash ctf
 
 COPY --from=build /build/target/release/nanolog /challenge/nanolog
-RUN chmod 755 /challenge/nanolog
+COPY --from=build /flag /flag
+
+RUN chmod 755 /challenge/nanolog \
+    && chown -R ctf:ctf /challenge
+
+USER ctf
 
 WORKDIR /challenge
 EXPOSE 1337
 
-CMD ["socat", \
-     "TCP-LISTEN:1337,reuseaddr,fork,nodelay", \
-     "EXEC:/challenge/nanolog,nofork"]
+CMD ["socat", "TCP-LISTEN:1337,reuseaddr,fork,nodelay", "EXEC:/challenge/nanolog,nofork"]

Dockerfile

@@ -1,14 +1,17 @@
 services:
   nanolog:
-    build: .
+    build:
+      context: .
+      args:
+        FLAG2: "DCI{N4n0L0g_L1bc_L34k_DC4svjxQ}"
     restart: unless-stopped
     ports:
       - "1337:1337"
     environment:
-    - FLAG=DCI{N4n0L0g_Adm1n_Byp4ss_9a6295810c1b}
+      - FLAG1=DCI{N4n0L0g_Adm1n_Byp4ss_b14b12bbcc2b}
     # pid: host   # Container escape vulnerability | Waiting on greenlight from infrastructure team
     read_only: true
     tmpfs:
-     - /tmp
+      - /tmp
     cap_drop:
-     - ALL
+      - ALL