diff --git a/SOURCES/Downgrade-missing-auth-headers-ERROR-to-INFO.patch b/SOURCES/Downgrade-missing-auth-headers-ERROR-to-INFO.patch new file mode 100644 index 0000000..53175c9 --- /dev/null +++ b/SOURCES/Downgrade-missing-auth-headers-ERROR-to-INFO.patch @@ -0,0 +1,49 @@ +From e2515cdeae0f6693c04d4569644892c3fd5eebe6 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Thu, 2 Nov 2017 13:30:57 -0400 +Subject: [PATCH] Downgrade missing auth headers ERROR to INFO + +Signed-off-by: Robbie Harwood +Reviewed-by: Simo Sorce +Resolves: #155 +Merges: #156 +(cherry picked from commit 07b0d3c568b8086fcf1558e9b1745df99bb15081) +--- + src/mod_auth_gssapi.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c +index c2dd039..1717837 100644 +--- a/src/mod_auth_gssapi.c ++++ b/src/mod_auth_gssapi.c +@@ -91,6 +91,19 @@ static const char *mag_err_text(enum mag_err_code err) + } + } + ++static void mag_post_info(request_rec *req, struct mag_config *cfg, ++ enum mag_err_code err, const char *msg) ++{ ++ const char *text = NULL; ++ ++ if (cfg->enverrs) { ++ mag_publish_error(req, 0, 0, text ? text : msg, mag_err_text(err)); ++ } ++ ++ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, req, "%s %s", mag_err_text(err), ++ text ? text : msg); ++} ++ + static void mag_post_error(request_rec *req, struct mag_config *cfg, + enum mag_err_code err, uint32_t maj, uint32_t min, + const char *msg) +@@ -957,8 +970,8 @@ static int mag_auth(request_rec *req) + + /* We can proceed only if we do have an auth header */ + if (!auth_header) { +- mag_post_error(req, cfg, MAG_NO_AUTH, 0, 0, +- "Client did not send any authentication headers"); ++ mag_post_info(req, cfg, MAG_NO_AUTH, ++ "Client did not send any authentication headers"); + goto done; + } + diff --git a/SOURCES/Fix-integer-sizes-used-with-ap_set_flag_slot.patch b/SOURCES/Fix-integer-sizes-used-with-ap_set_flag_slot.patch new file mode 100644 index 0000000..7738134 --- /dev/null +++ b/SOURCES/Fix-integer-sizes-used-with-ap_set_flag_slot.patch @@ -0,0 +1,40 @@ +From 928583704a51ce447a2196a324238beb6f86e5d7 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Tue, 19 Feb 2019 13:55:12 -0500 +Subject: [PATCH] Fix integer sizes used with ap_set_flag_slot() + +ap_set_flag_slot() requires a field of type `int`. Previously we +passed type `bool` in two places, causing test failures on s390x +because logging was not correctly configured. + +Signed-off-by: Robbie Harwood +(cherry picked from commit f89b876be5619d750e6ab4ea6e730a9a26b1cac4) +(cherry picked from commit 73c690ca9bd1d470c603f5e1ee48d2384941ae55) +(cherry picked from commit d681fe586a4f4258c5d61237511dd19c1fa84904) +[rharwood@redhat.com: fuzz around required_na_expr] +--- + src/mod_auth_gssapi.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mod_auth_gssapi.h b/src/mod_auth_gssapi.h +index 2ea52a3..42784c2 100644 +--- a/src/mod_auth_gssapi.h ++++ b/src/mod_auth_gssapi.h +@@ -81,7 +81,7 @@ struct mag_config { + gid_t deleg_ccache_gid; + gss_key_value_set_desc *cred_store; + bool deleg_ccache_unique; +- bool s4u2self; ++ int s4u2self; + char *ccname_envvar; + #endif + struct seal_key *mag_skey; +@@ -91,7 +91,7 @@ struct mag_config { + gss_OID_set_desc *basic_mechs; + bool negotiate_once; + struct mag_name_attributes *name_attributes; +- bool enverrs; ++ int enverrs; + gss_name_t acceptor_name; + }; + diff --git a/SOURCES/Handle-extra-large-NSS-entries.patch b/SOURCES/Handle-extra-large-NSS-entries.patch index 90d2124..249a0e0 100644 --- a/SOURCES/Handle-extra-large-NSS-entries.patch +++ b/SOURCES/Handle-extra-large-NSS-entries.patch @@ -12,9 +12,9 @@ Closes #152 [rharwood@redhat.com: conflicts due to no lex/yacc stuff yet] --- src/Makefile.am | 2 +- - src/mod_auth_gssapi.c | 26 +++++++------------- + src/mod_auth_gssapi.c | 26 ++++++----------- src/mod_auth_gssapi.h | 2 ++ - src/util.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/util.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 src/util.c diff --git a/SPECS/mod_auth_gssapi.spec b/SPECS/mod_auth_gssapi.spec index d2701ad..ca19524 100644 --- a/SPECS/mod_auth_gssapi.spec +++ b/SPECS/mod_auth_gssapi.spec @@ -1,6 +1,6 @@ Name: mod_auth_gssapi Version: 1.5.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: A GSSAPI Authentication module for Apache Group: System Environment/Daemons @@ -13,6 +13,8 @@ Patch1: Allow-admins-to-selectively-suppress-negotiation.patch Patch2: Fix-strtol-error-checking.patch Patch3: Handle-extra-large-NSS-entries.patch Patch4: Document-gssapi-no-negotiate.patch +Patch5: Fix-integer-sizes-used-with-ap_set_flag_slot.patch +Patch6: Downgrade-missing-auth-headers-ERROR-to-INFO.patch BuildRequires: httpd-devel, krb5-devel, openssl-devel, autoconf, automake, libtool Requires: httpd-mmn = %{_httpd_mmn} @@ -29,6 +31,8 @@ SPNEGO based HTTP Authentication protocol defined in RFC4559. %patch2 -p1 -b .Fix-strtol-error-checking %patch3 -p1 -b .Handle-extra-large-NSS-entries %patch4 -p1 -b .Document-gssapi-no-negotiate +%patch5 -p1 -b .Fix-integer-sizes-used-with-ap_set_flag_slot +%patch6 -p1 -b .Downgrade-missing-auth-headers-ERROR-to-INFO %build export APXS=%{_httpd_apxs} @@ -54,6 +58,14 @@ install -m 644 10-auth_gssapi.conf %{buildroot}%{_httpd_modconfdir} %{_httpd_moddir}/mod_auth_gssapi.so %changelog +* Mon Apr 06 2020 Robbie Harwood - 1.5.1-7 +- Downgrade missing auth headers ERROR to INFO +- Resolves: #1567223 + +* Mon Apr 06 2020 Robbie Harwood - 1.5.1-6 +- Fix integer sizes used with ap_set_flag_slot() +- Resolves: #1678873 + * Fri Oct 27 2017 Robbie Harwood - 1.5.1-5 - Document gssapi-no-negotiate - Resolves: #1309041