From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 8 Dec 2011 11:13:29 +0000 (-0700)
Subject: Bug 3442: assertion failed: external_acl.cc:908: ch->auth_user_request != NULL
X-Git-Tag: SQUID_3_1_19~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32732b94feafcf138bd980d213730936deb33262;p=thirdparty%2Fsquid.git

Bug 3442: assertion failed: external_acl.cc:908: ch->auth_user_request != NULL

External ACL sometimes cannot find the credentials in ACL Checklist even
if they are attached to the HTTPRequest object.

This seems to happen when the checklist is created and the line match
started before the credentials are known. The credentials validation
updates the HTTP request state but is not aware of ACL checklists needing
to be updated so it never happens.

This patch:
* locate the %LOGIN value from either place where credentials can be found,
* updates the checklist if it was unset,
* passes '-' to the helper if no credentials at all were given.

Although the earlier logics forcing a lookup means this '-' case should
not happen it might if the external ACL were processed in 'fast' check.
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index c91339f8a4..37d0d60a37 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -838,8 +838,13 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
         switch (format->type) {
 
         case _external_acl_format::EXT_ACL_LOGIN:
-            assert (ch->auth_user_request);
-            str = ch->auth_user_request->username();
+            // if this ACL line was the cause of credentials fetch
+            // they may not already be in the checklist
+            if (ch->auth_user_request == NULL && ch->request)
+                ch->auth_user_request = ch->request->auth_user_request;
+
+            if (ch->auth_user_request != NULL)
+                str = ch->auth_user_request->username();
             break;
 #if USE_IDENT