From 6fa32cdfe90d54352e9f00c291471e3d9e323644 Mon Sep 17 00:00:00 2001 From: dmitry pervushin Date: Tue, 22 Nov 2016 20:32:02 +0100 Subject: [PATCH] new file, params.py params.py contains variables to control requests behaviour: - timeout (defaulted to 10 seconds) - verifySSL (default is True, strict checking) --- synolopy/cgi.py | 12 +++++++----- synolopy/devices.py | 5 ++++- synolopy/params.py | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 synolopy/params.py diff --git a/synolopy/cgi.py b/synolopy/cgi.py index 79431cc..9a13c6a 100644 --- a/synolopy/cgi.py +++ b/synolopy/cgi.py @@ -5,9 +5,7 @@ from urllib import urlencode from synolopy.errors import * - - -TIMEOUT = 10 +import synolopy.params # ------------------------------------------------------------------------------ @@ -145,9 +143,13 @@ def request(self, method, **kwargs): 'has been defined' % node.path() ) session = manager.session(node) or manager.credentials(node) - return requests.get(url, cookies=session, timeout=TIMEOUT) + return requests.get(url, cookies=session, \ + timeout=synolopy.params.timeout, \ + verify = synolopy.params.verifySSL) else: - return requests.get(url, timeout=TIMEOUT) + return requests.get(url, \ + timeout=synolopy.params.timeout, \ + verify = synolopy.params.verifySSL) # ------------------------------------------------------------------------------ diff --git a/synolopy/devices.py b/synolopy/devices.py index 09e7a01..346cd4a 100644 --- a/synolopy/devices.py +++ b/synolopy/devices.py @@ -2,6 +2,7 @@ from synolopy.cgi import CGIFactory, SessionManager, ValidationManager from synolopy.errors import API_ERROR, SynologyException +import synolopy.params class _NasValidationManager(ValidationManager): @@ -31,7 +32,9 @@ def credentials(self, node): account=self.login, passwd=self.password, session=node.path()[:-1], format='cookie') - resp = requests.get(url, timeout=10, ) + resp = requests.get(url, \ + timeout=synolopy.params.timeout,\ + verify=synolopy.params.verifySSL ) cookie = _NasValidationManager.validate(resp) sid = dict(id=cookie['sid']) diff --git a/synolopy/params.py b/synolopy/params.py new file mode 100644 index 0000000..6107f78 --- /dev/null +++ b/synolopy/params.py @@ -0,0 +1,2 @@ +timeout = 10 +verifySSL = True