Changeset 180 for etherws/trunk

Timestamp:

07/27/12 00:35:15 (12 years ago)

Author:

atzm

Message:

• functionize SSL wrapper

File:

• etherws/trunk/etherws.py (modified) (3 diffs)

etherws/trunk/etherws.py

@@ -444 +444 @@
 
 
+def ssl_wrapper(insecure, ca_certs):
+    args = {'cert_reqs': ssl.CERT_REQUIRED, 'ca_certs': ca_certs}
+    if insecure:
+        args = {}
+    return lambda sock: ssl.wrap_socket(sock, **args)
+
+
 def server_main(args):
     realpath(args, 'keyfile', 'certfile', 'htpasswd')
@@ -491 +498 @@
         websocket.enableTrace(True)
 
-    if args.insecure:
-        websocket._SSLSocketWrapper = \
-            lambda s: ssl.wrap_socket(s)
-    else:
-        websocket._SSLSocketWrapper = \
-            lambda s: ssl.wrap_socket(s, cert_reqs=ssl.CERT_REQUIRED,
-                                      ca_certs=args.cacerts)
-
     if args.ageout <= 0:
         raise ValueError('invalid ageout: %s' % args.ageout)
@@ -505 +504 @@
         args.passwd = getpass.getpass()
 
+    websocket._SSLSocketWrapper = ssl_wrapper(args.insecure, args.cacerts)
     cred = {'user': args.user, 'passwd': args.passwd}
     ioloop = tornado.ioloop.IOLoop.instance()