fruworg/pgls
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Astra linux domain support

Browse Source 
Added support ALD
This commit is contained in:
fsight 2022-04-18 23:38:32 +05:00
parent 31f11627e1
commit 4a16f02414
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/sample-config2.yaml
View File

@ -25,6 +25,8 @@ ldap_users:
name_attribute: sAMAccountName name_attribute: sAMAccountName
# lowercase name for use as PG role name # lowercase name for use as PG role name
lowercase_name: true lowercase_name: true
# uppercase name for use as PG role name
uppercase_name: false
# Add lowercase name *and* original name for use as PG role names (useful for migrating between case types) # Add lowercase name *and* original name for use as PG role names (useful for migrating between case types)
bothcase_name: false bothcase_name: false
@ -36,8 +38,13 @@ ldap_groups:
name_attribute: cn name_attribute: cn
# lowercase name for use as PG role name # lowercase name for use as PG role name
lowercase_name: false lowercase_name: false
# uppercase name for use as PG role name
uppercase_name: false
# this attribute must reference to all member DN's of the given group # this attribute must reference to all member DN's of the given group
member_attribute: member member_attribute: "memberuid"
# True if use Astra Linux Domain
ald_domain: true
# Connection parameters to PostgreSQL server # Connection parameters to PostgreSQL server
# see also: http://rubydoc.info/gems/pg/PG/Connection#initialize-instance_method # see also: http://rubydoc.info/gems/pg/PG/Connection#initialize-instance_method

11
config/schema.yaml
View File

@ -20,10 +20,10 @@ mapping:
"lowercase_name": "lowercase_name":
type: bool type: bool
required: no required: no
"uppercase_name": "bothcase_name":
type: bool type: bool
required: no required: no
"bothcase_name": "uppercase_name":
type: bool type: bool
required: no required: no
@ -43,15 +43,18 @@ mapping:
"lowercase_name": "lowercase_name":
type: bool type: bool
required: no required: no
"uppercase_name": "bothcase_name":
type: bool type: bool
required: no required: no
"bothcase_name": "uppercase_name":
type: bool type: bool
required: no required: no
"member_attribute": "member_attribute":
type: str type: str
required: yes required: yes
"ald_domain":
type: bool
required: no
"pg_connection": "pg_connection":
type: any type: any

7
lib/pg_ldap_sync/application.rb
View File

@ -61,7 +61,6 @@ class Application
log.warn "user attribute #{ldap_user_conf[:name_attribute].inspect} not defined for #{entry.dn}" log.warn "user attribute #{ldap_user_conf[:name_attribute].inspect} not defined for #{entry.dn}"
next next
end end
log.info "found user-dn: #{entry.dn}" log.info "found user-dn: #{entry.dn}"
names = if ldap_user_conf[:bothcase_name] names = if ldap_user_conf[:bothcase_name]
@ -99,7 +98,6 @@ class Application
log.warn "user attribute #{ldap_group_conf[:name_attribute].inspect} not defined for #{entry.dn}" log.warn "user attribute #{ldap_group_conf[:name_attribute].inspect} not defined for #{entry.dn}"
next next
end end
log.info "found group-dn: #{entry.dn}" log.info "found group-dn: #{entry.dn}"
names = if ldap_group_conf[:bothcase_name] names = if ldap_group_conf[:bothcase_name]
@ -256,8 +254,13 @@ class Application
MatchedMembership = Struct.new :role_name, :has_member, :state MatchedMembership = Struct.new :role_name, :has_member, :state
def match_memberships(ldap_roles, pg_roles) def match_memberships(ldap_roles, pg_roles)
ldap_group_conf = @config[:ldap_groups]
hash_of_arrays = Hash.new { |h, k| h[k] = [] } hash_of_arrays = Hash.new { |h, k| h[k] = [] }
if ldap_group_conf[:ald_domain]
ldap_by_dn = ldap_roles.inject(hash_of_arrays){|h,r| h[r.name] << r; h }
else
ldap_by_dn = ldap_roles.inject(hash_of_arrays){|h,r| h[r.dn] << r; h } ldap_by_dn = ldap_roles.inject(hash_of_arrays){|h,r| h[r.dn] << r; h }
end
ldap_by_m2m = ldap_roles.inject([]) do |a,r| ldap_by_m2m = ldap_roles.inject([]) do |a,r|
next a unless r.member_dns next a unless r.member_dns
a + r.member_dns.flat_map do |dn| a + r.member_dns.flat_map do |dn|