Move map method to its own controller

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 6cbe302d61d2b928b70e5305c8f6a3b9a246efa0..5833a1e045b01cd55ab69a8e746d040bd090ae72 100644 (file)
--- 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 :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]
 
   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
   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(
 
     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']
         :object_src => %w[*],
         :plugin_types => %w[application/x-shockwave-flash],
         :script_src => %w['unsafe-inline']


@@ -120,7 +122,7 @@ class SiteController < ApplicationController
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],

-      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org services.arcgisonline.com serviceslab.arcgisonline.com 'unsafe-eval'],
+      :script_src => %w[dev.virtualearth.net 'unsafe-eval'],

       :style_src => %w['unsafe-inline']
     )
 
       :style_src => %w['unsafe-inline']
     )