|
@ -49,7 +49,7 @@ def check_cert(host, cert): |
|
|
def cert_has_expired(cert_path): |
|
|
def cert_has_expired(cert_path): |
|
|
try: |
|
|
try: |
|
|
import OpenSSL |
|
|
import OpenSSL |
|
|
except: |
|
|
except Exception: |
|
|
print_error("Warning: cannot import OpenSSL") |
|
|
print_error("Warning: cannot import OpenSSL") |
|
|
return False |
|
|
return False |
|
|
from OpenSSL import crypto as c |
|
|
from OpenSSL import crypto as c |
|
@ -112,7 +112,7 @@ class Interface(threading.Thread): |
|
|
try: |
|
|
try: |
|
|
host, port, protocol = self.server.split(':') |
|
|
host, port, protocol = self.server.split(':') |
|
|
port = int(port) |
|
|
port = int(port) |
|
|
except: |
|
|
except Exception: |
|
|
self.server = None |
|
|
self.server = None |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
@ -196,7 +196,7 @@ class Interface(threading.Thread): |
|
|
self.connection_msg = ('https' if self.use_ssl else 'http') + '://%s:%d'%( self.host, self.port ) |
|
|
self.connection_msg = ('https' if self.use_ssl else 'http') + '://%s:%d'%( self.host, self.port ) |
|
|
try: |
|
|
try: |
|
|
self.poll() |
|
|
self.poll() |
|
|
except: |
|
|
except Exception: |
|
|
print_error("http init session failed") |
|
|
print_error("http init session failed") |
|
|
self.is_connected = False |
|
|
self.is_connected = False |
|
|
return |
|
|
return |
|
@ -218,7 +218,7 @@ class Interface(threading.Thread): |
|
|
break |
|
|
break |
|
|
except socket.error: |
|
|
except socket.error: |
|
|
break |
|
|
break |
|
|
except: |
|
|
except Exception: |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
break |
|
|
break |
|
|
|
|
|
|
|
@ -265,7 +265,7 @@ class Interface(threading.Thread): |
|
|
try: |
|
|
try: |
|
|
req = urllib2.Request(self.connection_msg, data_json, headers) |
|
|
req = urllib2.Request(self.connection_msg, data_json, headers) |
|
|
response_stream = urllib2.urlopen(req, timeout=DEFAULT_TIMEOUT) |
|
|
response_stream = urllib2.urlopen(req, timeout=DEFAULT_TIMEOUT) |
|
|
except: |
|
|
except Exception: |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
|
for index, cookie in enumerate(cj): |
|
|
for index, cookie in enumerate(cj): |
|
@ -318,7 +318,7 @@ class Interface(threading.Thread): |
|
|
s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) |
|
|
s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) |
|
|
try: |
|
|
try: |
|
|
s.connect((self.host, self.port)) |
|
|
s.connect((self.host, self.port)) |
|
|
except: |
|
|
except Exception: |
|
|
# print_error("failed to connect", self.host, self.port) |
|
|
# print_error("failed to connect", self.host, self.port) |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
@ -346,7 +346,7 @@ class Interface(threading.Thread): |
|
|
|
|
|
|
|
|
try: |
|
|
try: |
|
|
s.connect(( self.host.encode('ascii'), int(self.port))) |
|
|
s.connect(( self.host.encode('ascii'), int(self.port))) |
|
|
except: |
|
|
except Exception: |
|
|
print_error("failed to connect", self.host, self.port) |
|
|
print_error("failed to connect", self.host, self.port) |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
@ -370,7 +370,7 @@ class Interface(threading.Thread): |
|
|
else: |
|
|
else: |
|
|
print_msg("wrong certificate", self.host) |
|
|
print_msg("wrong certificate", self.host) |
|
|
return |
|
|
return |
|
|
except: |
|
|
except Exception: |
|
|
print_error("wrap_socket failed", self.host) |
|
|
print_error("wrap_socket failed", self.host) |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
return |
|
|
return |
|
@ -424,7 +424,7 @@ class Interface(threading.Thread): |
|
|
c = json.loads(c) |
|
|
c = json.loads(c) |
|
|
self.queue_json_response(c) |
|
|
self.queue_json_response(c) |
|
|
|
|
|
|
|
|
except: |
|
|
except Exception: |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
traceback.print_exc(file=sys.stdout) |
|
|
|
|
|
|
|
|
self.is_connected = False |
|
|
self.is_connected = False |
|
|