oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rev245, Fix for gevent1.0.2 ssl, Disable asnyc js load (its slower on my browser)

Browse source
This commit is contained in:
HelloZeroNet 2015-06-18 20:31:33 +02:00
parent 823508f261
commit d908a3a456
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -4,7 +4,7 @@ import ConfigParser
class Config(object): class Config(object):
def __init__(self): def __init__(self):
self.version = "0.3.1" self.version = "0.3.1"
self.rev = 242 self.rev = 245
self.parser = self.createArguments() self.parser = self.createArguments()
argv = sys.argv[:] # Copy command line arguments argv = sys.argv[:] # Copy command line arguments
argv = self.parseConfig(argv) # Add arguments from config file argv = self.parseConfig(argv) # Add arguments from config file

13
src/Crypt/CryptConnection.py
View file

@ -1,8 +1,13 @@
import sys, logging, os import sys
import logging
import os
import ssl
from Config import config from Config import config
import gevent import gevent
from util import SslPatch from util import SslPatch
class CryptConnectionManager: class CryptConnectionManager:
def __init__(self): def __init__(self):
# OpenSSL params # OpenSSL params
@ -30,9 +35,9 @@ class CryptConnectionManager:
if crypt == "tls-rsa": if crypt == "tls-rsa":
ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:AES128-GCM-SHA256:AES128-SHA256:HIGH:!aNULL:!eNULL:!EXPORT:!DSS:!DES:!RC4:!3DES:!MD5:!PSK" ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:AES128-GCM-SHA256:AES128-SHA256:HIGH:!aNULL:!eNULL:!EXPORT:!DSS:!DES:!RC4:!3DES:!MD5:!PSK"
if server: if server:
return gevent.ssl.wrap_socket(sock, server_side=server, keyfile='%s/key-rsa.pem' % config.data_dir, certfile='%s/cert-rsa.pem' % config.data_dir, ciphers=ciphers) return ssl.wrap_socket(sock, server_side=server, keyfile='%s/key-rsa.pem' % config.data_dir, certfile='%s/cert-rsa.pem' % config.data_dir, ciphers=ciphers)
else: else:
return gevent.ssl.wrap_socket(sock, ciphers=ciphers) return ssl.wrap_socket(sock, ciphers=ciphers)
else: else:
return sock return sock
@ -43,7 +48,7 @@ class CryptConnectionManager:
if os.path.isfile(file_path): os.unlink(file_path) if os.path.isfile(file_path): os.unlink(file_path)
# Loand and create cert files is necessary # Load and create cert files is necessary
def loadCerts(self): def loadCerts(self):
if config.disable_encryption: return False if config.disable_encryption: return False

2
src/Ui/template/wrapper.html
View file

@ -57,7 +57,7 @@ permissions = {permissions}
show_loadingscreen = {show_loadingscreen} show_loadingscreen = {show_loadingscreen}
server_url = '{server_url}' server_url = '{server_url}'
</script> </script>
<script type="text/javascript" src="{server_url}/uimedia/all.js?rev={rev}" async></script> <script type="text/javascript" src="{server_url}/uimedia/all.js?rev={rev}"></script>
</body> </body>
</html> </html>

2
src/main.py
View file

@ -54,7 +54,7 @@ if config.debug:
else: else:
console_log.setLevel(logging.INFO) # Display only important info to console console_log.setLevel(logging.INFO) # Display only important info to console
monkey.patch_all(thread=False, ssl=False) # Make time, socket gevent compatible. Not thread: pyfilesystem and system tray icon not compatible, Not ssl: broken in 2.7.9 monkey.patch_all(thread=False) # Make time, socket gevent compatible. Not thread: pyfilesystem and system tray icon not compatible