X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/673b58f96f3acfd0281c62a2a7f080825b6fb28b..46bc4650d2123a2233e62f0e101983552178d12a:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index fa8ec5a1e..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'] @@ -120,7 +122,8 @@ class SiteController < ApplicationController append_content_security_policy_directives( :connect_src => %w[*], :img_src => %w[* blob:], - :script_src => %w[dev.virtualearth.net 'unsafe-eval'] + :script_src => %w[dev.virtualearth.net 'unsafe-eval'], + :style_src => %w['unsafe-inline'] ) render "id", :layout => false