Merge remote-tracking branch 'origin/topic/bbannier/issue-23'

analyzer/ldap.spicy

@@ -578,9 +578,11 @@ public function string_representation(search_filter: SearchFilter): string {
     # The following FilterTypes are leaf nodes and can thus be represented in a statement
 
       case FilterType::FILTER_EXT: {
-        repr = "(%s:%s:=%s)" % (search_filter.FILTER_EXT.attributeDesc.decode(),
-                                search_filter.FILTER_EXT.assertionValueDecoded,
-                                search_filter.FILTER_EXT.matchValue.decode());
+        # For extended search filters the meaning of the individual fields in
+        # `DecodedAttributeValue` is slightly different.
+        repr = "(%s:%s:=%s)" % (search_filter.FILTER_EXT.assertionValueDecoded,
+                                search_filter.FILTER_EXT.attributeDesc.decode(),
+                                search_filter.FILTER_EXT.matchValue);
       }
       case FilterType::FILTER_APPROX: {
         repr = "(%s~=%s)" % (search_filter.FILTER_APPROX.attributeDesc.decode(),

tests/analyzer/functions.spicy

@@ -126,6 +126,6 @@ function test_string_representation() {
 
     local repr3 = make_nested_repr(vector("foo", "bar", "baz"));
     assert repr3 == "(|(|(foo=*)(bar=*))(baz=*))": repr3;
-#                   "(|(|(foo=*)(bar=*))(baz=*))"
 }
+
 test_string_representation();

tests/analyzer/search_filter_extended.zeek

@@ -0,0 +1,11 @@
+# Copyright (c) 2021 by the Zeek Project. See LICENSE for details.
+
+# @TEST-DOC: This test case is a regression test for #23.
+#
+# @TEST-EXEC: zeek -C -r ${TRACES}/ldap-issue-32.pcapng %INPUT
+# @TEST-EXEC: cat ldap_search.log | zeek-cut -C uid filter base_object > ldap_search.log2 && mv ldap_search.log2 ldap_search.log
+# @TEST-EXEC: btest-diff ldap_search.log
+#
+# @TEST-DOC: Test LDAP analyzer with small trace.
+
+@load analyzer

tests/baseline/analyzer.search_filter_extended/ldap_search.log

@@ -0,0 +1,12 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+### NOTE: This file has been sorted with diff-sort.
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	ldap_search
+#open XXXX-XX-XX-XX-XX-XX
+#fields	uid	filter	base_object
+#types	string	string	vector[string]
+#close XXXX-XX-XX-XX-XX-XX
+CHhAvVGS1DHFjwGM9	(departmentNumber:2.16.840.1.113730.3.3.2.46.1:=>=N4709)	DC=matrix\x2cDC=local

tests/traces/README

@@ -11,3 +11,5 @@ We collect them here for convenience only.
   - the LDAP flow selected (filtered out the Kerberos packets)
   - truncated to 10 packets (where packet 10 contains the SASL encrypted LDAP message)
   - one `\x30` byte in the cyphertext changed to `\x00`
+- ldap-issue-32.pcapng: Provided by GH user martinvanhensbergen,
+  <https://github.com/zeek/spicy-ldap/issues/23>