Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream

2023-08-12 09:36:38 +02:00
parent 150cfcf3ae 3a4d3e9d4b
commit ea8802a05a
23 changed files with 198 additions and 20 deletions
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@ -346,7 +346,7 @@ class Request
      end

      def private_address_exceptions
-        @private_address_exceptions = (ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(',').map { |addr| IPAddr.new(addr) }
+        @private_address_exceptions = (ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(/(?:\s*,\s*|\s+)/).map { |addr| IPAddr.new(addr) }
      end
    end
  end