ditty 0.7.1 → 0.10.1

data/lib/ditty/memcached.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'ditty/services/logger'
+
+Ditty::Services::Logger.info 'Setting up caching'
+require 'memcached'
+CACHE = Memcached.new(ENV['MEMCACHED_URL'])
+Sequel::Model.plugin :caching, CACHE, ignore_exceptions: true

data/lib/ditty/middleware/accept_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ditty
   module Middleware
     # Allow requests to be responded to in JSON if the URL has .json at the end.
@@ -6,7 +8,7 @@ module Ditty
     class AcceptExtension
       attr_reader :env, :regex, :content_type
 
-      def initialize(app, regex = /\A(.*)\.json(\/?)\Z/, content_type = 'application/json')
+      def initialize(app, regex = %r{\A(.*)\.json(/?)\Z}, content_type = 'application/json')
         # @mutex = Mutex.new
         @app = app
         @regex = regex
@@ -17,7 +19,7 @@ module Ditty
         @env = env
 
         request = Rack::Request.new(env)
-        if request.path =~ regex
+        if request.path&.match?(regex)
           request.path_info = request.path_info.gsub(regex, '\1\2')
           env = request.env
           env['ACCEPT'] = content_type

data/lib/ditty/middleware/error_catchall.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ditty/services/logger'
 
 module Ditty
@@ -14,8 +16,8 @@ module Ditty
         begin
           @app.call env
         rescue StandardError => e
-          ::Ditty::Services::Logger.instance.error "Ditty Catchall: #{e.class}"
-          ::Ditty::Services::Logger.instance.error e
+          ::Ditty::Services::Logger.error "Ditty Catchall: #{e.class}"
+          ::Ditty::Services::Logger.error e
           [500, {}, ['Unknown Error']]
         end
       end

data/lib/ditty/models/audit_log.rb

@@ -8,6 +8,7 @@ module Ditty
     many_to_one :user
 
     def validate
+      super
       validates_presence [:action]
     end
   end

data/lib/ditty/models/base.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'digest/sha2'
 require 'sequel'
 
 module Ditty
@@ -5,5 +8,15 @@ module Ditty
     def for_json
       values
     end
+
+    def display_id
+      self[:slug] || self[:guid] || self[:id]
+    end
+
+    def etag
+      Digest::SHA2.hexdigest values.to_json
+    end
+
+    alias for_csv for_json
   end
 end

data/lib/ditty/models/identity.rb

@@ -22,6 +22,7 @@ module Ditty
 
     def authenticate(unencrypted)
       return false if crypted_password.blank?
+
       self if ::BCrypt::Password.new(crypted_password) == unencrypted
     end
 
@@ -38,6 +39,7 @@ module Ditty
 
     # Validation
     def validate
+      super
       validates_presence :username
       unless username.blank?
         validates_unique :username
@@ -53,7 +55,7 @@ module Ditty
           # 1 Special Character
           # 1 Number
           # At least 8 characters
