From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Nov 2021 11:27:02 +0000 (+0000)
Subject: Make safe_referer handle invalid URIs
X-Git-Tag: live~2085
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d951621c4488c58ec6caf12daf81a2b048fd40b1

Make safe_referer handle invalid URIs
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 517b11e14..d0898bf5e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -381,18 +381,22 @@ class ApplicationController < ActionController::Base
 
   # clean any referer parameter
   def safe_referer(referer)
-    referer = URI.parse(referer)
+    begin
+      referer = URI.parse(referer)
+
+      if referer.scheme == "http" || referer.scheme == "https"
+        referer.scheme = nil
+        referer.host = nil
+        referer.port = nil
+      elsif referer.scheme || referer.host || referer.port
+        referer = nil
+      end
 
-    if referer.scheme == "http" || referer.scheme == "https"
-      referer.scheme = nil
-      referer.host = nil
-      referer.port = nil
-    elsif referer.scheme || referer.host || referer.port
+      referer = nil if referer&.path&.first != "/"
+    rescue URI::InvalidURIError
       referer = nil
     end
 
-    referer = nil if referer&.path&.first != "/"
-
     referer.to_s
   end