Merge branch 'master' of https://github.com/progmboy/zeek

* 'master' of https://github.com/progmboy/zeek:
  fix http AUTHORIZATION base64 decode failed

Added a test during merge.

CHANGES

@@ -1,3 +1,7 @@
+6.1.0-dev.118 | 2023-06-27 18:17:40 +0200
+
+  * fix http AUTHORIZATION base64 decode failed (progmboy)
+
 6.1.0-dev.115 | 2023-06-21 17:45:35 -0700
 
   * formatters/JSON: Make JSON::NullDoubleWriter use zeek::json::detail version (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-6.1.0-dev.115
+6.1.0-dev.118

scripts/base/protocols/http/main.zeek

@@ -290,7 +290,7 @@ event http_header(c: connection, is_orig: bool, name: string, value: string) &pr
 			{
 			if ( /^[bB][aA][sS][iI][cC] / in value )
 				{
-				local userpass = decode_base64_conn(c$id, sub(value, /[bB][aA][sS][iI][cC][[:blank:]]/, ""));
+				local userpass = decode_base64_conn(c$id, sub(value, /[bB][aA][sS][iI][cC][[:blank:]]+/, ""));
 				local up = split_string(userpass, /:/);
 				if ( |up| >= 2 )
 					{

testing/btest/Baseline/scripts.base.protocols.http.http-basic-auth-extra-space/http.log

@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	http
+#open XXXX-XX-XX-XX-XX-XX
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	trans_depth	method	host	uri	referrer	version	user_agent	origin	request_body_len	response_body_len	status_code	status_msg	info_code	info_msg	tags	username	password	proxied	orig_fuids	orig_filenames	orig_mime_types	resp_fuids	resp_filenames	resp_mime_types
+#types	time	string	addr	port	addr	port	count	string	string	string	string	string	string	string	count	count	count	string	count	string	set[enum]	string	string	set[string]	vector[string]	vector[string]	vector[string]	vector[string]	vector[string]	vector[string]
+XXXXXXXXXX.XXXXXX	CUM0KZ3MLUfNB0cl11	172.24.133.205	43090	172.24.133.205	8000	1	GET	172.24.133.205:8000	/	-	1.0	python-requests/2.31.0	-	0	643	200	OK	-	-	(empty)	test	1234	-	-	-	-	F2yF2x2UFyYsb6poSc	-	text/html
+#close XXXX-XX-XX-XX-XX-XX

testing/btest/scripts/base/protocols/http/http-basic-auth-extra-space.zeek

@@ -0,0 +1,8 @@
+# Authorization: Basic is followed by two spaces rather than one.
+#
+# @TEST-EXEC: zeek -b -Cr $TRACES/http/basic-auth-with-extra-space.trace %INPUT
+# @TEST-EXEC: btest-diff http.log
+
+@load base/protocols/http
+
+redef HTTP::default_capture_password = T;