Fix client_connection_mark handling of clientless transactions (#312)

Also affects the deprecated clientside_mark ACL.

Broken since CONNMARK matching was added in commit 653d992.

diff --git a/src/acl/ConnMark.cc b/src/acl/ConnMark.cc
index 5a62e6f36a6b7a156965cf1028c8b94eccb46e5d..d5b0b3449b511b71d8b2873ea4c82852e1611d6d 100644 (file)
--- a/src/acl/ConnMark.cc
+++ b/src/acl/ConnMark.cc
@@ -74,15 +74,22 @@ int
 Acl::ConnMark::match(ACLChecklist *cl)
 {
     const auto *checklist = Filled(cl);
-    const auto connmark = checklist->conn()->clientConnection->nfmark;
+    const auto conn = checklist->conn();
 
-    for (const auto &m : marks) {
-        if ((connmark & m.second) == m.first) {
-            debugs(28, 5, "found " << m << " matching " << asHex(connmark));
-            return 1;
+    if (conn && conn->clientConnection) {
+        const auto connmark = conn->clientConnection->nfmark;
+
+        for (const auto &m : marks) {
+            if ((connmark & m.second) == m.first) {
+                debugs(28, 5, "found " << m << " matching " << asHex(connmark));
+                return 1;
+            }
+            debugs(28, 7, "skipped " << m << " mismatching " << asHex(connmark));
         }
-        debugs(28, 7, "skipped " << m << " mismatching " << asHex(connmark));
+    } else {
+        debugs(28, 7, "fails: no client connection");
     }
+
     return 0;
 }