chaltron 0.3.2 → 1.0.0

data/lib/chaltron/engine.rb

@@ -2,7 +2,7 @@ require 'devise'
 require 'cancancan'
 require 'omniauth'
 require 'omniauth-ldap'
-require 'bootstrap-sass'
+require 'bootstrap'
 require 'autoprefixer-rails'
 require 'font-awesome-sass'
 require 'simple-navigation'
@@ -11,9 +11,8 @@ require 'bootstrap_form'
 require 'nprogress-rails'
 require 'rails-i18n'
 require 'jquery-rails'
-require 'jquery-datatables-rails'
+require 'jquery-datatables'
 
-require 'simple_navigation_bootstrap'
 SimpleNavigation.config_file_paths << File.expand_path('../../../config', __FILE__)
 
 module Chaltron

data/lib/chaltron/ldap/connection.rb

@@ -4,12 +4,6 @@ require 'chaltron/ldap/person'
 module Chaltron
   module LDAP
     class Connection
-      NET_LDAP_ENCRYPTION_METHOD = {
-        simple_tls: :simple_tls,
-        start_tls:  :start_tls,
-        plain:      nil
-      }.freeze
-
       attr_reader :ldap
 
       def initialize(params = {})
@@ -22,9 +16,7 @@ module Chaltron
       end
 
       def find_by_uid(id)
-        opts = {}
-        opts[uid.to_sym] = id
-        ret = find_user(opts)
+        find_user(uid: id)
       end
 
       def find_user(*args)
@@ -55,31 +47,35 @@ module Chaltron
             scope: Net::LDAP::SearchScope_BaseObject
           }
         else
-          filters = fields.map do |field|
-            f = translate_field(field)
-            Net::LDAP::Filter.eq(f, args[field]) if f
+          filters = []
+          fields.each do |field|
+            filters << Net::LDAP::Filter.eq(field, args[field])
           end
           options = {
             base: base,
             filter: filters.inject { |sum, n| Net::LDAP::Filter.join(sum, n) }
           }
         end
-        options.merge!(size: limit) unless limit.nil?
-        ldap_search(options).map do |entry|
-          Chaltron::LDAP::Person.new(entry, uid) if entry.respond_to? uid
-        end.compact
-      end
 
-      def find_groups_by_member(entry)
-        options = {
-          base: Chaltron.ldap_group_base || base,
-          filter: Chaltron.ldap_group_member_filter.call(entry)
-        }
-        ldap_search(options)
-      end
+#        if config.user_filter.present?
+#          user_filter = Net::LDAP::Filter.construct(config.user_filter)
+
+#          options[:filter] = if options[:filter]
+#                               Net::LDAP::Filter.join(options[:filter], user_filter)
+#                             else
+#                               user_filter
+#                             end
+#        end
 
-      def update_attributes(dn, args)
-        ldap.modify dn: dn, operations: args.map { |k,v| [:replace, k, v] }
+        options.merge!(size: limit) if limit.present?
+
+        entries = ldap_search(options).select do |entry|
+          entry.respond_to? uid
+        end
+
+        entries.map do |entry|
+          Chaltron::LDAP::Person.new(entry, uid)
+        end
       end
 
       private
@@ -88,21 +84,15 @@ module Chaltron
         Devise.omniauth_configs[:ldap].options
       end
 
-      def translate_field field
-        return uid if field.to_sym == :uid
-        return Chaltron.ldap_field_mappings[field.to_sym] unless Chaltron.ldap_field_mappings[field.to_sym].nil?
-        field
-      end
-
       def adapter_options
-        opts = {
+        {
           host: options[:host],
           port: options[:port],
-          encryption: encryption_options,
+          encryption: encryption,
           verbose: true
-        }
-        opts.merge!(auth_options) if has_auth?
-        opts
+        }.tap do |options|
+          options.merge!(auth_options) if has_auth?
+        end
       end
 
       def base
@@ -113,64 +103,15 @@ module Chaltron
         options[:uid]
       end
 
-      def encryption_options
-        method = translate_method
-        return unless method
-        {
-          method: method,
-          tls_options: tls_options
-        }
-      end
-
-      def translate_method
-        NET_LDAP_ENCRYPTION_METHOD[options[:encryption]&.to_sym]
-      end
-
-      def tls_options
-        return @tls_options if defined?(@tls_options)
-
-        method = translate_method
-        return unless method
-
-        opts = if options[:disable_verify_certificates]
-        # It is important to explicitly set verify_mode for two reasons:
-        # 1. The behavior of OpenSSL is undefined when verify_mode is not set.
-        # 2. The net-ldap gem implementation verifies the certificate hostname
-        #    unless verify_mode is set to VERIFY_NONE.
-        { verify_mode: OpenSSL::SSL::VERIFY_NONE }
+      def encryption
+        case options[:method].to_s
+        when 'ssl'
+          :simple_tls
+        when 'tls'
+          :start_tls
         else
-          # Dup so we don't accidentally overwrite the constant
-          OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.dup
-        end
-
-        opts.merge!(custom_tls_options)
-
-        @tls_options = opts
-      end
-
-      def custom_tls_options
-        return {} unless options['tls_options']
-
-        # Dup so we don't overwrite the original value
-        custom_options = options['tls_options'].dup.delete_if { |_, value| value.nil? || value.blank? }
-        custom_options.symbolize_keys!
-
-        if custom_options[:cert]
-          begin
-            custom_options[:cert] = OpenSSL::X509::Certificate.new(custom_options[:cert])
-          rescue OpenSSL::X509::CertificateError => e
-            Rails.logger.error "LDAP TLS Options 'cert' is invalid for provider #{provider}: #{e.message}"
-          end
-        end
-
-        if custom_options[:key]
-          begin
-            custom_options[:key] = OpenSSL::PKey.read(custom_options[:key])
-          rescue OpenSSL::PKey::PKeyError => e
-            Rails.logger.error "LDAP TLS Options 'key' is invalid for provider #{provider}: #{e.message}"
-          end
+          nil
         end
-        custom_options
       end
 
       def auth_options

data/lib/chaltron/ldap/person.rb

@@ -44,17 +44,11 @@ module Chaltron
       end
 
       def department
-        entry.send(Chaltron.ldap_field_mappings[:department]).first rescue nil
+        entry.department.first rescue nil
       end
 
       def name
-        if Chaltron.ldap_field_mappings[:full_name].nil?
-          first_name = entry.send(Chaltron.ldap_field_mappings[:first_name]).first
-          last_name = entry.send(Chaltron.ldap_field_mappings[:last_name]).first
-          "#{first_name} #{last_name}"
-        else
-          entry.send(Chaltron.ldap_field_mappings[:full_name]).first
-        end
+        entry.cn.first
       end
 
       def uid
@@ -66,7 +60,7 @@ module Chaltron
       end
 
       def email
-        entry.send(Chaltron.ldap_field_mappings[:email]).first rescue nil
+        entry.mail.first rescue nil
       end
 
       def dn
@@ -77,10 +71,6 @@ module Chaltron
         'ldap'
       end
 
-      def ldap_groups
-        self.class.ldap.find_groups_by_member(self)
-      end
-
       private
 
       def self.ldap

data/lib/chaltron/ldap/user.rb

@@ -20,11 +20,7 @@ module Chaltron
           entry = Chaltron::LDAP::Person.find_by_uid(username)
           if user.nil? and create
             # create user
-            roles = Chaltron.default_roles
-            roles = entry.ldap_groups.map do |e|
-              Chaltron.ldap_role_mappings[e.dn]
-            end.compact if !Chaltron.ldap_role_mappings.blank?
-            user = entry.create_user(roles)
+            user = entry.create_user Chaltron.default_roles
           end
           update_ldap_attributes(user, entry) unless user.nil?
           user

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '0.3.2'.freeze
+  VERSION = '1.0.0'
 end

data/lib/generators/chaltron/install_generator.rb

@@ -15,6 +15,15 @@ module Chaltron
       end
     end
 