-          %r[\A(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#&$*)(}{%^=_+|\\:";'<>,.\-\/?\[\]])(?=.*[0-9]).{8,}\Z],
+          %r[\A(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#&$*)(}{%^=_+|\\:";'<>,.\-/?\[\]])(?=.*[0-9]).{8,}\Z],
           :password,
           message: 'is not strong enough'
         )
@@ -64,17 +66,18 @@ module Ditty
 
     # Callbacks
     def before_save
+      super
       encrypt_password unless password == '' || password.nil?
     end
 
     private
 
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+      def encrypt_password
+        self.crypted_password = ::BCrypt::Password.create(password)
+      end
 
-    def password_required
-      crypted_password.blank? || !password.blank?
-    end
+      def password_required
+        crypted_password.blank? || !password.blank?
+      end
   end
 end

data/lib/ditty/models/role.rb

@@ -5,10 +5,12 @@ require 'ditty/models/base'
 module Ditty
   class Role < ::Sequel::Model
     include ::Ditty::Base
+    plugin :tree
 
     many_to_many :users
 
     def validate
+      super
       validates_presence [:name]
       validates_unique [:name]
     end

data/lib/ditty/models/user.rb

@@ -13,14 +13,24 @@ module Ditty
     one_to_many :identity
     many_to_many :roles
     one_to_many :audit_logs
+    one_to_many :user_login_traits
 
     def role?(check)
       @roles ||= Hash.new do |h, k|
-        h[k] = !roles_dataset.first(name: k).nil?
+        role_or_descendant = roles.find do |role|
+          role.name == k || role.descendants.map(&:name).include?(k)
+        end
+        h[k] = !role_or_descendant.nil?
       end
       @roles[check]
     end
 
+    def all_roles
+      roles.inject([]) do |memo, role|
+        memo + [role] + role.descendants
+      end.uniq
+    end
+
     def method_missing(method_sym, *arguments, &block)
       if respond_to_missing?(method_sym)
         role?(method_sym[0..-2])
@@ -30,7 +40,9 @@ module Ditty
     end
 
     def respond_to_missing?(name, _include_private = false)
-      name[-1] == '?'
+      return true if name[-1] == '?'
+
+      super
     end
 
     def gravatar
@@ -39,25 +51,42 @@ module Ditty
     end
 
     def validate
+      super
       validates_presence :email
       return if email.blank?
+
       validates_unique :email
       validates_format(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :email)
     end
 
+    def before_save
+      super
+      self.name = nil if name.blank?
+      self.surname = nil if surname.blank?
+    end
+
     # Add the basic roles and identity
     def after_create
+      super
       check_roles
     end
 
     def check_roles
       return if roles_dataset.first(name: 'anonymous')
       return if roles_dataset.first(name: 'user')
+
       add_role Role.find_or_create(name: 'user')
     end
 
     def username
-      identity_dataset.first.username
+      identity = identity_dataset.first
+      return identity.username if identity
+
+      email
+    end
+
+    def display_name
+      name || username
     end
 
     class << self
@@ -65,6 +94,14 @@ module Ditty
         role = ::Ditty::Role.find_or_create(name: 'anonymous')
         ::Ditty::User.where(roles: role).first
       end
+
+      def create_anonymous_user(email = 'anonymous@ditty.io')
+        return if anonymous_user
+
+        user = ::Ditty::User.find_or_create(email: email)
+        user.remove_role ::Ditty::Role.find_or_create(name: 'user')
+        user.add_role ::Ditty::Role.find_or_create(name: 'anonymous') unless user.role?('anonymous')
+      end
     end
   end
 end

data/lib/ditty/models/user_login_trait.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'ditty/models/base'
+
+# Why not store this in Elasticsearch?
+module Ditty
+  class UserLoginTrait < ::Sequel::Model
+    include ::Ditty::Base
+
+    many_to_one :user
+
+    def validate
+      super
+      validates_presence :user_id
+    end
+  end
+end

data/lib/ditty/policies/audit_log_policy.rb

@@ -5,23 +5,23 @@ require 'ditty/policies/application_policy'
 module Ditty
   class AuditLogPolicy < ApplicationPolicy
     def create?
-      user && user.super_admin?
+      false
     end
 
     def list?
-      create?
+      user&.super_admin?
     end
 
     def read?
-      create?
+      user&.super_admin?
     end
 
     def update?
-      read?
+      false
     end
 
     def delete?
-      create?
+      false
     end
 
     def permitted_attributes
@@ -30,7 +30,7 @@ module Ditty
 
     class Scope < ApplicationPolicy::Scope
       def resolve
-        if user && user.super_admin?
+        if user&.super_admin?
           scope
         else
           scope.where(id: -1)

data/lib/ditty/policies/role_policy.rb

@@ -5,7 +5,7 @@ require 'ditty/policies/application_policy'
 module Ditty
   class RolePolicy < ApplicationPolicy
     def create?
-      user && user.super_admin?
+      user&.super_admin?
     end
 
     def list?
@@ -25,12 +25,12 @@ module Ditty
     end
 
     def permitted_attributes
-      [:name]
+      %i[parent_id name]
     end
 
     class Scope < ApplicationPolicy::Scope
       def resolve
-        if user && user.super_admin?
+        if user&.super_admin?
           scope
         else
           scope.where(id: -1)

data/lib/ditty/policies/user_login_trait_policy.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'ditty/policies/application_policy'
+
+module Ditty
+  class UserLoginTraitPolicy < ApplicationPolicy
+    def create?
+      user&.super_admin?
+    end
+
+    def list?
+      !!user
+    end
+
+    def read?
+      user && (record.user_id == user.id || user.super_admin?)
+    end
+
+    def update?
+      user&.super_admin?
+    end
+
+    def delete?
+      user&.super_admin?
+    end
+
+    def permitted_attributes
+      attribs = %i[ip_address os browser]
+      attribs << :user_id if user.super_admin?
+      attribs
+    end
+
+    class Scope < ApplicationPolicy::Scope
+      def resolve
+        if user&.super_admin?
+          scope
+        elsif user
+          scope.where(user_id: user.id)
+        else
+          scope.where(id: -1)
+        end
+      end
+    end
+  end
+end

data/lib/ditty/policies/user_policy.rb

@@ -10,7 +10,7 @@ module Ditty
     end
 
     def create?
-      user && user.super_admin?
+      user&.super_admin?
     end
 
     def list?
@@ -26,7 +26,7 @@ module Ditty
     end
 
     def delete?
-      create?
+      create? && record&.super_admin? == false
     end
 
     def permitted_attributes
@@ -37,7 +37,7 @@ module Ditty
 
     class Scope < ApplicationPolicy::Scope
       def resolve
-        if user && user.super_admin?
+        if user&.super_admin?
           scope
         elsif user
           scope.where(id: user.id)

data/lib/ditty/rubocop.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'rubocop/cop/ditty/call_services_directly'

data/lib/ditty/seed.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 ::Ditty::Components.seeders.each(&:call)

data/lib/ditty/services/authentication.rb

@@ -1,13 +1,15 @@
-require 'ditty/models/identity'
-require 'ditty/controllers/auth'
+# frozen_string_literal: true
+
+require 'ditty/controllers/application_controller'
 require 'ditty/services/settings'
 require 'ditty/services/logger'
 
 require 'omniauth'
-OmniAuth.config.logger = Ditty::Services::Logger.instance
-OmniAuth.config.path_prefix = "#{Ditty::Application.map_path}/auth"
+OmniAuth.config.logger = ::Ditty::Services::Logger
+OmniAuth.config.path_prefix = "#{::Ditty::ApplicationController.map_path}/auth"
 OmniAuth.config.on_failure = proc { |env|
   next [400, {}, []] if env['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
+
   OmniAuth::FailureEndpoint.new(env).redirect_to_failure
 }
 
@@ -20,36 +22,50 @@ module Ditty
         end
 
         def providers
-          config.compact.keys
+          config.compact.keys.select { |e| config[e][:available] && config[e][:enabled] != false }
         end
 
         def setup
-          providers.each do |provider|
-            begin
-              require "omniauth/#{provider}"
+          config.compact.each_key do |provider|
+            ::Ditty::Services::Logger.debug "Loading authentication provider #{provider}"
+            req = if config.dig(provider, :require)
+              [config[provider][:require]]
+            else
+              ["omniauth/#{provider}", "omniauth-#{provider}"]
+            end
+            req.find do |e|
+              require e
+              config[provider][:available] = true
+              true
             rescue LoadError
-              require "omniauth-#{provider}"
+              ::Ditty::Services::Logger.warn "Could not load authentication provider #{provider} using #{e}"
+              config[provider][:available] = false
+              false
             end
           end
         end
 
         def config
-          default.merge Ditty::Services::Settings.values(:authentication) || {}
+          @config ||= default.merge(::Ditty::Services::Settings.values(:authentication) || {})
         end
 
         def provides?(provider)
-          providers.include? provider.to_sym
+          provider = provider.to_sym
+          providers.include?(provider) && config[provider][:available] && config.dig(provider, :enabled) != false
         end
 
         def default
+          require 'ditty/models/identity'
+          require 'ditty/controllers/auth_controller'
           {
             identity: {
+              available: true,
               arguments: [
                 {
                   fields: [:username],
-                  model: Ditty::Identity,
-                  on_login: Ditty::Auth,
-                  on_registration: Ditty::Auth,
+                  model: ::Ditty::Identity,
+                  on_login: ::Ditty::AuthController,
+                  on_registration: ::Ditty::AuthController,
                   locate_conditions: ->(req) { { username: req['username'] } }
                 }
               ]
@@ -61,4 +77,4 @@ module Ditty
   end
 end
 
-Ditty::Services::Authentication.setup
+::Ditty::Services::Authentication.setup