cmor_system 0.0.55.pre → 0.0.60.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c05144e47572d438bd34e070455a52a958f6ed16677e1de8d9571e0a5985c3
-  data.tar.gz: a6707c5f3ddc99be8439af4ea5b36b81e65bc04889b2de90fb4d24b71c47fc34
+  metadata.gz: 88abc5af2082a34262abc4b0c6037885bb61e8573f5f1367c99dfd48a867d767
+  data.tar.gz: c1a4ca647b591bdd90bbc2a3001dfb79ff23e4f99f0e28246190718ec5bcb43a
 SHA512:
-  metadata.gz: 4289be1cddccfb1cfe195d92fb93cde66048244e71e2e76445a5b270e8674472f3d05fc2ce0601de9b3c2d090c20b486dec5f543bc339354e03c7813fa541890
-  data.tar.gz: fa0d0457c196ba81544c45f16a22f396f8574b268e44594fc905e6642021ac1abbef5bbcd42cc51bd7f56ad0ae6234ce795835aed688e54da77732949cc3f16a
+  metadata.gz: 7d9a328962dab3ed5821e59b6c43a19270df06c224a95721577679b0abd317e1a66ce4270b7182ef3ab82801668eb5b95a49c6347e49d9ae0c11acd6b0c4bd34
+  data.tar.gz: 4baec010a03a40cbfa995f2bd70c49a51d20c1d91c9c2f2ae501091f371d4a90aff5a6ac2f2434e1565d5a8a8b9882b92b65a3974d5b62ec135e4031433d386d

data/app/controllers/cmor/system/active_storage/attachments_controller.rb

@@ -2,6 +2,8 @@ module Cmor
   module System
     module ActiveStorage
       class AttachmentsController < Cmor::Core::Backend::ResourcesController::Base
+        include Cmor::Audits::ResourcesController::PaperTrailConcern if Cmor::Core.features?(:cmor_audits)
+
         def self.engine_class
           ::Cmor::System::Engine
         end

data/app/controllers/cmor/system/active_storage/blobs_controller.rb

@@ -2,6 +2,8 @@ module Cmor
   module System
     module ActiveStorage
       class BlobsController < Cmor::Core::Backend::ResourcesController::Base
+        include Cmor::Audits::ResourcesController::PaperTrailConcern if Cmor::Core.features?(:cmor_audits)
+
         def self.engine_class
           ::Cmor::System::Engine
         end

data/app/controllers/cmor/system/rack/attack/banned_ips_controller.rb

@@ -0,0 +1,27 @@
+module Cmor
+  module System
+    module Rack
+      module Attack
+        class BannedIpsController < Cmor::Core::Backend::ResourcesController::Base
+          def self.engine_class
+            Cmor::System::Engine
+          end
+
+          def self.resource_class
+            Cmor::System::Rack::Attack::BannedIp
+          end
+    
+          def self.available_rest_actions
+            %i(index show new create destroy)
+          end
+    
+          private
+    
+          def permitted_params
+            params.require(:rack_attack_banned_ip).permit(:key)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/cmor/system/active_collection/base.rb

@@ -0,0 +1,153 @@
+module Cmor
+  module System
+    module ActiveCollection
+      class Base
+        if Object.const_defined?('Kaminari')
+          class Collection < Kaminari::PaginatableArray
+          end
+        else
+          class Collection < Array
+          end
+        end
+
+        extend ActiveModel::Model
+        extend ActiveModel::Naming
+        include ActiveModel::Conversion
+        extend ActiveModel::Translation
+        include ActiveModel::Validations
+        include Markup::Rails::ActiveRecord
+
+        module AttributesConcern
+          extend ActiveSupport::Concern
+
+          included do
+            class_attribute :attribute_names
+            attr_accessor :attributes
+
+            delegate :[], to: :attributes
+          end
+
+          def method_missing(m, *args, &block)
+            if self.attribute_names.map(&:to_s).include?(m.to_s)
+              return @attributes[m.to_s]
+            elsif self.attribute_names.map { |an| "#{an}=" }.include?(m.to_s)
+              return @attributes[m.to_s[0..-2]] = args.first
+            else
+              super
+            end
+          end
+
+          def initialize(attributes = {})
+            @attributes = {}.with_indifferent_access
+            attributes.each do |k, v|
+              self.send("#{k}=", v)
+            end
+          end
+        end
+
+        include AttributesConcern
+
+        module ActiveRecordLikeConcern
+          extend ActiveSupport::Concern
+
+          class_methods do
+            def reorder(order)
+              key = order.first[0].to_sym
+              value = order.first[1].to_sym
+              sorted = _all.sort { |a, b| a.send(key) <=> b.send(key) }
+              value == :asc ? sorted : sorted.reverse
+              Collection.new(value == 'asc' ? sorted : sorted.reverse)
+            end
+
+            def count
+              all.size
+            end
+
+            def first
+              all.first
+            end
+
+            def last
+              all.last
+            end
+
+            def _all
+              raise "Child class responsiblity"
+            end
+
+            def all
+              Collection.new(_all)
+            end
+
+            def destroy_all
+              all.map(&:destroy)
+            end
+
+            def find(id)
+              all.select { |cl| cl.id == id }.first || raise(ActiveRecord::RecordNotFound)
+            end
+
+            def columns_hash
+              @columns_hash ||= attribute_names.each_with_object({}) { |e, m| m[name] = {} }
+            end
+
+            def create(attributes = {})
+              new(attributes).save
+            end
+          end
+
+          def ==(other)
+            return false unless other.respond_to?(:attributes)
+            self.attributes == other.attributes
+          end
+
+          def to_key
+            [id]
+          end
+
+          def to_param
+            id
+          end
+
+          def persisted?
+            true
+          end
+
+          def read_attribute(name)
+            @attributes[name.to_sym]
+          end
+
+          def write_attribute(name, value)
+            @attributes[name.to_sym] = value
+          end
+
+          def update(attributes)
+            raise "Child class responsibility"
+          end
+
+          def save
+            raise "Child class responsibility"
+          end
+
+          def save!
+            save
+          end
+        end
+
+        include ActiveRecordLikeConcern
+
+        module PaginationConcern
+          extend ActiveSupport::Concern
+
+          class_methods do
+            def page(page)
+              all.page(page)
+            end
+          end
+        end
+
+        include PaginationConcern
+      end
+    end
+  end
+end

data/app/models/cmor/system/rack/attack/banned_ip.rb

@@ -0,0 +1,72 @@
+module Cmor
+  module System
+    module Rack
+      module Attack
+        class BannedIp < Cmor::System::ActiveCollection::Base
+          self.attribute_names = %w(id key value)
+
+          validates :key, presence: true
+
+          def human
+            key
+          end
+
+          def self._all
+            _keys.collect { |k| new(key: k) }
+          end
+
+          def self._store
+            ::Rack::Attack.cache.store
+          end
+
+          def self._keys
+            if _store.is_a?(ActiveSupport::Cache::MemoryStore)
+              _store.instance_variable_get(:@data).keys
+            elsif _store.is_a?(::Rack::Attack::StoreProxy::RedisCacheStoreProxy)
+              _store.redis.keys
+            elsif _store.is_a?(::Rack::Attack::StoreProxy::RedisProxy)
+              _store.keys
+            elsif _store.is_a?(ActiveSupport::Cache::NullStore)
+              []
+            end.find_all { |k| k.to_s.include?(":ban:") }
+          end
+          
+          def key=(value)
+            write_attribute('key', value)
+            if value.nil?
+              write_attribute('id', nil)
+            else
+              write_attribute('id', Digest::SHA1.hexdigest(key))
+            end
+          end
+
+          def destroy
+            self.class._store.delete(key)
+            self
+          end
+
+          def update(attributes)
+            self.class._store.write(attributes['key'], attributes['value'])
+            if self.key != attributes['key']
+              self.class._store.delete(key)
+              self.key = attributes['key']
+            end
+          end
+
+          def persisted?
+            key.present? && self.class._keys.include?(key)
+          end
+
+          def save
+            !!self.class._store.write(attributes['key'], attributes['value'])
+          end
+
+          def ip
+            return unless key.respond_to?(:split)
+            key.split(":").last
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/cmor/system/rack/attack/banned_ips/_form.html.haml

@@ -0,0 +1 @@
+= form.input :key

data/app/views/cmor/system/rack/attack/banned_ips/_index_table.html.haml

@@ -0,0 +1,3 @@
+= table.id
+= table.column :ip
+= table.column :key

data/app/views/cmor/system/rack/attack/banned_ips/_index_table_actions.html.haml~

@@ -0,0 +1,17 @@
+= table.column(:actions, title: false) do |resource|
+  - capture_haml do
+    .w-100.d-flex
+      .btn-group.ml-auto
+        - if available_rest_actions.include?(:show)
+          - binding.pry
+          = link_to(url_for([resource_namespace, resource]), class: 'show btn btn-xs btn-responsive btn-primary') do
+            %i.fas.fa-eye
+            %span.btn-text= t('.show')
+        - if available_rest_actions.include?(:edit)
+          = link_to(url_for([:edit, resource_namespace, resource]), class: 'edit btn btn-xs btn-responsive btn-secondary') do
+            %i.fas.fa-edit
+            %span.btn-text= t('.edit')
+        - if available_rest_actions.include?(:destroy)
+          = link_to(url_for([resource_namespace, resource]), class: 'destroy btn btn-xs btn-responsive btn-danger', method: :delete, 'data-confirm': I18n.t('administrador.controller.confirmations.destroy')) do
+            %i.fas.fa-fire
+            %span.btn-text= t('.destroy')