+    def gemfile
+      gem 'bootstrap_form',
+        git: 'https://github.com/bootstrap-ruby/rails-bootstrap-forms.git',
+        branch: 'master'
+      Bundler.with_clean_env do
+        run 'bundle install'
+      end
+    end
+
     def db_migrations
       rake 'chaltron_engine:install:migrations'
     end
@@ -42,9 +51,6 @@ RUBY
       # javascript
       inject_into_file 'app/assets/javascripts/application.js',
         "//= require chaltron\n", before: '//= require_tree .'
-      # css
-      inject_into_file 'app/assets/stylesheets/application.css',
-        " *= require chaltron\n", before: ' *= require_self'
     end
 
     def create_index_controller

data/lib/generators/chaltron/templates/app/assets/stylesheets/home.scss

@@ -2,29 +2,11 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
+@import 'chaltron';
+
 #main-carousel {
   img {
     height: 400px;
     width: 100%;
   }
-  margin-bottom: 60px;
-}
-
-.marketing {
-  img.img-circle {
-    height: 140px;
-    width: 140px;
-  }
-  .col-lg-4 {
-    margin-bottom: 20px;
-    text-align: center;
-  }
-}
-
-.featurette-divider {
-  margin: 80px 0;
-}
-
-.featurette-heading {
-  font-size: 50px;
 }

data/lib/generators/chaltron/templates/app/views/home/_carousel.html.erb

@@ -1,39 +1,39 @@
-<div id='main-carousel' class='carousel slide' data-ride='carousel'>
-  <!-- Indicators -->
-  <ol class='carousel-indicators'>
-    <li data-target='#main-carousel' data-slide-to='0' class='active'></li>
-    <li data-target='#main-carousel' data-slide-to='1'></li>
-    <li data-target='#main-carousel' data-slide-to='2'></li>
+<div id='main-carousel' class='carousel slide border-bottom border-primary' data-ride='carousel'>
+
+  <ol class="carousel-indicators">
+    <li data-target="#main-carousel" data-slide-to="0" class="active"></li>
+    <li data-target="#main-carousel" data-slide-to="1"></li>
+    <li data-target="#main-carousel" data-slide-to="2"></li>
   </ol>
 
-  <!-- Wrapper for slides -->
   <div class='carousel-inner'>
-    <div class='item active'>
+    <div class='carousel-item active'>
       <%= image_tag('slide1.gif') %>
-      <div class='carousel-caption'>
+      <div class='carousel-caption d-none d-md-block'>
         <h1>Chaltron rulez!</h1>
       </div>
     </div>
-    <div class='item'>
+    <div class='carousel-item'>
       <%= image_tag('slide2.gif') %>
-      <div class='carousel-caption'>
+      <div class='carousel-caption d-none d-md-block'>
         <h1>Wow!</h1>
         <p>Looking good</p>
       </div>
     </div>
-    <div class='item'>
+    <div class='carousel-item'>
       <%= image_tag('slide3.gif') %>
-      <div class='carousel-caption'>
+      <div class='carousel-caption d-none d-md-block'>
         <h1>Not bad!</h1>
       </div>
     </div>
   </div>
 
-  <!-- Controls -->
-  <a class='left carousel-control' href='#main-carousel' role='button' data-slide='prev'>
-    <span class='glyphicon glyphicon-chevron-left'></span>
+  <a class="carousel-control-prev" href="#main-carousel" role="button" data-slide="prev">
+    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
   </a>
-  <a class='right carousel-control' href='#main-carousel' role='button' data-slide='next'>
-    <span class='glyphicon glyphicon-chevron-right'></span>
+  <a class="carousel-control-next" href="#main-carousel" role="button" data-slide="next">
+    <span class="carousel-control-next-icon" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
   </a>
 </div>

data/lib/generators/chaltron/templates/app/views/home/_faq.html.erb

@@ -1,11 +1,13 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h4 class="panel-title">
-      <%= link_to raw(faq[:question]), "#collapse#{faq_counter}", data: {toggle: 'collapse', parent: '#accordion'}, class: 'accordion-toggle' %>
-    </h4>
-  </div>
-  <%= content_tag :div, id: "collapse#{faq_counter}", class: 'panel-collapse collapse' do %>
-    <div class="panel-body">
+<div class='card'>
+  <%= content_tag :div, id: "heading#{faq_counter}", class: 'card-header', role: 'tab' do %>
+    <h5 class='mb-0'>
+      <%= link_to raw(faq[:question]), "#collapse#{faq_counter}", data: {toggle: 'collapse'},
+        role: 'button', aria: {expanded: false, controls: "collapse#{faq_counter}"}, class: 'collapsed' %>
+    </h5>
+  <% end %>
+  <%= content_tag :div, id: "collapse#{faq_counter}", class: 'collapse', role: 'tabpanel',
+    data: { parent: '#accordion'}, aria: {labelledby: "heading#{faq_counter}"} do %>
+    <div class="card-body">
       <%= raw faq[:answer] %>
     </div>
   <% end %>

data/lib/generators/chaltron/templates/app/views/home/_panel.html.erb

@@ -4,15 +4,13 @@
   link_text ||= 'Learn more'
 %>
 
-<div class="col-md-4">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4>
+<div class='col-md-4'>
+  <div class='card'>
+    <h5 class='card-header text-white bg-primary'>
         <%= icon(icon) %>
         <%= title %>
-      </h4>
-    </div>
-    <div class="panel-body">
+    </h5>
+    <div class='card-body'>
       <p><%= raw body %> </p>
       <%= link_to link_text, link, class: 'btn btn-primary' %>
     </div>

data/lib/generators/chaltron/templates/app/views/home/index.html.erb

@@ -1,13 +1,12 @@
 <%= render 'carousel' %>
-
 <div class='container-fluid'>
   <div class='row'>
     <div class='col-lg-12'>
-      <h1 class='page-header'>
+      <h1 class='pt-4'>
         Welcome to Chaltron! <small> aka Muffaster reloaded</small>
       </h1>
     </div>
-    <%= render 'panel', title: 'Bootstrap v3',
+    <%= render 'panel', title: 'Bootstrap v4',
         link: 'http://getbootstrap.com', icon: 'check',
         body: 'Bootstrap rocks! And there are lots of good template ready to ' \
               'use, and free. Just as this one ;-)'
@@ -23,9 +22,11 @@
     %>
   </div>
 
+  <hr>
+
   <div class='row'>
     <div class='col-lg-12'>
-      <h2 class='page-header'>Main features</h2>
+      <h2 class='pt-4'>Main features</h2>
     </div>
     <div class='col-md-6'>
       <p>Chaltron provides:</p>
@@ -33,7 +34,7 @@
         <li>
           <%= icon('check-square', '', class: 'fa-li') %>
           Compatibility with
-          <strong><%= link_to 'Bootstrap v3', 'http://getbootstrap.com' %></strong> and
+          <strong><%= link_to 'Bootstrap v4', 'http://getbootstrap.com' %></strong> and
           <strong><%= link_to 'Font Awesome v4', 'http://fortawesome.github.io/Font-Awesome/' %></strong>
         </li>
         <li>
@@ -54,13 +55,15 @@
         taste <strong>L</strong>ight <strong>S</strong>peed <strong>A</strong>pplication <strong>D</strong>evelopment!</p>
     </div>
     <div class='col-md-6'>
-      <%= image_tag('700x300.gif', class: 'img-responsive img-thumbnail') %>
+      <%= image_tag('700x300.gif', class: 'img-responsive img-thumbnail border border-primary') %>
     </div>
   </div>
 
+  <hr>
+
   <div class='row'%>
     <div class='col-lg-12'>
-      <h2 class='page-header'>FAQ</h2>
+      <h2 class='pt-4'>FAQ</h2>
     </div>
   </div>
 
@@ -85,11 +88,10 @@
     }
   %>
 
-  <div class='row'%>
+  <div class='row'>
     <div class='col-lg-12'>
-      <div class='panel-group' id='accordion'>
+      <div id='accordion' role='tablist'>
         <%= render partial: 'faq', collection: faqs %>
-      </div>
     </div>
   </div>