X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cecfa7d01a8a38215b4c963f12221ebef3aff73..1abb7bfa56318b293c7a57dd094961b241e0673d:/config/initializers/cors.rb

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 9bbf937cf..1a8ce106d 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,11 +1,26 @@
 require "rack/cors"
 
+# Mark CORS responses as uncacheable as we don't want a browser to
+# try and reuse a response that had a different origin, even with
+# revalidation, as the origin check will fail.
+module OpenStreetMap
+  class Cors < Rack::Cors
+    def call(env)
+      status, headers, body = super env
+      if headers['Access-Control-Allow-Origin']
+        headers['Cache-Control'] = 'no-cache'
+      end
+      [status, headers, body]
+    end
+  end
+end
+
 # Allow any and all cross-origin requests to the API. Allow any origin, and
 # any headers. Non-browser requests do not have origin or header restrictions,
 # so browser-requests should be similarly permitted. (Though the API does not
 # require any custom headers, Ajax frameworks may automatically add headers
 # such as X-Requested-By to requests.)
-Rails.configuration.middleware.use Rack::Cors do
+Rails.configuration.middleware.use OpenStreetMap::Cors do
   allow do
     origins "*"
     resource "/oauth/*", :headers => :any, :methods => [:get, :post]