X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/942e62117ff7f12d40618a94ea3f4e86f8cb25af..3fd083d9d4f3c266ad9bc8bbf337f44c184d15a2:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index efb77e2f5..5833a1e04 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -6,10 +6,11 @@ class SiteController < ApplicationController before_action :set_locale before_action :redirect_browse_params, :only => :index before_action :redirect_map_params, :only => [:index, :edit, :export] - before_action :require_user, :only => [:welcome] before_action :require_oauth, :only => [:index] before_action :update_totp, :only => [:index] + authorize_resource :class => false + def index session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline end @@ -69,6 +70,7 @@ class SiteController < ApplicationController if %w[potlatch potlatch2].include?(editor) append_content_security_policy_directives( + :connect_src => %w[*], :object_src => %w[*], :plugin_types => %w[application/x-shockwave-flash], :script_src => %w['unsafe-inline']