X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a83030dab7512c4b2848e777f7a7dbff456774b3..420a7289a0b08eee091f6650c2e83166df3fbe69:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index fa8ec5a1e..2fa91256e 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 @@ -102,7 +103,9 @@ class SiteController < ApplicationController @locale = params[:copyright_locale] || I18n.locale end - def welcome; end + def welcome + require_user + end def help; end @@ -120,7 +123,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