Repository: cloudstack-cloudmonkey Updated Branches: refs/heads/master eb5f71b33 -> 6ac7f863e
cloudmonkey: for https requests use TLSv1 Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/6ac7f863 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/6ac7f863 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/6ac7f863 Branch: refs/heads/master Commit: 6ac7f863eede4be359fb9ca6a0b44208997a4038 Parents: eb5f71b Author: Rohit Yadav <[email protected]> Authored: Tue Apr 14 14:41:14 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Apr 14 14:41:14 2015 +0530 ---------------------------------------------------------------------- cloudmonkey/requester.py | 8 +++++++- setup.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/6ac7f863/cloudmonkey/requester.py ---------------------------------------------------------------------- diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py index a26151d..cf082aa 100644 --- a/cloudmonkey/requester.py +++ b/cloudmonkey/requester.py @@ -24,12 +24,14 @@ try: import itertools import json import requests + import ssl import sys import time import urllib import urllib2 from datetime import datetime, timedelta + from requests_toolbelt import SSLAdapter from urllib2 import HTTPError, URLError except ImportError, e: print "Import error in %s : %s" % (__name__, e) @@ -68,6 +70,7 @@ def login(url, username, password, domain="/", verifysslcert=False): sessionkey = '' session = requests.Session() + session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1)) try: resp = session.post(url, params=args, verify=verifysslcert) @@ -209,8 +212,11 @@ def make_request(command, args, logger, url, credentials, expires, args['apiKey'] = credentials['apikey'] args["signature"] = sign_request(args, credentials['secretkey']) + session = requests.Session() + session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1)) + try: - response = requests.get(url, params=args, verify=verifysslcert) + response = session.get(url, params=args, verify=verifysslcert) logger_debug(logger, "Request sent: %s" % response.url) result = response.text http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/6ac7f863/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 52a053d..3d0791a 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ requires = [ 'Pygments>=1.5', 'prettytable>=0.6', 'requests', + 'requests-toolbelt', 'argcomplete' ]
