Merge pull request #38 from wptad/master

fix wss issue when using https  #37 支持 wss 和 https

jumpserver/views.py

@@ -344,7 +344,7 @@ def download(request):
 def exec_cmd(request):
     role = request.GET.get('role')
     check_assets = request.GET.get('check_assets', '')
-    web_terminal_uri = 'ws://%s/exec?role=%s' % (WEB_SOCKET_HOST, role)
+    web_terminal_uri = '%s/exec?role=%s' % (WEB_SOCKET_HOST, role)
     return my_render('exec_cmd.html', locals(), request)
 
 
@@ -356,7 +356,7 @@ def web_terminal(request):
     if asset:
         print asset
         hostname = asset.hostname
-    web_terminal_uri = 'ws://%s/terminal?id=%s&role=%s' % (WEB_SOCKET_HOST, asset_id, role_name)
+    web_terminal_uri = '%s/terminal?id=%s&role=%s' % (WEB_SOCKET_HOST, asset_id, role_name)
     return render_to_response('jlog/web_terminal.html', locals())
 
 

templates/exec_cmd.html

@@ -23,7 +23,13 @@
 
 
 <script type="text/javascript">
-    var wsUri = "{{ web_terminal_uri }}"; //请求的websocket url
+
+    var protocol = "ws://";
+    if (window.location.protocol == 'https:') {
+        protocol = 'wss://';
+    }
+
+    var wsUri = protocol + "{{ web_terminal_uri }}"; //请求的websocket url
     var ws = new WebSocket(wsUri);
 
     function createSystemMessage(message) {

templates/jlog/web_terminal.html

@@ -43,7 +43,12 @@
             }
 
             WSSHClient.prototype.connect = function(options) {
-                var endpoint = '{{ web_terminal_uri }}';
+                var protocol = "ws://";
+                if (window.location.protocol == 'https:') {
+                    protocol = 'wss://';
+                }
+
+                var endpoint = protocol + '{{ web_terminal_uri }}';
 
                 if (window.WebSocket) {
                     this._connection = new WebSocket(endpoint);