5.5.5 support OpenWrt

code/default/lib/noarch/front_base/openssl_wrap.py

@@ -9,22 +9,26 @@
 import sys
 
 error_str = ""
-try:
-    from .boringssl_wrap import SSLConnection, SSLContext, SSLCert
-    implementation = "BoringSSL"
-except Exception as e:
-    error_str = "import boringssl except: %r;" % e
+implementation = None
 
+def init():
+    global implementation
     try:
-        from .tlslite_wrap import SSLConnection, SSLContext, SSLCert
-        implementation = "TLSLite, import boringssl except:" + error_str
+        from .boringssl_wrap import SSLConnection, SSLContext, SSLCert
+        implementation = "BoringSSL"
+        return SSLConnection, SSLContext, SSLCert
     except Exception as e:
-        error_str += "import tlslite except: %r;" % e
+        error_str = "import boringssl except: %r;" % e
 
-        if sys.version_info[0] == 3:
-            from .ssl_wrap import SSLConnection, SSLContext, SSLCert
+    if sys.version_info[0] == 3:
+        from .ssl_wrap import SSLConnection, SSLContext, SSLCert
 
-            implementation = "ssl, import tlslite except:" + error_str
-        else:
-            from .pyopenssl_wrap import SSLConnection, SSLContext, SSLCert
-            implementation = "OpenSSL, import tlslite except:" + error_str
+        implementation = "ssl, import tlslite except:" + error_str
+    else:
+        from .pyopenssl_wrap import SSLConnection, SSLContext, SSLCert
+        implementation = "OpenSSL, import tlslite except:" + error_str
+
+    return SSLConnection, SSLContext, SSLCert
+
+
+SSLConnection, SSLContext, SSLCert = init()

code/default/version.txt

@@ -1 +1 @@
-5.5.4
+5.5.5

code/default/x_tunnel/local/proxy_session.py

@@ -1049,6 +1049,9 @@ def jwt_login(account, password, node):
 
 
 def login_process():
+    if not g.session:
+        return
+
     with login_lock:
         if not (g.config.login_account and g.config.login_password):
             xlog.debug("x-tunnel no account")