user: More refactoring
This commit is contained in:
Ossi Salmi
parent
0b73e7782c
commit
528df05aea
2 changed files with 89 additions and 111 deletions
|
|
@ -1,23 +1,22 @@
|
|||
require 'set'
|
||||
require 'uri'
|
||||
require 'ldap'
|
||||
require "set"
|
||||
require "uri"
|
||||
require "ldap"
|
||||
|
||||
basedn = ''
|
||||
conn = ''
|
||||
conn = nil
|
||||
basedn = nil
|
||||
|
||||
File.readlines('/etc/openldap/ldap.conf').each do |line|
|
||||
File.readlines("/etc/openldap/ldap.conf").each do |line|
|
||||
line = line.strip
|
||||
next if line.empty?
|
||||
next if line.start_with?('#')
|
||||
next if line.empty? or line.start_with?("#")
|
||||
line = line.split
|
||||
if line[0] == 'BASE'
|
||||
if line[0] == "BASE"
|
||||
basedn = line[1]
|
||||
elsif line[0] == 'URI'
|
||||
elsif line[0] == "URI"
|
||||
line.shift
|
||||
line.each do |uri|
|
||||
uri = URI.parse(uri)
|
||||
begin
|
||||
if uri.scheme == 'ldaps'
|
||||
if uri.scheme == "ldaps"
|
||||
uri.port = 636 unless uri.port
|
||||
conn = LDAP::SSLConn.new(uri.host, uri.port)
|
||||
else
|
||||
|
|
@ -33,53 +32,49 @@ File.readlines('/etc/openldap/ldap.conf').each do |line|
|
|||
end
|
||||
end
|
||||
|
||||
groups = {}
|
||||
user_pp = []
|
||||
group_pp = []
|
||||
|
||||
groups = {}
|
||||
filter = "objectClass=posixAccount"
|
||||
attrib = %w(uid gidNumber)
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, attrib) do |entry|
|
||||
uid = entry["uid"].first
|
||||
next if uid.include?("$") # skip samba machine accounts
|
||||
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE,
|
||||
'objectClass=posixAccount', ['uid', 'gidNumber']) do |entry|
|
||||
dn = entry.get_dn
|
||||
uid = entry['uid'][0]
|
||||
|
||||
# skip samba machine accounts
|
||||
next if uid.include?('?')
|
||||
gidnumber = entry["gidNumber"].first
|
||||
|
||||
gids = Set.new
|
||||
|
||||
# find primary group
|
||||
filter = '(&(objectClass=posixGroup)(gidNumber=%s))' % entry['gidNumber'][0]
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ['cn']) do |group|
|
||||
gid = group['cn'][0]
|
||||
filter = "(&(objectClass=posixGroup)(gidNumber=#{gidnumber}))"
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ["cn"]) do |group|
|
||||
gid = group["cn"].first
|
||||
gids << gid
|
||||
groups[gid] = Set.new unless groups.has_key?(gid)
|
||||
groups[gid] << uid
|
||||
end
|
||||
|
||||
# find supplementary groups
|
||||
filter = '(&(objectClass=posixGroup)(|(uniqueMember=%s)(memberUid=%s)))' % [ dn, uid ]
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ['cn']) do |group|
|
||||
gid = group['cn'][0]
|
||||
filter = "(&(objectClass=posixGroup)(|(uniqueMember=#{dn})(memberUid=#{uid})))"
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ["cn"]) do |group|
|
||||
gid = group["cn"].first
|
||||
gids << gid
|
||||
groups[gid] = Set.new unless groups.has_key?(gid)
|
||||
groups[gid] << uid
|
||||
end
|
||||
|
||||
user_pp << "class user::user::%s inherits user::virtual {\n\n" % uid
|
||||
user_pp << " realize(User::Add[\"%s\"])\n" % uid
|
||||
gids.sort.each do |gid|
|
||||
user_pp << " realize(Group[\"%s\"])\n" % gid
|
||||
end
|
||||
user_pp << "class user::user::#{uid} inherits user::virtual {\n\n"
|
||||
user_pp << " realize(User::Add[\"#{uid}\"])\n"
|
||||
gids.sort.each { |gid| user_pp << " realize(Group[\"#{gid}\"])\n" }
|
||||
user_pp << "\n}\n\n"
|
||||
end
|
||||
|
||||
groups.each do |gid, uids|
|
||||
next if uids.length == 1 and uids.include?(gid)
|
||||
group_pp << "class user::group::%s {\n\n" % gid
|
||||
uids.sort.each do |uid|
|
||||
group_pp << " include user::user::%s\n" % uid
|
||||
end
|
||||
uids.sort.each { |uid| group_pp << " include user::user::#{uid}\n" }
|
||||
group_pp << "\n}\n\n"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
require 'set'
|
||||
require 'uri'
|
||||
require 'ldap'
|
||||
require "set"
|
||||
require "uri"
|
||||
require "ldap"
|
||||
|
||||
basedn = ''
|
||||
conn = ''
|
||||
conn = nil
|
||||
basedn = nil
|
||||
|
||||
File.readlines('/etc/openldap/ldap.conf').each do |line|
|
||||
File.readlines("/etc/openldap/ldap.conf").each do |line|
|
||||
line = line.strip
|
||||
next if line.empty?
|
||||
next if line.start_with?('#')
|
||||
next if line.empty? or line.start_with?("#")
|
||||
line = line.split
|
||||
if line[0] == 'BASE'
|
||||
if line[0] == "BASE"
|
||||
basedn = line[1]
|
||||
elsif line[0] == 'URI'
|
||||
elsif line[0] == "URI"
|
||||
line.shift
|
||||
line.each do |uri|
|
||||
uri = URI.parse(uri)
|
||||
begin
|
||||
if uri.scheme == 'ldaps'
|
||||
if uri.scheme == "ldaps"
|
||||
uri.port = 636 unless uri.port
|
||||
conn = LDAP::SSLConn.new(uri.host, uri.port)
|
||||
else
|
||||
|
|
@ -33,89 +32,73 @@ File.readlines('/etc/openldap/ldap.conf').each do |line|
|
|||
end
|
||||
end
|
||||
|
||||
print "class user::virtual {\n"
|
||||
virtual = "class user::virtual {\n"
|
||||
|
||||
filter = 'objectClass=posixAccount'
|
||||
attrs = [
|
||||
'uid',
|
||||
'uidNumber',
|
||||
'gidNumber',
|
||||
'gecos',
|
||||
'homeDirectory',
|
||||
'loginShell',
|
||||
]
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, attrs) do |entry|
|
||||
filter = "objectClass=posixAccount"
|
||||
attrib = %w(uid uidNumber gidNumber gecos homeDirectory loginShell)
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, attrib) do |entry|
|
||||
dn = entry.get_dn
|
||||
uid = entry['uid'][0]
|
||||
uidnumber=entry['uidNumber'][0]
|
||||
gidnumber=entry['gidNumber'][0]
|
||||
uid = entry["uid"].first
|
||||
uidnumber = entry["uidNumber"].first
|
||||
gidnumber = entry["gidNumber"].first
|
||||
|
||||
primarygroup = nil
|
||||
groups = Set.new
|
||||
|
||||
filter = '(&(objectClass=posixGroup)(gidNumber=%s))' % gidnumber
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ['cn']) do |group|
|
||||
primarygroup = group['cn'][0]
|
||||
filter = "(&(objectClass=posixGroup)(gidNumber=#{gidnumber}))"
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ["cn"]) do |group|
|
||||
primarygroup = group["cn"].first
|
||||
end
|
||||
|
||||
continue if primarygroup.nil?
|
||||
|
||||
filter = '(&(objectClass=posixGroup)(|(uniqueMember=%s)(memberUid=%s)))' % [ dn, uid ]
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ['cn']) do |group|
|
||||
groups << group['cn'][0]
|
||||
filter = "(&(objectClass=posixGroup)(|(uniqueMember=#{dn})(memberUid=#{uid})))"
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, ["cn"]) do |group|
|
||||
groups << group["cn"].first
|
||||
end
|
||||
|
||||
print "\n"
|
||||
print " @user::add { \"%s\":\n" % uid
|
||||
print " uid => \"%s\",\n" % uidnumber
|
||||
print " gid => \"%s\",\n" % gidnumber
|
||||
begin
|
||||
print " comment => \"%s\",\n" % entry['gecos'][0]
|
||||
rescue
|
||||
print " comment => \"%s\",\n" % entry['uid'][0]
|
||||
end
|
||||
print " home => \"%s\",\n" % entry['homeDirectory'][0]
|
||||
begin
|
||||
print " shell => \"%s\",\n" % entry['loginShell'][0]
|
||||
rescue
|
||||
print " shell => \"%s\",\n" % "/bin/bash"
|
||||
end
|
||||
comment = entry["gecos"] ? entry["gecos"].first : entry["uid"].first
|
||||
shell = entry["loginShell"] ? entry["loginShell"].first : "/bin/bash"
|
||||
home = entry["homeDirectory"].first
|
||||
|
||||
virtual << <<-EOF
|
||||
|
||||
@user::add { "#{uid}":
|
||||
uid => "#{uidnumber}",
|
||||
gid => "#{gidnumber}",
|
||||
comment => "#{comment}",
|
||||
home => "#{home}",
|
||||
shell => "#{shell}",
|
||||
EOF
|
||||
|
||||
unless groups.empty?
|
||||
print " groups => $::operatingsystem ? {\n"
|
||||
print " \"openbsd\" => [ "
|
||||
groups.each do |group|
|
||||
print "\"%s\", " % group
|
||||
end
|
||||
print "\"wheel\", " if groups.include?('sysadm')
|
||||
print "],\n"
|
||||
print " default => [ "
|
||||
groups.each do |group|
|
||||
print "\"%s\", " % group
|
||||
end
|
||||
print "],\n },\n"
|
||||
virtual << " groups => $::operatingsystem ? {\n"
|
||||
virtual << " \"openbsd\" => [ "
|
||||
groups.each { |group| virtual << "\"#{group}\", " }
|
||||
virtual << "\"wheel\", " if groups.include?("sysadm")
|
||||
virtual << "},\n default => [ "
|
||||
groups.each { |group| virtual << "\"#{group}\", " }
|
||||
virtual << "],\n },\n"
|
||||
end
|
||||
print " require => [\n"
|
||||
print " Group[\"%s\"],\n" % primarygroup
|
||||
groups.each do |group|
|
||||
print " Group[\"%s\"],\n" % group
|
||||
end
|
||||
print " ],\n"
|
||||
print " }\n"
|
||||
virtual << " require => [\n"
|
||||
virtual << " Group[\"#{primarygroup}\"],\n"
|
||||
groups.each { |group| virtual << " Group[\"#{group}\"],\n" }
|
||||
virtual << " ],\n }\n"
|
||||
end
|
||||
|
||||
filter = 'objectClass=posixGroup'
|
||||
attrs = [
|
||||
'cn',
|
||||
'gidNumber',
|
||||
'memberUid',
|
||||
'uniqueMember',
|
||||
]
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, attrs) do |entry|
|
||||
print "\n"
|
||||
print " @group { \"%s\":\n" % entry['cn'][0]
|
||||
print " ensure => present,\n"
|
||||
print " gid => %s,\n" % entry['gidNumber'][0]
|
||||
print " }\n"
|
||||
filter = "objectClass=posixGroup"
|
||||
attrib = %w(cn gidNumber memberUid uniqueMember)
|
||||
conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, filter, attrib) do |entry|
|
||||
cn = entry["cn"].first
|
||||
gid = entry["gidNumber"].first
|
||||
|
||||
virtual << <<-EOF
|
||||
|
||||
@group { "#{cn}":
|
||||
ensure => present,
|
||||
gid => "#{gid}",
|
||||
}
|
||||
EOF
|
||||
end
|
||||
|
||||
print "\n}\n"
|
||||
puts virtual, "\n}"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue