Add timeout to requests in Shodan._request() #111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
reviewed
Nov 5, 2019
| @@ -294,13 +295,13 @@ def _request(self, function, params, service='shodan', method='get'): | |||
| try: | |||
| method = method.lower() | |||
| if method == 'post': | |||
| data = self._session.post(base_url + function, params) | |||
| data = self._session.post(base_url + function, params, timeout=REQUESTS_TIMEOUT) | |||
There was a problem hiding this comment.
I suggest to set the timeout on the session, that's easier (self._session.timeout = 30 or similar)
There was a problem hiding this comment.
I agree. I thought about speficying the timeout directly when the session object is created but it's no supported and there's no setter for it. I didn't think about assigning directly to the attribute. I'll do that.
There was a problem hiding this comment.
Nevermind, it doesn't work. The session object does not have a timeout attribute at all. The timeout is directly passed to the method.
There was a problem hiding this comment.
Uh, ok that seems to have worked previously, but not anymore.
Other solutions:
- A shim on the request: Feature Request: Add timeout to session psf/requests#2011 (comment)
- in intelmq we have our own TimeoutHTTPAdapter https://github.com/certtools/intelmq/blob/develop/intelmq/lib/utils.py#L692-L726
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I've noticed that when facing network problems (e.g. Wi-Fi connection dropped) Shodan may hang indefinitely without timing out. The code calling the Shodan library has no control over this and may be left hanging for a response.
According to the
requestsdocumentation requests should have a timeout:These changes define a
REQUESTS_TIMEOUTconstant which defines a connect and read timeout of 30 seconds each. These timeouts are applied to the_request()method of theShodanclass.