data/app/views/cmor/system/rack/attack/banned_ips/_show_table.html.haml

@@ -0,0 +1,3 @@
+= table.id
+= table.row :ip
+= table.row :key

data/config/locales/de.yml

@@ -4,12 +4,20 @@ de:
       cmor/system/changelog:
         one: Changelog
         other: Changelogs
+      cmor/system/rack/attack/banned_ip:
+        one: Geblockte IP
+        other: Geblockte IPs
     attributes:
       cmor/system/changelog:
         id: ID
         file: Datei
         content: Inhalt
         version: Version
+      cmor/system/rack/attack/banned_ip:
+        id: ID
+        ip: IP Adresse
+        key: Schlüssel
+        value: Wert
   activerecord:
     models:
       active_storage/attachment:

data/config/locales/en.yml

@@ -1,4 +1,23 @@
 en:
+  activemodel:
+    models:
+      cmor/system/changelog:
+        one: Changelog
+        other: Changelogs
+      cmor/system/rack/attack/banned_ip:
+        one: Blocked IP
+        other: Blocked IPs
+    attributes:
+      cmor/system/changelog:
+        id: ID
+        file: Datei
+        content: Inhalt
+        version: Version
+      cmor/system/rack/attack/banned_ip:
+        id: ID
+        ip: IP Address
+        key: Schlüssel
+        value: Wert
   activerecord:
     models:
       active_storage/attachment:

data/config/routes.rb

@@ -2,8 +2,18 @@ Cmor::System::Engine.routes.draw do
   resources :changelogs, only: [:index, :show]
   resources :delayed_backend_active_record_jobs if Cmor::System::Configuration.enable_delayed_job_backend
   namespace :active_storage do
-    resources :blobs , only: [:index, :show, :destroy]
-    resources :attachments , only: [:index, :show, :destroy]
+    resources :blobs , only: [:index, :show, :destroy] do
+      Cmor::Core::Backend::Routing::ResourcesRoutes.inject_routes(self)
+    end
+    resources :attachments , only: [:index, :show, :destroy] do
+      Cmor::Core::Backend::Routing::ResourcesRoutes.inject_routes(self)
+    end
+  end if Cmor::System::Configuration.enable_active_storage_backend
+
+  namespace :rack do
+    namespace :attack do
+      resources :banned_ips, only: [:index, :show, :new, :create, :destroy]
+    end
   end if Cmor::System::Configuration.enable_active_storage_backend
 
   root to: 'home#index'

data/lib/cmor/system/configuration.rb

@@ -13,11 +13,14 @@ module Cmor
       mattr_accessor(:enable_active_storage_backend) { false }
       mattr_accessor(:enable_delayed_job_backend) { false }
       mattr_accessor(:record_factory_name) { 'user' }
+      mattr_accessor(:record_attachment_name) { 'asset' }
+      mattr_accessor(:enable_rack_attack_backend) { false }
 
       def self.registered_controllers
         rc = @@registered_controllers.call
         rc.reject! { |c| c.name =~ /.*ActiveStorage.*/ } unless enable_active_storage_backend
         rc.reject! { |c| c.name =~ /.*Delayed.*/ } unless enable_delayed_job_backend
+        rc.reject! { |c| c.name =~ /.*Rack::Attack.*/ } unless enable_rack_attack_backend
         -> { rc }
       end
     end

data/lib/generators/cmor/system/install/install_generator.rb

@@ -6,15 +6,19 @@ module Cmor
 
         source_root File.expand_path('../templates', __FILE__)
 
+        attr_reader :cmor_system_enable_rack_attack
         attr_reader :cmor_system_enable_active_storage
         attr_reader :cmor_system_enable_delayed_job
         attr_reader :record_factory_name
+        attr_reader :record_attachment_name
 
         def initialize(*args)
           super
+          @cmor_system_enable_rack_attack = ENV.fetch('CMOR_SYSTEM_ENABLE_RACK_ATTACK') { false }
           @cmor_system_enable_active_storage = ENV.fetch('CMOR_SYSTEM_ENABLE_ACTIVE_STORAGE') { false }
           @cmor_system_enable_delayed_job = ENV.fetch('CMOR_SYSTEM_ENABLE_DELAYED_JOB') { false }
           @record_factory_name = ENV.fetch('CMOR_SYSTEM_RECORD_FACTORY_NAME') { 'post' }
+          @record_attachment_name = ENV.fetch('CMOR_SYSTEM_RECORD_ATTACHMENT_NAME') { 'asset' }
         end
 
         def generate_initializer

data/lib/generators/cmor/system/install/templates/initializer.rb

@@ -2,15 +2,19 @@ Cmor::System.configure do |config|
   # Set the resources, that will be shown in the backend menu.
   # 
   # Default: config.registered_controllers = -> {[
+  #            Cmor::System::ChangelogsController,
   #            Cmor::System::DelayedBackendActiveRecordJobsController,
   #            Cmor::System::ActiveStorage::BlobsController,
-  #            Cmor::System::ActiveStorage::AttachmentsController
+  #            Cmor::System::ActiveStorage::AttachmentsController,
+  #            Cmor::System::Rack::Attack::BannedIpsController
   #          ]}
   # 
   config.registered_controllers = -> {[
+    Cmor::System::ChangelogsController,
     Cmor::System::DelayedBackendActiveRecordJobsController,
     Cmor::System::ActiveStorage::BlobsController,
-    Cmor::System::ActiveStorage::AttachmentsController
+    Cmor::System::ActiveStorage::AttachmentsController,
+    Cmor::System::Rack::Attack::BannedIpsController
   ]}
 
   # Set the services, that will be shown in the backend menu.
@@ -21,12 +25,18 @@ Cmor::System.configure do |config|
   config.registered_services = -> {[
   ]}
 
-  # Factory name to use for creators and updaters.
+  # Factory name to use for active storage attachment records.
   #
   # default: config.record_factory_name = 'post'
   #
   config.record_factory_name = '<%= record_factory_name %>'
 
+  # Attachment name to use for active storage attachments.
+  #
+  # default: config.record_attachment_name = 'asset'
+  #
+  config.record_attachment_name = '<%= record_attachment_name %>'
+
   # Enable support for ActiveStorage.
   # 
   # default: config.enable_active_storage_backend = false
@@ -38,4 +48,10 @@ Cmor::System.configure do |config|
   # default: config.enable_delayed_job_backend = false
   #
   config.enable_delayed_job_backend = <%= cmor_system_enable_delayed_job %>
+
+  # Enable support for Rack::Attack.
+  #
+  # default: config.enable_rack_attack_backend = false
+  #
+  config.enable_rack_attack_backend = <%= cmor_system_enable_rack_attack %>
 end

data/spec/factories/active_storage/attachments.rb

@@ -2,6 +2,6 @@ FactoryBot.define do
   factory :active_storage_attachment, class: 'ActiveStorage::Attachment' do
     association(:record, factory: Cmor::System::Configuration.record_factory_name)
     association(:blob, factory: :active_storage_blob)
-    name { 'example.png' }
+    name { Cmor::System::Configuration.record_attachment_name }
   end
 end

data/spec/factories/rack/attack/banned_ips.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :cmor_system_rack_attack_banned_ip, class: 'Cmor::System::Rack::Attack::BannedIp' do
+    sequence(:key) { |i| "rack::attack:allow2ban:ban:10.1.1.#{i}" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_system
 version: !ruby/object:Gem::Version
-  version: 0.0.55.pre
+  version: 0.0.60.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.55.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-attack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - roberto@vasquez-angel.de
@@ -368,7 +382,10 @@ files:
 - app/controllers/cmor/system/changelogs_controller.rb
 - app/controllers/cmor/system/delayed_backend_active_record_jobs_controller.rb
 - app/controllers/cmor/system/home_controller.rb
+- app/controllers/cmor/system/rack/attack/banned_ips_controller.rb
+- app/models/cmor/system/active_collection/base.rb
 - app/models/cmor/system/changelog.rb
+- app/models/cmor/system/rack/attack/banned_ip.rb
 - app/views/cmor/system/active_storage/attachments/_index_table.html.haml
 - app/views/cmor/system/active_storage/blobs/_index_table.html.haml
 - app/views/cmor/system/changelogs/_after_show_table.html.haml
@@ -376,6 +393,10 @@ files:
 - app/views/cmor/system/changelogs/_show_table.html.haml
 - app/views/cmor/system/delayed_backend_active_record_jobs/_index_table_actions.html.haml
 - app/views/cmor/system/delayed_backend_active_record_jobs/_show_actions.html.haml
+- app/views/cmor/system/rack/attack/banned_ips/_form.html.haml
+- app/views/cmor/system/rack/attack/banned_ips/_index_table.html.haml
+- app/views/cmor/system/rack/attack/banned_ips/_index_table_actions.html.haml~
+- app/views/cmor/system/rack/attack/banned_ips/_show_table.html.haml
 - config/initializers/assets.rb
 - config/initializers/cmor.rb
 - config/locales/de.yml
@@ -393,6 +414,7 @@ files:
 - spec/factories/active_storage/blobs.rb
 - spec/factories/cmor_system_changelogs.rb
 - spec/factories/delayed/backend_active_record_jobs.rb
+- spec/factories/rack/attack/banned_ips.rb
 - spec/files/active_storage/blob/example.png
 - spec/files/cmor/system/changelog/file/example.md
 homepage: https://github.com/content-management-on-rails