(whimsy) branch master updated: Fix up stale credentials
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 1810b574 Fix up stale credentials 1810b574 is described below commit 1810b574daf4f48d64662da525f880f4766dd0c2 Author: Sebb AuthorDate: Thu Apr 25 17:22:36 2024 +0100 Fix up stale credentials --- docker-config/25-authz_ldap_group_membership.conf | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-config/25-authz_ldap_group_membership.conf b/docker-config/25-authz_ldap_group_membership.conf index 1ce8054e..1680b2a3 100644 --- a/docker-config/25-authz_ldap_group_membership.conf +++ b/docker-config/25-authz_ldap_group_membership.conf @@ -59,8 +59,8 @@ # LDAP alias: infrastructure AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0 @@ -69,8 +69,8 @@ # LDAP alias: apldap AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0
(whimsy) branch master updated: Fix file name
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 cb97709c Fix file name
cb97709c is described below
commit cb97709c1100d9865d1adb904f1b274e926fddc8
Author: Sebb
AuthorDate: Thu Apr 25 15:27:42 2024 +0100
Fix file name
---
lib/whimsy/asf/committee.rb | 4 ++--
www/test/dataflow.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb
index a2402194..0e9f0e74 100644
--- a/lib/whimsy/asf/committee.rb
+++ b/lib/whimsy/asf/committee.rb
@@ -305,9 +305,9 @@ module ASF
contents
end
-# record termination date in committee-info.yml
+# record termination date in committee-info.yaml
# Params:
-# - input: the contents of committee-info.yml
+# - input: the contents of committee-info.yaml
# - pmc: the pmc name
# - mm: -MM retirement date
# Returns: the updated contents
diff --git a/www/test/dataflow.json b/www/test/dataflow.json
index cac408a4..098ea569 100644
--- a/www/test/dataflow.json
+++ b/www/test/dataflow.json
@@ -19,7 +19,7 @@
"maintainer": "/www/roster/public_committee_info.rb",
"sources": [
"/lib/whimsy/asf/committee.rb",
- "private/committers/board/committee-info.yml"
+ "private/committers/board/committee-info.yaml"
]
},
"https://whimsy.apache.org/public/icla-info.json": {
(whimsy) 02/02: Show anchor for error URLs
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
commit 736aa0fdc2d4517b1e8617b17bc7ee061f1cbdda
Author: Sebb
AuthorDate: Thu Apr 25 14:00:51 2024 +0100
Show anchor for error URLs
---
tools/site-scan.rb | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 1a907412..3790ee23 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -7,7 +7,6 @@
#
# Makes no value judgements. Simply extracts raw data for offline analysis.
$LOAD_PATH.unshift '/srv/whimsy/lib'
-require 'set'
require 'net/http'
require 'nokogiri'
require 'json'
@@ -103,7 +102,7 @@ def parse(id, site, name, podling=false)
end
data[:uri] = uri.to_s
- subpages = Set.new
+ subpages = Hash.new
# FIRST: scan each link's a_href to see if we need to capture it
# also capture script src for events, and some page refs for podlings
doc.traverse do |a|
@@ -167,7 +166,7 @@ def parse(id, site, name, podling=false)
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
if site2.host == uri.host and site2.path.size > 2
- subpages.add site2.to_s
+ subpages[site2.to_s] = a
end
rescue StandardError => e
$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
@@ -205,7 +204,7 @@ def parse(id, site, name, podling=false)
if podling
hasdisclaimer = 0
nodisclaimer = []
-subpages.each do |subpage|
+subpages.each do |subpage, anchor|
begin
uri, response, status = $cache.get(subpage)
if uri&.to_s == subpage or uri&.to_s == subpage + '/'
@@ -219,6 +218,8 @@ def parse(id, site, name, podling=false)
else
nodisclaimer << subpage
end
+else
+ $stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
end
rescue URI::InvalidURIError
end
(whimsy) branch master updated (83488587 -> 736aa0fd)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git from 83488587 Show error text new ce25fdac Don't show trivial URL changes new 736aa0fd Show anchor for error URLs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tools/site-scan.rb | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-)
(whimsy) 01/02: Don't show trivial URL changes
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
commit ce25fdaca37a7c627e9dc72362bdd1a04eb42425
Author: Sebb
AuthorDate: Thu Apr 25 13:46:07 2024 +0100
Don't show trivial URL changes
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9877fb58..1a907412 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -208,7 +208,11 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-puts "#{id} #{subpage} => #{uri} #{status}" # uri might be nil
+if uri&.to_s == subpage or uri&.to_s == subpage + '/'
+ puts "#{id} #{uri} #{status}"
+else
+ puts "#{id} #{subpage} => #{uri} #{status}"
+end
if %w{unchanged recent updated}.include? status
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
(whimsy) branch master updated: Show error text
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 83488587 Show error text
83488587 is described below
commit 83488587ec6ced95e8c31be86b99082e0c7ab202
Author: Sebb
AuthorDate: Thu Apr 25 13:26:12 2024 +0100
Show error text
---
tools/site-scan.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 96d1d2bd..9877fb58 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -169,8 +169,8 @@ def parse(id, site, name, podling=false)
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
- rescue StandardError
-$stderr.puts "#{id}: Bad a_href #{a_href}"
+ rescue StandardError => e
+$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
end
end
end
(whimsy) branch master updated: Needs to be a URI
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 8ac7efea Needs to be a URI
8ac7efea is described below
commit 8ac7efea44f494d0372aa386a992e41307fcf5e7
Author: Sebb
AuthorDate: Thu Apr 25 13:17:39 2024 +0100
Needs to be a URI
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 92255621..96d1d2bd 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -162,7 +162,7 @@ def parse(id, site, name, podling=false)
unless a_href =~ %r{^(#|mailto:)}
begin
if a_href =~ %r{^https?://} # no need to rebase this
- site2 = a_href
+ site2 = URI.parse(a_href) # needs to be a URI
else
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
(whimsy) branch master updated: Have to do it ourselves now
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 df051701 Have to do it ourselves now
df051701 is described below
commit df05170108f8776f9bcb6fe64b4bb48b6e48f9c3
Author: Sebb
AuthorDate: Thu Apr 25 13:11:03 2024 +0100
Have to do it ourselves now
---
.github/workflows/unittestlib.yml | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index eb1ed68a..5653624a 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -15,8 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-# Subversion not currently present on macos-13+
-os: [macos-12, ubuntu-20.04, ubuntu-22.04]
+os: [macos-latest, ubuntu-20.04, ubuntu-22.04]
ruby: [2.7, 3.1]
# 2.7 not supported on 22.04
exclude:
@@ -24,13 +23,17 @@ jobs:
ruby: 2.7
runs-on: ${{ matrix.os }}
steps:
-- name: setup # needed for installing ruby-ldap
+- name: setup non-macOS # needed for installing ruby-ldap
run: |
sudo apt-get update
sudo apt-get install libldap2-dev
sudo apt-get install libsasl2-dev
sudo apt-get install libyaml-dev # seems to be needed for installing
ruby since psych 5.0.0 release
- if: matrix.os != 'macos-latest'
+ if: ${{ runner.os != 'macOS' }}
+- name: setup macos
+ run: |
+brew install subversion
+ if: ${{ runner.os == 'macOS' }}
- uses: actions/checkout@v3
with:
persist-credentials: false
(whimsy) branch master updated: Tidy up matched text
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 6d03c8b5 Tidy up matched text
6d03c8b5 is described below
commit 6d03c8b53bba67c25e375ba460121978fb94652d
Author: Sebb
AuthorDate: Thu Apr 25 13:01:04 2024 +0100
Tidy up matched text
---
tools/download_check.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index b62d3135..c5c1fc06 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -488,8 +488,10 @@ def _checkDownloadPage(path, tlp, version)
hasGPGverify = false
# Check if GPG verify has two parameters
- body.scan(%r{^.+gpg --verify.+$}) { |m|
+ body.scan(%r{gpg --verify.+$}) { |m|
hasGPGverify = true
+# Hack to tidy matched text: drop spans and truncate at or
+m.gsub!(%r{]+>|}, '').sub!(%r{(https://www.apache.org/info/verification.html#specify_both;
end
(whimsy) branch master updated: Allow for missing Subversion
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 d53c6b39 Allow for missing Subversion d53c6b39 is described below commit d53c6b39da4b873b9e901f3c4c5b29c1e7c1924d Author: Sebb AuthorDate: Thu Apr 25 12:33:36 2024 +0100 Allow for missing Subversion --- .github/workflows/unittestlib.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestlib.yml b/.github/workflows/unittestlib.yml index aea0ee98..eb1ed68a 100644 --- a/.github/workflows/unittestlib.yml +++ b/.github/workflows/unittestlib.yml @@ -15,7 +15,8 @@ jobs: strategy: fail-fast: false matrix: -os: [macos-latest, ubuntu-20.04, ubuntu-22.04] +# Subversion not currently present on macos-13+ +os: [macos-12, ubuntu-20.04, ubuntu-22.04] ruby: [2.7, 3.1] # 2.7 not supported on 22.04 exclude:
(whimsy) branch master updated: Match new log messages
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 a9a500d0 Match new log messages
a9a500d0 is described below
commit a9a500d08869af4185986194e9c255726a199dea
Author: Sebb
AuthorDate: Thu Apr 25 11:41:25 2024 +0100
Match new log messages
---
www/status/monitors/site_scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/status/monitors/site_scan.rb b/www/status/monitors/site_scan.rb
index 4fcca158..d2cca96d 100644
--- a/www/status/monitors/site_scan.rb
+++ b/www/status/monitors/site_scan.rb
@@ -20,7 +20,7 @@ def Monitor.site_scan(previous_status)
log = File.read(logfile)
# Drop standard cache info
- log.gsub! /^([-\w]+ )*https?:\S+ \w+\n/, ''
+ log.gsub! /^([-\w]+ )*https?:\S+ (=> \S* )?\w+\n/, ''
# Drop other info (must agree with scanner script)
log.gsub! %r{^(Started|Ended|Events):.+\n}, '' # drop 'Events: already have'
(whimsy) branch master updated: Fix up relative links
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 591e32cb Fix up relative links
591e32cb is described below
commit 591e32cb2af5384522663ce3c573bd12326f1396
Author: Sebb
AuthorDate: Thu Apr 25 11:20:31 2024 +0100
Fix up relative links
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9e2c614d..92255621 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -161,7 +161,11 @@ def parse(id, site, name, podling=false)
end
unless a_href =~ %r{^(#|mailto:)}
begin
-site2 = URI.join(site,a_href.gsub(' ','+'))
+if a_href =~ %r{^https?://} # no need to rebase this
+ site2 = a_href
+else
+ site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
+end
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
(whimsy) branch master updated: Show original page for error case
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 90ca069a Show original page for error case
90ca069a is described below
commit 90ca069af28d2396fb56c56a77eb4e78e190ce86
Author: Sebb
AuthorDate: Thu Apr 25 09:18:10 2024 +0100
Show original page for error case
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 583d4617..9e2c614d 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -204,7 +204,7 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-puts "#{id} #{uri} #{status}"
+puts "#{id} #{subpage} => #{uri} #{status}" # uri might be nil
if %w{unchanged recent updated}.include? status
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
(whimsy) branch master updated: Docco
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 87b7877e Docco 87b7877e is described below commit 87b7877eb670fd5518217511b00d8e591b5ef7d5 Author: Sebb AuthorDate: Thu Apr 25 09:14:41 2024 +0100 Docco --- lib/whimsy/cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/whimsy/cache.rb b/lib/whimsy/cache.rb index cab0f0c1..a3103c19 100644 --- a/lib/whimsy/cache.rb +++ b/lib/whimsy/cache.rb @@ -42,8 +42,8 @@ class Cache # # Returns: # - uri (after redirects) - # - content - # - status: nocache, recent, updated, missing or no last mod/etag + # - content - or response if status is error + # - status: nocache, recent, updated, unchanged, error, cachemiss or no last mod/etag def get(url) if not @enabled uri, res = fetch(url)
(whimsy) branch master updated: Identify site with bad ref
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 b1c52f60 Identify site with bad ref
b1c52f60 is described below
commit b1c52f60fb99f7a7bd616c8a098789cca6c74f21
Author: Sebb
AuthorDate: Thu Apr 25 09:05:01 2024 +0100
Identify site with bad ref
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index b52ea858..583d4617 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -166,7 +166,7 @@ def parse(id, site, name, podling=false)
subpages.add site2.to_s
end
rescue StandardError
-$stderr.puts "Bad a_href #{a_href}"
+$stderr.puts "#{id}: Bad a_href #{a_href}"
end
end
end
(whimsy) branch master updated: Check for failed fetch
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 fe4ee630 Check for failed fetch
fe4ee630 is described below
commit fe4ee630fdaf3f3be27acb5fcfb82a34a6aafef6
Author: Sebb
AuthorDate: Thu Apr 25 08:45:51 2024 +0100
Check for failed fetch
---
tools/site-scan.rb | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index f57a832e..b52ea858 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -204,10 +204,13 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
- hasdisclaimer += 1
-else
- nodisclaimer << subpage
+puts "#{id} #{uri} #{status}"
+if %w{unchanged recent updated}.include? status
+ if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
+hasdisclaimer += 1
+ else
+nodisclaimer << subpage
+ end
end
rescue URI::InvalidURIError
end
