ldap_tools 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66ce79c9e09afacf1af7b98f025e5cb352a6504
-  data.tar.gz: 4c9859ca50e52d1ebae2c6b277a8c233fdc44059
+  metadata.gz: 6460a58ed64997c7d6a574bf144f1eb4001bb2b9
+  data.tar.gz: 582aedaabe2033a5d36ab53b4e3deff54b443524
 SHA512:
-  metadata.gz: 54b284a95ea1803e305b91ff0a17ee7100eb98584e02e5c6d80e477b11b5f4e19643b96b44d8cacfced68db4ce3462cbf3c7c361686cf3860107f8b4a2031565
-  data.tar.gz: 4ad9fb8fc7dc8d736568e0d5425f18b99cb25dfbdcb9972ca5b6fff21f3dec2bea6d0912506aba08c2e25cf2e2718ec9c7eeafa690878c216325d58b218a97e5
+  metadata.gz: e0522e4fc808a6de38d362efc935892bfabd818ff1f85e0f7cdee8852ec4156b863c9d84427ba6881c250174d456eac957b1eaabeb62a8966c1f7fb4ccfaba5a
+  data.tar.gz: df556c80555d45698c2de525bad47a135cbb6dea1013088149f68c9c70a9de016a2423f7a250a85060b460c62c9945abb538b3cb9425d2bcc1243a859fcd7052

data/bin/ldaptools

@@ -23,9 +23,7 @@ case cmd
 when "user"  # run commands associated with user object
   Tapjoy::LDAP::User.commands
 when 'group'
-  GROUP_SUB_COMMANDS = %w(create delete add_user)
-  commands('This object is used for group management', cmd, GROUP_SUB_COMMANDS)
-  Tapjoy::LDAP::Group.new
+  Tapjoy::LDAP::Group.commands
 when 'key'
   KEY_SUB_COMMANDS = %w(add remove install list show)
   commands('This object is used for group management', cmd, KEY_SUB_COMMANDS)

data/lib/tapjoy/ldap/group/add_user.rb

@@ -0,0 +1,34 @@
+module Tapjoy
+  module LDAP
+    module Group
+      # Add existing user to existing group
+      class AddUser
+        def add_user
+          puts Tapjoy::LDAP::client.modify(dn, operations)
+        end
+
+        private
+        def opts
+          @opts ||= Trollop::options do
+            # Set help message
+            usage 'group add_user [options]'
+            synopsis "\nThis command is for adding existing users to existing groups"
+
+            opt(:group, 'Specify group', :type => :string, :required => true)
+            opt(:username, 'Specify username', :type => :string, :required => true)
+          end
+        end
+
+        def dn
+          @dn ||= "cn=#{opts[:group]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        end
+
+        def operations
+          # Format is LDAP operation, attribute modified, value modified
+          # i.e, add the username to the memberuid attribute for the specified group
+          @operations ||= [[:add, :memberUid, opts[:username]]]
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/group/create.rb

@@ -0,0 +1,40 @@
+module Tapjoy
+  module LDAP
+    module Group
+      # Create LDAP group
+      class Create
+        def create
+          # Check for errors
+          Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
+
+          puts Tapjoy::LDAP::client.add(dn, ldap_attr)
+        end
+
+        private
+
+        def opts
+          @opts ||= Trollop::options do
+            # Set help message
+            usage 'group create [options]'
+            synopsis "\nThis command is for creating new LDAP groups"
+
+            opt :name, 'Specify group to create', type: :string, required: true
+            opt :type, 'Specfy if this is a user or service group', type: :string, default: 'user'
+          end
+        end
+
+        def dn
+          @dn ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        end
+
+        def ldap_attr
+          @ldap_attr ||= {
+            :cn          => opts[:name],
+            :objectclass => %w(top posixGroup),
+            :gidnumber   => Tapjoy::LDAP::client.get_max_id('group', opts[:type])
+          }
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/group/delete.rb

