ldap_tools 0.8.2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8600db31c87bf3b7a5bc6c4317bda3a14a72072c
-  data.tar.gz: c9e9f42d262b867d908fd88f46fc664a0e078f5f
+  metadata.gz: ea0fa0ebe1c98580e3e623f810c1b036c5002ff9
+  data.tar.gz: 6e56df2eb8f7caed546bfec945cb070c162d2b99
 SHA512:
-  metadata.gz: 060fbd893561bb81c9db96196f6303d4c03235eaaf2d4757d1d68f651c77a6a98aa2573e47906f94067d51308a2864d044eb49c5b46f74dd0b1da192db0f3197
-  data.tar.gz: a9925e2a36bf9cc30f3183f6b04a1cd399426db1f87b9a8e926f00337b09f59000d71630b2521144cdf942aaf8f7a35189fe068c53583a6ea7e1f92624d27754
+  metadata.gz: 98bb0f41e0ec6df27863a2d4917a28e6d24cd7d4bc7c7966e9375decf4c1b4e7c9760c9d6431127b10238593f96581a454727129329530c26f402da980fca62d
+  data.tar.gz: 3108815f8a5ec38c43917a7b0111f255aeb83c068d42e30dace52d59a40126586fd81edcd9a36716520f3515e1360b2acaf784db7581d9eb2921c59846444343

data/bin/ldaptools

@@ -2,5 +2,3 @@
 require 'tapjoy/ldap'
 
 Tapjoy::LDAP::CLI.commands
-# Tapjoy::LDAP::API::User.create('ali', 'tayarani', 'user', 'users')
-# Tapjoy::LDAP::API::User.destroy('ali.tayarani', 'user')

data/lib/tapjoy/ldap.rb

@@ -2,11 +2,13 @@ require 'net/ldap'
 require 'yaml'
 require 'trollop'
 require 'memoist'
+require 'pry'
 require_relative 'ldap/cli'
 require_relative 'ldap/base'
 require_relative 'ldap/key'
 require_relative 'ldap/audit'
 require_relative 'ldap/version'
+require_relative 'ldap/errors'
 
 
 module Tapjoy

data/lib/tapjoy/ldap/base.rb

@@ -8,12 +8,19 @@ module Tapjoy
       def initialize
         ldap_config_file = "#{ldap_config_directory}/ldap_info.yaml"
         ldap_password_file = "#{ldap_config_directory}/ldap.secret"
-        @ldap_info    = YAML.load_file(ldap_config_file)
-        @hosts        = @ldap_info['servers']
-        @basedn       = @ldap_info['basedn']
-        @conn         = find_valid_host(ldap_password_file)
-        @service_ou   = @ldap_info['service_ou']
-        @email_domain = @ldap_info['email_domain']
+
+        begin
+          if can_read_files?(ldap_config_file, ldap_password_file)
+            load_config_from_files(ldap_config_file, ldap_password_file)
+          else
+            load_config_from_env
+          end
+        rescue => err
+          STDERR.puts "Error message: #{err.inspect}"
+          abort("Config not specified.  Either provide #{ldap_config_file} and #{ldap_password_file} or environment variables")
+        else
+          @conn = find_valid_host
+        end
       end
 
       # Set LDAP Config Directory
@@ -138,21 +145,20 @@ module Tapjoy
       private
 
       # Connect to LDAP server
-      def ldap_connect(host, ldap_password_file)
-        port = @ldap_info['port']
+      def ldap_connect(host)
         auth = {
           method:   :simple,
-          username: @ldap_info['rootdn'],
-          password: File.read(ldap_password_file).chomp
+          username: @rootdn,
+          password: @ldap_password
         }
 
-        Net::LDAP.new(host: host, port: port, base: @base, auth: auth)
+        Net::LDAP.new(host: host, port: @port, base: @basedn, auth: auth)
       end
 
       # Find valid LDAP host
-      def find_valid_host(ldap_password_file)
+      def find_valid_host
         @hosts.each do |host|
-          @ldap = ldap_connect(host, ldap_password_file)
+          @ldap = ldap_connect(host)
           begin
             if @ldap.bind
               return @ldap
@@ -181,6 +187,36 @@ module Tapjoy
 
         return minID, maxID
       end
+
+      # Load config from files
+      def load_config_from_files(ldap_config_file, ldap_password_file)
+        ldap_info      = YAML.load_file(ldap_config_file)
+        @rootdn        = ldap_info['rootdn']
+        @hosts         = ldap_info['servers']
+        @basedn        = ldap_info['basedn']
+        @service_ou    = ldap_info['service_ou']
+        @email_domain  = ldap_info['email_domain']
+        @port          = ldap_info['port']
+        @ldap_password = File.read(ldap_password_file).chomp
+      end
+
+      # Load config from ENV
+      def load_config_from_env
+        raise Tapjoy::LDAP::Errors::UndefinedServers if ENV['LDAP_SERVERS'].nil?
+
+        @rootdn        = ENV['LDAP_BIND_DN']
+        @basedn        = ENV['LDAP_BASE_DN']
+        @service_ou    = ENV['LDAP_SERVICE_OU']
+        @email_domain  = ENV['LDAP_EMAIL_DOMAIN']
+        @port          = ENV['LDAP_PORT']
+        @ldap_password = ENV['LDAP_BIND_PASS']
+        @hosts         = ENV['LDAP_SERVERS'].split(',')
+      end
+
+      # Check if config files are readable
+      def can_read_files?(ldap_config_file, ldap_password_file)
+        File.readable?(ldap_config_file) && File.readable?(ldap_password_file)
+      end
     end
   end
 end

data/lib/tapjoy/ldap/errors.rb

@@ -0,0 +1,12 @@
+module Tapjoy
+  module LDAP
+    module Errors
+      # Raise if error LDAP_SERVERS is incorrect
+      class UndefinedServers < NoMethodError
+        def initialize
+          abort("FATAL: LDAP_SERVERS is undefined.")
+        end
+      end
+    end
+  end
+end

data/lib/tapjoy/ldap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldap_tools
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.2
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -192,6 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A set of tools to make managing LDAP users, groups, and keys easier
 email: ali.tayarani@tapjoy.com
 executables:
@@ -218,6 +246,7 @@ files:
 - lib/tapjoy/ldap/cli/user/create.rb
 - lib/tapjoy/ldap/cli/user/delete.rb
 - lib/tapjoy/ldap/cli/user/show.rb
+- lib/tapjoy/ldap/errors.rb
 - lib/tapjoy/ldap/key.rb
 - lib/tapjoy/ldap/key/add.rb
 - lib/tapjoy/ldap/key/install.rb
@@ -249,4 +278,3 @@ signing_key:
 specification_version: 4
 summary: Tapjoy LDAP Tools
 test_files: []
-has_rdoc: