Fix database offline mode

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 5e8ef997fb8523e19f72800b027b43ef452d0933..7e8e921a29f4d0c35b69c4a2d1a45331d41147cf 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -8,72 +8,79 @@ class Ability
          :changeset, :note, :new_note, :query], :browse
     can :show, :capability
     can :index, :change
-    can [:index, :feed, :show, :download, :query], Changeset
-    can :index, ChangesetComment
     can :search, :direction
     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
-    can [:index, :rss, :show, :comments], DiaryEntry
     can [:finish, :embed], :export
     can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
     can :index, :map
-    can [:index, :create, :comment, :feed, :show, :search, :mine], Note
     can [:token, :request_token, :access_token, :test_request], :oauth
     can :show, :permission
-    can [:index, :show], Redaction
     can [:search_all, :search_nodes, :search_ways, :search_relations], :search
     can [:trackpoints], :swf
-    can [:index, :show, :data, :georss, :picture, :icon], Trace
-    can :index, Tracepoint
-    can [:terms, :api_users, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :api_read, :auth_success, :auth_failure], User
-    can [:index, :show, :blocks_on, :blocks_by], UserBlock
-    can [:index, :show], Node
-    can [:index, :show, :full, :ways_for_node], Way
-    can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
-    can [:history, :version], OldNode
-    can [:history, :version], OldWay
-    can [:history, :version], OldRelation
+
+    if Settings.status != "database_offline"
+      can [:index, :feed, :show, :download, :query], Changeset
+      can :index, ChangesetComment
+      can [:index, :rss, :show, :comments], DiaryEntry
+      can [:index, :create, :comment, :feed, :show, :search, :mine], Note
+      can [:index, :show], Redaction
+      can [:index, :show, :data, :georss, :picture, :icon], Trace
+      can :index, Tracepoint
+      can [:terms, :api_users, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :api_read, :auth_success, :auth_failure], User
+      can [:index, :show, :blocks_on, :blocks_by], UserBlock
+      can [:index, :show], Node
+      can [:index, :show, :full, :ways_for_node], Way
+      can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
+      can [:history, :version], OldNode
+      can [:history, :version], OldWay
+      can [:history, :version], OldRelation
+    end
 
     if user
       can :welcome, :site
-      can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
-      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
-      can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
-      can [:close, :reopen], Note
       can [:revoke, :authorize], :oauth
-      can [:new, :create], Report
-      can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
-      can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
-      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 
-      if user.terms_agreed?
-        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
-        can :create, ChangesetComment
-        can [:create, :update, :delete], Node
-        can [:create, :update, :delete], Way
-        can [:create, :update, :delete], Relation
-      end
+      if Settings.status != "database_offline"
+        can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
+        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
+        can [:close, :reopen], Note
+        can [:new, :create], Report
+        can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
+        can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
+        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 
-      if user.moderator?
-        can [:destroy, :restore], ChangesetComment
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can :destroy, Note
-        can [:new, :create, :edit, :update, :destroy], Redaction
-        can [:new, :edit, :create, :update, :revoke], UserBlock
         if user.terms_agreed?
-          can :redact, OldNode
-          can :redact, OldWay
-          can :redact, OldRelation
+          can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
+          can :create, ChangesetComment
+          can [:create, :update, :delete], Node
+          can [:create, :update, :delete], Way
+          can [:create, :update, :delete], Relation
         end
-      end
 
-      if user.administrator?
-        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can [:set_status, :delete, :index], User
-        can [:grant, :revoke], UserRole
+        if user.moderator?
+          can [:destroy, :restore], ChangesetComment
+          can [:index, :show, :resolve, :ignore, :reopen], Issue
+          can :create, IssueComment
+          can :destroy, Note
+          can [:new, :create, :edit, :update, :destroy], Redaction
+          can [:new, :edit, :create, :update, :revoke], UserBlock
+
+          if user.terms_agreed?
+            can :redact, OldNode
+            can :redact, OldWay
+            can :redact, OldRelation
+          end
+        end
+
+        if user.administrator?
+          can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
+          can [:index, :show, :resolve, :ignore, :reopen], Issue
+          can :create, IssueComment
+          can [:set_status, :delete, :index], User
+          can [:grant, :revoke], UserRole
+        end
       end
     end
 

diff --git a/app/abilities/capability.rb b/app/abilities/capability.rb
index d8f51eefea7562e723fb5a3ac47005a994d77f8a..f4c24e97d7ffd24122888ee1d069294f567c7a4c 100644 (file)
--- a/app/abilities/capability.rb
+++ b/app/abilities/capability.rb
@@ -4,29 +4,31 @@ class Capability
   include CanCan::Ability
 
   def initialize(token)
-    can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)
-    can [:api_read, :api_data], Trace if capability?(token, :allow_read_gpx)
-    can [:api_create, :api_update, :api_delete], Trace if capability?(token, :allow_write_gpx)
-    can [:api_details], User if capability?(token, :allow_read_prefs)
-    can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
-    can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
-    can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
+    if Settings.status != "database_offline"
+      can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)
+      can [:api_read, :api_data], Trace if capability?(token, :allow_read_gpx)
+      can [:api_create, :api_update, :api_delete], Trace if capability?(token, :allow_write_gpx)
+      can [:api_details], User if capability?(token, :allow_read_prefs)
+      can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
+      can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
+      can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
 
-    if token&.user&.terms_agreed?
-      can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
-      can :create, ChangesetComment if capability?(token, :allow_write_api)
-      can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
-      can [:create, :update, :delete], Way if capability?(token, :allow_write_api)
-      can [:create, :update, :delete], Relation if capability?(token, :allow_write_api)
-    end
-
-    if token&.user&.moderator?
-      can [:destroy, :restore], ChangesetComment if capability?(token, :allow_write_api)
-      can :destroy, Note if capability?(token, :allow_write_notes)
       if token&.user&.terms_agreed?
-        can :redact, OldNode if capability?(token, :allow_write_api)
-        can :redact, OldWay if capability?(token, :allow_write_api)
-        can :redact, OldRelation if capability?(token, :allow_write_api)
+        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
+        can :create, ChangesetComment if capability?(token, :allow_write_api)
+        can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
+        can [:create, :update, :delete], Way if capability?(token, :allow_write_api)
+        can [:create, :update, :delete], Relation if capability?(token, :allow_write_api)
+      end
+
+      if token&.user&.moderator?
+        can [:destroy, :restore], ChangesetComment if capability?(token, :allow_write_api)
+        can :destroy, Note if capability?(token, :allow_write_notes)
+        if token&.user&.terms_agreed?
+          can :redact, OldNode if capability?(token, :allow_write_api)
+          can :redact, OldWay if capability?(token, :allow_write_api)
+          can :redact, OldRelation if capability?(token, :allow_write_api)
+        end
       end
     end
   end

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index a69d0d57b7daaa14b9e78459a87f71de8187bc45..fff9f543bf7f7dc3e95d0c49fa6f77e6267db466 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -7,10 +7,10 @@ class ChangesetsController < ApplicationController
   skip_before_action :verify_authenticity_token, :except => [:index]
   before_action :authorize_web
   before_action :set_locale
+  before_action(:only => [:index, :feed]) { |c| c.check_database_readable(true) }
 
   authorize_resource
 
-  before_action(:only => [:index, :feed]) { |c| c.check_database_readable(true) }
   around_action :web_timeout
 
   # Helper methods for checking consistency

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 282ac29289fe1ea03bb8de382ce40c6c77298a49..fb1e7b702a6aa92250f24eb914be3633c4ca4cfc 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -3,11 +3,11 @@ class DiaryEntriesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
+  before_action :check_database_readable
 
   authorize_resource
 
   before_action :lookup_user, :only => [:show, :comments]
-  before_action :check_database_readable
   before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
   before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
 

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 68a125f13f374b9475b7d72796019c4931e2109d..3091f4360f39cae2a40184c2734f25b651f00f5c 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -3,10 +3,10 @@ class TracesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
+  before_action :check_database_readable
 
   authorize_resource
 
-  before_action :check_database_readable
   before_action :check_database_writable, :only => [:new, :create, :edit, :delete]
   before_action :offline_warning, :only => [:mine, :show]
   before_action :offline_redirect, :only => [:new, :create, :edit, :delete, :data]

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 91742c7613aec51dc4d14ed6cf163b1ca82341c2..9b97fa0a1f08af46d9d5657c12c75ad070acc052 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -5,11 +5,11 @@ class UsersController < ApplicationController
   before_action :disable_terms_redirect, :only => [:terms, :save, :logout]
   before_action :authorize_web
   before_action :set_locale
+  before_action :check_database_readable
 
   authorize_resource
 
   before_action :require_self, :only => [:account]
-  before_action :check_database_readable, :except => [:login]
   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 946f95febf22f23aee9ba1391a70c2ab247be514..a9919f7d2216949b4ea76e691f22f0e4df5c8ea9 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -54,7 +54,7 @@
       <li id="compact-secondary-nav" class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t 'layouts.more' %> <b class="caret"></b></a>
         <ul class="dropdown-menu">
-          <% if can? :index, Issue %>
+          <% if Settings.status != "database_offline" && can?(:index, Issue) %>
             <li class="<%= current_page_class(issues_path) %>">
               <%= link_to issues_path(:status => 'open') do %>
                 <%= open_issues_count %>

diff --git a/config/application.rb b/config/application.rb
index d521b4a9cc9764fe909c003a558e8356f772d5fc..096b7573ac1d53471fddb555b3edbe8af46feae5 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,9 +31,13 @@ status = if ENV["STATUS"] && ALLOWED_STATUS.include?(ENV["STATUS"].to_sym)
 Object.const_set("STATUS", status)
 
 if STATUS == :database_offline
+  require "active_model/railtie"
+  require "active_job/railtie"
+  require "active_storage/engine"
   require "action_controller/railtie"
   require "action_mailer/railtie"
-  require "active_model/railtie"
+  require "action_view/railtie"
+  require "action_cable/engine"
   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else
@@ -59,7 +63,7 @@ module OpenStreetMap
 
     # This defaults to true from rails 5.0 but our code doesn't comply
     # with it at all so we turn it off
-    config.active_record.belongs_to_required_by_default = false
+    config.active_record.belongs_to_required_by_default = false unless STATUS == :database_offline
 
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,

diff --git a/config/environments/development.rb b/config/environments/development.rb
index b7e60eb4fd9ad352854f96bcee53fa52d3518afc..e850887b3fc777a4fd209d3389db6b693644736c 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -42,7 +42,7 @@ Rails.application.configure do
   config.active_record.migration_error = :page_load unless STATUS == :database_offline
 
   # Highlight code that triggered database queries in logs.
-  config.active_record.verbose_query_logs = true
+  config.active_record.verbose_query_logs = true unless STATUS == :database_offline
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large