blueauth 0.0.16 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0cb18fd2b7ec0999979c82b4785d1174aff330
-  data.tar.gz: 5dc410f009472d66bad111b10824987185e8e636
+  metadata.gz: 8165645faa29f6da46652f30a954374db6a58b1d
+  data.tar.gz: 1c8f22b04657dfdf1e67560ba22995a3b87f696a
 SHA512:
-  metadata.gz: 42b3b6c06fae02b74e903b3c8feada2d5fd7c00ee8c7915d6a66dfaef46054a13a55285fada60f234b1e660622337e9c206cd7b9c837d7e7e1e7b75a22ed1eaa
-  data.tar.gz: 7fc0b7b5c913ef096300f7abb7ba39c25d0a9698ea93b3faca1c8e385102bea003a7504d453e132ad31c1be59bafa4fbe2cb440136e9db8b8ffc20ae50edb237
+  metadata.gz: 9f28eecefafbb396aecbb2890654401990581bbfc6037fea41fb76a8716238332d2e70e871f16b7f70dc131f971cfadd4fa4cfa8c548a03c667259090e6d01ac
+  data.tar.gz: de90394c5e6e6cad96c24a75b11d1d7627efc29e762c205cba5b845382c1a5b7e45140896e4aaf163ee2d91d01df136442008e8a5bf538567a84787ce01a8f1f

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 - 2.2.3
 - 2.3.3
 - 2.3.4
+- 2.3.5
 before_install: gem install bundler -v 1.11.2
 group: bluezone
 script:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.0
+### Changes
+* Blueauth is a class now instead of a module
 ## v0.0.16
 ### Changes
 * Direct IP addresses has been removed, only bluepages.ibm.com remained

data/README.md

@@ -24,9 +24,10 @@ Or install it yourself as:
     
 The userid can be Intranet ID or Notes ID or Common name
     
-      Blueauth::search 'istvan.kovacs@hu.ibm.com'
-      Blueauth::search 'Istvan Kovacs/Hungary/IBM'
-      Blueauth::search 'Istvan Kovacs'
+      blueauth = Blueauth.new
+      blueauth.search 'istvan.kovacs@hu.ibm.com'
+      blueauth.search 'Istvan Kovacs/Hungary/IBM'
+      blueauth.search 'Istvan Kovacs'
 
 If the user is found, then the returned object will be a hash: {:name, :country, :intranetid, :dn}. If the user is not found, then nil
 
@@ -35,8 +36,9 @@ If the user is found, then the returned object will be a hash: {:name, :country,
     
 First, the user must exist in Enterprise Directory, and the Bluegroup can be queried based on the DN of the user
     
-      user = Blueauth::search 'istvan.kovacs@hu.ibm.com'
-      Blueauth::bluegroups user[:dn]
+      blueauth = Blueauth.new
+      user = blueauth.search 'istvan.kovacs@hu.ibm.com'
+      blueauth.bluegroups user[:dn]
 
 Returned object will be an Array of strings containing the names of Bluegroups where the user is assigned to.
 
@@ -44,9 +46,10 @@ Returned object will be an Array of strings containing the names of Bluegroups w
     
 The userid can be Intranet ID or Notes ID or Common name
     
-      Blueauth::authenticate 'istvan.kovacs@hu.ibm.com', 'password'
-      Blueauth::authenticate 'Istvan Kovacs/Hungary/IBM', 'password'
-      Blueauth::authenticate 'Istvan Kovacs', 'password'
+      blueauth = Blueauth.new
+      blueauth.authenticate 'istvan.kovacs@hu.ibm.com', 'password'
+      blueauth.authenticate 'Istvan Kovacs/Hungary/IBM', 'password'
+      blueauth.authenticate 'Istvan Kovacs', 'password'
 
 If the user is found, then the returned object will be a hash: {:name, :country, :intranetid, :dn, :groups}. Groups is an array containing all Bluegroups. If the user is not found, then nil
 

data/lib/blueauth.rb

@@ -3,44 +3,43 @@ require 'blueauth/error'
 require 'blueauth/certificates'
 require 'net-ldap'
 
-module Blueauth
+class Blueauth
 
   BPBASE = 'ou=bluepages,o=ibm.com'
   BGBASE = 'ou=memberlist,ou=ibmgroups,o=ibm.com'
-
   BPHOSTS = [['bluepages.ibm.com',636]]
 
   old_verbose, $VERBOSE = $VERBOSE, nil
   Net::LDAP::LDAPControls::PAGED_RESULTS = FALSE
   $VERBOSE = old_verbose
 
-  @cert_store = OpenSSL::X509::Store.new
-  @cert_store.add_cert OpenSSL::X509::Certificate.new(NEW_CERT)
-  @cert_store.add_cert OpenSSL::X509::Certificate.new(OLD_CERT)
+  def initialize
+
+    cert_store = OpenSSL::X509::Store.new
+    cert_store.add_cert OpenSSL::X509::Certificate.new(NEW_CERT)
+    cert_store.add_cert OpenSSL::X509::Certificate.new(OLD_CERT)
 
-  def self.open_ldap
-    Net::LDAP.new hosts: BPHOSTS, encryption: {
+    @ldap = Net::LDAP.new hosts: BPHOSTS, encryption: {
       method: :simple_tls,
-      connect_timeout: 15,
+      connect_timeout: 20,
       tls_options: {
         ssl_version: :TLSv1_2,
         verify_mode: OpenSSL::SSL::VERIFY_PEER,
-        cert_store: @cert_store
+        cert_store: cert_store
       }
     }
   end
 
   # using this method a user can be authenticated
   # Intraned ID, password are mandatory
-  def self.authenticate(id, password)
+  def authenticate(id, password)
     user = search id.strip
     unless user.nil?
-      ldap = open_ldap
-      ldap.auth user[:dn], password.strip
+      @ldap.auth user[:dn], password.strip
       begin
-        auth = ldap.bind
+        auth = @ldap.bind
       rescue => e
-        raise Blueauth::BlueError, "BluePages Bind issue -> #{e.message}"
+        raise BlueError, "BluePages Bind issue -> #{e.message}"
       end
       if auth
         groups = bluegroups user[:dn]
@@ -58,7 +57,7 @@ module Blueauth
   #   - Common name (none of the previous two)
   # return object contains
   # :name, :country, :intranetid, :dn
-  def self.search(id)
+  def search(id)
     if id.include? '@'
       searchfield = 'mail'
     elsif id.include? '/'
@@ -83,10 +82,9 @@ module Blueauth
     end
     filter = Net::LDAP::Filter.eq(searchfield, id) & Net::LDAP::Filter.eq('objectclass', "ibmPerson")
     begin
-      ldap = open_ldap
-      user_array = ldap.search(base: BPBASE, filter: filter, size: 1)
+      user_array = @ldap.search(base: BPBASE, filter: filter, size: 1)
     rescue => e
-      raise Blueauth::BlueError, "BluePages Search issue -> #{e.message}"
+      raise BlueError, "BluePages Search issue -> #{e.message}"
     end
 
     if user_array.count == 0
@@ -98,15 +96,14 @@ module Blueauth
     return result
   end
 
-  def self.bluegroups(dn)
+  def bluegroups(dn)
     result = []
     filter = Net::LDAP::Filter.eq('uniquemember', dn)
     begin
-      ldap = open_ldap
-      bgres = ldap.search(base: BGBASE, filter: filter, attributes: ['cn'])
+      bgres = @ldap.search(base: BGBASE, filter: filter, attributes: ['cn'])
       bgres.each {|g| result << g.cn.first}
     rescue => e
-      raise Blueauth::BlueError, "BlueGroup Search issue -> #{e.message}"
+      raise BlueError, "BlueGroup Search issue -> #{e.message}"
     end
     return result
   end

data/lib/blueauth/certificates.rb

@@ -1,4 +1,4 @@
-module Blueauth
+class Blueauth
 
   # Having only the root signer certificate (DigiCert Global Root G2) in the TLS client truststore is sufficient.
   # https://w3-connections.ibm.com/wikis/home?lang=en-us#!/wiki/W1f849f7604cc_43a5_a6d9_2ad1fcbc532e/page/Digital%20Certificate%20FAQs

data/lib/blueauth/error.rb

@@ -1,4 +1,4 @@
-module Blueauth
+class Blueauth
   class Error < StandardError
 
     def initialize(options = {})

data/lib/blueauth/version.rb

@@ -1,3 +1,3 @@
-module Blueauth
-  VERSION = "0.0.16"
+class Blueauth
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueauth
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 1.0.0
 platform: ruby
 authors:
 - zoltan-izso
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap