cratus 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b9d1523a8cf677c94486af757db8d9a5a47cc1
-  data.tar.gz: 2117c80712931b5b6f3dbbf50168805fbde36022
+  metadata.gz: 03546e33c0cbcd721059db8bee9f197fc831b55c
+  data.tar.gz: 9880fb938e1a84cd89fc28d0f4d762a6b3d5371a
 SHA512:
-  metadata.gz: 053d6b9673cf6cb84b1e7f65d2a95e58a821aec6f2d6864df34b7d7789e1a7e3c07b0f2f4d98cb778dd65852c0aafd8c60633bf1aff5f0b55adc16d96a019031
-  data.tar.gz: 38ad9ac3ad5ed03b117f4bfca4b0ed4c2d78a9cebd3c04bae3fb6e6ad1312891227c943552ac4068529dded2b7eb8939eb2fa7896fa619e70d8a555b7fe88abd
+  metadata.gz: 0aeb98394522da853724b82fda06d2a429185c29115cb0b74f275362cc8ad738902a144dcf1da5861fc970f012309915927a76c3dee9da5771d160c3d4ce927c
+  data.tar.gz: 80ecee4931f58e86b5cb497d1a34ac0699b9738f65f4734b4217b29273273f9f924af8a0968ba31696394d2d80f03b8eb50da28037498f7706835fea4805d1ae

data/lib/cratus.rb

@@ -12,3 +12,4 @@ Cratus.config.load
 require 'cratus/ldap'
 require 'cratus/group'
 require 'cratus/user'
+require 'cratus/exceptions/failed_ldap_search'

data/lib/cratus/group.rb

@@ -23,6 +23,7 @@ module Cratus
       all_members[:groups]
     end
 
+    # Recursively determine group memberships of a group
     def member_of
       memrof_attr = Cratus.config.group_memberof_attribute
 
@@ -48,16 +49,49 @@ module Cratus
       all_the_groups.uniq(&:name)
     end
 
+    # Returns the LDAP dn for a Group
+    def dn
+      @raw_ldap_data[:dn].last
+    end
+
     # LDAP description attribute
     def description
       @raw_ldap_data[Cratus.config.group_description_attribute].last
     end
 
+    # Add a User to the group
+    def add_user(user)
+      raise 'InvalidUser' unless user.respond_to?(:dn)
+      direct_members = @raw_ldap_data[Cratus.config.group_member_attribute]
+      return true if direct_members.include?(user.dn)
+
+      direct_members << user.dn
+      Cratus::LDAP.replace_attribute(
+        dn,
+        Cratus.config.group_member_attribute,
+        direct_members.uniq
+      )
+    end
+
+    # Remove a User from the group
+    def remove_user(user)
+      raise 'InvalidUser' unless user.respond_to?(:dn)
+      direct_members = @raw_ldap_data[Cratus.config.group_member_attribute]
+      return true unless direct_members.include?(user.dn)
+
+      direct_members.delete(user.dn)
+      Cratus::LDAP.replace_attribute(
+        dn,
+        Cratus.config.group_member_attribute,
+        direct_members.uniq
+      )
+    end
+
     # All the LDAP Groups
     def self.all
       filter = "(#{ldap_dn_attribute}=*)"
       Cratus::LDAP.search(filter, basedn: ldap_search_base, attrs: ldap_dn_attribute).map do |entry|
-        new(entry[ldap_dn_attribute].last)
+        new(entry[ldap_dn_attribute.to_sym].last)
       end
     end
 
@@ -82,6 +116,8 @@ module Cratus
       Cratus.config.group_basedn.to_s
     end
 
+    # Compare based on the group's name
+    # TODO: possibly change to dn
     def <=>(other)
       @name <=> other.name
     end

data/lib/cratus/ldap.rb

@@ -58,7 +58,16 @@ module Cratus
         base: options[:basedn], filter: filter,
         scope: scope_class, attributes: [*attrs].map(&:to_s)
       )
-      results.nil? ? raise('Search Failed') : results.compact
+      results.nil? ? raise(Exceptions::FailedLDAPSearch) : results.compact
+    end
+
+    # Modify an LDAP object's attribute
+    def self.replace_attribute(dn, attribute, values)
+      validate_ldap_connection
+      validate_ldap_bound
+      validate_attribute_values(values)
+
+      connection.replace_attribute(dn, attribute, values)
     end
 
     # Validation Methods
@@ -79,10 +88,14 @@ module Cratus
       end
     end
 
+    def self.validate_attribute_values(values)
+      raise 'Values Must Be Array' unless values.is_a?(Array)
+    end
+
     def self.validate_connection_options(options)
       raise 'Invalid Options' unless options.respond_to?(:key?)
 
-      [:host, :port, :basedn, :username, :password].each do |key|
+      %i[host port basedn username password].each do |key|
         raise "Missing Option: #{key}" unless options.key?(key)
       end
     end

data/lib/cratus/user.rb

@@ -14,6 +14,20 @@ module Cratus
       ).last
     end
 
+    # Add a user to a group
+    def add_to_group(group)
+      raise 'InvalidGroup' unless group.respond_to?(:add_user)
+      # just be lazy and hand off to the group to do the work...
+      group.add_user(self)
+    end
+
+    # Remove a user from a group
+    def remove_from_group(group)
+      raise 'InvalidGroup' unless group.respond_to?(:remove_user)
+      # just be lazy and hand off to the group to do the work...
+      group.remove_user(self)
+    end
+
     def department
       @raw_ldap_data[Cratus.config.user_department_attribute].last
     end

data/lib/cratus/version.rb

@@ -2,8 +2,8 @@
 module Cratus
   def self.version
     major = 0 # Breaking, incompatible releases
-    minor = 3 # Compatible, but new features
-    patch = 9 # Fixes to existing features
+    minor = 4 # Compatible, but new features
+    patch = 0 # Fixes to existing features
     [major, minor, patch].map(&:to_s).join('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cratus
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize