[Debian-ha-maintainers] Bug#1080528: apache/http-mon.sh: change curl opts to match wget

[Athos Ribeiro]

Package: resource-agents
Version: 1:4.15.1-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

The autopkgtest infrastructure in Ubuntu differs from the one in Debian.
The usage of systemwide proxies there revealed a potential regression
with the http-mon.sh script used by the apache2 resource agent to
monitor the service.

The issue is that the script would prefer using wget whenever available,
and would target specific IP addresses by default and force wget to skip
any proxy systemwide configurations. On the other hand, curl was not
skipping proxy configurations and targeting an interface.

This patch adjusts the curl param to better match the previous wget
behavior.

  * Fix DEP8 test timeout failures (LP: #2078860):
    - d/t/control: apache2 tests now use curl instead of wget.
    - d/p/use-curl-noproxy.patch: change heartbeat/http-mon.sh curl
      options to match the wget behavior.


Thanks for considering the patch.

*** /tmp/tmpemtfm_2f/resource-agents_1:4.15.1-1ubuntu1.debdiff
diff -Nru resource-agents-4.15.1/debian/patches/series resource-agents-4.15.1/debian/patches/series
--- resource-agents-4.15.1/debian/patches/series	2024-07-28 09:54:35.000000000 -0300
+++ resource-agents-4.15.1/debian/patches/series	2024-09-05 10:01:45.000000000 -0300
@@ -6,3 +6,4 @@
 gitignore.patch
 reproducible.patch
 var-run.patch
+use-curl-noproxy.patch
diff -Nru resource-agents-4.15.1/debian/patches/use-curl-noproxy.patch resource-agents-4.15.1/debian/patches/use-curl-noproxy.patch
--- resource-agents-4.15.1/debian/patches/use-curl-noproxy.patch	1969-12-31 21:00:00.000000000 -0300
+++ resource-agents-4.15.1/debian/patches/use-curl-noproxy.patch	2024-09-05 10:01:32.000000000 -0300
@@ -0,0 +1,21 @@
+Description: Change http-mon.sh curl options to match wget ones
+ Upstream moved curl to be de default http client, deprecating wget.
+ However, the curl options being used differ from the ones set for wget,
+ changing the behavior of the agents using the monitor when using one or
+ the other client.
+Author: Athos Ribeiro <athos.ribeiro at canonical.com>
+Forwarded: https://github.com/ClusterLabs/resource-agents/pull/1971
+Last-Update: 2024-09-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/heartbeat/http-mon.sh
++++ b/heartbeat/http-mon.sh
+@@ -22,7 +22,7 @@
+ 	curl_ipv6_opts="-g"
+ fi
+ WGETOPTS="-O- -q --no-proxy --bind-address=$bind_address"
+-CURLOPTS="-o - -Ss -L --interface lo $curl_ipv6_opts"
++CURLOPTS="-o - -Ss -L --noproxy '*' --interface $bind_address $curl_ipv6_opts"
+ 
+ request_url_header() {
+ 	which curl >/dev/null 2>&1
diff -Nru resource-agents-4.15.1/debian/tests/control resource-agents-4.15.1/debian/tests/control
--- resource-agents-4.15.1/debian/tests/control	2024-07-28 09:54:35.000000000 -0300
+++ resource-agents-4.15.1/debian/tests/control	2024-09-05 10:04:05.000000000 -0300
@@ -11,7 +11,7 @@
 Restrictions: needs-root, isolation-container
 
 Test-Command: debian/tests/run-ocft apache
-Depends: resource-agents, apache2, wget
+Depends: resource-agents, apache2, curl
 Restrictions: needs-root, isolation-container
 
 Test-Command: debian/tests/run-ocft mysql


-- 
Athos Ribeiro