wobauth 4.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036ba4d2f604909cb8d224f27fc1570723520ddcdbe0f830e26f3f2eecdb93ae
-  data.tar.gz: 781621423c2cccdff5f9c1477eae55cfe9517d6e21f814bfbe67f8c4b0e04d6a
+  metadata.gz: ece99ba3c367db93f0174e65b7322eee6b8eb14ce78ef81e1b954672833fb56a
+  data.tar.gz: 2eb7759dd766870f95cdfd7ed18f712e650dd364ab4a8179cb789ce65a644618
 SHA512:
-  metadata.gz: c2615f3b762673ab9697f2d2619d2965269f2763daa246517c0039e63e52e7309f2b71cab759e5900e843401f88eee5e71994f43d209bbfa44cacbf817640b43
-  data.tar.gz: 0af1198085fb8ef517204d41990cfb64b9d280b85b478d0ea3ca4b36b804e11075a4e3b129dbe480c4f90ebe26add903bf20ed88a10b85b6e79ccd5e17a93af2
+  metadata.gz: fbd648f6565680dd3f3d2f344b7c7b39bbe2ddadea2285828e18bc803ba1cfbc1146fddd740cc6c5d26b352b04444295890bad1aa6d7ab936a7f0f1dd855454e
+  data.tar.gz: e75e32b2f84fbf4b0c4405769c154c65cff5d88b6d6a9b40001dfae05f6ae33e4d4a649654da472821f8a3b02dce0673e4641cd3443cd4c3eee5d82062d62c0f

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2014-2019 Wolfgang Barth
+Copyright (c) 2014-2020 Wolfgang Barth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -29,13 +29,22 @@ wobauth 1.x is for Rails 4, wobauth 2.x will support Rails 5.
 wobauth 3.x uses bootstrap v4 and font-awesome, starting with Rails 5.1 
 (may work with Rails 5.0, but not tested)
 wobauth 4.x works with sprockets v4.
+wobauth 5.x works with rails 6.x and is designed for autoloading via zeitwerk.
 
 Requirements
 ------------
 
+### Rails >= 6.0, autoload = :zeitwerk
+
+| branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
+|------------|-------|--------|-----------|-----------------|---------------|
+| master(5.x)| >=6.0 | >= 2.6 |  v4       | fontawesome 5.x | master (4.x)  |
+
+### Rails <= 5.2, autoload = :classic
+
 | branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
 |------------|-------|--------|-----------|-----------------|---------------|
-| master(4.x)| >=5.1 | >= 2.3 |  v4       | fontawesome 5.x | master (4.x)  |
+| 4-0-stable | >=5.1 | >= 2.3 |  v4       | fontawesome 5.x | master (4.x)  |
 | 3-0-stable | >=5.1 | >= 2.3 |  v4       | fontawesome 4.7 | 3-0-stable    |
 | 2-0-stable |  5.0  | >= 2.2 |  v3       | glyphicons      | 2-0-stable    |
 | 1-0-stable |  4.2  | >= 2.0 |  v3       | glyphicons      | 1-0-stable    |
@@ -48,6 +57,7 @@ Installation
 Add wobauth to your Gemfile:
 
 ```ruby
+gem 'wobauth', '~> 5.0.0'
 gem 'wobauth', '~> 4.0.0'
 gem 'wobauth', '~> 3.4.8'
 gem 'wobauth', git: 'https://github.com/swobspace/wobauth.git', branch: '3-0-stable'
@@ -171,7 +181,7 @@ included in this rails engine.
 Licence
 -------
 
-wobauth Copyright (C) 2014-2019  Wolfgang Barth
+wobauth Copyright (C) 2014-2020  Wolfgang Barth
 
 MIT license, see [LICENSE](LICENSE)
 

data/app/assets/javascripts/wobauth/authorities.js.coffee

@@ -4,14 +4,14 @@
 
 # - start with given values
 auth_types = $('#authority_authorizable_type').find("option:selected").val()
-$('#authority_authorizable_id optgroup').find('option').addBack().hide()
-$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().show()
+$('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorizable_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorizable_id optgroup').find('option').addBack().hide()
-  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )
 
 #
@@ -20,12 +20,12 @@ $(document).on('click', '#authority_authorizable_type', ->
 
 # - start with given values
 authfor_type = $('#authority_authorized_for_type').find("option:selected").val()
-$('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().show()
+$('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorized_for_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )

data/app/helpers/wobauth/application_helper.rb

@@ -1,19 +1,7 @@
 module Wobauth
   module ApplicationHelper
     include Wobapphelpers::Helpers::All
-
-    def polymorphic_selector(form, poly, types, group_method = :all)
-      msg = ""
-      # -- object available?
-      if form.object.send(poly).present?
-	msg += poly_type_display(form, poly)
-	msg += poly_id_select(form, poly, form.object.send("#{poly}_type"), :all)
-      else
-	msg += poly_type_select(form, poly, types)
-	msg += poly_id_select(form, poly, types, group_method)
-      end
-      msg.html_safe
-    end
+    include Wobapphelpers::Helpers::PolymorphicHelper
 
     def navigation_admin_links
       render partial: 'wobauth/shared/admin'
@@ -29,25 +17,5 @@ module Wobauth
       end
     end
 
-  private
-
-    def poly_type_select(f, poly, types)
-      f.input "#{poly}_type".to_sym, collection: types,
-              label_method: lambda {|x| t('activerecord.models.' + x.underscore)}
-    end
-
-    def poly_type_display(f, poly)
-     f.input("#{poly}_type".to_sym, collection: Array(f.object.send("#{poly}_type")),
-       label_method: lambda {|x| t('activerecord.models.' + x.underscore)},
-       disabled: true) +
-     f.hidden_field("#{poly}_type".to_sym, value: f.object.send("#{poly}_type"))
-    end
-
-    def poly_id_select(f, poly, types, group_method)
-      collections = Array(types).map {|t| t.constantize}
-      f.input "#{poly}_id".to_sym, collection: collections,
-                 as: :grouped_select, group_method: group_method
-    end
-
   end
 end

data/app/models/wobauth/group.rb

@@ -8,8 +8,7 @@ module Wobauth
                      source: :user
     # -- configuration
     # -- validations and callbacks
-    validates :name, :presence => true, :uniqueness => true
-
+    validates :name, presence: true, uniqueness: {case_sensitive: true}
 
     def to_s
       name

data/app/models/wobauth/role.rb

@@ -10,7 +10,7 @@ module Wobauth
                       source_type: Wobauth::Group
     # -- configuration
     # -- validations and callbacks
-    validates :name, :presence => true, :uniqueness => true
+    validates :name, presence: true, uniqueness: {case_sensitive: true}
 
     def to_s
       name

data/app/models/wobauth/user.rb

@@ -1,7 +1,8 @@
+require_dependency 'wobauth/concerns/models/user_concerns'
 module Wobauth
   class User < ActiveRecord::Base
     # dependencies within wobauth models
-    include Wobauth::Concerns::Models::User
+    include UserConcerns
 
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable

data/app/services/wobauth/search_ad_user_service.rb

@@ -17,17 +17,27 @@ module Wobauth
 	return Result.new(success: false, error_messages: ["no query given"], ad_users: [])
       end
 
-      ldap = Wobaduser::LDAP.new(ldap_options: ldap_options)
-      if ldap.errors.any?
-	return Result.new(success: false, error_messages: ldap.errors, ad_users: [])
+      errors = []
+      ad_users = []
+      ldap_options.each do |ldapopts|
+        ldap = Wobaduser::LDAP.new(ldap_options: ldapopts)
+        if ldap.errors.any?
+          errors += ldap.errors
+          next
+        end
+        search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
+        if search.success?
+          ad_users += search.entries
+        else
+          errors += search.errors
+        end
       end
 
-      search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
-      if search.success?
-	result = Result.new(success: true, error_messages: [], ad_users: search.entries)
+      if errors.any?
+        return Result.new(success: false, error_messages: errors, ad_users: ad_users)
       else
-	result = Result.new(success: false, error_messages: search.errors, ad_users: [])
-       end
+        result = Result.new(success: true, error_messages: errors, ad_users: ad_users)
+      end
     end
 
   private
@@ -50,5 +60,13 @@ module Wobauth
       filter += ")"
       filter = Net::LDAP::Filter.construct(filter)
     end
+
+    def ldap_options
+      if @ldap_options.kind_of? Hash
+        [@ldap_options]
+      else
+        @ldap_options
+      end
+    end
   end
-end
+ end

data/app/views/wobauth/authorities/_form.html.erb

@@ -11,12 +11,16 @@
     <%= polymorphic_selector(f,
                              'authorizable',
                               Wobauth.authorizable_types,
-                              Wobauth.authorizable_group_method) %>
+                              Wobauth.authorizable_group_method,
+                              {class: 'select2'}) 
+     %>
     <%= f.association :role %>
     <%= polymorphic_selector(f,
                              'authorized_for',
                              Wobauth.authorized_for_types,
-                             Wobauth.authorized_for_group_method) %>
+                             Wobauth.authorized_for_group_method,
+                              {class: 'select2'}) 
+     %>
 
     <%= f.input :valid_from, as: :string, class: 'datepicker'
      %>

data/app/views/wobauth/authorities/show.html.erb

@@ -3,33 +3,33 @@
     <h4><%= t('activerecord.models.wobauth/authority') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless">
       <tr>
-	<th><%= t('attributes.authorizable')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable')%>:</th>
 	<td><%= @authority.authorizable %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorizable_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable_type')%>:</th>
 	<td><%= @authority.authorizable_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.role')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.role')%>:</th>
 	<td><%= @authority.role %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for')%>:</th>
 	<td><%= @authority.authorized_for %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for_type')%>:</th>
 	<td><%= @authority.authorized_for_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_from')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_from')%>:</th>
 	<td><%= @authority.valid_from %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_until')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_until')%>:</th>
 	<td><%= @authority.valid_until %></td>
       </tr>
     </table>

data/app/views/wobauth/memberships/show.html.erb

@@ -3,17 +3,17 @@
     <h4><%= t('attributes.membership') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless ">
       <tr>
-	<th><%= t('attributes.user')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.user')%>:</th>
 	<td><%= @membership.user %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.group')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.group')%>:</th>
 	<td><%= @membership.group %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.auto')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.auto')%>:</th>
 	<td><%= @membership.auto %></td>
       </tr>
     </table>

data/app/views/wobauth/users/index.html.erb

@@ -49,4 +49,4 @@
 
 <%= back_link %>
 <%= new_link [wobauth, Wobauth::User] %>
-<%= link_to t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary' %>
+<%= link_to(t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary') if can? :create, Wobauth::User %>

data/app/views/wobauth/users/show.html.erb

@@ -94,7 +94,7 @@
       <%= edit_link([wobauth, @user]) %>
       <%= delete_link([wobauth, @user]) %>
       <%= new_link [wobauth, Wobauth::User] %>
-      <%= link_to t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary' %>
+      <%= link_to(t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary') if can? :create, Wobauth::User %>
     </div>
 
   </div>

data/config/ldap.yml.example

@@ -0,0 +1,41 @@
+# simple 
+ldap_options:
+  host: 1.2.3.4
+  port: 3268
+  base: dc=example,dc=com
+  auth:
+    method: :simple
+    username: myusername
+    password: mysecretpassword
+
+# redundant: 1 directory with 2 redundant servers
+ldap_options:
+  hosts: 
+    - [1.2.3.4, 3269]
+    - [5.6.7.8, 3269]
+  encryption: :simple_tls
+  base: dc=example,dc=com
+  auth:
+    method: :simple
+    username: myusername
+    password: mysecretpassword
+
+# multiple directories
+ldap_options:
+  - host: 1.2.3.4
+    port: 3268
+    base: dc=example,dc=com
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+  - host: 5.6.7.8
+    port: 3269
+    base: dc=example,dc=com
+    encryption: :simple_tls
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+
+

data/config/locales/wobapphelpers.de.yml

@@ -1,10 +1,14 @@
 de:
   wobapphelpers:
     helpers:
-      back: "Zurück"
-      cancel: "Abbrechen"
-    controller:
-      new:  "%{name} erstellen"
-      create:  "%{name} erstellen"
-      edit:  "%{name} bearbeiten"
-      update:  "%{name} bearbeiten"
+      back: Zurück
+      cancel: Abbrechen
+    actions:
+      new:  "%{model} erstellen"
+      create:  "%{model} erstellen"
+      show:  "%{model} anzeigen"
+      edit:  "%{model} bearbeiten"
+      copy:  "%{model} kopieren"
+      update:  "%{model} bearbeiten"
+      destroy:  "%{model} löschen"
+      destroy_confirm:  "Der Datensatz kann nicht wieder hergestellt werden!"

data/config/locales/wobapphelpers.en.yml

@@ -3,6 +3,12 @@ en:
     helpers:
       back: Back
       cancel: Cancel
-    controller:
-      new:  "create %{name}"
-      edit:  "update %{name}"
+    actions:
+      new:  "create %{model}"
+      create: "create %{model}"
+      show: "show %{model}"
+      edit: "update %{model}"
+      update: "update %{model}"
+      copy: "copy %{model}"
+      destroy: "destroy %{model}"
+      destroy_confirm: "record would be finally destroyed, no recovery possible!"

data/lib/wobauth.rb

@@ -45,13 +45,18 @@ module Wobauth
     config ||= Hash.new
 
     if config['ldap_options'].present?
-      opts = config['ldap_options'].symbolize_keys
-      opts.each do |k,v|
-        opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+      ldapopts = config['ldap_options']
+      if ldapopts.kind_of? Hash
+        ldapopts = [ldapopts]
+      end
+      ldapopts.each do |opts|
+        opts.symbolize_keys!
+        opts.each do |k,v|
+          opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+        end
       end
     else
       nil
     end
   end
-
 end

data/lib/wobauth/concerns/models/user_concerns.rb

@@ -0,0 +1,40 @@
+module UserConcerns
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :authorities, as: :authorizable, dependent: :destroy
+    has_many :roles,       through: :authorities
+    has_many :memberships, dependent: :destroy
+    has_many :groups, -> { distinct }, through: :memberships
+    has_many :group_roles, through: :groups, source: :roles
+    has_many :group_authorities, through: :groups, source: :authorities
+
+    validates :username, presence: true, uniqueness: { case_sensitive: false }
+  end
+
+
+  def to_s
+    if sn.blank? and givenname.blank?
+      "#{username}" 
+    elsif title.blank?
+      "#{sn}, #{givenname} (#{username})"
+    else
+      "#{sn}, #{title} #{givenname} (#{username})"
+    end
+  end
+
+  def name
+    to_s
+  end
+
+  def is_admin?
+    role?(:admin)
+  end
+
+  def role?(role)
+    (self.authorities.joins(:role)
+     .where("wobauth_roles.name = ?", role.to_s.camelize).present?) ||
+    (self.group_authorities.joins(:role)
+     .where("wobauth_roles.name = ?", role.to_s.camelize).present?)
+  end
+end

data/lib/wobauth/version.rb

@@ -1,4 +1,4 @@
 module Wobauth
-  VERSION = "4.0.0".freeze
-  RELEASEDATE = "2019-11-28".freeze
+  VERSION = "5.1.1".freeze
+  RELEASEDATE = "2020-10-03".freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wobauth
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: wobaduser
   requirement: !ruby/object:Gem::Requirement
@@ -636,6 +636,7 @@ files:
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/initializers/wobapphelpers.rb
+- config/ldap.yml.example
 - config/locales/de.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
@@ -650,7 +651,6 @@ files:
 - db/migrate/20140504143328_create_wobauth_authorities.rb
 - db/migrate/20140508120810_devise_create_wobauth_users.rb
 - db/migrate/20171231084355_additional_fields_to_wobauth_user.rb
-- lib/concerns/models/user.rb
 - lib/generators/templates/initializers/wobauth.rb
 - lib/generators/wobauth/install_generator.rb
 - lib/tasks/wobauth_tasks.rake
@@ -661,6 +661,7 @@ files:
 - lib/templates/erb/scaffold/show.html.erb
 - lib/templates/rails/scaffold_controller/controller.rb
 - lib/wobauth.rb
+- lib/wobauth/concerns/models/user_concerns.rb
 - lib/wobauth/engine.rb
 - lib/wobauth/version.rb
 - spec/factories.rb

data/lib/concerns/models/user.rb

@@ -1,44 +0,0 @@
-module Wobauth
-  module Concerns
-    module Models::User
-      extend ActiveSupport::Concern
-
-      included do
-	has_many :authorities, as: :authorizable, dependent: :destroy
-	has_many :roles,       through: :authorities
-	has_many :memberships, dependent: :destroy
-	has_many :groups, -> { distinct }, through: :memberships
-	has_many :group_roles, through: :groups, source: :roles
-	has_many :group_authorities, through: :groups, source: :authorities
-
-        validates :username, presence: true, uniqueness: true
-      end
-
-
-      def to_s
-        if sn.blank? and givenname.blank?
-          "#{username}" 
-        elsif title.blank?
-          "#{sn}, #{givenname} (#{username})"
-        else
-          "#{sn}, #{title} #{givenname} (#{username})"
-        end
-      end
-  
-      def name
-        to_s
-      end
-
-      def is_admin?
-        role?(:admin)
-      end
-
-      def role?(role)
-        (self.authorities.joins(:role)
-         .where("wobauth_roles.name = ?", role.to_s.camelize).present?) ||
-        (self.group_authorities.joins(:role)
-         .where("wobauth_roles.name = ?", role.to_s.camelize).present?)
-      end
-    end
-  end
-end