fix double https://

Author: 3kh0

app/controllers/concerns/json_error_responses.rb

@@ -17,9 +17,9 @@ module JSONErrorResponses
 
   STATUS_ALIASES = { unprocessable_entity: :unprocessable_content }.freeze
 
-  def self.canonical_host = ENV["CDN_HOST"].presence || "cdn.hackclub.com"
+  def self.canonical_host = CDNHost.host
 
-  def self.documentation_url = "https://#{canonical_host}#{DOCUMENTATION_PATH}"
+  def self.documentation_url = "#{CDNHost.base_url}#{DOCUMENTATION_PATH}"
 
   def self.payload(code:, status:, message:, hint: nil, error: nil, **extra)
     body = {

app/helpers/metadata_helper.rb

@@ -4,8 +4,8 @@ module MetadataHelper
   SITE_NAME = "Hack Club CDN"
   SITE_DESCRIPTION = "File hosting for Hack Clubbers. Upload files through the dashboard or the HTTP API and get permanent CDN URLs."
 
-  def canonical_host = ENV["CDN_HOST"].presence || "cdn.hackclub.com"
-  def canonical_root = "https://#{canonical_host}"
+  def canonical_host = CDNHost.host
+  def canonical_root = CDNHost.base_url
   def canonical_url = content_for(:canonical_url).presence || "#{canonical_root}#{request.path}"
   def page_title = content_for(:title).presence || SITE_NAME
   def page_description = content_for(:description).presence || SITE_DESCRIPTION

app/models/cdn_host.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Single source of truth for the CDN's public hostname. CDN_HOST is documented
+# as a bare hostname, but some deployments store a full https:// URL there.
+# Normalize it so URL builders that add their own scheme never emit
+# "https://https://cdn.hackclub.com".
+module CDNHost
+  DEFAULT_HOST = "cdn.hackclub.com"
+
+  module_function
+
+  def host
+    raw = ENV["CDN_HOST"].presence || DEFAULT_HOST
+    raw.sub(%r{\Ahttps?://}i, "").sub(%r{/+\z}, "")
+  end
+
+  def base_url = "https://#{host}"
+end

app/models/llms_txt.rb

@@ -17,9 +17,9 @@ class LlmsTxt
   AUTH_URL = "https://auth.hackclub.com"
 
   class << self
-    def host = ENV["CDN_HOST"].presence || "cdn.hackclub.com"
+    def host = CDNHost.host
 
-    def base_url = "https://#{host}"
+    def base_url = CDNHost.base_url
 
     def to_s
       [ header, guidance, when_to_use, api, docs, optional ].join("\n")

app/models/open_api_spec.rb

@@ -5,9 +5,9 @@ class OpenAPISpec
   API_VERSION = "4.0.0"
 
   class << self
-    def host = ENV["CDN_HOST"].presence || "cdn.hackclub.com"
+    def host = CDNHost.host
 
-    def base_url = "https://#{host}"
+    def base_url = CDNHost.base_url
 
     def as_json(*) = document
 

app/models/sitemap.rb

@@ -11,9 +11,9 @@ class Sitemap
   Entry = Data.define(:loc, :lastmod, :changefreq)
 
   class << self
-    def host = ENV["CDN_HOST"].presence || "cdn.hackclub.com"
+    def host = CDNHost.host
 
-    def base_url = "https://#{host}"
+    def base_url = CDNHost.base_url
 
     def entries = [ home_entry, *doc_entries ]
 

app/models/upload.rb

@@ -80,7 +80,7 @@ def cdn_url
     Rails.application.routes.url_helpers.external_upload_url(
       id:,
       filename:,
-      host: ENV["CDN_HOST"] || "cdn.hackclub.com"
+      host: CDNHost.host
     )
   end
 

lib/tasks/import_slack_files.rake

@@ -7,7 +7,7 @@ namespace :import do
   desc "Import files from Slack using a CSV with slack_file_url and slack_user_id"
   task slack_files: :environment do
     # Set URL options for ActiveStorage in rake context
-    ActiveStorage::Current.url_options = { host: ENV.fetch("CDN_HOST", "cdn.hackclub.com"), protocol: "https" }
+    ActiveStorage::Current.url_options = { host: CDNHost.host, protocol: "https" }
     csv_path = ENV.fetch("CSV_PATH", "files_with_slack_url.csv")
     slack_token = ENV.fetch("SLACK_TOKEN") { raise "SLACK_TOKEN (xoxp-...) is required" }
     thread_count = ENV.fetch("THREADS", 67).to_i

test/models/cdn_host_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class CDNHostTest < ActiveSupport::TestCase
+  def with_cdn_host(value)
+    previous = ENV["CDN_HOST"]
+    value.nil? ? ENV.delete("CDN_HOST") : ENV["CDN_HOST"] = value
+    yield
+  ensure
+    previous.nil? ? ENV.delete("CDN_HOST") : ENV["CDN_HOST"] = previous
+  end
+
+  test "defaults to the production hostname when CDN_HOST is unset" do
+    with_cdn_host(nil) do
+      assert_equal "cdn.hackclub.com", CDNHost.host
+      assert_equal "https://cdn.hackclub.com", CDNHost.base_url
+    end
+  end
+
+  test "accepts a bare hostname" do
+    with_cdn_host("cdn.example.com") do
+      assert_equal "cdn.example.com", CDNHost.host
+      assert_equal "https://cdn.example.com", CDNHost.base_url
+    end
+  end
+
+  test "strips a scheme and trailing slash from CDN_HOST" do
+    with_cdn_host("https://cdn.example.com/") do
+      assert_equal "cdn.example.com", CDNHost.host
+      assert_equal "https://cdn.example.com", CDNHost.base_url
+    end
+  end
+
+  test "never produces a doubled scheme" do
+    with_cdn_host("https://cdn.hackclub.com") do
+      assert_equal "https://cdn.hackclub.com", CDNHost.base_url
+      refute_includes CDNHost.base_url, "https://https://"
+    end
+  end
+end