This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new a4a412bb ou=apps group has been deleted
a4a412bb is described below
commit a4a412bbd8387e4199d09beb7b6de1d33400eb19
Author: Sebb <[email protected]>
AuthorDate: Fri Apr 28 15:24:08 2023 +0100
ou=apps group has been deleted
---
lib/whimsy/asf/ldap.rb | 32 ----------------------
www/roster/models/group.rb | 12 ---------
www/roster/views/actions/appgroup.json.rb | 44 -------------------------------
www/roster/views/group.js.rb | 2 --
4 files changed, 90 deletions(-)
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index e850f8d0..63799ea8 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -1509,37 +1509,6 @@ module ASF
end
end
- # <tt>ou=apps</tt> subtree of <tt>ou=groups,dc=apache,dc=org</tt>, currently
- # only used for <tt>hudson-jobadmin</tt>
- class AppGroup < Service
- @base = 'ou=apps,ou=groups,dc=apache,dc=org'
-
- # return a list of App groups (cns only), from LDAP.
- def self.listcns(filter='cn=*')
- # Note that hudson-job-admin is under ou=hudson hence need
- # to override Service.listcns and use subtree search
- ASF.search_subtree(base, filter, 'cn').flatten
- end
-
- # remove people from an application group.
- def remove(people)
- @members = nil
- people = (Array(people) & members).map(&:dn)
- ASF::LDAP.modify(self.dn, [ASF::Base.mod_delete('member', people)])
- ensure
- @members = nil
- end
-
- # add people to an application group.
- def add(people)
- @members = nil
- people = (Array(people) - members).map(&:dn)
- ASF::LDAP.modify(self.dn, [ASF::Base.mod_add('member', people)])
- ensure
- @members = nil
- end
- end
-
# <tt>ou=auth</tt> subtree of <tt>ou=groups,dc=apache,dc=org</tt>, used for
# subprojects and a variety of organizational constructs (accounting,
# exec-officers, fundraising, trademarks, ...)
@@ -1570,5 +1539,4 @@ if __FILE__ == $0
puts newids.length
puts newids.first
ASF::RoleGroup.listcns.map {|g| puts ASF::RoleGroup.find(g).dn}
- ASF::AppGroup.listcns.map {|g| puts ASF::AppGroup.find(g).dn}
end
diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index dd13e27c..c76203a8 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -22,13 +22,6 @@ class Group
# add authorization groups (LDAP)
groups += ASF::AuthGroup.listcns.map {|group| [group, "LDAP Auth Group"]}
- # add app groups
- begin # HACK to bypass missing LDAP ou=apps group
- groups += ASF::AppGroup.listcns.map {|app| [app, "LDAP app group"]}
- rescue LDAP::ResultError => e
- Wunderbar.warn "Ignoring LDAP error: #{e.inspect}"
- end
-
groups.sort
end
@@ -51,11 +44,6 @@ class Group
group = ASF::Service.find(id)
end
- unless group.hasLDAP?
- type = 'LDAP app group'
- group = ASF::AppGroup.find(id)
- end
-
if group.hasLDAP?
# LDAP group
diff --git a/www/roster/views/actions/appgroup.json.rb
b/www/roster/views/actions/appgroup.json.rb
deleted file mode 100644
index fea7a68d..00000000
--- a/www/roster/views/actions/appgroup.json.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Add or remove a person from an application group in LDAP
-#
-
-if env.password
- person = ASF::Person.find(@id)
- group = ASF::AppGroup.find(@group)
-
- # update LDAP
- ASF::LDAP.bind(env.user, env.password) do
- if @action == 'add'
- group.add(person)
- elsif @action == 'remove'
- group.remove(person)
- end
- end
-
- # compose E-mail
- action = (@action == 'add' ? 'added to' : 'removed from')
- list = "#{@group} LDAP appgroup"
-
- details = [person.dn, group.dn]
-
- from = ASF::Person.find(env.user)
-
- # construct email
- mail = Mail.new do
- from "#{from.public_name} <#{from.id}@apache.org>"
- to "[email protected]"
- subject "#{person.public_name} #{action} #{list}"
- body "Current roster can be found at:\n\n" +
- " https://whimsy.apache.org/roster/group/#{group.id}\n\n"; +
- "LDAP details:\n\n #{details.join("\n ")}"
- end
-
- # Header for root@'s lovely email filters
- mail.header['X-For-Root'] = 'yes'
-
- # deliver email
- mail.deliver!
-end
-
-# return updated committee info to the client
-Group.serialize(@group)
diff --git a/www/roster/views/group.js.rb b/www/roster/views/group.js.rb
index fabf21db..e08a01b9 100644
--- a/www/roster/views/group.js.rb
+++ b/www/roster/views/group.js.rb
@@ -213,8 +213,6 @@ class GroupConfirm < Vue
action = 'actions/authgroup'
elsif @@group.type == 'LDAP service'
action = 'actions/service'
- elsif @@group.type == 'LDAP app group'
- action = 'actions/appgroup'
else
alert "unsupported group type: #{@@group.type}"
return
