Address review: assert uploaded bytes in disk update test

direct_upload_url_for now returns [blob, url] so the authenticated update
test can assert blob.download matches the uploaded payload, not just the
204 status — guarding against a write landing at the wrong key or with the
wrong content. Both update call sites destructure the tuple.

Gemfile.lock

@@ -137,7 +137,7 @@ GEM
     bcrypt (3.1.22)
     benchmark (0.5.0)
     bigdecimal (3.3.1)
-    brakeman (8.0.5)
+    brakeman (8.0.4)
       racc
     builder (3.3.0)
     bundler-audit (0.9.3)
@@ -153,13 +153,13 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chunky_png (1.4.0)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.5)
     crack (1.0.0)
       bigdecimal
       rexml
-    crass (1.0.7)
-    date (3.5.1)
+    crass (1.0.6)
+    date (3.5.0)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -191,7 +191,7 @@ GEM
     jbuilder (2.14.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
-    json (2.20.0)
+    json (2.13.2)
     jwt (3.2.0)
       base64
     kredis (1.8.0)
@@ -201,7 +201,7 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loofah (2.25.2)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -224,7 +224,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http-persistent (4.0.6)
       connection_pool (~> 2.2, >= 2.2.4)
-    net-imap (0.6.4.1)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -234,13 +234,13 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.4-aarch64-linux-gnu)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.4-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.4-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.4-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     openssl (3.3.0)
     ostruct (0.6.3)
@@ -278,8 +278,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.1)
-      loofah (~> 2.25, >= 2.25.2)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_autolink (1.1.8)
       actionview (> 3.1)
@@ -367,10 +367,10 @@ GEM
       rack-protection (= 4.2.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sqlite3 (2.9.5-aarch64-linux-gnu)
-    sqlite3 (2.9.5-arm64-darwin)
-    sqlite3 (2.9.5-x86_64-darwin)
-    sqlite3 (2.9.5-x86_64-linux-gnu)
+    sqlite3 (2.7.3-aarch64-linux-gnu)
+    sqlite3 (2.7.3-arm64-darwin)
+    sqlite3 (2.7.3-x86_64-darwin)
+    sqlite3 (2.7.3-x86_64-linux-gnu)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.8)
@@ -380,7 +380,7 @@ GEM
     thruster (0.1.15-x86_64-darwin)
     thruster (0.1.15-x86_64-linux)
     tilt (2.6.1)
-    timeout (0.6.1)
+    timeout (0.4.4)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -397,7 +397,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.11)
-    websocket-driver (0.8.2)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

README.md

@@ -11,45 +11,51 @@ expect, including:
 - @mentions
 - API, with support for bot integrations
 
-## Running your own Campfire instance
+## Deploying with Docker
 
 Campfire's Docker image contains everything needed for a fully-functional,
 single-machine deployment. This includes the web app, background jobs, caching,
-file serving, and SSL. You can use our pre-built image at
-`ghcr.io/basecamp/once-campfire:latest`, or build your own from this repo.
+file serving, and SSL.
 
-### Deploying with ONCE
+To persist storage of the database and file attachments, map a volume to `/rails/storage`.
 
-The easiest way to self-host Campfire is with [ONCE](https://github.com/basecamp/once).
-It will guide you through the initial set up and then keep your instance up to date automatically.
+To configure additional features, you can set the following environment variables:
 
-If you don't already have `once` installed, run this on the machine you want to run Campfire on:
+- `SSL_DOMAIN` - enable automatic SSL via Let's Encrypt for the given domain name
+- `DISABLE_SSL` - alternatively, set `DISABLE_SSL` to serve over plain HTTP
+- `VAPID_PUBLIC_KEY`/`VAPID_PRIVATE_KEY` - set these to a valid keypair to
+  allow sending Web Push notifications. You can generate a new keypair by running
+  `/script/admin/create-vapid-key`
+- `SENTRY_DSN` - to enable error reporting to sentry in production, supply your
+  DSN here
 
-```sh
-curl https://get.once.com | sh
-```
+For example:
 
-`once` will launch as soon as the install is finished. 
+    docker build -t campfire .
 
-Choose Campfire from the list of applications, follow the instructions, and ONCE will take care of the rest.
+    docker run \
+      --publish 80:80 --publish 443:443 \
+      --restart unless-stopped \
+      --volume campfire:/rails/storage \
+      --env SECRET_KEY_BASE=$YOUR_SECRET_KEY_BASE \
+      --env VAPID_PUBLIC_KEY=$YOUR_PUBLIC_KEY \
+      --env VAPID_PRIVATE_KEY=$YOUR_PRIVATE_KEY \
+      --env TLS_DOMAIN=chat.example.com \
+      campfire
 
-If you prefer the command line to the dashboard, you can deploy directly:
+## Running in development
 
-```sh
-once deploy ghcr.io/basecamp/once-campfire --host chat.example.com
-```
+    bin/setup
+    bin/rails server
 
-### Deploying with Docker
+## Worth Noting
 
-If you'd rather run the Docker image yourself, you can read more about that in the [self-hosting guide](docs/self-hosting.md).
+When you start Campfire for the first time, you’ll be guided through
+creating an admin account.
+The email address of this admin account will be shown on the login page
+so that people who forget their password know who to contact for help.
+(You can change this email later in the settings)
 
-> [!TIP]
-> When you start Campfire for the first time, you'll be guided through a wizard to create an admin account.
-> The email address that you enter for the admin account will be visible on the sign-in page, it's there so
-> that people have someone to contact if they need help with their account. If that bothers you, put in any
-> email address you want and create yourself a new admin account.
-
-## Development
-
-You are welcome - and encouraged - to modify Campfire to your liking.
-Please see our [development guide](docs/development.md) for how to get Campfire set up for local development.
+Campfire is single-tenant: any rooms designated "public" will be accessible by
+all users in the system. To support entirely distinct groups of customers, you
+would deploy multiple instances of the application.

config/initializers/active_storage.rb

@@ -2,4 +2,30 @@ ActiveSupport.on_load(:active_storage_blob) do
   ActiveStorage::DiskController.after_action only: :show do
     response.set_header("Cache-Control", "max-age=3600, public")
   end
+
+  # Gate the ActiveStorage write path behind app authentication. These endpoints
+  # ship unauthenticated by Rails default; Campfire never uses direct upload for
+  # legit attachments (those go through MessagesController#create, and Trix file
+  # drops are disabled in the composer). Requiring a session on the write actions
+  # blocks anonymous blob writes and disk-fill while leaving blob serving public.
+  #
+  # ActiveStorage controllers live in ActiveStorage::Engine, so they see the
+  # engine's url helpers, not the main app's. Include the application helpers
+  # first so Authentication#request_authentication can redirect to new_session_url.
+  ActiveStorage::DirectUploadsController.include Rails.application.routes.url_helpers
+  ActiveStorage::DirectUploadsController.include Authentication # only action: #create
+
+  ActiveStorage::DiskController.include Rails.application.routes.url_helpers
+  ActiveStorage::DiskController.include Authentication
+
+  # Blob serving (#show) stays public so signed-token attachment URLs keep
+  # resolving for unauthenticated and bot clients alike.
+  ActiveStorage::DiskController.allow_unauthenticated_access only: :show
+  ActiveStorage::DiskController.allow_bot_access only: :show
+
+  # Including Authentication re-adds protect_from_forgery, but Active Storage's
+  # direct-upload service PUT (#update) carries only signed service headers and
+  # no authenticity token. Re-exempt it from CSRF so authenticated uploads can
+  # still store bytes; the signed URL token and the session check remain.
+  ActiveStorage::DiskController.skip_forgery_protection only: :update
 end

docs/development.md

@@ -1,69 +0,0 @@
-## Development
-
-### Setting up
-
-First, get everything installed and configured with:
-
-```sh
-bin/setup
-```
-
-This installs the system packages Campfire needs (SQLite, ffmpeg), the right Ruby version (via [mise](https://mise.jdx.dev)), and the app's gems; prepares the database; and starts Redis (in a Docker container called `campfire-redis`, if it isn't already running locally).
-
-If you want to start over at any point, run:
-
-```sh
-bin/setup --reset
-```
-
-### Running the server
-
-Start the development server with:
-
-```sh
-bin/dev
-```
-
-You'll be able to access the app at http://localhost:3000.
-
-On first run you'll be guided through creating your admin account, and you can sign in with that account from then on.
-
-Note that Campfire needs Redis (for Action Cable, caching, and background jobs), so if you've restarted your machine or stopped the container, `docker start campfire-redis` will bring it back.
-
-### Web Push notifications
-
-Campfire uses VAPID (Voluntary Application Server Identification) keys to send browser push notifications. For notifications to work in development you'll need to generate a key pair and set these environment variables:
-
-- `VAPID_PRIVATE_KEY`
-- `VAPID_PUBLIC_KEY`
-
-You can generate a fresh pair (along with a secret key base, which you can ignore in development) by running:
-
-```sh
-script/admin/generate-secrets
-```
-
-### Running tests
-
-Run the unit tests with:
-
-```sh
-bin/rails test
-```
-
-And the browser-based system tests with:
-
-```sh
-bin/rails test:system
-```
-
-Before pushing your changes, you can run the full CI suite locally - style checks, security audits, and all the tests - with a single command:
-
-```sh
-bin/ci
-```
-
-### Contributing
-
-You are welcome - and encouraged - to modify Campfire to your liking.
-If you'd like to contribute your changes back, please read our [contributing guide](../CONTRIBUTING.md) first.

docs/self-hosting.md

@@ -1,213 +0,0 @@
-## Self-hosting Campfire
-
-Campfire's Docker image contains everything needed for a fully-functional, single-machine deployment.
-This includes the web app, background jobs, caching, file serving, and SSL.
-
-> [!TIP]
-> The easiest way to self-host Campfire is with [ONCE](https://github.com/basecamp/once), which handles installation, updates, and backups for you. See the [README](../README.md#deploying-with-once) for details. This guide covers running the Docker image by hand.
-
-We recommend using `ghcr.io/basecamp/once-campfire:latest`, which always points to the most recent tagged release - the most stable and battle-tested version of Campfire.
-
-We provide a tagged release for every major, minor and patch version of Campfire, so you can also pin your deployment to a specific version if you want to avoid unexpected changes. For example:
-
-```bash
-# exactly version 1.4.4
-ghcr.io/basecamp/once-campfire:1.4.4
-
-# any 1.4.x version
-# e.g. 1.4.4 or 1.4.5
-# the last number is usually changed for bug fixes
-ghcr.io/basecamp/once-campfire:1.4
-
-# any 1.x version
-# e.g. 1.4.4 or 1.5.0
-# the middle number is usually changed for changes to, or addition of, features
-ghcr.io/basecamp/once-campfire:1
-```
-
-If you want to live on the bleeding edge, the `main` tag tracks the main release branch instead.
-It changes with every merged pull request, so it's the newest - but least battle-tested - version of Campfire.
-
-To run it you'll need three things:
-1. a machine that runs Docker
-2. a mounted volume (so that your database and file attachments are kept around between restarts)
-3. some environment variables for configuration
-
-If you'd rather build the image yourself from your own copy of the source, you can do that too:
-
-```sh
-docker build -t campfire .
-```
-
-### Mounting a storage volume
-
-Campfire keeps all of its storage - the database and uploaded file attachments - inside the path `/rails/storage`.
-By default Docker containers don't persist storage between runs, so you'll want to mount a persistent volume into that location.
-
-The simplest way to do this is with the `--volume` flag with `docker run`. For example:
-
-```sh
-docker run --volume campfire:/rails/storage ghcr.io/basecamp/once-campfire:latest
-```
-
-That will create a named volume (called `campfire`) and mount it into the correct path.
-Docker will manage where that volume is actually stored on your server.
-
-You can also specify the data location yourself, mount a network drive, and more.
-Check the Docker documentation to find out more about what's available.
-
-### Configuring with environment variables
-
-To configure your Campfire installation, you can use environment variables.
-At a minimum you'll want to configure your secret key and your SSL domain.
-
-#### Secrets
-
-Campfire needs a few secret values that are specific to your instance:
-
-- `SECRET_KEY_BASE` - the basis for cryptographic features like signed cookies. This should be a long, unguessable random string.
-- `VAPID_PRIVATE_KEY`/`VAPID_PUBLIC_KEY` - a key pair used for sending Web Push notifications.
-
-You can generate them by running:
-
-```sh
-docker run --rm ghcr.io/basecamp/once-campfire:latest script/admin/generate-secrets
-```
-
-It prints a fresh set of values ready to set as environment variables:
-
-```
-SECRET_KEY_BASE=...
-VAPID_PRIVATE_KEY=...
-VAPID_PUBLIC_KEY=...
-```
-
-Keep them safe and reuse the same values across restarts and upgrades - changing them later will invalidate sessions and push notification subscriptions.
-
-#### SSL
-
-If you want the Campfire container to handle its own SSL (HTTPS) automatically (via Let's Encrypt), you just need to specify the domain name that you're running it on.
-You can do that with the `TLS_DOMAIN` environment variable.
-
-> [!NOTE]
-> If you're using SSL, you'll want to allow traffic on ports 80 and 443.
-
-So if you were running on `chat.example.com` you could enable SSL like this:
-
-```sh
-docker run --publish 80:80 --publish 443:443 --env TLS_DOMAIN=chat.example.com ...
-```
-
-If you are terminating SSL in some other proxy in front of Campfire, or aren't using SSL at all (for example, if you want to run it locally on your laptop), then you should set `DISABLE_SSL=true` instead and just publish port 80:
-
-```sh
-docker run --publish 80:80 --env DISABLE_SSL=true ...
-```
-
-#### Error reporting (optional)
-
-To enable error reporting to Sentry in production, supply your DSN in the `SENTRY_DSN` environment variable.
-To disable Sentry initialization entirely, set `SKIP_TELEMETRY=true`.
-
-### Example
-
-Putting it all together, here's a complete `docker run` invocation:
-
-```sh
-docker run \
-  --name campfire \
-  --publish 80:80 --publish 443:443 \
-  --restart unless-stopped \
-  --volume campfire:/rails/storage \
-  --env SECRET_KEY_BASE=$YOUR_SECRET_KEY_BASE \
-  --env VAPID_PUBLIC_KEY=$YOUR_PUBLIC_KEY \
-  --env VAPID_PRIVATE_KEY=$YOUR_PRIVATE_KEY \
-  --env TLS_DOMAIN=chat.example.com \
-  ghcr.io/basecamp/once-campfire:latest
-```
-
-And here's an equivalent `docker-compose.yml` that you could use to run Campfire via `docker compose up`:
-
-```yaml
-services:
-  web:
-    image: ghcr.io/basecamp/once-campfire:latest
-    restart: unless-stopped
-    ports:
-      - "80:80"
-      - "443:443"
-    environment:
-      - SECRET_KEY_BASE=abcdefabcdef
-      - TLS_DOMAIN=chat.example.com
-      - VAPID_PRIVATE_KEY=myvapidprivatekey
-      - VAPID_PUBLIC_KEY=myvapidpublickey
-    volumes:
-      - campfire:/rails/storage
-
-volumes:
-  campfire:
-```
-
-### First run
-
-When you start Campfire for the first time, you'll be guided through creating an admin account.
-
-> [!TIP]
-> The email address of this admin account will be shown on the login page so that people who forget their password know who to contact for help.
-> (You can change this email later in the settings.)
-
-Campfire is single-tenant: any rooms designated "public" will be accessible by all users in the system.
-To support entirely distinct groups of customers, you would deploy multiple instances of the application.
-
-### Upgrading
-
-All of Campfire's state lives in the mounted volume, so upgrading is a matter of pulling a newer image and recreating the container:
-
-```sh
-docker pull ghcr.io/basecamp/once-campfire:latest
-```
-
-Any pending database migrations run automatically when the container boots.
-
-### Backups
-
-To back up your instance, back up the contents of the `/rails/storage` volume.
-
-Because the SQLite database may be written to at any moment, you shouldn't copy its files directly while Campfire is running.
-Instead, first run `script/admin/prepare-backup` inside the running container to produce a consistent snapshot of the database (it's written to `storage/backups/` inside the volume):
-
-```sh
-docker exec campfire script/admin/prepare-backup
-```
-
-(If you're using Docker Compose, replace `docker exec campfire` with `docker compose exec web`)
-
-Then archive the whole storage volume to a file on the host:
-
-```sh
-docker run --rm \
-  --user root \
-  --volume campfire:/rails/storage \
-  --volume "$PWD":/backup \
-  ghcr.io/basecamp/once-campfire:latest \
-  tar czf "/backup/campfire-backup.tar.gz" -C /rails storage
-```
-
-This gives you a `campfire-backup.tar.gz` in your current directory containing the database snapshot and all uploaded files.
-Copy it somewhere safe, ideally off the machine.
-
-To restore, extract the archive back into a (stopped) instance's volume, and replace the live database with the snapshot:
-
-```sh
-docker run --rm \
-  --user root \
-  --volume campfire:/rails/storage \
-  --volume "$PWD":/backup \
-  ghcr.io/basecamp/once-campfire:latest \
-  bash -c "tar xzf /backup/campfire-backup.tar.gz -C /rails &&
-           cp /rails/storage/backups/production.sqlite3 /rails/storage/db/production.sqlite3 &&
-           rm -f /rails/storage/db/production.sqlite3-wal /rails/storage/db/production.sqlite3-shm &&
-           chown -R rails:rails /rails/storage"
-```
-
-Then start Campfire again.

lib/restricted_http/private_network_guard.rb

@@ -8,14 +8,6 @@ module RestrictedHTTP
 
     LOCAL_IP = IPAddr.new("0.0.0.0/8") # "This" network
 
-    # IPv6 transition/encapsulation and shared-address ranges that can smuggle
-    # requests toward internal networks and must never be reachable.
-    DISALLOWED_RANGES = [
-      IPAddr.new("64:ff9b::/96"),  # NAT64 (RFC 6052) — embeds IPv4 in IPv6
-      IPAddr.new("2002::/16"),     # 6to4 (RFC 3056) — embeds IPv4 in IPv6
-      IPAddr.new("100.64.0.0/10")  # CGNAT / shared address space (RFC 6598)
-    ]
-
     def resolve(hostname)
       Resolv.getaddress(hostname).tap do |ip|
         raise Violation.new("Attempt to access private IP via #{hostname}") if ip && private_ip?(ip)
@@ -24,7 +16,7 @@ module RestrictedHTTP
 
     def private_ip?(ip)
       IPAddr.new(ip).then do |ipaddr|
-        ipaddr.private? || ipaddr.loopback? || ipaddr.link_local? || ipaddr.ipv4_mapped? || ipaddr.ipv4_compat? || LOCAL_IP.include?(ipaddr) || DISALLOWED_RANGES.any? { |range| range.include?(ipaddr) }
+        ipaddr.private? || ipaddr.loopback? || ipaddr.link_local? || ipaddr.ipv4_mapped? || ipaddr.ipv4_compat? || LOCAL_IP.include?(ipaddr)
       end
     rescue IPAddr::InvalidAddressError
       true

script/admin/generate-secrets

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-require "bundler/setup"
-require "securerandom"
-require "web_push"
-
-vapid_key = WebPush.generate_key
-
-puts "SECRET_KEY_BASE=#{SecureRandom.hex(64)}"
-puts "VAPID_PRIVATE_KEY=#{vapid_key.private_key}"
-puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}"

test/controllers/active_storage/direct_uploads_controller_test.rb

@@ -0,0 +1,83 @@
+require "test_helper"
+
+class ActiveStorage::DirectUploadsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    host! "once.campfire.test"
+  end
+
+  test "create requires authentication" do
+    assert_no_difference -> { ActiveStorage::Blob.count } do
+      post rails_direct_uploads_url, params: { blob: blob_params }
+    end
+
+    assert_redirected_to new_session_url
+  end
+
+  test "create succeeds for an authenticated session" do
+    sign_in :david
+
+    assert_difference -> { ActiveStorage::Blob.count }, 1 do
+      post rails_direct_uploads_url, params: { blob: blob_params }
+    end
+
+    assert_response :success
+  end
+
+  test "disk show stays reachable without authentication" do
+    blob = ActiveStorage::Blob.create_and_upload! \
+      io: StringIO.new("hello"), filename: "hello.txt", content_type: "text/plain"
+
+    ActiveStorage::Current.set(url_options: { host: "once.campfire.test", protocol: "http" }) do
+      get blob.url
+    end
+
+    assert_response :success
+  end
+
+  test "disk update requires authentication" do
+    _blob, url = direct_upload_url_for("hello")
+
+    put url, params: "hello", headers: { "Content-Type" => "text/plain" }
+
+    assert_redirected_to new_session_url
+  end
+
+  test "disk update stores bytes for an authenticated session without a CSRF token" do
+    sign_in :david
+    blob, url = direct_upload_url_for("hello")
+
+    # Forgery protection is off in test by default; turn it on so this proves the
+    # signed-token service PUT stays CSRF-exempt even when the concern re-arms it.
+    with_forgery_protection do
+      put url, params: "hello", headers: { "Content-Type" => "text/plain" }
+    end
+
+    assert_response :no_content
+    assert_equal "hello", blob.download
+  end
+
+  private
+    def blob_params
+      content = "hello"
+      { filename: "hello.txt", byte_size: content.bytesize, content_type: "text/plain", \
+        checksum: Digest::MD5.base64digest(content) }
+    end
+
+    def direct_upload_url_for(content)
+      blob = ActiveStorage::Blob.create_before_direct_upload! \
+        filename: "hello.txt", byte_size: content.bytesize, \
+        checksum: Digest::MD5.base64digest(content), content_type: "text/plain"
+      url = ActiveStorage::Current.set(url_options: { host: "once.campfire.test", protocol: "http" }) do
+        blob.service_url_for_direct_upload
+      end
+      [ blob, url ]
+    end
+
+    def with_forgery_protection
+      original = ActionController::Base.allow_forgery_protection
+      ActionController::Base.allow_forgery_protection = true
+      yield
+    ensure
+      ActionController::Base.allow_forgery_protection = original
+    end
+end

test/lib/restricted_http/private_network_guard_test.rb

@@ -64,26 +64,6 @@ class RestrictedHTTP::PrivateNetworkGuardTest < ActiveSupport::TestCase
     assert_private_ip "::93.184.216.34"
   end
 
-  # IPv6/encapsulation and shared-address ranges (SSRF bypass prevention)
-
-  test "private_ip? returns true for NAT64 addresses" do
-    assert_private_ip "64:ff9b::a00:1"  # NAT64-embedded 10.0.0.1
-  end
-
-  test "private_ip? returns true for 6to4 addresses" do
-    assert_private_ip "2002::1"
-    assert_private_ip "2002:0a00:0001::"  # 6to4-embedded 10.0.0.1
-  end
-
-  test "private_ip? returns true for CGNAT / shared address space" do
-    assert_private_ip "100.64.0.1"
-    assert_private_ip "100.127.255.255"
-  end
-
-  test "private_ip? returns false for public addresses outside the new ranges" do
-    assert_not RestrictedHTTP::PrivateNetworkGuard.private_ip?("93.184.216.34")
-  end
-
   test "private_ip? returns true for invalid addresses" do
     assert RestrictedHTTP::PrivateNetworkGuard.private_ip?("not-an-ip")
     assert RestrictedHTTP::PrivateNetworkGuard.private_ip?("")