summaryrefslogtreecommitdiff
path: root/beinc_server_.py
diff options
context:
space:
mode:
Diffstat (limited to 'beinc_server_.py')
-rwxr-xr-xbeinc_server_.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/beinc_server_.py b/beinc_server_.py
index ec920c2..cf4f7c7 100755
--- a/beinc_server_.py
+++ b/beinc_server_.py
@@ -62,9 +62,11 @@ BEINC_OSD_TYPE_PYOSD = 2
62BEINC_SSL_METHODS = {'SSLv3': OpenSSL.SSL.SSLv3_METHOD, 62BEINC_SSL_METHODS = {'SSLv3': OpenSSL.SSL.SSLv3_METHOD,
63 'TLSv1': OpenSSL.SSL.TLSv1_METHOD} 63 'TLSv1': OpenSSL.SSL.TLSv1_METHOD}
64try: 64try:
65 errstr = "Warning: Current Twisted / OpenSSL version doesn't support TLSv1.1" 65 errstr = ("Warning: Current Twisted / "
66 "OpenSSL version doesn't support TLSv1.1")
66 BEINC_SSL_METHODS.update({'TLSv1_1': OpenSSL.SSL.TLSv1_1_METHOD}) 67 BEINC_SSL_METHODS.update({'TLSv1_1': OpenSSL.SSL.TLSv1_1_METHOD})
67 errstr = "Warning: Current Twisted / OpenSSL version doesn't support TLSv1.2" 68 errstr = ("Warning: Current Twisted / " +
69 "OpenSSL version doesn't support TLSv1.2")
68 BEINC_SSL_METHODS.update({'TLSv1_2': OpenSSL.SSL.TLSv1_2_METHOD}) 70 BEINC_SSL_METHODS.update({'TLSv1_2': OpenSSL.SSL.TLSv1_2_METHOD})
69except: 71except:
70 sys.stderr.write(errstr + '\n') 72 sys.stderr.write(errstr + '\n')
@@ -217,7 +219,7 @@ class BEINCInstance(object):
217 219
218def beinc_login_required(method): 220def beinc_login_required(method):
219 """ 221 """
220 decorator for checking login credentials 222 Decorator for checking login credentials
221 """ 223 """
222 224
223 @wraps(method) 225 @wraps(method)
@@ -339,8 +341,8 @@ def main():
339 action='version', 341 action='version',
340 version='%(prog)s {0}'.format(__version__), 342 version='%(prog)s {0}'.format(__version__),
341 help='Display program-version and exit') 343 help='Display program-version and exit')
342 log.startLogging(sys.stdout)
343 args = parser.parse_args() 344 args = parser.parse_args()
345 log.startLogging(sys.stdout)
344 try: 346 try:
345 with open(args.config_file, 'r') as fp: 347 with open(args.config_file, 'r') as fp:
346 config_dict = json.load(fp) 348 config_dict = json.load(fp)
@@ -374,8 +376,9 @@ def main():
374 if ssl_method: 376 if ssl_method:
375 options.method = ssl_method 377 options.method = ssl_method
376 if ssl_acceptable_ciphers_str.lower() != 'auto': 378 if ssl_acceptable_ciphers_str.lower() != 'auto':
377 options.acceptableCiphers = ssl.AcceptableCiphers.fromOpenSSLCipherString( 379 options.acceptableCiphers = (
378 ssl_acceptable_ciphers_str) 380 ssl.AcceptableCiphers.fromOpenSSLCipherString(
381 ssl_acceptable_ciphers_str))
379 reactor.listenSSL(args.port, 382 reactor.listenSSL(args.port,
380 server.Site(beinc_server), 383 server.Site(beinc_server),
381 options, 384 options,