mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-23 14:48:53 +02:00
Code Activity

use ssl session resumption

Browse Source 
saves some cycles if osc makes several requests
This commit is contained in:
Ludwig Nussel
2011-04-18 11:02:26 +02:00
parent 1c9d99fa79
commit eee8c96d0c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osc/oscssl.py
View File

@@ -155,12 +155,14 @@ class mySSLContext(SSL.Context):
def __init__(self): def __init__(self):
SSL.Context.__init__(self, 'sslv23') SSL.Context.__init__(self, 'sslv23')
self.set_options(m2.SSL_OP_ALL | m2.SSL_OP_NO_SSLv2) # m2crypto does this for us but better safe than sorry self.set_options(m2.SSL_OP_ALL | m2.SSL_OP_NO_SSLv2) # m2crypto does this for us but better safe than sorry
self.set_session_cache_mode(m2.SSL_SESS_CACHE_CLIENT)
self.verrs = None self.verrs = None
#self.set_info_callback() # debug #self.set_info_callback() # debug
self.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, depth=9, callback=lambda ok, store: verify_cb(self, ok, store)) self.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, depth=9, callback=lambda ok, store: verify_cb(self, ok, store))
class myHTTPSHandler(M2Crypto.m2urllib2.HTTPSHandler): class myHTTPSHandler(M2Crypto.m2urllib2.HTTPSHandler):
handler_order = 499 handler_order = 499
saved_session = None
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.appname = kwargs.pop('appname', 'generic') self.appname = kwargs.pop('appname', 'generic')
@@ -190,6 +192,8 @@ class myHTTPSHandler(M2Crypto.m2urllib2.HTTPSHandler):
selector = req.get_selector() selector = req.get_selector()
# End our change # End our change
h.set_debuglevel(self._debuglevel) h.set_debuglevel(self._debuglevel)
if self.saved_session:
h.set_session(self.saved_session)
headers = dict(req.headers) headers = dict(req.headers)
headers.update(req.unredirected_hdrs) headers.update(req.unredirected_hdrs)
@@ -202,6 +206,9 @@ class myHTTPSHandler(M2Crypto.m2urllib2.HTTPSHandler):
headers["Connection"] = "close" headers["Connection"] = "close"
try: try:
h.request(req.get_method(), selector, req.data, headers) h.request(req.get_method(), selector, req.data, headers)
s = h.get_session()
if s:
self.saved_session = s
r = h.getresponse() r = h.getresponse()
except socket.error, err: # XXX what error? except socket.error, err: # XXX what error?
err.filename = full_url err.filename = full_url