Rm teminal app

apps/jumpserver/settings.py

@@ -54,7 +54,7 @@ INSTALLED_APPS = [
     'users.apps.UsersConfig',
     'assets.apps.AssetsConfig',
     'perms.apps.PermsConfig',
-    'terminal.apps.TerminalConfig',
+    # 'terminal.apps.TerminalConfig',
     'ops.apps.OpsConfig',
     'audits.apps.AuditsConfig',
     'common.apps.CommonConfig',
@@ -274,36 +274,36 @@ REST_FRAMEWORK = {
 }
 # This setting is required to override the Django's main loop, when running in
 # development mode, such as ./manage runserver
-WSGI_APPLICATION = 'ws4redis.django_runserver.application'
+# WSGI_APPLICATION = 'ws4redis.django_runserver.application'
 
 # URL that distinguishes websocket connections from normal requests
-WEBSOCKET_URL = '/ws/'
+# WEBSOCKET_URL = '/ws/'
 
 # WebSocket Redis
-WS4REDIS_CONNECTION = {
+# WS4REDIS_CONNECTION = {
-    'host': CONFIG.REDIS_HOST or '127.0.0.1',
+#     'host': CONFIG.REDIS_HOST or '127.0.0.1',
-    'port': CONFIG.REDIS_PORT or 6379,
+#     'port': CONFIG.REDIS_PORT or 6379,
-    'db': 2,
+#     'db': 2,
-}
+# }
 
 # Set the number of seconds each message shall persisted
-WS4REDIS_EXPIRE = 3600
+# WS4REDIS_EXPIRE = 3600
 
-WS4REDIS_HEARTBEAT = 'love you'
+# WS4REDIS_HEARTBEAT = 'love you'
 
-WS4REDIS_PREFIX = 'demo'
+# WS4REDIS_PREFIX = 'demo'
 
-SESSION_ENGINE = 'redis_sessions.session'
+# SESSION_ENGINE = 'redis_sessions.session'
 
-SESSION_REDIS_PREFIX = 'session'
+# SESSION_REDIS_PREFIX = 'session'
 
-SESSION_REDIS_HOST = CONFIG.REDIS_HOST
+# SESSION_REDIS_HOST = CONFIG.REDIS_HOST
 
-SESSION_REDIS_PORT = CONFIG.REDIS_PORT
+# SESSION_REDIS_PORT = CONFIG.REDIS_PORT
 
-SESSION_REDIS_PASSWORD = CONFIG.REDIS_PASSWORD
+# SESSION_REDIS_PASSWORD = CONFIG.REDIS_PASSWORD
 
-SESSION_REDIS_DB = CONFIG.REDIS_DB
+# SESSION_REDIS_DB = CONFIG.REDIS_DB
 
 
 # Custom User Auth model

apps/jumpserver/urls.py

@@ -25,7 +25,6 @@ urlpatterns = [
     url(r'^(api/)?users/', include('users.urls')),
     url(r'^assets/', include('assets.urls')),
     url(r'^perms/', include('perms.urls')),
-    url(r'^terminal/', include('terminal.urls')),
 ]
 
 

apps/terminal/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

apps/terminal/apps.py

@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.apps import AppConfig
-
-
-class TerminalConfig(AppConfig):
-    name = 'terminal'

apps/terminal/hands.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# 
-
-

apps/terminal/models.py

@@ -1,5 +0,0 @@
-from __future__ import unicode_literals
-
-from django.db import models
-
-# Create your models here.

apps/terminal/templates/main.html

@@ -1,176 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-
-    <div class="container">
-        <div id="term">
-        </div>
-    </div>
-    <div class="termChangBar">
-        <input type="number" min="100" value="100" placeholder="col" id="term-col"/>
-        <input type="number" min="35" value="35" placeholder="row" id="term-row"/>
-        <button id="col-row">修改窗口大小</button>
-    </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script type="application/javascript" src="/static/js/jquery-2.1.1.js"></script>
-    <script type="application/javascript" src="/static/js/term.js"></script>
-    <script>/**
-     * Created by liuzheng on 3/3/16.
-     */
-    var rowHeight = 1;
-    var colWidth = 1;
-    function WSSHClient() {
-    }
-    WSSHClient.prototype._generateEndpoint = function (options) {
-        console.log(options);
-        if (window.location.protocol == 'https:') {
-            var protocol = 'wss://';
-        } else {
-            var protocol = 'ws://';
-        }
-
-        var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/foobar?subscribe-broadcast&publish-broadcast&echo';
-        return endpoint;
-    };
-    WSSHClient.prototype.connect = function (options) {
-        var endpoint = this._generateEndpoint(options);
-
-        if (window.WebSocket) {
-            this._connection = new WebSocket(endpoint);
-        }
-        else if (window.MozWebSocket) {
-            this._connection = MozWebSocket(endpoint);
-        }
-        else {
-            options.onError('WebSocket Not Supported');
-            return;
-        }
-
-        this._connection.onopen = function () {
-            options.onConnect();
-        };
-
-        this._connection.onmessage = function (evt) {
-            try {
-                options.onData(evt.data);
-            } catch (e) {
-                var data = JSON.parse(evt.data.toString());
-                options.onError(data.error);
-            }
-        };
-
-        this._connection.onclose = function (evt) {
-            options.onClose();
-        };
-    };
-
-    WSSHClient.prototype.send = function (data) {
-        this._connection.send(JSON.stringify({'data': data}));
-    };
-
-    function openTerminal(options) {
-        var client = new WSSHClient();
-        var rowHeight, colWidth;
-        try {
-            rowHeight = localStorage.getItem('term-row');
-            colWidth = localStorage.getItem('term-col');
-        } catch (err) {
-            rowHeight = 35;
-            colWidth = 100
-        }
-        if (rowHeight) {
-        } else {
-            rowHeight = 35
-        }
-        if (colWidth) {
-        } else {
-            colWidth = 100
-        }
-
-        var term = new Terminal({
-            rows: rowHeight,
-            cols: colWidth,
-            useStyle: true,
-            screenKeys: true
-        });
-        term.open();
-        term.on('data', function (data) {
-            client.send(data)
-        });
-        $('.terminal').detach().appendTo('#term');
-        //term.resize(colWidth, rowHeight);
-        term.write('Connecting...');
-        client.connect($.extend(options, {
-            onError: function (error) {
-                term.write('Error: ' + error + '\r\n');
-            },
-            onConnect: function () {
-                // Erase our connecting message
-                client.send({'resize': {'rows': rowHeight, 'cols': colWidth}});
-                term.write('\r');
-            },
-            onClose: function () {
-                term.write('Connection Reset By Peer');
-            },
-            onData: function (data) {
-                if (data == "love you")
-                    console.log(data);
-                else
-                    term.write(data);
-            }
-        }));
-        //rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24;
-        //colWidth = 0.0 + 1.00 * $('.terminal').width() / 80;
-        return {'term': term, 'client': client};
-    }
-
-    //function resize() {
-    //    $('.terminal').css('width', window.innerWidth - 25);
-    //    console.log(window.innerWidth);
-    //    console.log(window.innerWidth - 10);
-    //    var rows = Math.floor(window.innerHeight / rowHeight) - 2;
-    //    var cols = Math.floor(window.innerWidth / colWidth) - 1;
-    //
-    //    return {rows: rows, cols: cols};
-    //}
-
-    $(document).ready(function () {
-        var options = {};
-
-        $('#ssh').show();
-        var term_client = openTerminal(options);
-        console.log(rowHeight);
-        // by liuzheng712 because it will bring record bug
-        //window.onresize = function () {
-        //    var geom = resize();
-        //    console.log(geom);
-        //    term_client.term.resize(geom.cols, geom.rows);
-        //    term_client.client.send({'resize': {'rows': geom.rows, 'cols': geom.cols}});
-        //    $('#ssh').show();
-        //}
-        try {
-            $('#term-row')[0].value = localStorage.getItem('term-row');
-            $('#term-col')[0].value = localStorage.getItem('term-col');
-        } catch (err) {
-            $('#term-row')[0].value = 35;
-            $('#term-col')[0].value = 100;
-        }
-        $('#col-row').click(function () {
-            var col = $('#term-col').val();
-            var row = $('#term-row').val();
-            localStorage.setItem('term-col', col);
-            localStorage.setItem('term-row', row);
-            term_client.term.resize(col, row);
-            term_client.client.send({'resize': {'rows': row, 'cols': col}});
-            $('#ssh').show();
-        });
-        $(".terminal").mouseleave(function () {
-            $(".termChangBar").slideDown();
-        });
-        $(".terminal").mouseenter(function () {
-            $(".termChangBar").slideUp();
-        })
-    });</script>
-
-{% endblock %}

apps/terminal/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

apps/terminal/urls.py

@@ -1,10 +0,0 @@
-# coding:utf-8
-from django.conf.urls import url
-
-import views
-
-app_name = 'terminal'
-
-urlpatterns = [
-    url(r'^web-terminal$', views.TerminalView.as_view(), name='web-terminal'),
-]

apps/terminal/views.py

@@ -1,28 +0,0 @@
-from django.shortcuts import render
-from django.urls import reverse_lazy
-from django.db.models import Q
-from django.views.generic.list import ListView
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
-from django.views.generic.detail import DetailView
-from django.views.generic.base import TemplateView
-from django.views import View
-from django.http import HttpResponse
-from ws4redis.redis_store import RedisMessage
-from ws4redis.publisher import RedisPublisher
-from django.conf import settings
-
-
-# Create your views here.
-class TerminalView(TemplateView):
-    template_name = 'main.html'
-
-    def get(self, request, *args, **kwargs):
-        welcome = RedisMessage('Hello everybody')  # create a welcome message to be sent to everybody
-        RedisPublisher(facility='foobar', broadcast=True).publish_message(welcome)
-        return super(TerminalView, self).get(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        redis_publisher = RedisPublisher(facility='foobar', groups=[request.POST.get('group')])
-        message = RedisMessage(request.POST.get('message'))
-        redis_publisher.publish_message(message)
-        return HttpResponse('OK')