Skip to content

traffic_dump: add nullptr check for sni string #6700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinrich merged 1 commit into from
Apr 23, 2020
Merged

traffic_dump: add nullptr check for sni string #6700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions plugins/experimental/traffic_dump/traffic_dump.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,16 @@ global_ssn_handler(TSCont contp, TSEvent event, void *edata)
TSDebug(PLUGIN_NAME, "global_ssn_handler(): Ignore non-HTTPS session %" PRId64 "...", id);
break;
}
const std::string sni = SSL_get_servername(ssl_obj, TLSEXT_NAMETYPE_host_name);
if (sni != sni_filter) {
TSDebug(PLUGIN_NAME, "global_ssn_handler(): Ignore HTTPS session with non-filtered SNI: %s", sni.c_str());
const char *sni_ptr = SSL_get_servername(ssl_obj, TLSEXT_NAMETYPE_host_name);
if (sni_ptr == nullptr) {
TSDebug(PLUGIN_NAME, "global_ssn_handler(): Ignore HTTPS session with non-existent SNI.");
break;
} else {
const std::string sni{sni_ptr};
if (sni != sni_filter) {
TSDebug(PLUGIN_NAME, "global_ssn_handler(): Ignore HTTPS session with non-filtered SNI: %s", sni.c_str());
break;
}
}
}
const auto this_session_count = session_counter++;
Expand Down
7 changes: 7 additions & 0 deletions tests/gold_tests/pluginTest/traffic_dump/gold/200_bob_no_sni.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
``
> GET / HTTP/2
> Host: bob--cert
``
< HTTP/2 200
< content-length: 0
``
19 changes: 17 additions & 2 deletions tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,17 @@
replay_file_session_2 = os.path.join(replay_dir, "127", "0000000000000001")
ts.Disk.File(replay_file_session_2, exists=False)

# The third session should also be filtered out because it doesn't have any
# SNI (note exists is set to False).
replay_file_session_2 = os.path.join(replay_dir, "127", "0000000000000002")
ts.Disk.File(replay_file_session_2, exists=False)

#
# Test 1: Verify dumping a session with the desired SNI and not dumping
# the session with the other SNI.
#

# Execute the first transaction.
# Execute the first transaction with an SNI of bob.
tr = Test.AddTestRun("Verify dumping of a session with the filtered SNI")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-foo.key")
Expand All @@ -121,7 +126,7 @@
tr.StillRunningAfter = server
tr.StillRunningAfter = ts

# Execute the second transaction.
# Execute the second transaction with an SNI of dave.
tr = Test.AddTestRun("Verify that a session of a different SNI is not dumped.")
tr.Processes.Default.Command = \
('curl --tls-max 1.2 -k -H"Host: dave" --resolve "dave:{0}:127.0.0.1" '
Expand All @@ -131,6 +136,16 @@
tr.StillRunningAfter = server
tr.StillRunningAfter = ts

# Execute the third transaction without any SNI.
tr = Test.AddTestRun("Verify that a session of a non-existent SNI is not dumped.")
tr.Processes.Default.Command = \
('curl --tls-max 1.2 -k -H"Host: bob"'
'--cert ./signed-foo.pem --key ./signed-foo.key --verbose https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/200_bob_no_sni.gold"
tr.StillRunningAfter = server
tr.StillRunningAfter = ts

# Verify the properties of the replay file for the dumped transaction.
tr = Test.AddTestRun("Verify the json content of the first session")
verify_replay = "verify_replay.py"
Expand Down