Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
MIME-Version: 1.0
In-Reply-To: 
 <CAKQ1sVOoqNkFW_XjgH+VDLnMnsa_HtBXJRfC4LJdW1rdKsbWwA@mail.gmail.com>
References: <6BAB910D-B843-413F-B0C5-1FFB208FBD06@reverze.net>
	<CAKQ1sVMackiKUhFSD6AcLLkwE2xz3NWXTHKkxtL4aci7ZSZ8Kw@mail.gmail.com>
	<CAKQ1sVOoqNkFW_XjgH+VDLnMnsa_HtBXJRfC4LJdW1rdKsbWwA@mail.gmail.com>
Date: Tue, 12 May 2015 13:46:29 +0200
Message-ID: 
 <CAKQ1sVPyseBZJ-N2a=89LZtJ9RVnWeKrrD98MQKZfszS6hkmgQ@mail.gmail.com>
Subject: Re: [users@httpd] mod_authz_dbd regression in apache 2.4.12?
From: Yann Ylavic <ylavic.dev@gmail.com>
To: httpd <dev@httpd.apache.org>
Cc: michel@reverze.net
Content-Type: multipart/mixed; boundary=089e012953809e793e0515e10b84

--089e012953809e793e0515e10b84
Content-Type: text/plain; charset=UTF-8

(CC'ing Michel, sorry for the resend, my initial omission)

On Tue, May 12, 2015 at 10:41 AM, Yann Ylavic <ylavic.dev@gmail.com> wrote:
> This as been raised on users@.
>
> ---------- Forwarded message ----------
> From: Yann Ylavic <ylavic.dev@gmail.com>
> Date: Tue, May 12, 2015 at 10:09 AM
>
> On Mon, May 11, 2015 at 10:54 PM, Michel Stam <michel@reverze.net> wrote:
>>
>> I was tinkering over the weekend with mod_authz_dbd and mysql, and i could not get a RequireAny/RequireAll to match on multiple Require dbd-group statements.
>> It would always match only the last result from the query, but once for every row in the resultset.
>>
>> Example:
>>         <LocationMatch "/(?<name>[^/]+)/">
>>                 <RequireAny>
>>                         Require         user %{env:MATCH_NAME}
>>                         Require         dbd-group %{env:MATCH_NAME}
>>                         Require         dbd-group Administrators
>>                 </RequireAny>
>>         </LocationMatch>
>>
>> After some searching, it appeared to me to be a regression of this:
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=46421
>
> The fix mentioned there is about APR's dbd (mysql) code but has never
> been pushed to a release (the bugzilla report is still open).
> As already discussed in [1] (with a simililar fix for mod_authn_dbd in
> [2]), I don't think it should be addressed in APR though (but in httpd
> as you and the OP of bugzilla #46421 proposed).
>
> There also seems to be other misuses of apr_dbd_get_entry() returned
> values in httpd, I'll start a thread on the dev@ mailing-list and
> propose a fix.
>
> [1] http://www.mail-archive.com/dev@apr.apache.org/msg26024.html
> [2] http://svn.apache.org/r1663647
>
> ---------- End of forwarded message ----------
>
> The issue is that apr_dbd_get_row()'s entries (usually pointed to by
> apr_dbd_get_entry(), depending on dbd though) get destroyed whenever
> apr_dbd_get_row() returns -1 (no more rows in iterative mode).
>
> This seem to be the case for several dbd systems implemented in APR,
> so I think we should take care of the entries' lifetime when used
> after an apr_dbd_get_row() loop.
> Thus, I think the attached patch should be applied, thoughts?
>
> PS: there are also APR dbd systems where the entries are duplicated on
> the apr_dbd_results' pool, so APR is not really consistent...

--089e012953809e793e0515e10b84
Content-Type: text/x-diff; charset=US-ASCII;
 name="httpd-trunk-dup_dbd_get_entry.patch"
Content-Disposition: attachment;
	filename="httpd-trunk-dup_dbd_get_entry.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_i9l92k831

