adap 0.1.11 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4d066d43955b785f767ef096ba10701eaa529d53887e43252a6e8afbe25e734
-  data.tar.gz: 9877d4024cc4f6a63edd63f793df411189d3a3b24fa5a921b21af77c9e01d76d
+  metadata.gz: c62c8b840a9a9edf3ee7c00ee5cdc2e3de3cb88bc65ae1460b6905bbc96a8157
+  data.tar.gz: 618edc59aaf5609604e7dbe506fc72837c6947129c8a8f10d16caa6ab6ce1a4b
 SHA512:
-  metadata.gz: add8058e5b15e510ee04c22de47f2843e3a26794bbe8bf306d67d0b0b16d51444ce760722af8b44046dd449421922fbd0eb13b3333c0ea22bd414b8b9f4390ae
-  data.tar.gz: 39eb23a7bd6af61aee6baea593fb5f74465ae6b4fd46c5288450a5b10013feafc47444e03c20204e8374e044637eadf849db23ea0c31c1a28e130854241cfc5d
+  metadata.gz: dc72a01e77c6b0f3041478efa1deab153b794e933370fca14d0547a005470f0ba340e6a593c51fab5f2c07ab33a5cd4558a4ac5621157486a243de968205e299
+  data.tar.gz: 3473d75cb8d5d007c53ac799866bce4bc96df2b22ebe71e6ed11f4977a1e152ab80db4ff8b9e3cff8672954c78fb5b1b852d772b5dae710cb6c7d67e4afb8065

data/README_FOR_DEVELOPER.md

@@ -28,15 +28,12 @@ $ gh workflow run
 ? otp (required)                                           // <- Input the OTP code
 ```
 
-
-
 ```
 $ gh run list --workflow=release.yml
 STATUS  TITLE  WORKFLOW  BRANCH  EVENT              ID           ELAPSED  AGE
 *       Ruby   Ruby      master  workflow_dispatch  12673039585  10s      less than a minute ago
 ```
 
-
 ## For release (non-interactively)
 You can also trigger the release workflow non-interactively.
 

data/lib/adap/adap.rb

@@ -19,8 +19,8 @@ class Adap
   def initialize(params)
     raise "Initialize Adap was failed. params must not be nil" if params == nil
 
-    [:ad_host, :ad_binddn, :ad_user_basedn, :ad_group_basedn, :ldap_host, :ldap_binddn, :ldap_user_basedn, :ldap_group_basedn].each { |k|
-      raise 'Adap requires keys in params ":ad_host", ":ad_binddn", ":ad_user_basedn", ":ad_group_basedn", ":ldap_host", ":ldap_binddn", ":ldap_user_basedn", ":ldap_group_basedn"' if !params.key?(k)
+    [:ad_host, :ad_bind_dn, :ad_user_base_dn, :ad_group_base_dn, :ldap_host, :ldap_bind_dn, :ldap_user_base_dn, :ldap_group_base_dn].each { |k|
+      raise 'Adap requires keys in params ":ad_host", ":ad_bind_dn", ":ad_user_base_dn", ":ad_group_base_dn", ":ldap_host", ":ldap_bind_dn", ":ldap_user_base_dn", ":ldap_group_base_dn"' if !params.key?(k)
     }
 
     # List of attributes for user in AD
@@ -41,17 +41,16 @@ class Adap
 
     @ad_host                  = params[:ad_host]
     @ad_port                  = (params[:ad_port] ? params[:ad_port] : 389)
-    @ad_binddn                = params[:ad_binddn]
-    @ad_user_basedn           = params[:ad_user_basedn]
-    @ad_group_basedn          = params[:ad_group_basedn]
-    @ad_auth                  = (params.has_key?(:ad_password) ? { :method => :simple, :username => @ad_binddn, :password => params[:ad_password] } : nil)
+    @ad_bind_dn               = params[:ad_bind_dn]
+    @ad_user_base_dn          = params[:ad_user_base_dn]
+    @ad_group_base_dn         = params[:ad_group_base_dn]
+    @ad_auth                  = (params.has_key?(:ad_password) ? { :method => :simple, :username => @ad_bind_dn, :password => params[:ad_password] } : nil)
     @ldap_host                = params[:ldap_host]
     @ldap_port                = (params[:ldap_port] ? params[:ldap_port] : 389)
-    @ldap_binddn              = params[:ldap_binddn]
-    @ldap_basedn              = params[:ldap_basedn]
-    @ldap_user_basedn         = params[:ldap_user_basedn]
-    @ldap_group_basedn        = params[:ldap_group_basedn]
-    @ldap_auth                = (params.has_key?(:ldap_password) ? { :method => :simple, :username => @ldap_binddn, :password => params[:ldap_password] } : nil )
+    @ldap_bind_dn             = params[:ldap_bind_dn]
+    @ldap_user_base_dn        = params[:ldap_user_base_dn]
+    @ldap_group_base_dn       = params[:ldap_group_base_dn]
+    @ldap_auth                = (params.has_key?(:ldap_password) ? { :method => :simple, :username => @ldap_bind_dn, :password => params[:ldap_password] } : nil )
 
     # A password-hash algorithm to sync to the LDAP.
     # Popular LDAP products like Open LDAP usually supports md5({MD5}), sha1({SHA}) and ssha({SSHA}) algorithms.
@@ -101,11 +100,11 @@ class Adap
   end
 
   def get_ad_user_dn(username)
-    "CN=#{username},#{@ad_user_basedn}"
+    "CN=#{username},#{@ad_user_base_dn}"
   end
 
   def get_ldap_user_dn(username)
-    "uid=#{username},#{@ldap_user_basedn}"
+    "uid=#{username},#{@ldap_user_base_dn}"
   end
 
   def create_ldap_attributes(ad_entry)
@@ -342,26 +341,26 @@ class Adap
     # Creating AD ldapsearch filter
 
     ad_filter = if primary_gid_number == nil then
-      # TODO: Searching with filter `objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_basedn}` is more accureate.
+      # TODO: Searching with filter `objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_base_dn}` is more accureate.
       #Net::LDAP::Filter.construct(
-      #    "(&(objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_basedn})(member=CN=#{uid},CN=Users,#{@ad_basedn}))")
+      #    "(&(objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_base_dn})(member=CN=#{uid},CN=Users,#{@ad_base_dn}))")
 
       Net::LDAP::Filter.construct(
-          "(&(objectClass=group)(member=CN=#{uid},#{@ad_user_basedn}))")
+          "(&(objectClass=group)(member=CN=#{uid},#{@ad_user_base_dn}))")
     else
-      # TODO: Searching with filter `objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_basedn}` is more accureate.
+      # TODO: Searching with filter `objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_base_dn}` is more accureate.
       #Net::LDAP::Filter.construct(
-      #    "(&(objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_basedn})(|(member=CN=#{uid},CN=Users,#{@ad_basedn})(gidNumber=#{primary_gid_number})))")
+      #    "(&(objectCategory=CN=Group,CN=Schema,CN=Configuration,#{@ad_base_dn})(|(member=CN=#{uid},CN=Users,#{@ad_base_dn})(gidNumber=#{primary_gid_number})))")
 
       Net::LDAP::Filter.construct(
-          "(&(objectClass=group)(|(member=CN=#{uid},#{@ad_user_basedn})(gidNumber=#{primary_gid_number})))")
+          "(&(objectClass=group)(|(member=CN=#{uid},#{@ad_user_base_dn})(gidNumber=#{primary_gid_number})))")
     end
 
     # Get groups from AD
     # entry = {
     #   :gidnumber => xxx,
     # }
-    @ad_client.search(:base => @ad_group_basedn, :filter => ad_filter, :attributes => [:cn, :gidnumber]) do |entry|
+    @ad_client.search(:base => @ad_group_base_dn, :filter => ad_filter, :attributes => [:cn, :gidnumber]) do |entry|
       ad_group_map[entry[:cn].first] = {:gidnumber => entry[:gidnumber]}
       #ad_group_map[entry[:cn]] = nil
     end
@@ -377,7 +376,7 @@ class Adap
     ldap_filter = Net::LDAP::Filter.construct("(memberUid=#{uid})")
 
     # Get groups from LDAP
-    @ldap_client.search(:base => @ldap_group_basedn, :filter => ldap_filter, :attributes => [:cn]) do |entry|
+    @ldap_client.search(:base => @ldap_group_base_dn, :filter => ldap_filter, :attributes => [:cn]) do |entry|
       # Capture common name of groups. gidnumber is not necessary for LDAP entry
       ldap_group_map[entry[:cn].first] = nil
     end
@@ -416,7 +415,7 @@ class Adap
     operation_pool = {}
 
     ad_group_map.each_key do |key|
-      dn = "cn=#{key},#{@ldap_group_basedn}"
+      dn = "cn=#{key},#{@ldap_group_base_dn}"
       # Convert AD entries to LDAP entries to create operation to update LDAP data.
       operation_pool[dn] = {
         :cn => key,
@@ -426,7 +425,7 @@ class Adap
     end
 
     ldap_group_map.each_key do |key|
-      operation_pool["cn=#{key},#{@ldap_group_basedn}"] = {
+      operation_pool["cn=#{key},#{@ldap_group_base_dn}"] = {
         # :cn and :gidnumber are not necessary
         :operations => [[:delete, :memberuid, uid]]
       } if !ad_group_map.has_key?(key)
@@ -555,7 +554,7 @@ class Adap
     return nil if uid ==nil
     primary_gid = nil
 
-    @ad_client.search(:base => "CN=#{uid},CN=Users,#{@ad_basedn}") do |entry|
+    @ad_client.search(:base => "CN=#{uid},CN=Users,#{@ad_base_dn}") do |entry|
       primary_gid = entry[:gidnumber].first
     end
 

data/lib/adap/version.rb

@@ -1,3 +1,3 @@
 module ModAdap
-  VERSION = "0.1.11"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adap
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.1
 platform: ruby
 authors:
 - Tsutomu Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler