[whimsy] branch master updated: RW hosts now same as RO hosts; drop defaults - bis

[sebb]

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 9eefa77d RW hosts now same as RO hosts; drop defaults - bis
9eefa77d is described below

commit 9eefa77db453d0110cb69c3bf0c9e26c134f3bfa
Author: Sebb <s...@apache.org>
AuthorDate: Fri Aug 5 21:35:19 2022 +0100

    RW hosts now same as RO hosts; drop defaults - bis
    
    Now allows for missing port in ldap.conf URIs
    
    This prepares for the upcoming LDAP migration
    Note: can still use :ldaprw host override if necessary
---
 lib/whimsy/asf/ldap.rb | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index d51ac41b..e60e263a 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -43,19 +43,6 @@ module ASF
   @@weakrefs = Set.new
 
   module LDAP
-     # see https://s.apache.org/IWu8
-     # Previously derived from the following sources:
-     # * 
https://github.com/apache/infrastructure-puppet/blob/deployment/data/common.yaml
 (ldapserver::slapd_peers)
-     # Updated 2018-02-24
-    RO_HOSTS = %w(
-      ldaps://ldap-us-ro.apache.org:636
-      ldaps://ldap-eu-ro.apache.org:636
-    )
-
-    RW_HOSTS = %w(
-      ldaps://ldap-master.apache.org:636
-    )
-
     # Mutex preventing simultaneous connections to LDAP from a single process
     CONNECT_LOCK = Mutex.new
 
@@ -152,19 +139,20 @@ module ASF
       @host
     end
 
-    # allow override of RW_HOSTS by :ldaprw or :ldap config
+    # allow override of writable host by :ldaprw
     def self.rwhosts
       return @rwhosts if @rwhosts # cache the rwhosts list
-      rwhosts = Array(ASF::Config.get(:ldaprw))
-      rwhosts = Array(ASF::Config.get(:ldap)) if rwhosts.empty?
-      rwhosts = RW_HOSTS if rwhosts.empty?
-      @rwhosts =  rwhosts
+      rwhosts = Array(ASF::Config.get(:ldaprw)) # allow separate override for 
RW LDAP
+      rwhosts = hosts if rwhosts.empty? # default to RO hosts
+      raise 'Cannot determine writable LDAP URI from ldap.conf or local 
config!' if rwhosts.empty?
+      @rwhosts = rwhosts
     end
 
     # determine what LDAP hosts are available
+    # use_config=false is needed for the configure method only
     def self.hosts(use_config = true)
       return @hosts if @hosts # cache the hosts list
-      # try whimsy config
+      # try whimsy config (overrides ldap.conf)
       hosts = Array(ASF::Config.get(:ldap))
 
       # check system configuration
@@ -172,16 +160,15 @@ module ASF
         conf = "#{ETCLDAP}/ldap.conf"
         if File.exist? conf
           uris = File.read(conf)[/^uri\s+(.*)/i, 1].to_s
-          hosts = uris.scan(/ldaps?:\/\/\S+?:\d+/)
+          hosts = uris.scan(%r{ldaps?://\S+}) # May not have a port
           Wunderbar.debug "Using hosts from LDAP config"
         end
       else
         Wunderbar.debug "Using hosts from Whimsy config"
       end
 
-      # if all else fails, use default list
-      Wunderbar.debug "Using default host list" if hosts.empty?
-      hosts = ASF::LDAP::RO_HOSTS if hosts.empty?
+      # There is no default
+      raise 'Cannot determine LDAP URI from ldap.conf or local config!' if 
hosts.empty?
 
       hosts.shuffle!
       # Wunderbar.debug "Hosts:\n#{hosts.join(' ')}"