@@ -0,0 +1,38 @@
+module Tapjoy
+  module LDAP
+    module Group
+      # Delete LDAP group
+      class Delete
+        def delete
+          confirm unless opts[:force]
+          puts Tapjoy::LDAP::client.delete(dn)
+        end
+
+        private
+        def opts
+          @opts ||= Trollop::options do
+            # Set help message
+            usage 'group delete [options]'
+            synopsis "\nThis command is for deleting LDAP groups"
+
+            opt :name, 'Specify group', type: :string, required: true
+            opt :force, 'Force delete'
+          end
+        end
+
+        def dn
+          @dn ||= "cn=#{opts[:name]},ou=Group,#{Tapjoy::LDAP::client.basedn}"
+        end
+
+        def confirm
+          puts "Confirm that you want to delete group #{opts[:group]} (yes/no)"
+          print '>'
+          confirm = STDIN.gets.chomp().downcase
+          unless confirm.eql?('y') || confirm.eql?('yes')
+            abort("Deletion of #{ opts[:group] } aborted")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/group.rb

@@ -1,7 +1,33 @@
+require_relative 'group/create'
+require_relative 'group/delete'
+require_relative 'group/add_user'
+
 module Tapjoy
   module LDAP
-    class Group
+    # Entry point for all group subcommands
+    module Group
       class << self
+
+        SUB_COMMANDS = %w(create delete add_user)
+
+        def commands
+          Trollop::options do
+            usage 'group [SUB_COMMAND] [options]'
+            synopsis "\nThis object is used for group management\nAvailable subcommands are: #{SUB_COMMANDS}"
+
+            stop_on SUB_COMMANDS
+          end
+
+          cmd = ARGV.shift
+
+          case cmd
+          when 'create', 'delete', 'add_user'
+            send(cmd) # call method with respective name
+          else
+            raise Tapjoy::LDAP::InvalidArgument
+          end
+        end
+
         # Lookup GID for the given group
         def lookup_id(groupname)
           gidnumber = []
@@ -22,110 +48,23 @@ module Tapjoy
           results.each { |result| gidnumber = result.gidnumber }
           return gidnumber[0]
         end
-      end
 
-      attr_reader :groupname, :servers, :conn
-
-      # Instantiate class
-      def initialize
-        # This is a necessary construct, because init could be called from
-        # places other than the commandline.  As result, we want to overload
-        # init, without *really* overloading it.
-        if ARGV.length >= 1
-          command = ARGV.shift
-
-          case command
-          when 'create', 'delete', 'add_user'
-            send(command)
-          else
-            raise Tapjoy::LDAP::InvalidArgument
-          end
+        # Create Group
+        def create
+          group = Tapjoy::LDAP::Group::Create.new
+          group.create
         end
-      end
-
-      # Lookup GID for the given group
-      # @TODO: Remove this in favor of class method
-      def lookup_id(groupname)
-        gidnumber = []
 
-        oc_filter = Net::LDAP::Filter.eq('objectclass', 'posixGroup')
-        cn_filter = Net::LDAP::Filter.eq('cn', groupname)
-        filter    = Net::LDAP::Filter.join(oc_filter, cn_filter)
-
-        results = Tapjoy::LDAP::client.search(['gidNumber'], filter)
-
-        # Make sure we return one, and only one group
-        if results.size < 1
-          abort('Group not found')
-        elsif results.size > 1
-          abort('Multiple groups found. Please narrow your search.')
+        # Delete group
+        def delete
+          group = Tapjoy::LDAP::Group::Delete.new
+          group.delete
         end
 
-        results.each { |result| gidnumber = result.gidnumber }
-        return gidnumber[0]
-      end
-
-      private
-      # Create group
-      def create
-        opts = Trollop::options do
-          # Set help message
-          banner("#{$0} group create [options]")
-
-          opt :name, 'Specify group to create', :type => :string
-          opt :type, 'Specfy if this is a user or service group', :type => :string, :default => 'user'
+        def add_user
+          group = Tapjoy::LDAP::Group::AddUser.new
+          group.add_user
         end
