You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2016/08/02 15:05:48 UTC
[whimsy] branch master updated (6766240 -> bce0bd1)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git.
from 6766240 Information page for Service Workers preview
new 2770988 authgroup support
new bce0bd1 refactor
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/whimsy/asf/ldap.rb | 48 ++++++++++++++++--------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/02: authgroup support
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
commit 2770988abeb66b458c7b49bc000d4f56c3891d36
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Aug 2 11:00:36 2016 -0400
authgroup support
---
lib/whimsy/asf/ldap.rb | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 909eaf2..fc48b00 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -840,6 +840,41 @@ module ASF
end
end
+ class AuthGroup < Service
+ @base = 'ou=auth,ou=groups,dc=apache,dc=org'
+
+ def dn
+ return @dn if @dn
+ dns = ASF.search_subtree(self.class.base, "cn=#{name}", 'dn')
+ @dn = dns.first.first unless dns.empty?
+ @dn
+ end
+
+ def base
+ if dn
+ dn.sub(/^cn=.*?,/, '')
+ else
+ super
+ end
+ end
+
+ def self.list(filter='cn=*')
+ ASF.search_subtree(base, filter, 'cn').flatten
+ end
+
+ def self.preload
+ Hash[ASF.search_subtree(base, "cn=*", %w(dn member modifyTimestamp createTimestamp)).map do |results|
+ cn = results['dn'].first[/^cn=(.*?),/, 1]
+ service = self.find(cn)
+ service.modifyTimestamp = results['modifyTimestamp'].first # it is returned as an array of 1 entry
+ service.createTimestamp = results['createTimestamp'].first # it is returned as an array of 1 entry
+ members = results['member'] || []
+ service.members = members
+ [service, members]
+ end]
+ end
+ end
+
end
if __FILE__ == $0
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/02: refactor
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
commit bce0bd156e8252891a5b438fe7eb638ce1c0b4c3
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Aug 2 11:05:34 2016 -0400
refactor
---
lib/whimsy/asf/ldap.rb | 77 +++++++++-----------------------------------------
1 file changed, 13 insertions(+), 64 deletions(-)
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index fc48b00..ed87740 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -759,13 +759,24 @@ module ASF
end
def dn
- "cn=#{id},#{self.class.base}"
+ return @dn if @dn
+ dns = ASF.search_subtree(self.class.base, "cn=#{name}", 'dn')
+ @dn = dns.first.first unless dns.empty?
+ @dn
+ end
+
+ def base
+ if dn
+ dn.sub(/^cn=.*?,/, '')
+ else
+ super
+ end
end
def self.preload
Hash[ASF.search_one(base, "cn=*", %w(dn member modifyTimestamp createTimestamp)).map do |results|
cn = results['dn'].first[/^cn=(.*?),/, 1]
- service = ASF::Service.find(cn)
+ service = self.find(cn)
service.modifyTimestamp = results['modifyTimestamp'].first # it is returned as an array of 1 entry
service.createTimestamp = results['createTimestamp'].first # it is returned as an array of 1 entry
members = results['member'] || []
@@ -807,72 +818,10 @@ module ASF
class AppGroup < Service
@base = 'ou=apps,ou=groups,dc=apache,dc=org'
-
- def dn
- return @dn if @dn
- dns = ASF.search_subtree(self.class.base, "cn=#{name}", 'dn')
- @dn = dns.first.first unless dns.empty?
- @dn
- end
-
- def base
- if dn
- dn.sub(/^cn=.*?,/, '')
- else
- super
- end
- end
-
- def self.list(filter='cn=*')
- ASF.search_subtree(base, filter, 'cn').flatten
- end
-
- def self.preload
- Hash[ASF.search_subtree(base, "cn=*", %w(dn member modifyTimestamp createTimestamp)).map do |results|
- cn = results['dn'].first[/^cn=(.*?),/, 1]
- service = ASF::Service.find(cn)
- service.modifyTimestamp = results['modifyTimestamp'].first # it is returned as an array of 1 entry
- service.createTimestamp = results['createTimestamp'].first # it is returned as an array of 1 entry
- members = results['member'] || []
- service.members = members
- [service, members]
- end]
- end
end
class AuthGroup < Service
@base = 'ou=auth,ou=groups,dc=apache,dc=org'
-
- def dn
- return @dn if @dn
- dns = ASF.search_subtree(self.class.base, "cn=#{name}", 'dn')
- @dn = dns.first.first unless dns.empty?
- @dn
- end
-
- def base
- if dn
- dn.sub(/^cn=.*?,/, '')
- else
- super
- end
- end
-
- def self.list(filter='cn=*')
- ASF.search_subtree(base, filter, 'cn').flatten
- end
-
- def self.preload
- Hash[ASF.search_subtree(base, "cn=*", %w(dn member modifyTimestamp createTimestamp)).map do |results|
- cn = results['dn'].first[/^cn=(.*?),/, 1]
- service = self.find(cn)
- service.modifyTimestamp = results['modifyTimestamp'].first # it is returned as an array of 1 entry
- service.createTimestamp = results['createTimestamp'].first # it is returned as an array of 1 entry
- members = results['member'] || []
- service.members = members
- [service, members]
- end]
- end
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.