From 4653ed1d47ed98b2c77d69c4d457e424adac719a Mon Sep 17 00:00:00 2001 From: Anders Kvist <63245933+KvistA-ELS@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:53:27 +0200 Subject: [PATCH 1/6] Checking for apxs in /usr/bin/apxs (CentOS 8 + Amazon Linux 2) --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 003421d..a9e22f6 100644 --- a/configure.ac +++ b/configure.ac @@ -61,10 +61,12 @@ AC_CHECK_FILE([/usr/local/apache2/conf/httpd.conf], [HTTPD_CONF="/usr/local/apac AC_SUBST([HTTPD_CONF]) AC_CHECK_FILE([/usr/local/apache2/bin/apxs], [APXS="/usr/local/apache2/bin/apxs"], [ - AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [ - AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [ - AC_CHECK_FILE([/usr/sbin/apxs2], [APXS="/usr/sbin/apxs2"], [ - AC_MSG_ERROR([Could not locate Apache apxs binary]) + AC_CHECK_FILE([/usr/bin/apxs], [APXS="/usr/bin/apxs"], [ + AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [ + AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [ + AC_CHECK_FILE([/usr/sbin/apxs2], [APXS="/usr/sbin/apxs2"], [ + AC_MSG_ERROR([Could not locate Apache apxs binary]) + ]) ]) ]) ]) From 5d83d8134e6f4b84aebfb7b94921797fd0e6bc20 Mon Sep 17 00:00:00 2001 From: Anders Kvist <63245933+KvistA-ELS@users.noreply.github.com> Date: Tue, 6 Apr 2021 12:20:02 +0200 Subject: [PATCH 2/6] Update spec with correct path for apxs binary. --- packages/mod_authnz_crowd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mod_authnz_crowd.spec b/packages/mod_authnz_crowd.spec index cdd93fe..8ccf2ee 100644 --- a/packages/mod_authnz_crowd.spec +++ b/packages/mod_authnz_crowd.spec @@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %post -/usr/sbin/apxs -e -a -n authnz_crowd mod_authnz_crowd.so +/usr/bin/apxs -e -a -n authnz_crowd mod_authnz_crowd.so cat << END > /tmp/httpd.conf.sed /^[ \t]*[Ll][Oo][Aa][Dd][Mm][Oo][Dd][Uu][Ll][Ee][ \t]\+authz_svn_module[ \t]/ { s/^/# / @@ -56,7 +56,7 @@ sed -i.bak -f /tmp/httpd.conf.sed /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/* /usr/sbin/apachectl graceful || true %preun -/usr/sbin/apxs -e -A -n authnz_crowd mod_authnz_crowd.so +/usr/bin/apxs -e -A -n authnz_crowd mod_authnz_crowd.so cat << END > /tmp/httpd.conf.sed /^[ \t]*[Ll][Oo][Aa][Dd][Mm][Oo][Dd][Uu][Ll][Ee][ \t]\+authz_svn_crowd_module[ \t]/ { s/^/# / From e4ab9adeb738d8251862fcbe32315a4fa81364b7 Mon Sep 17 00:00:00 2001 From: Anders Kvist Date: Wed, 6 Oct 2021 16:16:23 +0200 Subject: [PATCH 3/6] Attempting to force HTTP/1.1 --- src/crowd_client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crowd_client.c b/src/crowd_client.c index 9a42acf..d1149a2 100644 --- a/src/crowd_client.c +++ b/src/crowd_client.c @@ -544,7 +544,8 @@ static int crowd_request(const request_rec *r, const crowd_config *config, bool || (post && (curl_easy_setopt(curl_easy, CURLOPT_POST, 1) || curl_easy_setopt(curl_easy, CURLOPT_READFUNCTION, read_crowd_authentication_request) || curl_easy_setopt(curl_easy, CURLOPT_READDATA, &read_data) - || curl_easy_setopt(curl_easy, CURLOPT_POSTFIELDSIZE, read_data.remaining)))) { + || curl_easy_setopt(curl_easy, CURLOPT_POSTFIELDSIZE, read_data.remaining) + || curl_easy_setopt(curl_easy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1)))) { ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, "Failed to set curl options."); success = false; } From b115816ac7eb4d7f8f758a4beb70ac02c3072991 Mon Sep 17 00:00:00 2001 From: Anders Kvist Date: Wed, 6 Oct 2021 17:00:47 +0200 Subject: [PATCH 4/6] Moving HTTP version out of 'hidden' case. --- src/crowd_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crowd_client.c b/src/crowd_client.c index d1149a2..9d68938 100644 --- a/src/crowd_client.c +++ b/src/crowd_client.c @@ -529,6 +529,7 @@ static int crowd_request(const request_rec *r, const crowd_config *config, bool || curl_easy_setopt(curl_easy, CURLOPT_WRITEFUNCTION, write_response) || curl_easy_setopt(curl_easy, CURLOPT_WRITEDATA, &write_data) || curl_easy_setopt(curl_easy, CURLOPT_URL, url) + || curl_easy_setopt(curl_easy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1) #ifdef CURLOPT_USERNAME || curl_easy_setopt(curl_easy, CURLOPT_USERNAME, config->crowd_app_name) || curl_easy_setopt(curl_easy, CURLOPT_PASSWORD, config->crowd_app_password) @@ -544,8 +545,7 @@ static int crowd_request(const request_rec *r, const crowd_config *config, bool || (post && (curl_easy_setopt(curl_easy, CURLOPT_POST, 1) || curl_easy_setopt(curl_easy, CURLOPT_READFUNCTION, read_crowd_authentication_request) || curl_easy_setopt(curl_easy, CURLOPT_READDATA, &read_data) - || curl_easy_setopt(curl_easy, CURLOPT_POSTFIELDSIZE, read_data.remaining) - || curl_easy_setopt(curl_easy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1)))) { + || curl_easy_setopt(curl_easy, CURLOPT_POSTFIELDSIZE, read_data.remaining)))) { ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, "Failed to set curl options."); success = false; } From 21baefd5b1f2475ebc6c932416c3afb600afb562 Mon Sep 17 00:00:00 2001 From: Anders Kvist <63245933+KvistA-ELS@users.noreply.github.com> Date: Wed, 6 Oct 2021 19:21:14 +0200 Subject: [PATCH 5/6] Update mod_authnz_crowd.spec --- packages/mod_authnz_crowd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mod_authnz_crowd.spec b/packages/mod_authnz_crowd.spec index 8ccf2ee..cdd93fe 100644 --- a/packages/mod_authnz_crowd.spec +++ b/packages/mod_authnz_crowd.spec @@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %post -/usr/bin/apxs -e -a -n authnz_crowd mod_authnz_crowd.so +/usr/sbin/apxs -e -a -n authnz_crowd mod_authnz_crowd.so cat << END > /tmp/httpd.conf.sed /^[ \t]*[Ll][Oo][Aa][Dd][Mm][Oo][Dd][Uu][Ll][Ee][ \t]\+authz_svn_module[ \t]/ { s/^/# / @@ -56,7 +56,7 @@ sed -i.bak -f /tmp/httpd.conf.sed /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/* /usr/sbin/apachectl graceful || true %preun -/usr/bin/apxs -e -A -n authnz_crowd mod_authnz_crowd.so +/usr/sbin/apxs -e -A -n authnz_crowd mod_authnz_crowd.so cat << END > /tmp/httpd.conf.sed /^[ \t]*[Ll][Oo][Aa][Dd][Mm][Oo][Dd][Uu][Ll][Ee][ \t]\+authz_svn_crowd_module[ \t]/ { s/^/# / From 408e40da72c6d0641d0e33e8b46d09c4a48147d8 Mon Sep 17 00:00:00 2001 From: Anders Kvist <63245933+KvistA-ELS@users.noreply.github.com> Date: Wed, 6 Oct 2021 19:22:37 +0200 Subject: [PATCH 6/6] Update configure.ac --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a9e22f6..003421d 100644 --- a/configure.ac +++ b/configure.ac @@ -61,12 +61,10 @@ AC_CHECK_FILE([/usr/local/apache2/conf/httpd.conf], [HTTPD_CONF="/usr/local/apac AC_SUBST([HTTPD_CONF]) AC_CHECK_FILE([/usr/local/apache2/bin/apxs], [APXS="/usr/local/apache2/bin/apxs"], [ - AC_CHECK_FILE([/usr/bin/apxs], [APXS="/usr/bin/apxs"], [ - AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [ - AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [ - AC_CHECK_FILE([/usr/sbin/apxs2], [APXS="/usr/sbin/apxs2"], [ - AC_MSG_ERROR([Could not locate Apache apxs binary]) - ]) + AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [ + AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [ + AC_CHECK_FILE([/usr/sbin/apxs2], [APXS="/usr/sbin/apxs2"], [ + AC_MSG_ERROR([Could not locate Apache apxs binary]) ]) ]) ])