-
-        Trollop::die :name, 'argument count must be one' if opts[:name].nil?
-        Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
-
-        dn = "cn=#{ opts[:name] },ou=Group,#{ Tapjoy::LDAP::client.basedn }"
-
-        ldap_attr = {
-          :cn          => opts[:name],
-          :objectclass => ['top','posixGroup'],
-          :gidnumber   => Tapjoy::LDAP::client.get_max_id('group', opts[:type])
-        }
-        puts Tapjoy::LDAP::client.add(dn, ldap_attr)
-      end
-
-      # Delete group
-      def delete
-        opts = Trollop::options do
-          # Set help message
-          banner("#{$0} group delete [options]")
-
-          opt(:group, 'Specify group', :type => :string, :required => true)
-          opt(:force, 'Force delete')
-        end
-
-        dn = "cn=#{ opts[:group] },ou=Group,#{ Tapjoy::LDAP::client.basedn }"
-        unless opts[:force]
-          puts "Confirm that you want to delete group: #{ opts[:group] }"
-          print '>'
-          confirm = STDIN.gets.chomp().downcase
-          unless confirm.eql?('y') || confirm.eql?('yes')
-            abort("Deletion of #{ opts[:group] } aborted")
-          end
-        end
-
-        puts Tapjoy::LDAP::client.delete(dn)
-      end
-
-      # Add user to group
-      def add_user
-        opts = Trollop::options do
-          banner("#{0} group add_user [options]")
-
-          opt(:group, 'Specify group', :type => :string, :required => true)
-          opt(:username, 'Specify username', :type => :string, :required => true)
-        end
-
-        dn = "cn=#{ opts[:group] },ou=Group,#{ Tapjoy::LDAP::client.basedn }"
-        operations = [
-          [:add, :memberUid, opts[:username]]
-        ]
-        puts Tapjoy::LDAP::client.modify(dn, operations)
       end
     end
   end

data/lib/tapjoy/ldap/user/create.rb

@@ -3,6 +3,7 @@ require 'securerandom'
 module Tapjoy
   module LDAP
     module User
+      # Create LDAP user
       class Create
         def opts
           @opts ||= Trollop::options do
@@ -28,23 +29,12 @@ module Tapjoy
         def gidnumber
           @gidnumber ||= Tapjoy::LDAP::Group.lookup_id(opts[:group])
         end
-        
+
         def create
           # Check for errors
           Trollop::die :user, 'argument count must be two' if opts[:user].size != 2
           Trollop::die :type, "argument must be 'user' or 'service'" unless ['user', 'service'].include?opts[:type]
 
-
-          case opts[:type]
-          when 'user'
-            ou = 'People'
-          when 'service'
-            ou = Tapjoy::LDAP::client.service_ou
-          else
-            puts 'Unknown type'
-          end
-
-          dn = "uid=#{ username },ou=#{ou},#{ Tapjoy::LDAP::client.basedn }"
           puts Tapjoy::LDAP::client.add(dn, ldap_attr)
         end
 
@@ -77,6 +67,23 @@ module Tapjoy
             :userpassword  => '{SSHA}' + create_password
           }
         end
+
+        def dn
+          @dn ||= "uid=#{username},ou=#{ou},#{Tapjoy::LDAP::client.basedn}"
+        end
+
+        def ou
+          @ou ||= begin
+            case opts[:type]
+            when 'user'
+              ou = 'People'
+            when 'service'
+              ou = Tapjoy::LDAP::client.service_ou
+            else
+              puts 'Unknown type'
+            end
+          end
+        end
       end
     end
   end

data/lib/tapjoy/ldap/user/delete.rb

@@ -1,6 +1,7 @@
 module Tapjoy
   module LDAP
     module User
+      # Delete LDAP user
       class Delete
         def opts
           @opts ||= Trollop::options do

data/lib/tapjoy/ldap/user.rb

@@ -3,6 +3,7 @@ require_relative 'user/delete'
 
 module Tapjoy
   module LDAP
+    # Entry point for all user subcommands
     module User
       class << self
         SUB_COMMANDS = %w(create delete)
@@ -38,27 +39,3 @@ module Tapjoy
     end
   end
 end
-#
-#       # Instantiate class
-#       def initialize
-#         command = ARGV.shift
-#
-#         case command
-#         when 'create', 'delete'
-#           send(command)
-#         else
-#           raise Tapjoy::LDAP::InvalidArgument
-#         end
-#       end
-#
-#       private
-#       # Create user in LDAP
-
-#
-#       # Delete user from LDAP
-
-#       end
-#
-#     end
-#   end
-# end

data/lib/tapjoy/ldap/version.rb

@@ -2,7 +2,7 @@ module Tapjoy
   module LDAP
     module Version
       MAJOR = 0
-      MINOR = 3
+      MINOR = 4
       PATCH = 0
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldap_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop