-
-
Notifications
You must be signed in to change notification settings - Fork 139
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.
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
fix - kill network capture process if any container is killed #361
Conversation
core/load.py
Outdated
@@ -362,13 +362,16 @@ def wait_until_interrupt(virtual_machine_container_reset_factory_time_seconds, c | |||
# start containers based on selected modules | |||
start_containers(configuration) | |||
if not new_network_events_thread.is_alive(): | |||
return error(messages["interrupt_application"]) | |||
error(messages["interrupt_application"]) | |||
return True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return in a while loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Return error("")
Is returning None
So we need to return True in failing cases
We can break the while loop and at the end return True
What say @dhirensr ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can't use break there. sounds like a use case for break?
core/load.py
Outdated
@@ -884,6 +887,9 @@ def load_honeypot_engine(): | |||
) | |||
# killed the network traffic capture process by ctrl + c... waiting to end. | |||
info(messages["killing_capture_process"]) | |||
if exit_flag: | |||
# Terminate the network capture process | |||
network_traffic_capture_process.terminate() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should do the job right without the above changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nopes, we need a exit flag value which denotes this has exited
@dhirensr check now |
Description
Fix network thread issue
Issue is network thread is not terminating after an error
to reproduce the issue, run a module, and then kill the container with docker kill container_name. OHP is expected to exit from working and throw an error, but the network thread stays open and it's not terminating.
Steps to Reproduce
Related Issue
#359
Screenshots (if appropriate):
After killing the container the network capture process terminates successfully.
Types of changes
Checklist