This repository has been archived by the owner on Apr 26, 2021. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for contributing! But first: did you read our community guidelines?
https://cuckoo.sh/docs/introduction/community.html
What I have added/changed is:
cuckoo.core.resultserver
handled vanillaException
s which are not guaranteed to have theerrno
attribute.EnvironmentError
exceptions will have theerrno
attribute. The only exception thatSocketServer
should throw is asocket.error
which is a subclass ofIOError
which is a subclass ofEnvironmentError
. So, changing the exception type of this try/except block is sufficient to solve this problem.The goal of my change is:
Fix for #2270
What I have tested about my change is:
Starting the resultserver with bogus parameters to force the exception.
I'd like input on:
Non-
EnvironmentError
exceptions currently are unhandled as they should not be generated by normal operation ofSocketServer.ThreadingTCPServer.__init__
. We may want to consider adding a genericexcept Exception as e
branch that raises aCuckooCriticalError
in case the raised exception is not a subclass ofEnvironmentError
.