SW5kZXg6IG1vZHVsZXMvYWFhL21vZF9hdXRoel9kYmQuYwo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBtb2R1bGVz
L2FhYS9tb2RfYXV0aHpfZGJkLmMJKHJldmlzaW9uIDE2Nzg3NjMpCisrKyBtb2R1bGVzL2FhYS9t
b2RfYXV0aHpfZGJkLmMJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw3ICsxNzQsOSBAQCBzdGF0aWMg
aW50IGF1dGh6X2RiZF9sb2dpbihyZXF1ZXN0X3JlYyAqciwgYXV0aHpfZAogICAgICAgICAgICAg
ICAgICAgICAgICAgICBhY3Rpb24sIHItPnVzZXIsIG1lc3NhZ2U/bWVzc2FnZTpub2Vycm9yKTsK
ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAobmV3dXJpID09IE5V
TEwpIHsKLSAgICAgICAgICAgICAgICAgICAgbmV3dXJpID0gYXByX2RiZF9nZXRfZW50cnkoZGJk
LT5kcml2ZXIsIHJvdywgMCk7CisgICAgICAgICAgICAgICAgICAgIG5ld3VyaSA9CisgICAgICAg
ICAgICAgICAgICAgICAgICBhcHJfcHN0cmR1cChyLT5wb29sLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgYXByX2RiZF9nZXRfZW50cnkoZGJkLT5kcml2ZXIsIHJvdywgMCkp
OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAvKiB3ZSBjYW4ndCBicmVhayBv
dXQgaGVyZSBvciByb3cgd29uJ3QgZ2V0IGNsZWFuZWQgdXAgKi8KICAgICAgICAgICAgIH0KQEAg
LTIwNCw3ICsyMDYsNiBAQCBzdGF0aWMgaW50IGF1dGh6X2RiZF9ncm91cF9xdWVyeShyZXF1ZXN0
X3JlYyAqciwgYQogICAgIGFwcl9kYmRfcHJlcGFyZWRfdCAqcXVlcnk7CiAgICAgYXByX2RiZF9y
ZXN1bHRzX3QgKnJlcyA9IE5VTEw7CiAgICAgYXByX2RiZF9yb3dfdCAqcm93ID0gTlVMTDsKLSAg
ICBjb25zdCBjaGFyICoqZ3JvdXA7CiAKICAgICBpZiAoY2ZnLT5xdWVyeSA9PSBOVUxMKSB7CiAg
ICAgICAgIGFwX2xvZ19yZXJyb3IoQVBMT0dfTUFSSywgQVBMT0dfRVJSLCAwLCByLCBBUExPR05P
KDAxNjQ5KQpAQCAtMjI0LDggKzIyNSw5IEBAIHN0YXRpYyBpbnQgYXV0aHpfZGJkX2dyb3VwX3F1
ZXJ5KHJlcXVlc3RfcmVjICpyLCBhCiAgICAgICAgICAgICAgcnYgIT0gLTE7CiAgICAgICAgICAg
ICAgcnYgPSBhcHJfZGJkX2dldF9yb3coZGJkLT5kcml2ZXIsIHItPnBvb2wsIHJlcywgJnJvdywg
LTEpKSB7CiAgICAgICAgICAgICBpZiAocnYgPT0gMCkgewotICAgICAgICAgICAgICAgIGdyb3Vw
ID0gYXByX2FycmF5X3B1c2goZ3JvdXBzKTsKLSAgICAgICAgICAgICAgICAqZ3JvdXAgPSBhcHJf
ZGJkX2dldF9lbnRyeShkYmQtPmRyaXZlciwgcm93LCAwKTsKKyAgICAgICAgICAgICAgICBBUFJf
QVJSQVlfUFVTSChncm91cHMsIGNvbnN0IGNoYXIgKikgPQorICAgICAgICAgICAgICAgICAgICBh
cHJfcHN0cmR1cChyLT5wb29sLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHJf
ZGJkX2dldF9lbnRyeShkYmQtPmRyaXZlciwgcm93LCAwKSk7CiAgICAgICAgICAgICB9CiAgICAg
ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICBtZXNzYWdlID0gYXByX2RiZF9lcnJvcihk
YmQtPmRyaXZlciwgZGJkLT5oYW5kbGUsIHJ2KTsKSW5kZXg6IG1vZHVsZXMvbWFwcGVycy9tb2Rf
cmV3cml0ZS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXMvbWFwcGVycy9tb2RfcmV3cml0ZS5jCShy
ZXZpc2lvbiAxNjc4NzYzKQorKysgbW9kdWxlcy9tYXBwZXJzL21vZF9yZXdyaXRlLmMJKHdvcmtp
bmcgY29weSkKQEAgLTEzODQsMTIgKzEzODQsMTQgQEAgc3RhdGljIGNoYXIgKmxvb2t1cF9tYXBf
ZGJkKHJlcXVlc3RfcmVjICpyLCBjaGFyICoKICAgICB3aGlsZSAoKHJ2ID0gYXByX2RiZF9nZXRf
cm93KGRiLT5kcml2ZXIsIHItPnBvb2wsIHJlcywgJnJvdywgLTEpKSA9PSAwKSB7CiAgICAgICAg
ICsrbjsKICAgICAgICAgaWYgKHJldCA9PSBOVUxMKSB7Ci0gICAgICAgICAgICByZXQgPSBhcHJf
ZGJkX2dldF9lbnRyeShkYi0+ZHJpdmVyLCByb3csIDApOworICAgICAgICAgICAgcmV0ID0gYXBy
X3BzdHJkdXAoci0+cG9vbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9kYmRf
Z2V0X2VudHJ5KGRiLT5kcml2ZXIsIHJvdywgMCkpOwogICAgICAgICB9CiAgICAgICAgIGVsc2Ug
ewogICAgICAgICAgICAgLyogcmFuZG9taXNlIGNydWRlbHkgYW1vbmdzdCBtdWx0aXBsZSByZXN1
bHRzICovCiAgICAgICAgICAgICBpZiAoKGRvdWJsZSlyYW5kKCkgPCAoZG91YmxlKVJBTkRfTUFY
Lyhkb3VibGUpbikgewotICAgICAgICAgICAgICAgIHJldCA9IGFwcl9kYmRfZ2V0X2VudHJ5KGRi
LT5kcml2ZXIsIHJvdywgMCk7CisgICAgICAgICAgICAgICAgcmV0ID0gYXByX3BzdHJkdXAoci0+
cG9vbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHJfZGJkX2dldF9lbnRy
eShkYi0+ZHJpdmVyLCByb3csIDApKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0K
QEAgLTE0MDIsMTEgKzE0MDQsMTEgQEAgc3RhdGljIGNoYXIgKmxvb2t1cF9tYXBfZGJkKHJlcXVl
c3RfcmVjICpyLCBjaGFyICoKICAgICBjYXNlIDA6CiAgICAgICAgIHJldHVybiBOVUxMOwogICAg
IGNhc2UgMToKLSAgICAgICAgcmV0dXJuIGFwcl9wc3RyZHVwKHItPnBvb2wsIHJldCk7CisgICAg
ICAgIHJldHVybiByZXQ7CiAgICAgZGVmYXVsdDoKICAgICAgICAgLyogd2hhdCdzIGEgZmFpciBy
ZXdyaXRlbG9nIGxldmVsIGZvciB0aGlzPyAqLwogICAgICAgICByZXdyaXRlbG9nKChyLCAzLCBO
VUxMLCAiTXVsdGlwbGUgdmFsdWVzIGZvdW5kIGZvciAlcyIsIGtleSkpOwotICAgICAgICByZXR1
cm4gYXByX3BzdHJkdXAoci0+cG9vbCwgcmV0KTsKKyAgICAgICAgcmV0dXJuIHJldDsKICAgICB9
CiB9CiAKSW5kZXg6IG1vZHVsZXMvc2Vzc2lvbi9tb2Rfc2Vzc2lvbl9kYmQuYwo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBtb2R1bGVzL3Nlc3Npb24vbW9kX3Nlc3Npb25fZGJkLmMJKHJldmlzaW9uIDE2Nzg3NjMp
CisrKyBtb2R1bGVzL3Nlc3Npb24vbW9kX3Nlc3Npb25fZGJkLmMJKHdvcmtpbmcgY29weSkKQEAg
LTEzOCw3ICsxMzgsOCBAQCBzdGF0aWMgYXByX3N0YXR1c190IGRiZF9sb2FkKHJlcXVlc3RfcmVj
ICogciwgY29ucwogICAgICAgICAgICAgcmV0dXJuIEFQUl9FR0VORVJBTDsKICAgICAgICAgfQog
ICAgICAgICBpZiAoKnZhbCA9PSBOVUxMKSB7Ci0gICAgICAgICAgICAqdmFsID0gYXByX2RiZF9n
ZXRfZW50cnkoZGJkLT5kcml2ZXIsIHJvdywgMCk7CisgICAgICAgICAgICAqdmFsID0gYXByX3Bz
dHJkdXAoci0+cG9vbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHJfZGJkX2dl
dF9lbnRyeShkYmQtPmRyaXZlciwgcm93LCAwKSk7CiAgICAgICAgIH0KICAgICAgICAgLyogd2Ug
Y2FuJ3QgYnJlYWsgb3V0IGhlcmUgb3Igcm93IHdvbid0IGdldCBjbGVhbmVkIHVwICovCiAgICAg
fQo=
--089e012953809e793e0515e10b84--