Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/awelzel/3099-fix-and-extend-socks5-sig'

Browse source 
* origin/topic/awelzel/3099-fix-and-extend-socks5-sig:
  socks/dpd: Add newer auth methods
  socks/dpd: Fix socks5_server side signature

(cherry picked from commit c389d9804b)
This commit is contained in:
Tim Wojtulewicz 2023-06-12 10:56:55 -07:00
parent e41a5c3a93
commit b34e70e6cd
7 changed files with 63 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/Baseline/scripts.base.protocols.socks.socks-auth-10080/conn.log.cut Normal file
View file

@ -0,0 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
id.orig_h id.orig_p id.resp_h id.resp_p service history
192.168.0.2 55951 192.168.0.1 10080 socks ShADad
192.168.0.1 55951 192.168.0.2 22 - ShA

3
testing/btest/Baseline/scripts.base.protocols.socks.socks-auth-10080/socks.log.cut Normal file
View file

@ -0,0 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
id.orig_h id.orig_p id.resp_h id.resp_p version status bound.host bound.name bound_p
192.168.0.2 55951 192.168.0.1 10080 5 succeeded 192.168.0.1 - 55951

BIN
testing/btest/Traces/socks-auth-10080.pcap Normal file
View file

Binary file not shown.

11
testing/btest/scripts/base/protocols/socks/socks-auth-10080.zeek Normal file
View file

@ -0,0 +1,11 @@
# @TEST-DOC: Socks V5 over a non-standard port.
# @TEST-EXEC: zeek -r $TRACES/socks-auth-10080.pcap %INPUT
# @TEST-EXEC: zeek-cut -m id.orig_h id.orig_p id.resp_h id.resp_p service history < conn.log > conn.log.cut
# @TEST-EXEC: zeek-cut -m id.orig_h id.orig_p id.resp_h id.resp_p version status bound.host bound.name bound_p < socks.log > socks.log.cut
# @TEST-EXEC: btest-diff conn.log.cut
# @TEST-EXEC: btest-diff socks.log.cut
@load base/protocols/socks
redef SOCKS::default_capture_password = T;