[whimsy] branch master updated: whitelist and podlings

[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://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 12cb02d  whitelist and podlings
12cb02d is described below

commit 12cb02dc6356f1c3d5b5b12e053e8f18466af778
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon Sep 4 07:53:16 2017 -0400

    whitelist and podlings
---
 www/members/security-subs.cgi | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/www/members/security-subs.cgi b/www/members/security-subs.cgi
index e89c1c4..9d56adf 100755
--- a/www/members/security-subs.cgi
+++ b/www/members/security-subs.cgi
@@ -4,6 +4,12 @@ require 'wunderbar/bootstrap'
 require 'whimsy/asf'
 require 'whimsy/asf/mlist'
 
+WHITELIST = [
+  /^archive-asf-private@cust-asf\.ponee\.io$/,
+  /^archiver@mbox-vm\.apache\.org$/,
+  /^security-archive@.*\.apache\.org$/,
+]
+
 # ensure that there is a trailing slash (so relative paths will work)
 if not ENV['PATH_INFO']
   print "Status: 302 Found\r\nLocation: #{ENV['SCRIPT_URI']}/\r\n\r\n"
@@ -33,10 +39,17 @@ _html do
       end
 
     elsif lists[path]
+      podling = ASF::Podling.find(path)
       committee = ASF::Committee.find(path)
+      project = ASF::Project.find(path)
       _h2 do
-        _a committee.display_name, 
-          href: "../../roster/committee/#{committee.id}"
+        if podling
+          _a podling.display_name, 
+            href: "../../roster/ppmc/#{podling.id}"
+        else
+          _a committee.display_name, 
+            href: "../../roster/committee/#{committee.id}"
+        end
       end
 
       _table.table do
@@ -51,11 +64,13 @@ _html do
           lists[path].sort_by {|email| email.downcase}.each do |email|
             person = ASF::Person.find_by_email(email)
             if person
-              if person.asf_member? or committee.committers.include? person
+              if person.asf_member? or project.members.include? person
                 color = 'bg-success'
               else
                 color = 'bg-warning'
               end
+            elsif WHITELIST.any? {|regex| email =~ regex}
+              color = ''
             else
               color = 'bg-danger'
             end

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].