lita-ldap 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7f06cd70351f1cb694ef2c370a21871be3d116
-  data.tar.gz: c8bbe175bd45feff62ec4538e5d53afc13fd6729
+  metadata.gz: 0de328ac9f7bd2874241a587ad9b510804ddc672
+  data.tar.gz: f19e2f7d0e52cf358f54d0a5e66911164655e2ae
 SHA512:
-  metadata.gz: 9fe2c4a6547e01d8f91688b9c8b67e38bc10c6e8d1d6e94538b71f29eb0311c70a506beb4b4ab3ec3456ff84698e947ef1ce6985c6e03bd4de41aa0b66ff21c1
-  data.tar.gz: 82b6043191d6158b0ea203cab51595195e6cecda36a9a47f3d1d330e74be8811f36e00275836ac451b03defe918bd881537786f17406e29bf85bac9b89bd911b
+  metadata.gz: 2e572cca1829c967805cdc2d752f7e01a4b0da52ada3d85fb081bcb8d7ced429f2471708f0ad84053e59d806a02c5674a93cc245b7e7e9357ae9e4bb3b784109
+  data.tar.gz: 90cedc1cbe3c0a0f9585290a82201e304e4b4b522c73aab5cddb53c0f8b85ac461fe61233b29a7937ed79c03c4ae029037a6d0f7fc71e6787702b6810dce2b51

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+#Change Log
+
+##v0.1.2
+* Fix help message
+* Add function for delete entry
+* Add command to delete tree
+* Add command to show server root dse
+
+##v0.1.1
+* Search entry with filter
+* Show entry use full dn
+* Verify ldap filter
+
+##v0.1.0
+Basic search for user group

data/README.md

@@ -27,7 +27,10 @@ end
 
 ## Usage
 
-* lita search user nexus
-* lita search group nx-admin
-* lita search with filter 'cn=gerrit'
-* lita show dn 'cn=gerrit,ou=people,dc=ldap,dc=example,dc=com'
+* ldap search user nexus
+* ldap search group nx-admin
+* ldap search with filter 'cn=gerrit'
+* ldap show dn 'cn=gerrit,ou=people,dc=ldap,dc=example,dc=com'
+* ldap delete dn 'cn=gerrit,ou=people,dc=ldap,dc=example,dc=com'
+* ldap delete tree dn 'ou=people,dc=ldap,dc=example,dc=com' #if supported
+* ldap root dse

data/lib/ldaphelper/misc.rb

@@ -63,5 +63,37 @@ module LitaLDAPHelper
       #puts results
       results
     end
+
+    def delete_entry_by_dn(dn)
+      dn_spec = dn.split(':',2)
+      dn_str = dn_spec[0]
+      if dn_spec.length>1
+        dn_str = dn_spec[1]
+      end
+      dn_str = dn_str.strip
+      client.delete :dn => dn_str
+    end
+
+    def delete_tree_by_dn(dn)
+      dn_spec = dn.split(':',2)
+      dn_str = dn_spec[0]
+      if dn_spec.length>1
+        dn_str = dn_spec[1]
+      end
+      dn_str = dn_str.strip
+      client.delete :dn => dn_str
+    end
+
+    def search_root_dse
+      begin
+        info = client.search_root_dse
+        if info
+          info.to_ldif
+        end
+      rescue Exception => e
+        e.message
+      end
+    end
+
   end#module misc
 end#module LitaLDAPHelper

data/lib/lita/handlers/ldap.rb

@@ -84,6 +84,33 @@ module Lita
         }
       )
 
+      route(
+        /^ldap\s+delete\s+dn\s+(["'])([^\1]+)(\1)$/,
+        :cmd_delete_with_dn,
+        command: true,
+        help: {
+          t('help.cmd_delete_with_dn_key') => t('help.cmd_delete_with_dn_value')
+        }
+      )
+
+      route(
+        /^ldap\s+delete\s+tree\s+dn\s+(["'])([^\1]+)(\1)$/,
+        :cmd_delete_tree_with_dn,
+        command: true,
+        help: {
+          t('help.cmd_delete_tree_with_dn_key') => t('help.cmd_delete_tree_with_dn_value')
+        }
+      )
+
+      route(
+        /^ldap\s+root\s+dse\s*$/,
+        :cmd_show_root_dse,
+        command: true,
+        help: {
+          t('help.cmd_show_root_dse_key') => t('help.cmd_show_root_dse_value')
+        }
+      )
+
 
       def cmd_search_user(response)
         search_string = response.matches[0][0]
@@ -105,12 +132,12 @@ module Lita
         if ! filter_string.nil? && filter_string.strip.length>0
           is_valid = valid_filter?(filter_string)
           if is_valid
-            response.reply "Filter is valid"
+            response.reply "Filter is valid."
           else
-            response.reply "Filter in not valid"
+            response.reply "Filter in not valid."
           end
         else
-          response.reply "Filter string is empty"
+          response.reply "Filter string is empty."
         end
       end
 
@@ -122,10 +149,10 @@ module Lita
             results = search_with_filter(filter_string)
             response.reply results
           else
-            response.reply "Filter in not valid"
+            response.reply "Filter in not valid."
           end
         else
-          response.reply "Filter string is empty"
+          response.reply "Filter string is empty."
         end
       end
 
@@ -135,10 +162,51 @@ module Lita
           results = get_entry_by_dn(dn)
           response.reply results
         else
-          response.reply "Invalid dn"
+          response.reply "Invalid dn provided."
         end
       end
 
+      def cmd_delete_with_dn(response)
+        dn = response.matches[0][1]
+        if ! dn.nil? && dn.strip.length>0
+          begin
+            success = delete_entry_by_dn(dn)
+            if success
+              response.reply "Entry deleted."
+            else
+              response.reply "Failed to delete entry, server may not support LDAP control 1.2.840.113556.1.4.805."
+            end
+          rescue Exception => e
+            response.reply e.message
+          end
+        else
+          response.reply "Invalid dn provided."
+        end
+      end
+
+      def cmd_delete_tree_with_dn(response)
+        dn = response.matches[0][1]
+        if ! dn.nil? && dn.strip.length>0
+          begin
+            success = delete_tree_by_dn(dn)
+            if success
+              response.reply "Entry deleted."
+            else
+              response.reply "Failed to delete entry."
+            end
+          rescue Exception => e
+            response.reply e.message
+          end
+        else
+          response.reply "Invalid dn provided."
+        end
+      end
+
+      def cmd_show_root_dse(response)
+        results = search_root_dse
+        response.reply results
+      end
+
       Lita.register_handler(self)
     end #class
   end # module

data/lita-ldap.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-ldap"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Wang, Dawei"]
   spec.email         = ["daweiwang.gatekeeper@gmail.com"]
   spec.description   = "Lita LDAP operations like search user and group."

data/locales/en.yml

@@ -2,13 +2,20 @@ en:
   lita:
     handlers:
       ldap:
-        cmd_search_user_key: 'ldap search user SEARCH_STRING'
-        cmd_search_user_value: 'Search user with search string'
-        cmd_search_group_key: 'ldap search user SEARCH_STRING'
-        cmd_search_group_value: 'Search user with search string'
-        cmd_check_filter_key: 'ldap check filter "FILTER_STRING"'
-        cmd_check_filter_value: 'Check ldap filter syntax'
-        cmd_search_with_filter_key: 'ldap search with filter "FILTER_STRING"'
-        cmd_search_with_filter_value: 'Search entry with filter "FILTER_STRING"'
-        cmd_search_with_dn_key: 'ldap show dn "DN_STRING"'
-        cmd_search_with_dn_value: 'Show entry with dn "DN_STRING"'
+        help:
+          cmd_search_user_key: 'ldap search user SEARCH_STRING'
+          cmd_search_user_value: 'Search user with search string'
+          cmd_search_group_key: 'ldap search user SEARCH_STRING'
+          cmd_search_group_value: 'Search user with search string'
+          cmd_check_filter_key: 'ldap check filter "FILTER_STRING"'
+          cmd_check_filter_value: 'Check ldap filter syntax'
+          cmd_search_with_filter_key: 'ldap search with filter "FILTER_STRING"'
+          cmd_search_with_filter_value: 'Search entry with filter "FILTER_STRING"'
+          cmd_search_with_dn_key: 'ldap show dn "DN_STRING"'
+          cmd_search_with_dn_value: 'Show entry with dn "DN_STRING"'
+          cmd_delete_with_dn_key: 'ldap delete dn "DN_STRING"'
+          cmd_delete_with_dn_value: 'Delete entry with dn "DN_STRING"'
+          cmd_delete_tree_with_dn_key: 'ldap delete tree dn "DN_STRING"'
+          cmd_delete_tree_with_dn_value: 'Delete tree entry with dn "DN_STRING"'
+          cmd_show_root_dse_key: 'ldap root dse'
+          cmd_show_root_dse_value: 'Check ldap root dse'

data/spec/lita/handlers/ldap_spec.rb

@@ -57,6 +57,10 @@ describe Lita::Handlers::Ldap, lita_handler: true do
     is_expected.to route_command('ldap search group nx-admin').to(:cmd_search_group)
     is_expected.to route_command('ldap check filter "cn=admin"').to(:cmd_check_filter)
     is_expected.to route_command('ldap search with filter "cn=nexus"').to(:cmd_search_with_filter)
+    is_expected.to route_command("ldap show dn 'dn: cn=nx-admin,ou=groups,dc=ldap,dc=example,dc=com'").to(:cmd_search_with_dn)
+    is_expected.to route_command("ldap delete dn 'dn: cn=nx-admin,ou=groups,dc=ldap,dc=example,dc=com'").to(:cmd_delete_with_dn)
+    is_expected.to route_command("ldap delete tree dn 'dn: ou=groups,dc=ldap,dc=example,dc=com'").to(:cmd_delete_tree_with_dn)
+    is_expected.to route_command('ldap root dse').to(:cmd_show_root_dse)
   end
 
   describe '#search user' do
@@ -94,4 +98,25 @@ describe Lita::Handlers::Ldap, lita_handler: true do
       puts replies
     end
   end
+
+  describe '#delete dn' do
+    it 'delete entry with specified dn' do
+      send_command("ldap delete dn 'dn: cn=nx-admin,ou=groups,dc=ldap,dc=example,dc=com'")
+      puts replies
+    end
+  end
+
+  describe '#delete tree' do
+    it 'delete tree with specified dn' do
+      send_command("ldap delete dn 'dn: ou=groups,dc=ldap,dc=example,dc=com'")
+      puts replies
+    end
+  end
+
+  describe '#show root dse' do
+    it 'show directory root dse' do
+      send_command("ldap root dse")
+      puts replies
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-ldap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Wang, Dawei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md