From 3be084ade669202c0b8e4953df5e636a75143110 Mon Sep 17 00:00:00 2001 From: kaitoozawa Date: Sun, 14 Dec 2025 15:23:46 +1000 Subject: [PATCH 1/2] fix dockerfile installation and test spec --- Dockerfile | 9 +++++++-- .../core/main/network_stack/handlers/redirector_spec.rb | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7647faf6f..d5ee8fd71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ########################################################################################################### # ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------ -FROM ruby:3.4.7-slim-bullseye AS builder +FROM ruby:3.4.5-slim-bullseye AS builder COPY . /beef @@ -28,10 +28,12 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \ git \ curl \ xz-utils \ + pkg-config \ make \ g++ \ libcurl4-openssl-dev \ ruby-dev \ + libyaml-dev \ libffi-dev \ zlib1g-dev \ libsqlite3-dev \ @@ -44,7 +46,7 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \ # ---------------------------- Start of Builder 1 - Final Build ------------------------------------------ -FROM ruby:3.4.7-slim-bullseye +FROM ruby:3.4.5-slim-bullseye LABEL maintainer="Beef Project" \ source_url="github.com/beefproject/beef" \ homepage="https://beefproject.com/" @@ -61,6 +63,9 @@ RUN adduser --home /beef --gecos beef --disabled-password beef \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ + wget \ + espeak \ + lame \ openssl \ libssl-dev \ libreadline-dev \ diff --git a/spec/beef/core/main/network_stack/handlers/redirector_spec.rb b/spec/beef/core/main/network_stack/handlers/redirector_spec.rb index e17293127..68b97d42e 100644 --- a/spec/beef/core/main/network_stack/handlers/redirector_spec.rb +++ b/spec/beef/core/main/network_stack/handlers/redirector_spec.rb @@ -32,7 +32,7 @@ RSpec.describe 'BeEF Redirector' do response = Curl::Easy.http_get("http://127.0.0.1:#{@port}/test/") expect(response.response_code).to eql(302) expect(response.body_str).to eql("302 found") - expect(response.header_str).to match(/Location: http:\/\/www.beefproject\.com/) + expect(response.header_str).to match(/location:\s*http:\/\/www\.beefproject\.com/i) end end From 149aeaa944f4a405a3872b9259dd5beb88f830ef Mon Sep 17 00:00:00 2001 From: kaitoozawa Date: Mon, 15 Dec 2025 16:32:48 +1000 Subject: [PATCH 2/2] Fix review comments --- Dockerfile | 4 ++-- spec/beef/core/main/network_stack/handlers/redirector_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5ee8fd71..470f9acd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ########################################################################################################### # ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------ -FROM ruby:3.4.5-slim-bullseye AS builder +FROM ruby:3.4.7-slim-bookworm AS builder COPY . /beef @@ -46,7 +46,7 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \ # ---------------------------- Start of Builder 1 - Final Build ------------------------------------------ -FROM ruby:3.4.5-slim-bullseye +FROM ruby:3.4.7-slim-bookworm LABEL maintainer="Beef Project" \ source_url="github.com/beefproject/beef" \ homepage="https://beefproject.com/" diff --git a/spec/beef/core/main/network_stack/handlers/redirector_spec.rb b/spec/beef/core/main/network_stack/handlers/redirector_spec.rb index 68b97d42e..415d2ff39 100644 --- a/spec/beef/core/main/network_stack/handlers/redirector_spec.rb +++ b/spec/beef/core/main/network_stack/handlers/redirector_spec.rb @@ -32,7 +32,7 @@ RSpec.describe 'BeEF Redirector' do response = Curl::Easy.http_get("http://127.0.0.1:#{@port}/test/") expect(response.response_code).to eql(302) expect(response.body_str).to eql("302 found") - expect(response.header_str).to match(/location:\s*http:\/\/www\.beefproject\.com/i) + expect(response.header_str).to match(/^location:\s*http:\/\/www\.beefproject\.com\r?$/i) end end