修复centos7安装报错-平台不支持 (#603)

添加系统用户推送，使用密钥说明文案

.dockerignore

@@ -1,9 +0,0 @@
-.git
-logs/*
-data/*
-.github
-tmp/*
-django.db
-celerybeat.pid
-### Vagrant ###
-.vagrant/

.github/ISSUE_TEMPLATE.md

@@ -1,17 +0,0 @@
-[简述你的问题]
-
-
-##### 使用版本
-[请提供你使用的Jumpserver版本 1.x.x 注: 0.3.x不再提供支持]
-
-##### 问题复现步骤
-1. [步骤1]
-2. [步骤2]
-
-##### 具体表现[截图可能会更好些,最好能截全]
-
-
-##### 其他
-
-
-[注:] 完成后请关闭 issue

.gitignore

@@ -1,38 +1,46 @@
+*.py[cod]
+.idea
+test.py
 .DS_Store
-*.pyc
-*.pyo
-*.swp
-.env
-env
-env*
-venv
-dist
-build
+db.sqlite3
+# C extensions
+*.so
+
+# Packages
 *.egg
 *.egg-info
-_mailinglist
-dump.rdb
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+__pycache__
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
 .tox
-.cache/
-.idea/
-db.sqlite3
-config.py
-config.yml
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+.settings
 *.log
-host_rsa_key
-*.bat
-tags
-jumpserver.iml
-.python-version
-tmp/*
-sessions/*
-media
-celerybeat.pid
-django.db
-celerybeat-schedule.db
-data/static
-docs/_build/
-xpack
 logs/*
-### Vagrant ###
-.vagrant/
+keys/*
+jumpserver.conf
+nohup.out
+tmp/*

Dockerfile

@@ -1,26 +1,37 @@
-FROM registry.fit2cloud.com/public/python:v3
-MAINTAINER Jumpserver Team <ibuler@qq.com>
-
-WORKDIR /opt/jumpserver
-RUN useradd jumpserver
-
-COPY ./requirements /tmp/requirements
-
-RUN yum -y install epel-release && \
-      echo -e "[mysql]\nname=mysql\nbaseurl=https://mirrors.tuna.tsinghua.edu.cn/mysql/yum/mysql57-community-el6/\ngpgcheck=0\nenabled=1" > /etc/yum.repos.d/mysql.repo
-RUN cd /tmp/requirements && yum -y install $(cat rpm_requirements.txt)
-RUN cd /tmp/requirements && pip install --upgrade pip setuptools && pip install wheel && \
-    pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt || pip install -r requirements.txt
-RUN mkdir -p /root/.ssh/ && echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > /root/.ssh/config
-
-COPY . /opt/jumpserver
-RUN echo > config.yml
-VOLUME /opt/jumpserver/data
-VOLUME /opt/jumpserver/logs
-
-ENV LANG=zh_CN.UTF-8
-ENV LC_ALL=zh_CN.UTF-8
-
-EXPOSE 8070
-EXPOSE 8080
-ENTRYPOINT ["./entrypoint.sh"]
+FROM alpine
+MAINTAINER xRain <xrain@simcu.com>
+RUN apk add --update openssh sshpass python py-mysqldb py-psutil py-crypto && \
+	rm -rf /var/cache/apk/* 
+COPY . /jumpserver
+WORKDIR /jumpserver
+RUN python /jumpserver/install/docker/get-pip.py && \
+ 	pip install -r /jumpserver/install/docker/piprequires.txt && \
+	 rm -rf /jumpserver/docs && \
+ 	cp /jumpserver/install/docker/run.sh /run.sh && \
+  	rm -rf /etc/motd && chmod +x /run.sh && \
+  	rm -rf /jumpserver/keys && \
+  	rm -rf /jumpserver/logs && \
+  	rm -rf /home && \
+  	rm -rf /etc/ssh && \
+  	rm -rf /etc/shadow && \
+  	rm -rf /etc/passwd && \
+  	cp -r /jumpserver/install/docker/useradd /usr/sbin/useradd && \
+  	cp -r /jumpserver/install/docker/userdel /usr/sbin/userdel && \
+  	chmod +x /usr/sbin/useradd && \
+  	chmod +x /usr/sbin/userdel && \
+  	mkdir -p /data/home && \
+  	mkdir -p /data/logs && \
+  	mkdir -p /data/keys && \
+  	mkdir -p /data/ssh && \
+  	cp -r /jumpserver/install/docker/shadow /data/shadow && \
+  	cp -r /jumpserver/install/docker/passwd /data/passwd && \
+  	ln -s /data/logs /jumpserver/logs && \
+  	ln -s /data/keys /jumpserver/keys && \
+  	ln -s /data/home /home && \
+  	ln -s /data/ssh /etc/ssh && \
+  	ln -s /data/passwd /etc/passwd && \
+  	ln -s /data/shadow /etc/shadow && \
+  	chmod -R 777 /jumpserver
+VOLUME /data
+EXPOSE 80 22
+CMD /run.sh

LICENSE

@@ -1,4 +1,4 @@
-                    GNU GENERAL PUBLIC LICENSE
+GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
@@ -336,4 +336,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.

README.md

@@ -1,196 +1,80 @@
-# JumpServer 多云环境下更好用的堡垒机
+## 写在前面
+ - 版本号变更 2.0 -> 0.2版本 3.0 -> 0.3版本
 
-[![Python3](https://img.shields.io/badge/python-3.6-green.svg?style=plastic)](https://www.python.org/)
-[![Django](https://img.shields.io/badge/django-2.1-brightgreen.svg?style=plastic)](https://www.djangoproject.com/)
-[![Ansible](https://img.shields.io/badge/ansible-2.4.2.0-blue.svg?style=plastic)](https://www.ansible.com/)
-[![Paramiko](https://img.shields.io/badge/paramiko-2.4.1-green.svg?style=plastic)](http://www.paramiko.org/)
+#欢迎使用Jumpserver
+**Jumpserver** 是一款由python编写开源的跳板机(堡垒机)系统，实现了跳板机应有的功能。基于ssh协议来管理，客户端无需安装agent。
+支持常见系统:
+ 1. CentOS, RedHat, Fedora, Amazon Linux
+ 2. Debian
+ 3. SUSE, Ubuntu
+ 4. FreeBSD
+ 5. 其他ssh协议硬件设备
 
-JumpServer 是全球首款开源的堡垒机，使用 GNU GPL v2.0 开源协议，是符合 4A 机制的运维安全审计系统。
+###截图：
 
-JumpServer 使用 Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web Terminal 方案，交互界面美观、用户体验好。
+首页
+ 
+![webterminal](https://github.com/ibuler/static/raw/master/jumpserver3/index.jpg)
 
-JumpServer 采纳分布式架构，支持多机房跨区域部署，支持横向扩展，无资产数量及并发限制。
+WebTerminal:
 
-改变世界，从一点点开始。
+![webterminal](https://github.com/ibuler/static/raw/master/jumpserver3/webTerminal.gif)
 
-注: [KubeOperator](https://github.com/KubeOperator/KubeOperator) 是 JumpServer 团队在 Kubernetes 领域的的又一全新力作，欢迎关注和使用。
+Web批量执行命令
 
-## 核心功能列表
+![WebExecCommand](https://github.com/ibuler/static/raw/master/jumpserver3/webExec.gif)
 
-<table>
-  <tr>
-    <td rowspan="8">身份认证<br>Authentication</td>
-    <td rowspan="5">登录认证</td>
-    <td>资源统一登录与认证</td>
-  </tr>
-  <tr>
-    <td>LDAP/AD 认证</td>
-  </tr>
-  <tr>
-    <td>RADIUS 认证</td>
-  </tr>
-  <tr>
-    <td>OpenID 认证（实现单点登录）</td>
-  </tr>
-  <tr>
-    <td>CAS 认证 （实现单点登录）</td>
-  </tr>
-  <tr>
-    <td rowspan="2">MFA认证</td>
-    <td>MFA 二次认证（Google Authenticator）</td>
-  </tr>
-  <tr>
-    <td>RADIUS 二次认证</td>
-  </tr>
-  <tr>
-    <td>登录复核（X-PACK）</td>
-    <td>用户登录行为受管理员的监管与控制</td>
-  </tr>
-  <tr>
-    <td rowspan="11">账号管理<br>Account</td>
-    <td rowspan="2">集中账号</td>
-    <td>管理用户管理</td>
-  </tr>
-  <tr>
-    <td>系统用户管理</td>
-  </tr>
-  <tr>
-    <td rowspan="4">统一密码</td>
-    <td>资产密码托管</td>
-  </tr>
-  <tr>
-    <td>自动生成密码</td>
-  </tr>
-  <tr>
-    <td>自动推送密码</td>
-  </tr>
-  <tr>
-    <td>密码过期设置</td>
-  </tr>
-  <tr>
-    <td rowspan="2">批量改密（X-PACK）</td>
-    <td>定期批量改密</td>
-  </tr>
-  <tr>
-    <td>多种密码策略</td>
-  </tr>
-  <tr>
-    <td>多云纳管（X-PACK）</td>
-    <td>对私有云、公有云资产自动统一纳管</td>
-  </tr>
-  <tr>
-    <td>收集用户（X-PACK）</td>
-    <td>自定义任务定期收集主机用户</td>
-  </tr>
-  <tr>
-    <td>密码匣子（X-PACK）</td>
-    <td>统一对资产主机的用户密码进行查看、更新、测试操作</td>
-  </tr>
-  <tr>
-    <td rowspan="15">授权控制<br>Authorization</td>
-    <td>多维授权</td>
-    <td>对用户、用户组、资产、资产节点、应用以及系统用户进行授权</td>
-  </tr>
-  <tr>
-    <td rowspan="4">资产授权</td>
-    <td>资产以树状结构进行展示</td>
-  </tr>
-  <tr>
-    <td>资产和节点均可灵活授权</td>
-  </tr>
-  <tr>
-    <td>节点内资产自动继承授权</td>
-  </tr>
-  <tr>
-    <td>子节点自动继承父节点授权</td>
-  </tr>
-  <tr>
-    <td rowspan="2">应用授权</td>
-    <td>实现更细粒度的应用级授权</td>
-  </tr>
-  <tr>
-    <td>MySQL 数据库应用、RemoteApp 远程应用（X-PACK）</td>
-  </tr>
-  <tr>
-    <td>动作授权</td>
-    <td>实现对授权资产的文件上传、下载以及连接动作的控制</td>
-  </tr>
-  <tr>
-    <td>时间授权</td>
-    <td>实现对授权资源使用时间段的限制</td>
-  </tr>
-  <tr>
-    <td>特权指令</td>
-    <td>实现对特权指令的使用（支持黑白名单）</td>
-  </tr>
-  <tr>
-    <td>命令过滤</td>
-    <td>实现对授权系统用户所执行的命令进行控制</td>
-  </tr>
-  <tr>
-    <td>文件传输</td>
-    <td>SFTP 文件上传/下载</td>
-  </tr>
-  <tr>
-    <td>文件管理</td>
-    <td>实现 Web SFTP 文件管理</td>
-  </tr>
-  <tr>
-    <td>工单管理（X-PACK）</td>
-    <td>支持对用户登录请求行为进行控制</td>
-  </tr>
-  <tr>
-    <td>组织管理（X-PACK）</td>
-    <td>实现多租户管理与权限隔离</td>
-  </tr>
-  <tr>
-    <td rowspan="7">安全审计<br>Audit</td>
-    <td>操作审计</td>
-    <td>用户操作行为审计</td>
-  </tr>
-  <tr>
-    <td rowspan="2">会话审计</td>
-    <td>在线会话内容审计</td>
-  </tr>
-  <tr>
-    <td>历史会话内容审计</td>
-  </tr>
-  <tr>
-    <td rowspan="2">录像审计</td>
-    <td>支持对 Linux、Windows 等资产操作的录像进行回放审计</td>
-  </tr>
-  <tr>
-    <td>支持对 RemoteApp（X-PACK）、MySQL 等应用操作的录像进行回放审计</td>
-  </tr>
-  <tr>
-    <td>指令审计</td>
-    <td>支持对资产和应用等操作的命令进行审计</td>
-  </tr>
-  <tr>
-    <td>文件传输</td>
-    <td>可对文件的上传、下载记录进行审计</td>
-  </tr>
-</table>
+录像回放
 
-## 安装及使用指南
+![录像](https://github.com/ibuler/static/raw/master/jumpserver3/record.gif)
 
--  [Docker 快速安装文档](http://docs.jumpserver.org/zh/docs/dockerinstall.html)
--  [Step by Step 安装文档](http://docs.jumpserver.org/zh/docs/step_by_step.html)
--  [完整文档](http://docs.jumpserver.org)
+跳转和批量命令
 
-## 演示视频和截屏
+![跳转](https://github.com/ibuler/static/raw/master/jumpserver3/connect.gif)
 
-我们提供了演示视频和系统截图可以让你快速了解 JumpServer：
+命令统计
 
-- [演示视频](https://jumpserver.oss-cn-hangzhou.aliyuncs.com/jms-media/%E3%80%90%E6%BC%94%E7%A4%BA%E8%A7%86%E9%A2%91%E3%80%91Jumpserver%20%E5%A0%A1%E5%9E%92%E6%9C%BA%20V1.5.0%20%E6%BC%94%E7%A4%BA%E8%A7%86%E9%A2%91%20-%20final.mp4)
-- [系统截图](http://docs.JumpServer.org/zh/docs/snapshot.html)
+![跳转](https://github.com/ibuler/static/raw/master/jumpserver3/command.jpg)
 
-## License & Copyright
+### 文档
+
+* [访问wiki](https://github.com/jumpserver/jumpserver/wiki)
+* [概览](https://github.com/jumpserver/jumpserver/wiki/%E6%A6%82%E8%A7%88)
+* [名词解释](https://github.com/jumpserver/jumpserver/wiki/%E5%90%8D%E8%AF%8D%E8%A7%A3%E9%87%8A)
+* [常见问题](https://github.com/jumpserver/jumpserver/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)
+* 安装基于：[RedHat 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[Debian 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-Debian-%E7%9A%84%E7%B3%BB%E7%BB%9F)
+* [快速开始](https://github.com/jumpserver/jumpserver/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B)
+* [安装图解](https://github.com/jumpserver/jumpserver/wiki/%E5%AE%89%E8%A3%85%E5%9B%BE%E8%A7%A3)
+* [应用图解](https://github.com/jumpserver/jumpserver/wiki/%E5%BA%94%E7%94%A8%E5%9B%BE%E8%A7%A3)
+
+### 特点
+
+* 完全开源，GPL授权
+* Python编写，容易再次开发
+* 实现了跳板机基本功能，认证、授权、审计
+* 集成了Ansible，批量命令等
+* 支持WebTerminal
+* Bootstrap编写，界面美观
+* 自动收集硬件信息
+* 录像回放
+* 命令搜索
+* 实时监控
+* 批量上传下载
+
+### 其它
+
+[Jumpserver官网](http://www.jumpserver.org)
+
+[论坛](http://bbs.jumpserver.org)
+
+[demo站点](http://demo.jumpserver.org)
+
+交流群: 552054376
+
+### 团队
+
+![](https://github.com/ibuler/static/raw/master/jumpserver3/team.jpg)
 
-Copyright (c) 2014-2019 飞致云 FIT2CLOUD, All rights reserved.
 
-Licensed under The GNU General Public License version 2 (GPLv2)  (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
-https://www.gnu.org/licenses/gpl-2.0.html
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

README_EN.md

@@ -1,60 +0,0 @@
-## Jumpserver 
-
-![Total visitor](https://visitor-count-badge.herokuapp.com/total.svg?repo_id=jumpserver)
-![Visitors in today](https://visitor-count-badge.herokuapp.com/today.svg?repo_id=jumpserver)
-[![Python3](https://img.shields.io/badge/python-3.6-green.svg?style=plastic)](https://www.python.org/)
-[![Django](https://img.shields.io/badge/django-2.1-brightgreen.svg?style=plastic)](https://www.djangoproject.com/)
-[![Ansible](https://img.shields.io/badge/ansible-2.4.2.0-blue.svg?style=plastic)](https://www.ansible.com/)
-[![Paramiko](https://img.shields.io/badge/paramiko-2.4.1-green.svg?style=plastic)](http://www.paramiko.org/)
-
-
-----
-
-- [中文版](https://github.com/jumpserver/jumpserver/blob/master/README_EN.md)
-
-Jumpserver is the first fully open source bastion in the world, based on the GNU GPL v2.0 open source protocol. Jumpserver is a  professional operation and maintenance audit system conforms to 4A specifications.
-
-Jumpserver is developed using Python / Django, conforms to the Web 2.0 specification, and is equipped with the industry-leading Web Terminal solution which have beautiful interface and great user experience.
-
-Jumpserver adopts a distributed architecture to support multi-branch deployment across multiple areas. The central node provides APIs, and login nodes are deployed in each branch. It can be scaled horizontally without concurrency restrictions.
-
-Change the world, starting from little things.
-
-----
-
-### Features
-
- ![Jumpserver 功能](https://jumpserver-release.oss-cn-hangzhou.aliyuncs.com/Jumpserver148.jpeg "Jumpserver 功能")
-
-### Start 
-
-Quick start  [Docker Install](http://docs.jumpserver.org/zh/docs/dockerinstall.html)
-
-Step by Step deployment. [Docs](http://docs.jumpserver.org/zh/docs/step_by_step.html)
-
-Full documentation [Docs](http://docs.jumpserver.org)
-
-### Demo、Video 和 Snapshot
-
-We provide online demo, demo video and screenshots to get you started quickly.
-
-[Demo](https://demo.jumpserver.org/auth/login/?next=/)
-[Video](https://fit2cloud2-offline-installer.oss-cn-beijing.aliyuncs.com/tools/Jumpserver%20%E4%BB%8B%E7%BB%8Dv1.4.mp4)
-[Snapshot](http://docs.jumpserver.org/zh/docs/snapshot.html)
-
-### SDK
-
-We provide the SDK for your other systems to quickly interact with the Jumpserver API.
-
-- [Python](https://github.com/jumpserver/jumpserver-python-sdk) Jumpserver other components use this SDK to complete the interaction.
-- [Java](https://github.com/KaiJunYan/jumpserver-java-sdk.git) 恺珺同学提供的Java版本的SDK thanks to 恺珺 for provide Java SDK
-
-
-### License & Copyright
-Copyright (c) 2014-2019 Beijing Duizhan Tech, Inc., All rights reserved.
-
-Licensed under The GNU General Public License version 2 (GPLv2)  (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-https://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

Vagrantfile

@@ -1,56 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://vagrantcloud.com/search.
-  config.vm.box_check_update = false
-  config.vm.box = "centos/7"
-  config.vm.hostname = "jumpserver"
-  config.vm.network "private_network", ip: "172.17.8.101"
-  config.vm.provider "virtualbox" do |vb|
-    vb.memory = "4096"
-    vb.cpus = 2
-    vb.name = "jumpserver"
-  end
-
-  config.vm.synced_folder ".", "/vagrant", type: "rsync",
-    rsync__verbose: true,
-    rsync__exclude: ['.git*', 'node_modules*','*.log','*.box','Vagrantfile']
-
-  config.vm.provision "shell", inline: <<-SHELL
-## 设置yum的阿里云源
-sudo curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-7.repo
-sudo sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo
-sudo curl -o /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
-sudo yum makecache
-
-## 安装依赖包
-sudo yum install -y python36 python36-devel python36-pip \
-		 libtiff-devel libjpeg-devel libzip-devel freetype-devel \
-     lcms2-devel libwebp-devel tcl-devel tk-devel sshpass \
-     openldap-devel mariadb-devel mysql-devel libffi-devel \
-     openssh-clients telnet openldap-clients gcc
-
-## 配置pip阿里云源
-mkdir /home/vagrant/.pip
-cat << EOF | sudo tee -a /home/vagrant/.pip/pip.conf
-[global]
-timeout = 6000
-index-url = https://mirrors.aliyun.com/pypi/simple/
-
-[install]
-use-mirrors = true
-mirrors = https://mirrors.aliyun.com/pypi/simple/
-trusted-host=mirrors.aliyun.com
-EOF
-
-python3.6 -m venv /home/vagrant/venv
-source /home/vagrant/venv/bin/activate
-echo 'source /home/vagrant/venv/bin/activate' >> /home/vagrant/.bash_profile
-  SHELL
-end

apps/__init__.py

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

apps/applications/api/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/api/database_app.py

@@ -1,20 +0,0 @@
-# coding: utf-8
-# 
-
-from orgs.mixins.api import OrgBulkModelViewSet
-
-from .. import models
-from .. import serializers
-from ..hands import IsOrgAdminOrAppUser
-
-__all__ = [
-    'DatabaseAppViewSet',
-]
-
-
-class DatabaseAppViewSet(OrgBulkModelViewSet):
-    model = models.DatabaseApp
-    filter_fields = ('name',)
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = serializers.DatabaseAppSerializer

apps/applications/api/remote_app.py

@@ -1,27 +0,0 @@
-# coding: utf-8
-#
-
-from orgs.mixins.api import OrgBulkModelViewSet
-from orgs.mixins import generics
-from ..hands import IsOrgAdmin, IsAppUser
-from ..models import RemoteApp
-from ..serializers import RemoteAppSerializer, RemoteAppConnectionInfoSerializer
-
-
-__all__ = [
-    'RemoteAppViewSet', 'RemoteAppConnectionInfoApi',
-]
-
-
-class RemoteAppViewSet(OrgBulkModelViewSet):
-    model = RemoteApp
-    filter_fields = ('name',)
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = RemoteAppSerializer
-
-
-class RemoteAppConnectionInfoApi(generics.RetrieveAPIView):
-    model = RemoteApp
-    permission_classes = (IsAppUser, )
-    serializer_class = RemoteAppConnectionInfoSerializer

apps/applications/apps.py

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

apps/applications/const.py

@@ -1,63 +0,0 @@
-#  coding: utf-8
-#
-
-from django.utils.translation import ugettext_lazy as _
-
-
-# RemoteApp
-
-REMOTE_APP_BOOT_PROGRAM_NAME = '||jmservisor'
-
-REMOTE_APP_TYPE_CHROME = 'chrome'
-REMOTE_APP_TYPE_MYSQL_WORKBENCH = 'mysql_workbench'
-REMOTE_APP_TYPE_VMWARE_CLIENT = 'vmware_client'
-REMOTE_APP_TYPE_CUSTOM = 'custom'
-
-# Fields attribute write_only default => False
-
-REMOTE_APP_TYPE_CHROME_FIELDS = [
-    {'name': 'chrome_target'},
-    {'name': 'chrome_username'},
-    {'name': 'chrome_password', 'write_only': True}
-]
-REMOTE_APP_TYPE_MYSQL_WORKBENCH_FIELDS = [
-    {'name': 'mysql_workbench_ip'},
-    {'name': 'mysql_workbench_name'},
-    {'name': 'mysql_workbench_username'},
-    {'name': 'mysql_workbench_password', 'write_only': True}
-]
-REMOTE_APP_TYPE_VMWARE_CLIENT_FIELDS = [
-    {'name': 'vmware_target'},
-    {'name': 'vmware_username'},
-    {'name': 'vmware_password', 'write_only': True}
-]
-REMOTE_APP_TYPE_CUSTOM_FIELDS = [
-    {'name': 'custom_cmdline'},
-    {'name': 'custom_target'},
-    {'name': 'custom_username'},
-    {'name': 'custom_password', 'write_only': True}
-]
-
-REMOTE_APP_TYPE_FIELDS_MAP = {
-    REMOTE_APP_TYPE_CHROME: REMOTE_APP_TYPE_CHROME_FIELDS,
-    REMOTE_APP_TYPE_MYSQL_WORKBENCH: REMOTE_APP_TYPE_MYSQL_WORKBENCH_FIELDS,
-    REMOTE_APP_TYPE_VMWARE_CLIENT: REMOTE_APP_TYPE_VMWARE_CLIENT_FIELDS,
-    REMOTE_APP_TYPE_CUSTOM: REMOTE_APP_TYPE_CUSTOM_FIELDS
-}
-
-REMOTE_APP_TYPE_CHOICES = (
-    (REMOTE_APP_TYPE_CHROME, 'Chrome'),
-    (REMOTE_APP_TYPE_MYSQL_WORKBENCH, 'MySQL Workbench'),
-    (REMOTE_APP_TYPE_VMWARE_CLIENT, 'vSphere Client'),
-    (REMOTE_APP_TYPE_CUSTOM, _('Custom')),
-)
-
-
-# DatabaseApp
-
-
-DATABASE_APP_TYPE_MYSQL = 'mysql'
-
-DATABASE_APP_TYPE_CHOICES = (
-    (DATABASE_APP_TYPE_MYSQL, 'MySQL'),
-)

apps/applications/forms/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/forms/database_app.py

@@ -1,26 +0,0 @@
-# coding: utf-8
-#
-
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-from .. import models
-
-__all__ = ['DatabaseAppMySQLForm']
-
-
-class BaseDatabaseAppForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['type'].widget.attrs['disabled'] = True
-
-    class Meta:
-        model = models.DatabaseApp
-        fields = [
-            'name', 'type', 'host', 'port', 'database', 'comment'
-        ]
-
-
-class DatabaseAppMySQLForm(BaseDatabaseAppForm):
-    pass

apps/applications/forms/remote_app.py

@@ -1,120 +0,0 @@
-#  coding: utf-8
-#
-
-from django.utils.translation import ugettext as _
-from django import forms
-
-from orgs.mixins.forms import OrgModelForm
-
-from ..models import RemoteApp
-
-
-__all__ = [
-    'RemoteAppChromeForm', 'RemoteAppMySQLWorkbenchForm',
-    'RemoteAppVMwareForm', 'RemoteAppCustomForm'
-]
-
-
-class BaseRemoteAppForm(OrgModelForm):
-    default_initial_data = {}
-
-    def __init__(self, *args, **kwargs):
-        # 过滤RDP资产和系统用户
-        super().__init__(*args, **kwargs)
-        field_asset = self.fields['asset']
-        field_asset.queryset = field_asset.queryset.has_protocol('rdp')
-        self.fields['type'].widget.attrs['disabled'] = True
-        self.fields.move_to_end('comment')
-        self.initial_default()
-
-    def initial_default(self):
-        for name, value in self.default_initial_data.items():
-            field = self.fields.get(name)
-            if not field:
-                continue
-            field.initial = value
-
-    class Meta:
-        model = RemoteApp
-        fields = [
-            'name', 'asset', 'type', 'path', 'comment'
-        ]
-        widgets = {
-            'asset': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Asset')
-            }),
-        }
-
-
-class RemoteAppChromeForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
-    }
-
-    chrome_target = forms.CharField(
-        max_length=128, label=_('Target URL'), required=False
-    )
-    chrome_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    chrome_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-
-
-class RemoteAppMySQLWorkbenchForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files\MySQL\MySQL Workbench 8.0 CE'
-                r'\MySQLWorkbench.exe'
-    }
-
-    mysql_workbench_ip = forms.CharField(
-        max_length=128, label=_('Database IP'), required=False
-    )
-    mysql_workbench_name = forms.CharField(
-        max_length=128, label=_('Database name'), required=False
-    )
-    mysql_workbench_username = forms.CharField(
-        max_length=128, label=_('Database username'), required=False
-    )
-    mysql_workbench_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Database password'), required=False
-    )
-
-
-class RemoteAppVMwareForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files (x86)\VMware\Infrastructure'
-                r'\Virtual Infrastructure Client\Launcher\VpxClient.exe'
-    }
-
-    vmware_target = forms.CharField(
-        max_length=128, label=_('Target address'), required=False
-    )
-    vmware_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    vmware_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-
-
-class RemoteAppCustomForm(BaseRemoteAppForm):
-
-    custom_cmdline = forms.CharField(
-        max_length=128, label=_('Operating parameter'), required=False
-    )
-    custom_target = forms.CharField(
-        max_length=128, label=_('Target address'), required=False
-    )
-    custom_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    custom_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-

apps/applications/hands.py

@@ -1,15 +0,0 @@
-"""
-    jumpserver.__app__.hands.py
-    ~~~~~~~~~~~~~~~~~
-
-    This app depends other apps api, function .. should be import or write mack here.
-
-    Other module of this app shouldn't connect with other app.
-
-    :copyright: (c) 2014-2018 by JumpServer Team.
-    :license: GPL v2, see LICENSE for more details.
-"""
-
-
-from common.permissions import IsAppUser, IsOrgAdmin, IsValidUser, IsOrgAdminOrAppUser
-from users.models import User, UserGroup

apps/applications/migrations/0001_initial.py

@@ -1,42 +0,0 @@
-# Generated by Django 2.1.7 on 2019-05-20 11:04
-
-import common.fields.model
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('assets', '0026_auto_20190325_2035'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='RemoteApp',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('type', models.CharField(choices=[('Browser', (('chrome', 'Chrome'),)), ('Database tools', (('mysql_workbench', 'MySQL Workbench'),)), ('Virtualization tools', (('vmware_client', 'vSphere Client'),)), ('custom', 'Custom')], default='chrome', max_length=128, verbose_name='App type')),
-                ('path', models.CharField(max_length=128, verbose_name='App path')),
-                ('params', common.fields.model.EncryptJsonDictTextField(blank=True, default={}, max_length=4096, null=True, verbose_name='Parameters')),
-                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('comment', models.TextField(blank=True, default='', max_length=128, verbose_name='Comment')),
-                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Asset', verbose_name='Asset')),
-                ('system_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.SystemUser', verbose_name='System user')),
-            ],
-            options={
-                'verbose_name': 'RemoteApp',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.AlterUniqueTogether(
-            name='remoteapp',
-            unique_together={('org_id', 'name')},
-        ),
-    ]

apps/applications/migrations/0002_remove_remoteapp_system_user.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.7 on 2019-09-09 09:57
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('applications', '0001_initial'),
-        ('perms', '0009_remoteapppermission_system_users'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='remoteapp',
-            name='system_user',
-        ),
-    ]

apps/applications/migrations/0003_auto_20191210_1659.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.11 on 2019-12-10 08:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('applications', '0002_remove_remoteapp_system_user'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='remoteapp',
-            name='type',
-            field=models.CharField(choices=[('chrome', 'Chrome'), ('mysql_workbench', 'MySQL Workbench'), ('vmware_client', 'vSphere Client'), ('custom', 'Custom')], default='chrome', max_length=128, verbose_name='App type'),
-        ),
-    ]

apps/applications/migrations/0004_auto_20191218_1705.py

@@ -1,38 +0,0 @@
-# Generated by Django 2.1.11 on 2019-12-18 09:05
-
-from django.db import migrations, models
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('applications', '0003_auto_20191210_1659'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DatabaseApp',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('type', models.CharField(choices=[('mysql', 'MySQL')], default='mysql', max_length=128, verbose_name='Type')),
-                ('host', models.CharField(db_index=True, max_length=128, verbose_name='Host')),
-                ('port', models.IntegerField(default=3306, verbose_name='Port')),
-                ('database', models.CharField(blank=True, db_index=True, max_length=128, null=True, verbose_name='Database')),
-                ('comment', models.TextField(blank=True, default='', max_length=128, verbose_name='Comment')),
-            ],
-            options={
-                'verbose_name': 'DatabaseApp',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.AlterUniqueTogether(
-            name='databaseapp',
-            unique_together={('org_id', 'name')},
-        ),
-    ]

apps/applications/models/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/models/database_app.py

@@ -1,42 +0,0 @@
-# coding: utf-8
-#
-
-import uuid
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-
-from orgs.mixins.models import OrgModelMixin
-from common.mixins import CommonModelMixin
-from .. import const
-
-
-__all__ = ['DatabaseApp']
-
-
-class DatabaseApp(CommonModelMixin, OrgModelMixin):
-    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
-    name = models.CharField(max_length=128, verbose_name=_('Name'))
-    type = models.CharField(
-        default=const.DATABASE_APP_TYPE_MYSQL,
-        choices=const.DATABASE_APP_TYPE_CHOICES,
-        max_length=128, verbose_name=_('Type')
-    )
-    host = models.CharField(
-        max_length=128, verbose_name=_('Host'), db_index=True
-    )
-    port = models.IntegerField(default=3306, verbose_name=_('Port'))
-    database = models.CharField(
-        max_length=128, blank=True, null=True, verbose_name=_('Database'),
-        db_index=True
-    )
-    comment = models.TextField(
-        max_length=128, default='', blank=True, verbose_name=_('Comment')
-    )
-
-    def __str__(self):
-        return self.name
-
-    class Meta:
-        unique_together = [('org_id', 'name'), ]
-        verbose_name = _("DatabaseApp")
-        ordering = ('name', )

apps/applications/models/remote_app.py

@@ -1,78 +0,0 @@
-# coding: utf-8
-#
-
-import uuid
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-
-from orgs.mixins.models import OrgModelMixin
-from common.fields.model import EncryptJsonDictTextField
-
-from .. import const
-
-
-__all__ = [
-    'RemoteApp',
-]
-
-
-class RemoteApp(OrgModelMixin):
-    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
-    name = models.CharField(max_length=128, verbose_name=_('Name'))
-    asset = models.ForeignKey(
-        'assets.Asset', on_delete=models.CASCADE, verbose_name=_('Asset')
-    )
-    type = models.CharField(
-        default=const.REMOTE_APP_TYPE_CHROME,
-        choices=const.REMOTE_APP_TYPE_CHOICES,
-        max_length=128, verbose_name=_('App type')
-    )
-    path = models.CharField(
-        max_length=128, blank=False, null=False,
-        verbose_name=_('App path')
-    )
-    params = EncryptJsonDictTextField(
-        max_length=4096, default={}, blank=True, null=True,
-        verbose_name=_('Parameters')
-    )
-    created_by = models.CharField(
-        max_length=32, null=True, blank=True, verbose_name=_('Created by')
-    )
-    date_created = models.DateTimeField(
-        auto_now_add=True, null=True, blank=True, verbose_name=_('Date created')
-    )
-    comment = models.TextField(
-        max_length=128, default='', blank=True, verbose_name=_('Comment')
-    )
-
-    class Meta:
-        verbose_name = _("RemoteApp")
-        unique_together = [('org_id', 'name')]
-        ordering = ('name', )
-
-    def __str__(self):
-        return self.name
-
-    @property
-    def parameters(self):
-        """
-        返回Guacamole需要的RemoteApp配置参数信息中的parameters参数
-        """
-        _parameters = list()
-        _parameters.append(self.type)
-        path = '\"%s\"' % self.path
-        _parameters.append(path)
-        for field in const.REMOTE_APP_TYPE_FIELDS_MAP[self.type]:
-            value = self.params.get(field['name'])
-            if value is None:
-                continue
-            _parameters.append(value)
-        _parameters = ' '.join(_parameters)
-        return _parameters
-
-    @property
-    def asset_info(self):
-        return {
-            'id': self.asset.id,
-            'hostname': self.asset.hostname
-        }

apps/applications/serializers/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/serializers/database_app.py

@@ -1,26 +0,0 @@
-# coding: utf-8
-#
-
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
-from common.serializers import AdaptedBulkListSerializer
-
-from .. import models
-
-__all__ = [
-    'DatabaseAppSerializer',
-]
-
-
-class DatabaseAppSerializer(BulkOrgResourceModelSerializer):
-
-    class Meta:
-        model = models.DatabaseApp
-        list_serializer_class = AdaptedBulkListSerializer
-        fields = [
-            'id', 'name', 'type', 'get_type_display', 'host', 'port',
-            'database', 'comment', 'created_by', 'date_created', 'date_updated',
-        ]
-        read_only_fields = [
-            'created_by', 'date_created', 'date_updated'
-            'get_type_display',
-        ]

apps/applications/serializers/remote_app.py

@@ -1,86 +0,0 @@
-# coding: utf-8
-#
-
-import copy
-from rest_framework import serializers
-
-from common.serializers import AdaptedBulkListSerializer
-from common.fields.serializer import CustomMetaDictField
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
-
-from .. import const
-from ..models import RemoteApp
-
-
-__all__ = [
-    'RemoteAppSerializer', 'RemoteAppConnectionInfoSerializer',
-]
-
-
-class RemoteAppParamsDictField(CustomMetaDictField):
-    type_fields_map = const.REMOTE_APP_TYPE_FIELDS_MAP
-    default_type = const.REMOTE_APP_TYPE_CHROME
-    convert_key_remove_type_prefix = False
-    convert_key_to_upper = False
-
-
-class RemoteAppSerializer(BulkOrgResourceModelSerializer):
-    params = RemoteAppParamsDictField()
-    type_fields_map = const.REMOTE_APP_TYPE_FIELDS_MAP
-
-    class Meta:
-        model = RemoteApp
-        list_serializer_class = AdaptedBulkListSerializer
-        fields = [
-            'id', 'name', 'asset', 'asset_info', 'type', 'get_type_display',
-            'path', 'params', 'date_created', 'created_by', 'comment',
-        ]
-        read_only_fields = [
-            'created_by', 'date_created', 'asset_info',
-            'get_type_display'
-        ]
-
-    def process_params(self, instance, validated_data):
-        new_params = copy.deepcopy(validated_data.get('params', {}))
-        tp = validated_data.get('type', '')
-
-        if tp != instance.type:
-            return new_params
-
-        old_params = instance.params
-        fields = self.type_fields_map.get(instance.type, [])
-        for field in fields:
-            if not field.get('write_only', False):
-                continue
-            field_name = field['name']
-            new_value = new_params.get(field_name, '')
-            old_value = old_params.get(field_name, '')
-            field_value = new_value if new_value else old_value
-            new_params[field_name] = field_value
-
-        return new_params
-
-    def update(self, instance, validated_data):
-        params = self.process_params(instance, validated_data)
-        validated_data['params'] = params
-        return super().update(instance, validated_data)
-
-
-class RemoteAppConnectionInfoSerializer(serializers.ModelSerializer):
-    parameter_remote_app = serializers.SerializerMethodField()
-
-    class Meta:
-        model = RemoteApp
-        fields = [
-            'id', 'name', 'asset', 'parameter_remote_app',
-        ]
-        read_only_fields = ['parameter_remote_app']
-
-    @staticmethod
-    def get_parameter_remote_app(obj):
-        parameter = {
-            'program': const.REMOTE_APP_BOOT_PROGRAM_NAME,
-            'working_directory': '',
-            'parameters': obj.parameters,
-        }
-        return parameter

apps/applications/templates/applications/database_app_create_update.html

@@ -1,55 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-    <form id="DatabaseAppForm" method="post" class="form-horizontal">
-        {% bootstrap_form form layout="horizontal" %}
-        <div class="hr-line-dashed"></div>
-        <div class="form-group">
-            <div class="col-sm-4 col-sm-offset-2">
-                <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-                <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-var app_type_id = '#' + '{{ form.type.id_for_label }}';
-
-function getFormDataType(){
-    return $(app_type_id+ " option:selected").val();
-}
-function getFormData(form){
-    var data = form.serializeObject();
-    data['type'] = getFormDataType();
-    return data
-}
-
-$(document).ready(function () {
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url "api-applications:database-app-list" %}';
-    var redirect_to = '{% url "applications:database-app-list" %}';
-    var method = "POST";
-    {% if api_action == "update" %}
-        the_url = '{% url "api-applications:database-app-detail" object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = getFormData(form);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-    };
-    formSubmit(props);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/database_app_detail.html

@@ -1,103 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'applications:database-app-detail' pk=database_app.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'applications:database-app-update' pk=database_app.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-application">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ database_app.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ database_app.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Type' %}:</td>
-                                            <td><b>{{ database_app.get_type_display }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Host' %}:</td>
-                                            <td><b>{{ database_app.host }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Port' %}:</td>
-                                            <td><b>{{ database_app.port }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Database' %}:</td>
-                                            <td><b>{{ database_app.database }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ database_app.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ database_app.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ database_app.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-})
-.on('click', '.btn-delete-application', function () {
-    var $this = $(this);
-    var name = "{{ database_app.name }}";
-    var rid = "{{ database_app.id }}";
-    var the_url = '{% url "api-applications:database-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    var redirect_url = "{% url 'applications:database-app-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/database_app_list.html

@@ -1,88 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block help_message %}
-{% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-    <div class="btn-group uc pull-left m-r-5">
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
-            {% trans "Create DatabaseApp" %}
-            <span class="caret"></span></button>
-        <ul class="dropdown-menu">
-            {% for key, value in type_choices %}
-                <li><a class="" href="{% url 'applications:database-app-create' %}?type={{ key }}">{{ value }}</a></li>
-            {% endfor %}
-        </ul>
-    </div>
-    <table class="table table-striped table-bordered table-hover " id="database_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'Type' %}</th>
-            <th class="text-center">{% trans 'Host' %}</th>
-            <th class="text-center">{% trans 'Port' %}</th>
-            <th class="text-center">{% trans 'Database' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#database_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:database-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                    $(td).html(rowData.get_type_display)
-                }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                    var update_btn = '<a href="{% url "applications:database-app-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-rid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                    $(td).html(update_btn + del_btn)
-                }}
-        ],
-        ajax_url: '{% url "api-applications:database-app-list" %}',
-        columns: [
-            {data: "id"},
-            {data: "name" },
-            {data: "type"},
-            {data: "host"},
-            {data: "port"},
-            {data: "database"},
-            {data: "comment"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#database_app_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var rid = $this.data('rid');
-    var the_url = '{% url "api-applications:database-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_create_update.html

@@ -1,71 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-    <form id="RemoteAppForm" method="post" class="form-horizontal">
-        {% bootstrap_form form layout="horizontal" %}
-        <div class="hr-line-dashed"></div>
-        <div class="form-group">
-            <div class="col-sm-4 col-sm-offset-2">
-                <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-
-                <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-var app_type_id = '#' + '{{ form.type.id_for_label }}';
-
-function getFormDataType(){
-    return $(app_type_id+ " option:selected").val();
-}
-function constructFormDataParams(data){
-    var params = {};
-    var type =data.type;
-    for (var k in data){
-        if (k.startsWith(type)){
-            params[k] = data[k];
-            delete data[k]
-        }
-    }
-    return params
-}
-function getFormData(form){
-    var data = form.serializeObject();
-    data['type'] = getFormDataType();
-    data['params'] = constructFormDataParams(data);
-    return data
-}
-
-$(document).ready(function () {
-    $('.select2').select2({
-        closeOnSelect: true
-    });
-}).on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url "api-applications:remote-app-list" %}';
-    var redirect_to = '{% url "applications:remote-app-list" %}';
-    var method = "POST";
-    {% if api_action == "update" %}
-        the_url = '{% url "api-applications:remote-app-detail" object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = getFormData(form);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
- })
-;
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_detail.html

@@ -1,100 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'applications:remote-app-detail' pk=remote_app.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'applications:remote-app-update' pk=remote_app.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-application">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ remote_app.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ remote_app.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Asset' %}:</td>
-                                            <td><b><a href="{% url 'assets:asset-detail' pk=remote_app.asset.id %}">{{ remote_app.asset.hostname }}</a></b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'App type' %}:</td>
-                                            <td><b>{{ remote_app.get_type_display }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'App path' %}:</td>
-                                            <td><b>{{ remote_app.path }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ remote_app.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ remote_app.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ remote_app.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-jumpserver.nodes_selected = {};
-$(document).ready(function () {
-})
-.on('click', '.btn-delete-application', function () {
-    var $this = $(this);
-    var name = "{{ remote_app.name }}";
-    var rid = "{{ remote_app.id }}";
-    var the_url = '{% url "api-applications:remote-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    var redirect_url = "{% url 'applications:remote-app-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_list.html

@@ -1,92 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block help_message %}
-    {% trans 'Before using this feature, make sure that the application loader has been uploaded to the application server and successfully published as a RemoteApp application' %}
-    <b><a href="https://github.com/jumpserver/Jmservisor/releases" target="view_window" >{% trans 'Download application loader' %}</a></b>
-{% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-    <div class="btn-group uc pull-left m-r-5">
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
-            {% trans "Create RemoteApp" %}
-            <span class="caret"></span></button>
-        <ul class="dropdown-menu">
-            {% for key, value in type_choices %}
-                <li><a class="" href="{% url 'applications:remote-app-create' %}?type={{ key }}">{{ value }}</a></li>
-            {% endfor %}
-        </ul>
-    </div>
-    <table class="table table-striped table-bordered table-hover " id="remote_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'App type' %}</th>
-            <th class="text-center">{% trans 'Asset' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#remote_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:remote-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var hostname = htmlEscape(cellData.hostname);
-                    var detail_btn = '<a href="{% url 'assets:asset-detail' pk=DEFAULT_PK %}">' + hostname + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', cellData.id));
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var comment = htmlEscape(cellData);
-                    $(td).html(comment)
-                }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                    var update_btn = '<a href="{% url "applications:remote-app-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-rid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                    $(td).html(update_btn + del_btn)
-                }}
-        ],
-        ajax_url: '{% url "api-applications:remote-app-list" %}',
-        columns: [
-            {data: "id"},
-            {data: "name" },
-            {data: "get_type_display", orderable: false},
-            {data: "asset_info", orderable: false},
-            {data: "comment"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#remote_app_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var rid = $this.data('rid');
-    var the_url = '{% url "api-applications:remote-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/user_database_app_list.html

@@ -1,83 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-<div class="mail-box-header">
-    <table class="table table-striped table-bordered table-hover " id="database_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'Type' %}</th>
-            <th class="text-center">{% trans 'Host' %}</th>
-            <th class="text-center">{% trans 'Database' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var database_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:my-database-apps" %}';
-    var options = {
-        ele: $('#database_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    var name = htmlEscape(cellData);
-                    $(td).html(name)
-                }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                    var type = htmlEscape(rowData.get_type_display);
-                    $(td).html(type);
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var host = htmlEscape(cellData);
-                    $(td).html(host);
-                }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                    var database = htmlEscape(cellData);
-                    $(td).html(database);
-                }},
-            {targets: 6, createdCell: function (td, cellData, rowData) {
-                    var conn_btn = '<a href="{% url "luna-view" %}?type=database_app&login_to=' +  cellData +'" class="btn btn-xs btn-primary" target="_blank">{% trans "Connect" %}</a>';
-                    $(td).html(conn_btn)
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "type"},
-            {data: "host"},
-            {data: "database"},
-            {data: "comment", orderable: false},
-            {data: "id", orderable: false}
-        ]
-    };
-    database_app_table = jumpserver.initServerSideDataTable(options);
-    return database_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/user_remote_app_list.html

@@ -1,73 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-<div class="mail-box-header">
-    <table class="table table-striped table-bordered table-hover " id="remote_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'App type' %}</th>
-            <th class="text-center">{% trans 'Asset' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var remote_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:my-remote-apps" %}';
-    var options = {
-        ele: $('#remote_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    var name = htmlEscape(cellData);
-                    $(td).html(name)
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var hostname = htmlEscape(cellData.hostname);
-                    $(td).html(hostname);
-                }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                    var conn_btn = '<a href="{% url "luna-view" %}?type=remote_app&login_to=' +  cellData +'" class="btn btn-xs btn-primary" target="_blank">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    $(td).html(conn_btn)
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "get_type_display", orderable: false},
-            {data: "asset_info", orderable: false},
-            {data: "comment", orderable: false},
-            {data: "id", orderable: false}
-        ]
-    };
-    remote_app_table = jumpserver.initServerSideDataTable(options);
-    return remote_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}

apps/applications/urls/__init__.py

@@ -1,7 +0,0 @@
-#  coding: utf-8
-#
-
-
-__all__ = [
-
-]

apps/applications/urls/api_urls.py

@@ -1,24 +0,0 @@
-# coding:utf-8
-#
-
-from django.urls import path, re_path
-from rest_framework_bulk.routes import BulkRouter
-
-from common import api as capi
-from .. import api
-
-app_name = 'applications'
-
-router = BulkRouter()
-router.register(r'remote-apps', api.RemoteAppViewSet, 'remote-app')
-router.register(r'database-apps', api.DatabaseAppViewSet, 'database-app')
-
-urlpatterns = [
-    path('remote-apps/<uuid:pk>/connection-info/', api.RemoteAppConnectionInfoApi.as_view(), name='remote-app-connection-info'),
-]
-
-old_version_urlpatterns = [
-    re_path('(?P<resource>remote-app)/.*', capi.redirect_plural_name_api)
-]
-
-urlpatterns += router.urls + old_version_urlpatterns

apps/applications/urls/views_urls.py

@@ -1,23 +0,0 @@
-# coding:utf-8
-from django.urls import path
-from .. import views
-
-app_name = 'applications'
-
-urlpatterns = [
-    # RemoteApp
-    path('remote-app/', views.RemoteAppListView.as_view(), name='remote-app-list'),
-    path('remote-app/create/', views.RemoteAppCreateView.as_view(), name='remote-app-create'),
-    path('remote-app/<uuid:pk>/update/', views.RemoteAppUpdateView.as_view(), name='remote-app-update'),
-    path('remote-app/<uuid:pk>/', views.RemoteAppDetailView.as_view(), name='remote-app-detail'),
-    # User RemoteApp view
-    path('user-remote-app/', views.UserRemoteAppListView.as_view(), name='user-remote-app-list'),
-
-    path('database-app/', views.DatabaseAppListView.as_view(), name='database-app-list'),
-    path('database-app/create/', views.DatabaseAppCreateView.as_view(), name='database-app-create'),
-    path('database-app/<uuid:pk>/update/', views.DatabaseAppUpdateView.as_view(), name='database-app-update'),
-    path('database-app/<uuid:pk>/', views.DatabaseAppDetailView.as_view(), name='database-app-detail'),
-    # User DatabaseApp view
-    path('user-database-app/', views.UserDatabaseAppListView.as_view(), name='user-database-app-list'),
-
-]

apps/applications/views/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/views/database_app.py

@@ -1,115 +0,0 @@
-# coding: utf-8
-#
-
-from django.http import Http404
-from django.views.generic import TemplateView
-from django.views.generic.edit import CreateView, UpdateView
-from django.utils.translation import ugettext_lazy as _
-from django.views.generic.detail import DetailView
-
-from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-
-from .. import models, const, forms
-
-__all__ = [
-    'DatabaseAppListView', 'DatabaseAppCreateView', 'DatabaseAppUpdateView',
-    'DatabaseAppDetailView', 'UserDatabaseAppListView',
-]
-
-
-class DatabaseAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/database_app_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _("Application"),
-            'action': _('DatabaseApp list'),
-            'type_choices': const.DATABASE_APP_TYPE_CHOICES
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class BaseDatabaseAppCreateUpdateView:
-    template_name = 'applications/database_app_create_update.html'
-    model = models.DatabaseApp
-    permission_classes = [IsOrgAdmin]
-    default_type = const.DATABASE_APP_TYPE_MYSQL
-    form_class = forms.DatabaseAppMySQLForm
-    form_class_choices = {
-        const.DATABASE_APP_TYPE_MYSQL: forms.DatabaseAppMySQLForm,
-    }
-
-    def get_initial(self):
-        return {'type': self.get_type()}
-
-    def get_type(self):
-        return self.default_type
-
-    def get_form_class(self):
-        tp = self.get_type()
-        form_class = self.form_class_choices.get(tp)
-        if not form_class:
-            raise Http404()
-        return form_class
-
-
-class DatabaseAppCreateView(BaseDatabaseAppCreateUpdateView, CreateView):
-
-    def get_type(self):
-        tp = self.request.GET.get("type")
-        if tp:
-            return tp.lower()
-        return super().get_type()
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create DatabaseApp'),
-            'api_action': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DatabaseAppUpdateView(BaseDatabaseAppCreateUpdateView, UpdateView):
-
-    def get_type(self):
-        return self.object.type
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create DatabaseApp'),
-            'api_action': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DatabaseAppDetailView(PermissionsMixin, DetailView):
-    template_name = 'applications/database_app_detail.html'
-    model = models.DatabaseApp
-    context_object_name = 'database_app'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('DatabaseApp detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class UserDatabaseAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/user_database_app_list.html'
-    permission_classes = [IsValidUser]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'action': _('My DatabaseApp'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/applications/views/remote_app.py

@@ -1,128 +0,0 @@
-#  coding: utf-8
-#
-
-from django.http import Http404
-from django.utils.translation import ugettext as _
-from django.views.generic import TemplateView
-from django.views.generic.edit import CreateView, UpdateView
-from django.views.generic.detail import DetailView
-
-from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-
-from ..models import RemoteApp
-from .. import forms, const
-
-
-__all__ = [
-    'RemoteAppListView', 'RemoteAppCreateView', 'RemoteAppUpdateView',
-    'RemoteAppDetailView', 'UserRemoteAppListView',
-]
-
-
-class RemoteAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/remote_app_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('RemoteApp list'),
-            'type_choices': const.REMOTE_APP_TYPE_CHOICES,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class BaseRemoteAppCreateUpdateView:
-    template_name = 'applications/remote_app_create_update.html'
-    model = RemoteApp
-    permission_classes = [IsOrgAdmin]
-    default_type = const.REMOTE_APP_TYPE_CHROME
-    form_class = forms.RemoteAppChromeForm
-    form_class_choices = {
-        const.REMOTE_APP_TYPE_CHROME: forms.RemoteAppChromeForm,
-        const.REMOTE_APP_TYPE_MYSQL_WORKBENCH: forms.RemoteAppMySQLWorkbenchForm,
-        const.REMOTE_APP_TYPE_VMWARE_CLIENT: forms.RemoteAppVMwareForm,
-        const.REMOTE_APP_TYPE_CUSTOM: forms.RemoteAppCustomForm
-    }
-
-    def get_initial(self):
-        return {'type': self.get_type()}
-
-    def get_type(self):
-        return self.default_type
-
-    def get_form_class(self):
-        tp = self.get_type()
-        form_class = self.form_class_choices.get(tp)
-        if not form_class:
-            raise Http404()
-        return form_class
-
-
-class RemoteAppCreateView(BaseRemoteAppCreateUpdateView,
-                          PermissionsMixin, CreateView):
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create RemoteApp'),
-            'api_action': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-    def get_type(self):
-        tp = self.request.GET.get("type")
-        if tp:
-            return tp.lower()
-        return super().get_type()
-
-
-class RemoteAppUpdateView(BaseRemoteAppCreateUpdateView,
-                          PermissionsMixin, UpdateView):
-
-    def get_initial(self):
-        initial_data = super().get_initial()
-        params = {k: v for k, v in self.object.params.items()}
-        initial_data.update(params)
-        return initial_data
-
-    def get_type(self):
-        return self.object.type
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Update RemoteApp'),
-            'api_action': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class RemoteAppDetailView(PermissionsMixin, DetailView):
-    template_name = 'applications/remote_app_detail.html'
-    model = RemoteApp
-    context_object_name = 'remote_app'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('RemoteApp detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class UserRemoteAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/user_remote_app_list.html'
-    permission_classes = [IsValidUser]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'action': _('My RemoteApp'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/assets/api/__init__.py

@@ -1,11 +0,0 @@
-from .admin_user import *
-from .asset import *
-from .label import *
-from .system_user import *
-from .system_user_relation import *
-from .node import *
-from .domain import *
-from .cmd_filter import *
-from .asset_user import *
-from .gathered_user import *
-from .favorite_asset import *

apps/assets/api/admin_user.py

@@ -1,119 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
-#
-# Licensed under the GNU General Public License v2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.gnu.org/licenses/gpl-2.0.html
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from django.db import transaction
-from django.db.models import Count
-from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext as _
-from rest_framework import status
-from rest_framework.response import Response
-from orgs.mixins.api import OrgBulkModelViewSet
-from orgs.mixins import generics
-
-from common.utils import get_logger
-from ..hands import IsOrgAdmin
-from ..models import AdminUser, Asset
-from .. import serializers
-from ..tasks import test_admin_user_connectivity_manual
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'AdminUserViewSet', 'ReplaceNodesAdminUserApi',
-    'AdminUserTestConnectiveApi', 'AdminUserAuthApi',
-    'AdminUserAssetsListView',
-]
-
-
-class AdminUserViewSet(OrgBulkModelViewSet):
-    """
-    Admin user api set, for add,delete,update,list,retrieve resource
-    """
-    model = AdminUser
-    filter_fields = ("name", "username")
-    search_fields = filter_fields
-    serializer_class = serializers.AdminUserSerializer
-    permission_classes = (IsOrgAdmin,)
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset.annotate(_assets_amount=Count('assets'))
-        return queryset
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        has_related_asset = instance.assets.exists()
-        if has_related_asset:
-            data = {'msg': _('Deleted failed, There are related assets')}
-            return Response(data=data, status=status.HTTP_400_BAD_REQUEST)
-        return super().destroy(request, *args, **kwargs)
-
-
-class AdminUserAuthApi(generics.UpdateAPIView):
-    model = AdminUser
-    serializer_class = serializers.AdminUserAuthSerializer
-    permission_classes = (IsOrgAdmin,)
-
-
-class ReplaceNodesAdminUserApi(generics.UpdateAPIView):
-    model = AdminUser
-    serializer_class = serializers.ReplaceNodeAdminUserSerializer
-    permission_classes = (IsOrgAdmin,)
-
-    def update(self, request, *args, **kwargs):
-        admin_user = self.get_object()
-        serializer = self.serializer_class(data=request.data)
-        if serializer.is_valid():
-            nodes = serializer.validated_data['nodes']
-            assets = []
-            for node in nodes:
-                assets.extend([asset.id for asset in node.get_all_assets()])
-
-            with transaction.atomic():
-                Asset.objects.filter(id__in=assets).update(admin_user=admin_user)
-
-            return Response({"msg": "ok"})
-        else:
-            return Response({'error': serializer.errors}, status=400)
-
-
-class AdminUserTestConnectiveApi(generics.RetrieveAPIView):
-    """
-    Test asset admin user assets_connectivity
-    """
-    model = AdminUser
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.TaskIDSerializer
-
-    def retrieve(self, request, *args, **kwargs):
-        admin_user = self.get_object()
-        task = test_admin_user_connectivity_manual.delay(admin_user)
-        return Response({"task": task.id})
-
-
-class AdminUserAssetsListView(generics.ListAPIView):
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.AssetSimpleSerializer
-    filter_fields = ("hostname", "ip")
-    http_method_names = ['get']
-    search_fields = filter_fields
-
-    def get_object(self):
-        pk = self.kwargs.get('pk')
-        return get_object_or_404(AdminUser, pk=pk)
-
-    def get_queryset(self):
-        admin_user = self.get_object()
-        return admin_user.get_related_assets()

apps/assets/api/asset.py

@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import random
-
-from rest_framework.response import Response
-from rest_framework.viewsets import ModelViewSet
-from rest_framework.generics import RetrieveAPIView
-from django.shortcuts import get_object_or_404
-
-from common.utils import get_logger, get_object_or_none
-from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser, IsSuperUser
-from orgs.mixins.api import OrgBulkModelViewSet
-from orgs.mixins import generics
-from ..models import Asset, Node, Platform
-from .. import serializers
-from ..tasks import (
-    update_asset_hardware_info_manual, test_asset_connectivity_manual
-)
-from ..filters import AssetByNodeFilterBackend, LabelFilterBackend
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'AssetViewSet', 'AssetPlatformRetrieveApi',
-    'AssetGatewayListApi', 'AssetPlatformViewSet',
-    'AssetTaskCreateApi',
-]
-
-
-class AssetViewSet(OrgBulkModelViewSet):
-    """
-    API endpoint that allows Asset to be viewed or edited.
-    """
-    model = Asset
-    filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id")
-    search_fields = ("hostname", "ip")
-    ordering_fields = ("hostname", "ip", "port", "cpu_cores")
-    serializer_classes = {
-        'default': serializers.AssetSerializer,
-        'display': serializers.AssetDisplaySerializer,
-    }
-    permission_classes = (IsOrgAdminOrAppUser,)
-    extra_filter_backends = [AssetByNodeFilterBackend, LabelFilterBackend]
-
-    def set_assets_node(self, assets):
-        if not isinstance(assets, list):
-            assets = [assets]
-        node_id = self.request.query_params.get('node_id')
-        if not node_id:
-            return
-        node = get_object_or_none(Node, pk=node_id)
-        if not node:
-            return
-        node.assets.add(*assets)
-
-    def perform_create(self, serializer):
-        assets = serializer.save()
-        self.set_assets_node(assets)
-
-
-class AssetPlatformRetrieveApi(RetrieveAPIView):
-    queryset = Platform.objects.all()
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = serializers.PlatformSerializer
-
-    def get_object(self):
-        asset_pk = self.kwargs.get('pk')
-        asset = get_object_or_404(Asset, pk=asset_pk)
-        return asset.platform
-
-
-class AssetPlatformViewSet(ModelViewSet):
-    queryset = Platform.objects.all()
-    permission_classes = (IsSuperUser,)
-    serializer_class = serializers.PlatformSerializer
-    filterset_fields = ['name', 'base']
-    search_fields = ['name']
-
-    def check_object_permissions(self, request, obj):
-        if request.method.lower() in ['delete', 'put', 'patch'] and \
-                obj.internal:
-            self.permission_denied(
-                request, message={"detail": "Internal platform"}
-            )
-        return super().check_object_permissions(request, obj)
-
-
-class AssetTaskCreateApi(generics.CreateAPIView):
-    model = Asset
-    serializer_class = serializers.AssetTaskSerializer
-    permission_classes = (IsOrgAdmin,)
-
-    def get_object(self):
-        pk = self.kwargs.get("pk")
-        instance = get_object_or_404(Asset, pk=pk)
-        return instance
-
-    def perform_create(self, serializer):
-        asset = self.get_object()
-        action = serializer.validated_data["action"]
-        if action == "refresh":
-            task = update_asset_hardware_info_manual.delay(asset)
-        else:
-            task = test_asset_connectivity_manual.delay(asset)
-        data = getattr(serializer, '_data', {})
-        data["task"] = task.id
-        setattr(serializer, '_data', data)
-
-
-class AssetGatewayListApi(generics.ListAPIView):
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = serializers.GatewayWithAuthSerializer
-    model = Asset
-
-    def get_queryset(self):
-        asset_id = self.kwargs.get('pk')
-        asset = get_object_or_404(Asset, pk=asset_id)
-        if not asset.domain:
-            return []
-        queryset = asset.domain.gateways.filter(protocol='ssh')
-        return queryset

apps/assets/api/asset_user.py

@@ -1,144 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django.conf import settings
-from rest_framework.response import Response
-from rest_framework import generics, filters
-from rest_framework_bulk import BulkModelViewSet
-
-from common.permissions import IsOrgAdminOrAppUser, NeedMFAVerify
-from common.utils import get_object_or_none, get_logger
-from common.mixins import CommonApiMixin
-from ..backends import AssetUserManager
-from ..models import Asset, Node, SystemUser
-from .. import serializers
-from ..tasks import (
-    test_asset_users_connectivity_manual, push_system_user_a_asset_manual
-)
-
-
-__all__ = [
-    'AssetUserViewSet', 'AssetUserAuthInfoViewSet', 'AssetUserTaskCreateAPI',
-]
-
-
-logger = get_logger(__name__)
-
-
-class AssetUserFilterBackend(filters.BaseFilterBackend):
-    def filter_queryset(self, request, queryset, view):
-        kwargs = {}
-        for field in view.filter_fields:
-            value = request.GET.get(field)
-            if not value:
-                continue
-            if field == "node_id":
-                value = get_object_or_none(Node, pk=value)
-                kwargs["node"] = value
-                continue
-            elif field == "asset_id":
-                field = "asset"
-            kwargs[field] = value
-        if kwargs:
-            queryset = queryset.filter(**kwargs)
-        logger.debug("Filter {}".format(kwargs))
-        return queryset
-
-
-class AssetUserSearchBackend(filters.BaseFilterBackend):
-    def filter_queryset(self, request, queryset, view):
-        value = request.GET.get('search')
-        if not value:
-            return queryset
-        queryset = queryset.search(value)
-        return queryset
-
-
-class AssetUserLatestFilterBackend(filters.BaseFilterBackend):
-    def filter_queryset(self, request, queryset, view):
-        latest = request.GET.get('latest') == '1'
-        if latest:
-            queryset = queryset.distinct()
-        return queryset
-
-
-class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
-    serializer_classes = {
-        'default': serializers.AssetUserWriteSerializer,
-        'list': serializers.AssetUserReadSerializer,
-        'retrieve': serializers.AssetUserReadSerializer,
-    }
-    permission_classes = [IsOrgAdminOrAppUser]
-    filter_fields = [
-        "id", "ip", "hostname", "username",
-        "asset_id", "node_id",
-        "prefer", "prefer_id",
-    ]
-    search_fields = ["ip", "hostname", "username"]
-    filter_backends = [
-        AssetUserFilterBackend, AssetUserSearchBackend,
-        AssetUserLatestFilterBackend,
-    ]
-
-    def allow_bulk_destroy(self, qs, filtered):
-        return False
-
-    def get_object(self):
-        pk = self.kwargs.get("pk")
-        queryset = self.get_queryset()
-        obj = queryset.get(id=pk)
-        return obj
-
-    def get_exception_handler(self):
-        def handler(e, context):
-            return Response({"error": str(e)}, status=400)
-        return handler
-
-    def perform_destroy(self, instance):
-        manager = AssetUserManager()
-        manager.delete(instance)
-
-    def get_queryset(self):
-        manager = AssetUserManager()
-        queryset = manager.all()
-        return queryset
-
-
-class AssetUserAuthInfoViewSet(AssetUserViewSet):
-    serializer_classes = {"default": serializers.AssetUserAuthInfoSerializer}
-    http_method_names = ['get', 'post']
-    permission_classes = [IsOrgAdminOrAppUser]
-
-    def get_permissions(self):
-        if settings.SECURITY_VIEW_AUTH_NEED_MFA:
-            self.permission_classes = [IsOrgAdminOrAppUser, NeedMFAVerify]
-        return super().get_permissions()
-
-
-class AssetUserTaskCreateAPI(generics.CreateAPIView):
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = serializers.AssetUserTaskSerializer
-    filter_backends = AssetUserViewSet.filter_backends
-    filter_fields = AssetUserViewSet.filter_fields
-
-    def get_asset_users(self):
-        manager = AssetUserManager()
-        queryset = manager.all()
-        for cls in self.filter_backends:
-            queryset = cls().filter_queryset(self.request, queryset, self)
-        return list(queryset)
-
-    def perform_create(self, serializer):
-        asset_users = self.get_asset_users()
-        # action = serializer.validated_data["action"]
-        # only this
-        # if action == "test":
-        task = test_asset_users_connectivity_manual.delay(asset_users)
-        data = getattr(serializer, '_data', {})
-        data["task"] = task.id
-        setattr(serializer, '_data', data)
-        return task
-
-    def get_exception_handler(self):
-        def handler(e, context):
-            return Response({"error": str(e)}, status=400)
-        return handler

apps/assets/api/cmd_filter.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-from django.shortcuts import get_object_or_404
-
-from orgs.mixins.api import OrgBulkModelViewSet
-from ..hands import IsOrgAdmin
-from ..models import CommandFilter, CommandFilterRule
-from .. import serializers
-
-
-__all__ = ['CommandFilterViewSet', 'CommandFilterRuleViewSet']
-
-
-class CommandFilterViewSet(OrgBulkModelViewSet):
-    model = CommandFilter
-    filter_fields = ("name",)
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.CommandFilterSerializer
-
-
-class CommandFilterRuleViewSet(OrgBulkModelViewSet):
-    model = CommandFilterRule
-    filter_fields = ("content",)
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.CommandFilterRuleSerializer
-
-    def get_queryset(self):
-        fpk = self.kwargs.get('filter_pk')
-        if not fpk:
-            return CommandFilterRule.objects.none()
-        cmd_filter = get_object_or_404(CommandFilter, pk=fpk)
-        return cmd_filter.rules.all()
-
-

apps/assets/api/domain.py

@@ -1,49 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-
-from rest_framework.views import APIView, Response
-from django.views.generic.detail import SingleObjectMixin
-
-from common.utils import get_logger
-from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
-from orgs.mixins.api import OrgBulkModelViewSet
-from ..models import Domain, Gateway
-from .. import serializers
-
-
-logger = get_logger(__file__)
-__all__ = ['DomainViewSet', 'GatewayViewSet', "GatewayTestConnectionApi"]
-
-
-class DomainViewSet(OrgBulkModelViewSet):
-    model = Domain
-    filter_fields = ("name", )
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = serializers.DomainSerializer
-
-    def get_serializer_class(self):
-        if self.request.query_params.get('gateway'):
-            return serializers.DomainWithGatewaySerializer
-        return super().get_serializer_class()
-
-
-class GatewayViewSet(OrgBulkModelViewSet):
-    model = Gateway
-    filter_fields = ("domain__name", "name", "username", "ip", "domain")
-    search_fields = ("domain__name", "name", "username", "ip")
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.GatewaySerializer
-
-
-class GatewayTestConnectionApi(SingleObjectMixin, APIView):
-    permission_classes = (IsOrgAdmin,)
-    object = None
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object(Gateway.objects.all())
-        local_port = self.request.data.get('port') or self.object.port
-        ok, e = self.object.test_connective(local_port=local_port)
-        if ok:
-            return Response("ok")
-        else:
-            return Response({"error": e}, status=400)

apps/assets/api/favorite_asset.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from rest_framework_bulk import BulkModelViewSet
-
-from common.permissions import IsValidUser
-from orgs.utils import tmp_to_root_org
-from ..models import FavoriteAsset
-from ..serializers import FavoriteAssetSerializer
-
-__all__ = ['FavoriteAssetViewSet']
-
-
-class FavoriteAssetViewSet(BulkModelViewSet):
-    serializer_class = FavoriteAssetSerializer
-    permission_classes = (IsValidUser,)
-    filter_fields = ['asset']
-
-    def dispatch(self, request, *args, **kwargs):
-        with tmp_to_root_org():
-            return super().dispatch(request, *args, **kwargs)
-
-    def get_queryset(self):
-        queryset = FavoriteAsset.objects.filter(user=self.request.user)
-        return queryset
-
-    def allow_bulk_destroy(self, qs, filtered):
-        return filtered.count() == 1

apps/assets/api/gathered_user.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-from orgs.mixins.api import OrgModelViewSet
-from assets.models import GatheredUser
-from common.permissions import IsOrgAdmin
-
-from ..serializers import GatheredUserSerializer
-from ..filters import AssetRelatedByNodeFilterBackend
-
-
-__all__ = ['GatheredUserViewSet']
-
-
-class GatheredUserViewSet(OrgModelViewSet):
-    model = GatheredUser
-    serializer_class = GatheredUserSerializer
-    permission_classes = [IsOrgAdmin]
-    extra_filter_backends = [AssetRelatedByNodeFilterBackend]
-
-    filter_fields = ['asset', 'username', 'present']
-    search_fields = ['username', 'asset__ip', 'asset__hostname']

apps/assets/api/label.py

@@ -1,44 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
-#
-# Licensed under the GNU General Public License v2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.gnu.org/licenses/gpl-2.0.html
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from django.db.models import Count
-
-from common.utils import get_logger
-from orgs.mixins.api import OrgBulkModelViewSet
-from ..hands import IsOrgAdmin
-from ..models import Label
-from .. import serializers
-
-
-logger = get_logger(__file__)
-__all__ = ['LabelViewSet']
-
-
-class LabelViewSet(OrgBulkModelViewSet):
-    model = Label
-    filter_fields = ("name", "value")
-    search_fields = filter_fields
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.LabelSerializer
-
-    def list(self, request, *args, **kwargs):
-        if request.query_params.get("distinct"):
-            self.serializer_class = serializers.LabelDistinctSerializer
-            self.queryset = self.queryset.values("name").distinct()
-        return super().list(request, *args, **kwargs)
-
-    def get_queryset(self):
-        self.queryset = Label.objects.annotate(asset_count=Count("assets"))
-        return self.queryset

apps/assets/api/node.py

@@ -1,289 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-
-from collections import namedtuple
-from rest_framework import status
-from rest_framework.serializers import ValidationError
-from rest_framework.response import Response
-from django.utils.translation import ugettext_lazy as _
-from django.shortcuts import get_object_or_404, Http404
-
-from common.utils import get_logger, get_object_or_none
-from common.tree import TreeNodeSerializer
-from orgs.mixins.api import OrgModelViewSet
-from orgs.mixins import generics
-from ..hands import IsOrgAdmin
-from ..models import Node
-from ..tasks import (
-    update_node_assets_hardware_info_manual,
-    test_node_assets_connectivity_manual,
-)
-from .. import serializers
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'NodeViewSet', 'NodeChildrenApi', 'NodeAssetsApi',
-    'NodeAddAssetsApi', 'NodeRemoveAssetsApi', 'NodeReplaceAssetsApi',
-    'NodeAddChildrenApi', 'NodeListAsTreeApi',
-    'NodeChildrenAsTreeApi',
-    'NodeTaskCreateApi',
-]
-
-
-class NodeViewSet(OrgModelViewSet):
-    model = Node
-    filter_fields = ('value', 'key', 'id')
-    search_fields = ('value', )
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.NodeSerializer
-
-    # 仅支持根节点指直接创建，子节点下的节点需要通过children接口创建
-    def perform_create(self, serializer):
-        child_key = Node.org_root().get_next_child_key()
-        serializer.validated_data["key"] = child_key
-        serializer.save()
-
-    def perform_update(self, serializer):
-        node = self.get_object()
-        if node.is_org_root() and node.value != serializer.validated_data['value']:
-            msg = _("You can't update the root node name")
-            raise ValidationError({"error": msg})
-        return super().perform_update(serializer)
-
-    def destroy(self, request, *args, **kwargs):
-        node = self.get_object()
-        if node.has_children_or_has_assets():
-            error = _("Deletion failed and the node contains children or assets")
-            return Response(data={'error': error}, status=status.HTTP_403_FORBIDDEN)
-        return super().destroy(request, *args, **kwargs)
-
-
-class NodeListAsTreeApi(generics.ListAPIView):
-    """
-    获取节点列表树
-    [
-      {
-        "id": "",
-        "name": "",
-        "pId": "",
-        "meta": ""
-      }
-    ]
-    """
-    model = Node
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = TreeNodeSerializer
-
-    @staticmethod
-    def to_tree_queryset(queryset):
-        queryset = [node.as_tree_node() for node in queryset]
-        return queryset
-
-    def filter_queryset(self, queryset):
-        queryset = super().filter_queryset(queryset)
-        queryset = self.to_tree_queryset(queryset)
-        return queryset
-
-
-class NodeChildrenApi(generics.ListCreateAPIView):
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.NodeSerializer
-    instance = None
-    is_initial = False
-
-    def initial(self, request, *args, **kwargs):
-        self.instance = self.get_object()
-        return super().initial(request, *args, **kwargs)
-
-    def perform_create(self, serializer):
-        data = serializer.validated_data
-        _id = data.get("id")
-        value = data.get("value")
-        if not value:
-            value = self.instance.get_next_child_preset_name()
-        node = self.instance.create_child(value=value, _id=_id)
-        # 避免查询 full value
-        node._full_value = node.value
-        serializer.instance = node
-
-    def get_object(self):
-        pk = self.kwargs.get('pk') or self.request.query_params.get('id')
-        key = self.request.query_params.get("key")
-        if not pk and not key:
-            node = Node.org_root()
-            self.is_initial = True
-            return node
-        if pk:
-            node = get_object_or_404(Node, pk=pk)
-        else:
-            node = get_object_or_404(Node, key=key)
-        return node
-
-    def get_queryset(self):
-        query_all = self.request.query_params.get("all", "0") == "all"
-        if not self.instance:
-            return Node.objects.none()
-
-        if self.is_initial:
-            with_self = True
-        else:
-            with_self = False
-
-        if query_all:
-            queryset = self.instance.get_all_children(with_self=with_self)
-        else:
-            queryset = self.instance.get_children(with_self=with_self)
-        return queryset
-
-
-class NodeChildrenAsTreeApi(NodeChildrenApi):
-    """
-    节点子节点作为树返回，
-    [
-      {
-        "id": "",
-        "name": "",
-        "pId": "",
-        "meta": ""
-      }
-    ]
-
-    """
-    model = Node
-    serializer_class = TreeNodeSerializer
-    http_method_names = ['get']
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = [node.as_tree_node() for node in queryset]
-        queryset = self.add_assets_if_need(queryset)
-        queryset = sorted(queryset)
-        return queryset
-
-    def add_assets_if_need(self, queryset):
-        include_assets = self.request.query_params.get('assets', '0') == '1'
-        if not include_assets:
-            return queryset
-        assets = self.instance.get_assets().only(
-            "id", "hostname", "ip", "os",
-            "org_id", "protocols",
-        )
-        for asset in assets:
-            queryset.append(asset.as_tree_node(self.instance))
-        return queryset
-
-    def check_need_refresh_nodes(self):
-        if self.request.query_params.get('refresh', '0') == '1':
-            Node.refresh_nodes()
-
-
-class NodeAssetsApi(generics.ListAPIView):
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.AssetSerializer
-
-    def get_queryset(self):
-        node_id = self.kwargs.get('pk')
-        query_all = self.request.query_params.get('all')
-        instance = get_object_or_404(Node, pk=node_id)
-        if query_all:
-            return instance.get_all_assets()
-        else:
-            return instance.get_assets()
-
-
-class NodeAddChildrenApi(generics.UpdateAPIView):
-    model = Node
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.NodeAddChildrenSerializer
-    instance = None
-
-    def put(self, request, *args, **kwargs):
-        instance = self.get_object()
-        nodes_id = request.data.get("nodes")
-        children = [get_object_or_none(Node, id=pk) for pk in nodes_id]
-        for node in children:
-            if not node:
-                continue
-            node.parent = instance
-        return Response("OK")
-
-
-class NodeAddAssetsApi(generics.UpdateAPIView):
-    model = Node
-    serializer_class = serializers.NodeAssetsSerializer
-    permission_classes = (IsOrgAdmin,)
-    instance = None
-
-    def perform_update(self, serializer):
-        assets = serializer.validated_data.get('assets')
-        instance = self.get_object()
-        instance.assets.add(*tuple(assets))
-
-
-class NodeRemoveAssetsApi(generics.UpdateAPIView):
-    model = Node
-    serializer_class = serializers.NodeAssetsSerializer
-    permission_classes = (IsOrgAdmin,)
-    instance = None
-
-    def perform_update(self, serializer):
-        assets = serializer.validated_data.get('assets')
-        instance = self.get_object()
-        if instance != Node.org_root():
-            instance.assets.remove(*tuple(assets))
-        else:
-            assets = [asset for asset in assets if asset.nodes.count() > 1]
-            instance.assets.remove(*tuple(assets))
-
-
-class NodeReplaceAssetsApi(generics.UpdateAPIView):
-    model = Node
-    serializer_class = serializers.NodeAssetsSerializer
-    permission_classes = (IsOrgAdmin,)
-    instance = None
-
-    def perform_update(self, serializer):
-        assets = serializer.validated_data.get('assets')
-        instance = self.get_object()
-        for asset in assets:
-            asset.nodes.set([instance])
-
-
-class NodeTaskCreateApi(generics.CreateAPIView):
-    model = Node
-    serializer_class = serializers.NodeTaskSerializer
-    permission_classes = (IsOrgAdmin,)
-
-    def get_object(self):
-        node_id = self.kwargs.get('pk')
-        node = get_object_or_none(self.model, id=node_id)
-        return node
-
-    @staticmethod
-    def set_serializer_data(s, task):
-        data = getattr(s, '_data', {})
-        data["task"] = task.id
-        setattr(s, '_data', data)
-
-    @staticmethod
-    def refresh_nodes_cache():
-        Node.refresh_nodes()
-        Task = namedtuple('Task', ['id'])
-        task = Task(id="0")
-        return task
-
-    def perform_create(self, serializer):
-        action = serializer.validated_data["action"]
-        node = self.get_object()
-        if action == "refresh_cache" and node is None:
-            task = self.refresh_nodes_cache()
-            self.set_serializer_data(serializer, task)
-            return
-        if node is None:
-            raise Http404()
-        if action == "refresh":
-            task = update_node_assets_hardware_info_manual.delay(node)
-        else:
-            task = test_node_assets_connectivity_manual.delay(node)
-        self.set_serializer_data(serializer, task)
-

apps/assets/api/system_user.py

@@ -1,127 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-from django.shortcuts import get_object_or_404
-from rest_framework.response import Response
-
-from common.utils import get_logger
-from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser, IsAppUser
-from orgs.mixins.api import OrgBulkModelViewSet
-from orgs.mixins import generics
-from orgs.utils import tmp_to_org
-from ..models import SystemUser, Asset
-from .. import serializers
-from ..serializers import SystemUserWithAuthInfoSerializer
-from ..tasks import (
-    push_system_user_to_assets_manual, test_system_user_connectivity_manual,
-    push_system_user_a_asset_manual,
-)
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'SystemUserViewSet', 'SystemUserAuthInfoApi', 'SystemUserAssetAuthInfoApi',
-    'SystemUserCommandFilterRuleListApi', 'SystemUserTaskApi',
-]
-
-
-class SystemUserViewSet(OrgBulkModelViewSet):
-    """
-    System user api set, for add,delete,update,list,retrieve resource
-    """
-    model = SystemUser
-    filter_fields = ("name", "username")
-    search_fields = filter_fields
-    serializer_class = serializers.SystemUserSerializer
-    serializer_classes = {
-        'default': serializers.SystemUserSerializer,
-        'list': serializers.SystemUserListSerializer,
-    }
-    permission_classes = (IsOrgAdminOrAppUser,)
-
-
-class SystemUserAuthInfoApi(generics.RetrieveUpdateDestroyAPIView):
-    """
-    Get system user auth info
-    """
-    model = SystemUser
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = SystemUserWithAuthInfoSerializer
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        instance.clear_auth()
-        return Response(status=204)
-
-
-class SystemUserAssetAuthInfoApi(generics.RetrieveAPIView):
-    """
-    Get system user with asset auth info
-    """
-    model = SystemUser
-    permission_classes = (IsOrgAdminOrAppUser,)
-    serializer_class = SystemUserWithAuthInfoSerializer
-
-    def get_exception_handler(self):
-        def handler(e, context):
-            return Response({"error": str(e)}, status=400)
-        return handler
-
-    def get_object(self):
-        instance = super().get_object()
-        username = instance.username
-        if instance.username_same_with_user:
-            username = self.request.query_params.get("username")
-        asset_id = self.kwargs.get('aid')
-        asset = get_object_or_404(Asset, pk=asset_id)
-
-        with tmp_to_org(asset.org_id):
-            instance.load_asset_special_auth(asset=asset, username=username)
-            return instance
-
-
-class SystemUserTaskApi(generics.CreateAPIView):
-    permission_classes = (IsOrgAdmin,)
-    serializer_class = serializers.SystemUserTaskSerializer
-
-    def do_push(self, system_user, asset=None):
-        if asset is None:
-            task = push_system_user_to_assets_manual.delay(system_user)
-        else:
-            username = self.request.query_params.get('username')
-            task = push_system_user_a_asset_manual.delay(
-                system_user, asset, username=username
-            )
-        return task
-
-    @staticmethod
-    def do_test(system_user, asset=None):
-        task = test_system_user_connectivity_manual.delay(system_user)
-        return task
-
-    def get_object(self):
-        pk = self.kwargs.get('pk')
-        return get_object_or_404(SystemUser, pk=pk)
-
-    def perform_create(self, serializer):
-        action = serializer.validated_data["action"]
-        asset = serializer.validated_data.get('asset')
-        system_user = self.get_object()
-        if action == 'push':
-            task = self.do_push(system_user, asset)
-        else:
-            task = self.do_test(system_user, asset)
-        data = getattr(serializer, '_data', {})
-        data["task"] = task.id
-        setattr(serializer, '_data', data)
-
-
-class SystemUserCommandFilterRuleListApi(generics.ListAPIView):
-    permission_classes = (IsOrgAdminOrAppUser,)
-
-    def get_serializer_class(self):
-        from ..serializers import CommandFilterRuleSerializer
-        return CommandFilterRuleSerializer
-
-    def get_queryset(self):
-        pk = self.kwargs.get('pk', None)
-        system_user = get_object_or_404(SystemUser, pk=pk)
-        return system_user.cmd_filter_rules

apps/assets/api/system_user_relation.py

@@ -1,136 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from collections import defaultdict
-from django.db.models import F, Value
-from django.db.models.signals import m2m_changed
-from django.db.models.functions import Concat
-
-from common.permissions import IsOrgAdmin
-from orgs.mixins.api import OrgBulkModelViewSet
-from orgs.utils import current_org
-from .. import models, serializers
-
-__all__ = [
-    'SystemUserAssetRelationViewSet', 'SystemUserNodeRelationViewSet',
-    'SystemUserUserRelationViewSet',
-]
-
-
-class RelationMixin:
-    def get_queryset(self):
-        queryset = self.model.objects.all()
-        org_id = current_org.org_id()
-        if org_id is not None:
-            queryset = queryset.filter(systemuser__org_id=org_id)
-        queryset = queryset.annotate(systemuser_display=Concat(
-            F('systemuser__name'), Value('('), F('systemuser__username'),
-            Value(')')
-        ))
-        return queryset
-
-    def send_post_add_signal(self, instance):
-        if not isinstance(instance, list):
-            instance = [instance]
-
-        system_users_objects_map = defaultdict(list)
-        model, object_field = self.get_objects_attr()
-
-        for i in instance:
-            _id = getattr(i, object_field).id
-            system_users_objects_map[i.systemuser].append(_id)
-
-        sender = self.get_sender()
-        for system_user, objects in system_users_objects_map.items():
-            m2m_changed.send(
-                sender=sender, instance=system_user, action='post_add',
-                reverse=False, model=model, pk_set=objects
-            )
-
-    def get_sender(self):
-        return self.model
-
-    def get_objects_attr(self):
-        return models.Asset, 'asset'
-
-    def perform_create(self, serializer):
-        instance = serializer.save()
-        self.send_post_add_signal(instance)
-
-
-class BaseRelationViewSet(RelationMixin, OrgBulkModelViewSet):
-    pass
-
-
-class SystemUserAssetRelationViewSet(BaseRelationViewSet):
-    serializer_class = serializers.SystemUserAssetRelationSerializer
-    model = models.SystemUser.assets.through
-    permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
-        'id', 'asset', 'systemuser',
-    ]
-    search_fields = [
-        "id", "asset__hostname", "asset__ip",
-        "systemuser__name", "systemuser__username"
-    ]
-
-    def get_objects_attr(self):
-        return models.Asset, 'asset'
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset.annotate(
-            asset_display=Concat(
-                F('asset__hostname'), Value('('),
-                F('asset__ip'), Value(')')
-            )
-        )
-        return queryset
-
-
-class SystemUserNodeRelationViewSet(BaseRelationViewSet):
-    serializer_class = serializers.SystemUserNodeRelationSerializer
-    model = models.SystemUser.nodes.through
-    permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
-        'id', 'node', 'systemuser',
-    ]
-    search_fields = [
-        "node__value", "systemuser__name", "systemuser_username"
-    ]
-
-    def get_objects_attr(self):
-        return models.Node, 'node'
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset \
-            .annotate(node_key=F('node__key'))
-        return queryset
-
-
-class SystemUserUserRelationViewSet(BaseRelationViewSet):
-    serializer_class = serializers.SystemUserUserRelationSerializer
-    model = models.SystemUser.users.through
-    permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
-        'id', 'user', 'systemuser',
-    ]
-    search_fields = [
-        "user__username", "user__name",
-        "systemuser__name", "systemuser__username",
-    ]
-
-    def get_objects_attr(self):
-        from users.models import User
-        return User, 'user'
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset.annotate(
-            user_display=Concat(
-                F('user__name'), Value('('),
-                F('user__username'), Value(')')
-            )
-        )
-        return queryset
-

apps/assets/apps.py

@@ -1,25 +0,0 @@
-from __future__ import unicode_literals
-
-from django.apps import AppConfig
-from django.db.models.signals import post_migrate
-
-
-def initial_some_nodes():
-    from .models import Node
-    Node.initial_some_nodes()
-
-
-def initial_some_nodes_callback(sender, **kwargs):
-    initial_some_nodes()
-
-
-class AssetsConfig(AppConfig):
-    name = 'assets'
-
-    def ready(self):
-        super().ready()
-        from . import signals_handler
-        try:
-            initial_some_nodes()
-        except Exception:
-            post_migrate.connect(initial_some_nodes_callback, sender=self)

apps/assets/backends/__init__.py

@@ -1 +0,0 @@
-from .manager import AssetUserManager

apps/assets/backends/base.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from abc import abstractmethod
-
-from ..models import Asset
-
-
-class BaseBackend:
-    @abstractmethod
-    def all(self):
-        pass
-
-    @abstractmethod
-    def filter(self, username=None, hostname=None, ip=None, assets=None,
-               node=None, prefer_id=None, **kwargs):
-        pass
-
-    @abstractmethod
-    def search(self, item):
-        pass
-
-    @abstractmethod
-    def get_queryset(self):
-        pass
-
-    @abstractmethod
-    def delete(self, union_id):
-        pass
-
-    @staticmethod
-    def qs_to_values(qs):
-        values = qs.values(
-            'hostname', 'ip', "asset_id",
-            'username', 'password', 'private_key', 'public_key',
-            'score', 'version',
-            "asset_username", "union_id",
-            'date_created', 'date_updated',
-            'org_id', 'backend',
-        )
-        return values
-
-    @staticmethod
-    def make_assets_as_id(assets):
-        if not assets:
-            return []
-        if isinstance(assets[0], Asset):
-            assets = [a.id for a in assets]
-        return assets

apps/assets/backends/db.py

@@ -1,318 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django.utils.translation import ugettext as _
-from functools import reduce
-from django.db.models import F, CharField, Value, IntegerField, Q, Count
-from django.db.models.functions import Concat
-
-from common.utils import get_object_or_none
-from orgs.utils import current_org
-from ..models import AuthBook, SystemUser, Asset, AdminUser
-from .base import BaseBackend
-
-
-class DBBackend(BaseBackend):
-    union_id_length = 2
-
-    def __init__(self, queryset=None):
-        if queryset is None:
-            queryset = self.all()
-        self.queryset = queryset
-
-    def _clone(self):
-        return self.__class__(self.queryset)
-
-    def all(self):
-        return AuthBook.objects.none()
-
-    def count(self):
-        return self.queryset.count()
-
-    def get_queryset(self):
-        return self.queryset
-
-    def delete(self, union_id):
-        cleaned_union_id = union_id.split('_')
-        # 如果union_id通不过本检查，代表可能不是本backend, 应该返回空
-        if not self._check_union_id(union_id, cleaned_union_id):
-            return
-        return self._perform_delete_by_union_id(cleaned_union_id)
-
-    def _perform_delete_by_union_id(self, union_id_cleaned):
-        pass
-
-    def filter(self, assets=None, node=None, prefer=None, prefer_id=None,
-               union_id=None, id__in=None, **kwargs):
-        clone = self._clone()
-        clone._filter_union_id(union_id)
-        clone._filter_prefer(prefer, prefer_id)
-        clone._filter_node(node)
-        clone._filter_assets(assets)
-        clone._filter_other(kwargs)
-        clone._filter_id_in(id__in)
-        return clone
-
-    def _filter_union_id(self, union_id):
-        if not union_id:
-            return
-        cleaned_union_id = union_id.split('_')
-        # 如果union_id通不过本检查，代表可能不是本backend, 应该返回空
-        if not self._check_union_id(union_id, cleaned_union_id):
-            self.queryset = self.queryset.none()
-            return
-        return self._perform_filter_union_id(union_id, cleaned_union_id)
-
-    def _check_union_id(self, union_id, cleaned_union_id):
-        return union_id and len(cleaned_union_id) == self.union_id_length
-
-    def _perform_filter_union_id(self, union_id, union_id_cleaned):
-        self.queryset = self.queryset.filter(union_id=union_id)
-
-    def _filter_assets(self, assets):
-        assets_id = self.make_assets_as_id(assets)
-        if assets_id:
-            self.queryset = self.queryset.filter(asset_id__in=assets_id)
-
-    def _filter_node(self, node):
-        pass
-
-    def _filter_id_in(self, ids):
-        if ids and isinstance(ids, list):
-            self.queryset = self.queryset.filter(union_id__in=ids)
-
-    @staticmethod
-    def clean_kwargs(kwargs):
-        return {k: v for k, v in kwargs.items() if v}
-
-    def _filter_other(self, kwargs):
-        kwargs = self.clean_kwargs(kwargs)
-        if kwargs:
-            self.queryset = self.queryset.filter(**kwargs)
-
-    def _filter_prefer(self, prefer, prefer_id):
-        pass
-
-    def search(self, item):
-        qs = []
-        for i in ['hostname', 'ip', 'username']:
-            kwargs = {i + '__startswith': item}
-            qs.append(Q(**kwargs))
-        q = reduce(lambda x, y: x | y, qs)
-        clone = self._clone()
-        clone.queryset = clone.queryset.filter(q).distinct()
-        return clone
-
-
-class SystemUserBackend(DBBackend):
-    model = SystemUser.assets.through
-    backend = 'system_user'
-    prefer = backend
-    base_score = 0
-    union_id_length = 2
-
-    def _filter_prefer(self, prefer, prefer_id):
-        if prefer and prefer != self.prefer:
-            self.queryset = self.queryset.none()
-
-        if prefer_id:
-            self.queryset = self.queryset.filter(systemuser__id=prefer_id)
-
-    def _perform_filter_union_id(self, union_id, union_id_cleaned):
-        system_user_id, asset_id = union_id_cleaned
-        self.queryset = self.queryset.filter(
-            asset_id=asset_id, systemuser__id=system_user_id,
-        )
-
-    def _perform_delete_by_union_id(self, union_id_cleaned):
-        system_user_id, asset_id = union_id_cleaned
-        system_user = get_object_or_none(SystemUser, pk=system_user_id)
-        asset = get_object_or_none(Asset, pk=asset_id)
-        if all((system_user, asset)):
-            system_user.assets.remove(asset)
-
-    def _filter_node(self, node):
-        if node:
-            self.queryset = self.queryset.filter(asset__nodes__id=node.id)
-
-    def get_annotate(self):
-        kwargs = dict(
-            hostname=F("asset__hostname"),
-            ip=F("asset__ip"),
-            username=F("systemuser__username"),
-            password=F("systemuser__password"),
-            private_key=F("systemuser__private_key"),
-            public_key=F("systemuser__public_key"),
-            score=F("systemuser__priority") + self.base_score,
-            version=Value(0, IntegerField()),
-            date_created=F("systemuser__date_created"),
-            date_updated=F("systemuser__date_updated"),
-            asset_username=Concat(F("asset__id"), Value("_"),
-                                  F("systemuser__username"),
-                                  output_field=CharField()),
-            union_id=Concat(F("systemuser_id"), Value("_"), F("asset_id"),
-                            output_field=CharField()),
-            org_id=F("asset__org_id"),
-            backend=Value(self.backend, CharField())
-        )
-        return kwargs
-
-    def get_filter(self):
-        return dict(
-            systemuser__username_same_with_user=False,
-        )
-
-    def all(self):
-        kwargs = self.get_annotate()
-        filters = self.get_filter()
-        qs = self.model.objects.all().annotate(**kwargs)
-        if current_org.org_id() is not None:
-            filters['org_id'] = current_org.org_id()
-        qs = qs.filter(**filters)
-        qs = self.qs_to_values(qs)
-        return qs
-
-
-class DynamicSystemUserBackend(SystemUserBackend):
-    backend = 'system_user_dynamic'
-    prefer = 'system_user'
-    union_id_length = 3
-
-    def get_annotate(self):
-        kwargs = super().get_annotate()
-        kwargs.update(dict(
-            username=F("systemuser__users__username"),
-            asset_username=Concat(
-                F("asset__id"), Value("_"),
-                F("systemuser__users__username"),
-                output_field=CharField()
-            ),
-            union_id=Concat(
-                F("systemuser_id"), Value("_"), F("asset_id"),
-                Value("_"), F("systemuser__users__id"),
-                output_field=CharField()
-            ),
-            users_count=Count('systemuser__users'),
-        ))
-        return kwargs
-
-    def _perform_filter_union_id(self, union_id, union_id_cleaned):
-        system_user_id, asset_id, user_id = union_id_cleaned
-        self.queryset = self.queryset.filter(
-            asset_id=asset_id, systemuser_id=system_user_id,
-            union_id=union_id,
-        )
-
-    def _perform_delete_by_union_id(self, union_id_cleaned):
-        system_user_id, asset_id, user_id = union_id_cleaned
-        system_user = get_object_or_none(SystemUser, pk=system_user_id)
-        if not system_user:
-            return
-        system_user.users.remove(user_id)
-        if system_user.users.count() == 0:
-            system_user.assets.remove(asset_id)
-
-    def get_filter(self):
-        return dict(
-            users_count__gt=0,
-            systemuser__username_same_with_user=True
-        )
-
-
-class AdminUserBackend(DBBackend):
-    model = Asset
-    backend = 'admin_user'
-    prefer = backend
-    base_score = 200
-
-    def _filter_prefer(self, prefer, prefer_id):
-        if prefer and prefer != self.backend:
-            self.queryset = self.queryset.none()
-        if prefer_id:
-            self.queryset = self.queryset.filter(admin_user__id=prefer_id)
-
-    def _filter_node(self, node):
-        if node:
-            self.queryset = self.queryset.filter(nodes__id=node.id)
-
-    def _perform_filter_union_id(self, union_id, union_id_cleaned):
-        admin_user_id, asset_id = union_id_cleaned
-        self.queryset = self.queryset.filter(
-            id=asset_id, admin_user_id=admin_user_id,
-        )
-
-    def _perform_delete_by_union_id(self, union_id_cleaned):
-        raise PermissionError(_("Could not remove asset admin user"))
-
-    def all(self):
-        qs = self.model.objects.all().annotate(
-            asset_id=F("id"),
-            username=F("admin_user__username"),
-            password=F("admin_user__password"),
-            private_key=F("admin_user__private_key"),
-            public_key=F("admin_user__public_key"),
-            score=Value(self.base_score, IntegerField()),
-            version=Value(0, IntegerField()),
-            date_updated=F("admin_user__date_updated"),
-            asset_username=Concat(F("id"), Value("_"), F("admin_user__username"), output_field=CharField()),
-            union_id=Concat(F("admin_user_id"), Value("_"), F("id"), output_field=CharField()),
-            backend=Value(self.backend, CharField()),
-        )
-        qs = self.qs_to_values(qs)
-        return qs
-
-
-class AuthbookBackend(DBBackend):
-    model = AuthBook
-    backend = 'db'
-    prefer = backend
-    base_score = 400
-
-    def _filter_node(self, node):
-        if node:
-            self.queryset = self.queryset.filter(asset__nodes__id=node.id)
-
-    def _filter_prefer(self, prefer, prefer_id):
-        if not prefer or not prefer_id:
-            return
-        if prefer.lower() == "admin_user":
-            model = AdminUser
-        elif prefer.lower() == "system_user":
-            model = SystemUser
-        else:
-            self.queryset = self.queryset.none()
-            return
-        obj = get_object_or_none(model, pk=prefer_id)
-        if obj is None:
-            self.queryset = self.queryset.none()
-            return
-        username = obj.get_username()
-        if isinstance(username, str):
-            self.queryset = self.queryset.filter(username=username)
-        # dynamic system user return more username
-        else:
-            self.queryset = self.queryset.filter(username__in=username)
-
-    def _perform_filter_union_id(self, union_id, union_id_cleaned):
-        authbook_id, asset_id = union_id_cleaned
-        self.queryset = self.queryset.filter(
-            id=authbook_id, asset_id=asset_id,
-        )
-
-    def _perform_delete_by_union_id(self, union_id_cleaned):
-        authbook_id, asset_id = union_id_cleaned
-        authbook = get_object_or_none(AuthBook, pk=authbook_id)
-        if authbook.is_latest:
-            raise PermissionError(_("Latest version could not be delete"))
-        AuthBook.objects.filter(id=authbook_id).delete()
-
-    def all(self):
-        qs = self.model.objects.all().annotate(
-            hostname=F("asset__hostname"),
-            ip=F("asset__ip"),
-            score=F('version') + self.base_score,
-            asset_username=Concat(F("asset__id"), Value("_"), F("username"), output_field=CharField()),
-            union_id=Concat(F("id"), Value("_"), F("asset_id"), output_field=CharField()),
-            backend=Value(self.backend, CharField()),
-        )
-        qs = self.qs_to_values(qs)
-        return qs

apps/assets/backends/manager.py

@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from itertools import chain, groupby
-from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
-
-from orgs.utils import current_org
-from common.utils import get_logger, lazyproperty
-from common.struct import QuerySetChain
-
-from ..models import AssetUser, AuthBook
-from .db import (
-    AuthbookBackend, SystemUserBackend, AdminUserBackend,
-    DynamicSystemUserBackend
-)
-
-logger = get_logger(__name__)
-
-
-class NotSupportError(Exception):
-    pass
-
-
-class AssetUserQueryset:
-    ObjectDoesNotExist = ObjectDoesNotExist
-    MultipleObjectsReturned = MultipleObjectsReturned
-
-    def __init__(self, backends=()):
-        self.backends = backends
-        self._distinct_queryset = None
-
-    def backends_queryset(self):
-        return [b.get_queryset() for b in self.backends]
-
-    @lazyproperty
-    def backends_counts(self):
-        return [b.count() for b in self.backends]
-
-    def filter(self, hostname=None, ip=None, username=None,
-               assets=None, asset=None, node=None,
-               id=None, prefer_id=None, prefer=None, id__in=None):
-        if not assets and asset:
-            assets = [asset]
-
-        kwargs = dict(
-            hostname=hostname, ip=ip, username=username,
-            assets=assets, node=node, prefer=prefer, prefer_id=prefer_id,
-            id__in=id__in, union_id=id,
-        )
-        logger.debug("Filter: {}".format(kwargs))
-        backends = []
-        for backend in self.backends:
-            clone = backend.filter(**kwargs)
-            backends.append(clone)
-        return self._clone(backends)
-
-    def _clone(self, backends=None):
-        if backends is None:
-            backends = self.backends
-        return self.__class__(backends)
-
-    def search(self, item):
-        backends = []
-        for backend in self.backends:
-            new = backend.search(item)
-            backends.append(new)
-        return self._clone(backends)
-
-    def distinct(self):
-        logger.debug("Distinct asset user queryset")
-        queryset_chain = chain(*(backend.get_queryset() for backend in self.backends))
-        queryset_sorted = sorted(
-            queryset_chain,
-            key=lambda item: (item["asset_username"], item["score"]),
-            reverse=True,
-        )
-        results = groupby(queryset_sorted, key=lambda item: item["asset_username"])
-        final = [next(result[1]) for result in results]
-        self._distinct_queryset = final
-        return self
-
-    def get(self, latest=False, **kwargs):
-        queryset = self.filter(**kwargs)
-        if latest:
-            queryset = queryset.distinct()
-        queryset = list(queryset)
-        count = len(queryset)
-        if count == 1:
-            data = queryset[0]
-            return data
-        elif count > 1:
-            msg = 'Should return 1 record, but get {}'.format(count)
-            raise MultipleObjectsReturned(msg)
-        else:
-            msg = 'No record found(org is {})'.format(current_org.name)
-            raise ObjectDoesNotExist(msg)
-
-    def get_latest(self, **kwargs):
-        return self.get(latest=True, **kwargs)
-
-    @staticmethod
-    def to_asset_user(data):
-        obj = AssetUser()
-        for k, v in data.items():
-            setattr(obj, k, v)
-        return obj
-
-    @property
-    def queryset(self):
-        if self._distinct_queryset is not None:
-            return self._distinct_queryset
-        return QuerySetChain(self.backends_queryset())
-
-    def count(self):
-        if self._distinct_queryset is not None:
-            return len(self._distinct_queryset)
-        else:
-            return sum(self.backends_counts)
-
-    def __getitem__(self, ndx):
-        return self.queryset.__getitem__(ndx)
-
-    def __iter__(self):
-        self._data = iter(self.queryset)
-        return self
-
-    def __next__(self):
-        return self.to_asset_user(next(self._data))
-
-
-class AssetUserManager:
-    support_backends = (
-        ('db', AuthbookBackend),
-        ('system_user', SystemUserBackend),
-        ('admin_user', AdminUserBackend),
-        ('system_user_dynamic', DynamicSystemUserBackend),
-    )
-
-    def __init__(self):
-        self.backends = [backend() for name, backend in self.support_backends]
-        self._queryset = AssetUserQueryset(self.backends)
-
-    def all(self):
-        return self._queryset
-
-    def delete(self, obj):
-        name_backends_map = dict(self.support_backends)
-        backend_name = obj.backend
-        backend_cls = name_backends_map.get(backend_name)
-        union_id = obj.union_id
-        if backend_cls:
-            backend_cls().delete(union_id)
-        else:
-            raise ObjectDoesNotExist("Not backend found")
-
-    @staticmethod
-    def create(**kwargs):
-        # 使用create方法创建AuthBook对象，解决并发创建问题（添加锁机制）
-        authbook = AuthBook.create(**kwargs)
-        return authbook
-
-    def __getattr__(self, item):
-        return getattr(self._queryset, item)

apps/assets/backends/utils.py

@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-# from django.conf import settings
-
-# from .vault import VaultBackend
-

apps/assets/backends/vault.py

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-

apps/assets/const.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-#

apps/assets/filters.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-import coreapi
-from rest_framework import filters
-from django.db.models import Q
-
-from common.utils import dict_get_any, is_uuid, get_object_or_none
-from .models import Node, Label
-
-
-class AssetByNodeFilterBackend(filters.BaseFilterBackend):
-    fields = ['node', 'all']
-
-    def get_schema_fields(self, view):
-        return [
-            coreapi.Field(
-                name=field, location='query', required=False,
-                type='string', example='', description='', schema=None,
-            )
-            for field in self.fields
-        ]
-
-    @staticmethod
-    def is_query_all(request):
-        query_all_arg = request.query_params.get('all')
-        show_current_asset_arg = request.query_params.get('show_current_asset')
-
-        query_all = query_all_arg == '1'
-        if show_current_asset_arg is not None:
-            query_all = show_current_asset_arg != '1'
-        return query_all
-
-    @staticmethod
-    def get_query_node(request):
-        node_id = dict_get_any(request.query_params, ['node', 'node_id'])
-        if not node_id:
-            return None, False
-
-        if is_uuid(node_id):
-            node = get_object_or_none(Node, id=node_id)
-        else:
-            node = get_object_or_none(Node, key=node_id)
-        return node, True
-
-    @staticmethod
-    def perform_query(pattern, queryset):
-        return queryset.filter(nodes__key__regex=pattern).distinct()
-
-    def filter_queryset(self, request, queryset, view):
-        node, has_query_arg = self.get_query_node(request)
-        if not has_query_arg:
-            return queryset
-
-        if node is None:
-            return queryset
-        query_all = self.is_query_all(request)
-        if query_all:
-            pattern = node.get_all_children_pattern(with_self=True)
-        else:
-            pattern = node.get_children_key_pattern(with_self=True)
-        return self.perform_query(pattern, queryset)
-
-
-class LabelFilterBackend(filters.BaseFilterBackend):
-    sep = '#'
-    query_arg = 'label'
-
-    def get_schema_fields(self, view):
-        example = self.sep.join(['os', 'linux'])
-        return [
-            coreapi.Field(
-                name=self.query_arg, location='query', required=False,
-                type='string', example=example, description=''
-            )
-        ]
-
-    def get_query_labels(self, request):
-        labels_query = request.query_params.getlist(self.query_arg)
-        if not labels_query:
-            return None
-
-        q = None
-        for kv in labels_query:
-            if self.sep not in kv:
-                continue
-            key, value = kv.strip().split(self.sep)[:2]
-            if not all([key, value]):
-                continue
-            if q:
-                q |= Q(name=key, value=value)
-            else:
-                q = Q(name=key, value=value)
-        if not q:
-            return []
-        labels = Label.objects.filter(q, is_active=True)\
-            .values_list('id', flat=True)
-        return labels
-
-    def filter_queryset(self, request, queryset, view):
-        labels = self.get_query_labels(request)
-        if labels is None:
-            return queryset
-        if len(labels) == 0:
-            return queryset.none()
-        for label in labels:
-            queryset = queryset.filter(labels=label)
-        return queryset
-
-
-class AssetRelatedByNodeFilterBackend(AssetByNodeFilterBackend):
-    @staticmethod
-    def perform_query(pattern, queryset):
-        return queryset.filter(asset__nodes__key__regex=pattern).distinct()
-

apps/assets/forms/__init__.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from .asset import *
-from .label import *
-from .user import *
-from .domain import *
-from .cmd_filter import *
-from .platform import *

apps/assets/forms/asset.py

@@ -1,172 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from itertools import groupby
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from common.utils import get_logger
-from orgs.mixins.forms import OrgModelForm
-
-from ..models import Asset, Platform
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'AssetCreateUpdateForm', 'AssetBulkUpdateForm', 'ProtocolForm',
-]
-
-
-class ProtocolForm(forms.Form):
-    name = forms.ChoiceField(
-        choices=Asset.PROTOCOL_CHOICES, label=_("Name"), initial='ssh',
-        widget=forms.Select(attrs={'class': 'form-control protocol-name'})
-    )
-    port = forms.IntegerField(
-        max_value=65534, min_value=1, label=_("Port"), initial=22,
-        widget=forms.TextInput(attrs={'class': 'form-control protocol-port'})
-    )
-
-
-class AssetCreateUpdateForm(OrgModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_platform_to_name()
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        nodes_field = self.fields['nodes']
-        nodes_choices = []
-        if self.instance:
-            nodes_choices = [
-                (n.id, n.full_value) for n in
-                self.instance.nodes.all()
-            ]
-        nodes_field.choices = nodes_choices
-
-    @staticmethod
-    def sorted_platform(platform):
-        if platform['base'] == 'Other':
-            return 'zz'
-        return platform['base']
-
-    def set_platform_to_name(self):
-        choices = []
-        platforms = Platform.objects.all().values('name', 'base')
-        platforms_sorted = sorted(platforms, key=self.sorted_platform)
-        platforms_grouped = groupby(platforms_sorted, key=lambda x: x['base'])
-        for i in platforms_grouped:
-            base = i[0]
-            grouped = sorted(i[1], key=lambda x: x['name'])
-            grouped = [(j['name'], j['name']) for j in grouped]
-            choices.append(
-                (base, grouped)
-            )
-        platform_field = self.fields['platform']
-        platform_field.choices = choices
-        if self.instance:
-            self.initial['platform'] = self.instance.platform.name
-
-    def add_nodes_initial(self, node):
-        nodes_field = self.fields['nodes']
-        nodes_field.choices.append((node.id, node.full_value))
-        nodes_field.initial = [node]
-
-    class Meta:
-        model = Asset
-        fields = [
-            'hostname', 'ip', 'public_ip', 'protocols', 'comment',
-            'nodes', 'is_active', 'admin_user', 'labels', 'platform',
-            'domain', 'number',
-        ]
-        widgets = {
-            'nodes': forms.SelectMultiple(attrs={
-                'class': 'nodes-select2', 'data-placeholder': _('Nodes')
-            }),
-            'admin_user': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Admin user')
-            }),
-            'labels': forms.SelectMultiple(attrs={
-                'class': 'select2', 'data-placeholder': _('Label')
-            }),
-            'domain': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Domain')
-            }),
-            'platform': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Platform')
-            }),
-        }
-        labels = {
-            'nodes': _("Node"),
-        }
-        help_texts = {
-            'admin_user': _(
-                'root or other NOPASSWD sudo privilege user existed in asset,'
-                'If asset is windows or other set any one, more see admin user left menu'
-            ),
-            'platform': _("Windows 2016 RDP protocol is different, If is window 2016, set it"),
-            'domain': _("If your have some network not connect with each other, you can set domain")
-        }
-
-
-class AssetBulkUpdateForm(OrgModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        required=True,
-        label=_('Select assets'), queryset=Asset.objects,
-        widget=forms.SelectMultiple(
-            attrs={
-                'class': 'select2',
-                'data-placeholder': _('Select assets')
-            }
-        )
-    )
-
-    class Meta:
-        model = Asset
-        fields = [
-            'assets', 'admin_user', 'labels', 'platform',
-            'domain',
-        ]
-        widgets = {
-            'labels': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Label')}
-            ),
-            'nodes': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Node')}
-            ),
-        }
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-        # 重写其他字段为不再required
-        for name, field in self.fields.items():
-            if name != 'assets':
-                field.required = False
-
-    def set_fields_queryset(self):
-        assets_field = self.fields['assets']
-        if hasattr(self, 'data'):
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        changed_fields = []
-        for field in self._meta.fields:
-            if self.data.get(field) not in [None, '']:
-                changed_fields.append(field)
-
-        cleaned_data = {k: v for k, v in self.cleaned_data.items()
-                        if k in changed_fields}
-        assets = cleaned_data.pop('assets')
-        labels = cleaned_data.pop('labels', [])
-        nodes = cleaned_data.pop('nodes', None)
-        assets = Asset.objects.filter(id__in=[asset.id for asset in assets])
-        assets.update(**cleaned_data)
-
-        if labels:
-            for asset in assets:
-                asset.labels.set(labels)
-        if nodes:
-            for asset in assets:
-                asset.nodes.set(nodes)
-        return assets

apps/assets/forms/cmd_filter.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
-import re
-
-from orgs.mixins.forms import OrgModelForm
-from ..models import CommandFilter, CommandFilterRule
-
-__all__ = ['CommandFilterForm', 'CommandFilterRuleForm']
-
-
-class CommandFilterForm(OrgModelForm):
-    class Meta:
-        model = CommandFilter
-        fields = ['name', 'comment']
-
-
-class CommandFilterRuleForm(OrgModelForm):
-    invalid_pattern = re.compile(r'[\.\*\+\[\\\?\{\}\^\$\|\(\)\#\<\>]')
-
-    class Meta:
-        model = CommandFilterRule
-        fields = [
-            'filter', 'type', 'content', 'priority', 'action', 'comment'
-        ]
-        widgets = {
-            'content':  forms.Textarea(attrs={
-                'placeholder': 'eg:\r\nreboot\r\nrm -rf'
-            }),
-        }
-
-    def clean_content(self):
-        content = self.cleaned_data.get("content")
-        if self.invalid_pattern.search(content):
-            invalid_char = self.invalid_pattern.pattern.replace('\\', '')
-            msg = _("Content should not be contain: {}").format(invalid_char)
-            raise ValidationError(msg)
-        return content

apps/assets/forms/domain.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from orgs.mixins.forms import OrgModelForm
-from ..models import Domain, Asset, Gateway
-from .user import PasswordAndKeyAuthForm
-
-__all__ = ['DomainForm', 'GatewayForm']
-
-
-class DomainForm(forms.ModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects, label=_('Asset'), required=False,
-        widget=forms.SelectMultiple(
-            attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
-        )
-    )
-
-    class Meta:
-        model = Domain
-        fields = ['name', 'comment', 'assets']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        assets_field = self.fields.get('assets')
-
-        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
-        if not self.data:
-            # 有instance 代表渲染更新表单, 否则是创建表单
-            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
-            if self.instance:
-                assets_field.initial = self.instance.assets.all()
-                assets_field.queryset = self.instance.assets.all()
-            else:
-                assets_field.queryset = Asset.objects.none()
-        else:
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        instance = super().save(commit=commit)
-        assets = self.cleaned_data['assets']
-        instance.assets.set(assets)
-        return instance
-
-
-class GatewayForm(PasswordAndKeyAuthForm, OrgModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        password_field = self.fields.get('password')
-        password_field.help_text = _('Password should not contain special characters')
-        protocol_field = self.fields.get('protocol')
-        protocol_field.choices = [Gateway.PROTOCOL_CHOICES[0]]
-
-    def save(self, commit=True):
-        # Because we define custom field, so we need rewrite :method: `save`
-        instance = super().save()
-        password = self.cleaned_data.get('password')
-        private_key, public_key = super().gen_keys()
-        instance.set_auth(password=password, private_key=private_key)
-        return instance
-
-    class Meta:
-        model = Gateway
-        fields = [
-            'name', 'ip', 'port', 'username', 'protocol', 'domain', 'password',
-            'private_key',  'is_active', 'comment',
-        ]
-        help_texts = {
-            'protocol': _("SSH gateway support proxy SSH,RDP,VNC")
-        }
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-        }

apps/assets/forms/label.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from ..models import Label, Asset
-
-__all__ = ['LabelForm']
-
-
-class LabelForm(forms.ModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects.none(), label=_('Asset'), required=False,
-        widget=forms.SelectMultiple(
-            attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
-        )
-    )
-
-    class Meta:
-        model = Label
-        fields = ['name', 'value', 'assets']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        assets_field = self.fields.get('assets')
-
-        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
-        if not self.data:
-            # 有instance 代表渲染更新表单, 否则是创建表单
-            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
-            if self.instance:
-                assets_field.initial = self.instance.assets.all()
-                assets_field.queryset = self.instance.assets.all()
-            else:
-                assets_field.queryset = Asset.objects.none()
-        else:
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        label = super().save(commit=commit)
-        assets = self.cleaned_data['assets']
-        label.assets.set(assets)
-        return label

apps/assets/forms/platform.py

@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-from ..models import Platform
-
-
-__all__ = ['PlatformForm', 'PlatformMetaForm']
-
-
-class PlatformMetaForm(forms.Form):
-    SECURITY_CHOICES = (
-        ('rdp', "RDP"),
-        ('nla', "NLA"),
-        ('tls', 'TLS'),
-        ('any', "Any"),
-    )
-    CONSOLE_CHOICES = (
-        (True, _('Yes')),
-        (False, _('No')),
-    )
-    security = forms.ChoiceField(
-        choices=SECURITY_CHOICES, initial='any', label=_("RDP security"),
-        required=False,
-    )
-    console = forms.ChoiceField(
-        choices=CONSOLE_CHOICES, initial=False, label=_("RDP console"),
-        required=False,
-    )
-
-
-class PlatformForm(forms.ModelForm):
-    class Meta:
-        model = Platform
-        fields = [
-            'name', 'base', 'comment',
-        ]
-        labels = {
-            'base': _("Base platform")
-        }
-

apps/assets/forms/user.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from common.utils import validate_ssh_private_key, ssh_pubkey_gen, get_logger
-from orgs.mixins.forms import OrgModelForm
-from ..models import AdminUser, SystemUser
-
-logger = get_logger(__file__)
-__all__ = [
-    'FileForm', 'SystemUserForm', 'AdminUserForm', 'PasswordAndKeyAuthForm',
-]
-
-
-class FileForm(forms.Form):
-    file = forms.FileField()
-
-
-class PasswordAndKeyAuthForm(forms.ModelForm):
-    # Form field name can not start with `_`, so redefine it,
-    password = forms.CharField(
-        widget=forms.PasswordInput, max_length=128,
-        strip=True, required=False,
-        help_text=_('Password or private key passphrase'),
-        label=_("Password"),
-    )
-    # Need use upload private key file except paste private key content
-    private_key = forms.FileField(required=False, label=_("Private key"))
-
-    def clean_private_key(self):
-        private_key_f = self.cleaned_data['private_key']
-        password = self.cleaned_data['password']
-
-        if private_key_f:
-            key_string = private_key_f.read()
-            private_key_f.seek(0)
-            key_string = key_string.decode()
-
-            if not validate_ssh_private_key(key_string, password):
-                msg = _('Invalid private key, Only support '
-                        'RSA/DSA format key')
-                raise forms.ValidationError(msg)
-        return private_key_f
-
-    def validate_password_key(self):
-        password = self.cleaned_data['password']
-        private_key_f = self.cleaned_data.get('private_key', '')
-
-        if not password and not private_key_f:
-            raise forms.ValidationError(_(
-                'Password and private key file must be input one'
-            ))
-
-    def gen_keys(self):
-        password = self.cleaned_data.get('password', '') or None
-        private_key_f = self.cleaned_data['private_key']
-        public_key = private_key = None
-
-        if private_key_f:
-            private_key = private_key_f.read().strip().decode('utf-8')
-            public_key = ssh_pubkey_gen(private_key=private_key, password=password)
-        return private_key, public_key
-
-
-class AdminUserForm(PasswordAndKeyAuthForm):
-    def save(self, commit=True):
-        raise forms.ValidationError("Use api to save")
-
-    class Meta:
-        model = AdminUser
-        fields = ['name', 'username', 'password', 'private_key', 'comment']
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-        }
-
-
-class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
-    # Admin user assets define, let user select, save it in form not in view
-    auto_generate_key = forms.BooleanField(initial=True, required=False)
-
-    def save(self, commit=True):
-        raise forms.ValidationError("Use api to save")
-
-    class Meta:
-        model = SystemUser
-        fields = [
-            'name', 'username', 'protocol', 'auto_generate_key',
-            'password', 'private_key', 'auto_push', 'sudo',
-            'username_same_with_user',
-            'comment', 'shell', 'priority', 'login_mode', 'cmd_filters',
-            'sftp_root',
-        ]
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-            'cmd_filters': forms.SelectMultiple(attrs={
-                'class': 'select2', 'data-placeholder': _('Command filter')
-            }),
-        }
-        labels = {
-            'username_same_with_user': _("Username same with user"),
-        }
-        help_texts = {
-            'auto_push': _('Auto push system user to asset'),
-            'priority': _('1-100, High level will be using login asset as default, '
-                          'if user was granted more than 2 system user'),
-            'login_mode': _('If you choose manual login mode, you do not '
-                            'need to fill in the username and password.'),
-            'sudo': _("Use comma split multi command, ex: /bin/whoami,/bin/ifconfig"),
-            'sftp_root': _("SFTP root dir, tmp, home or custom"),
-            'username_same_with_user': _("Username is dynamic, When connect asset, using current user's username"),
-            # 'username_same_with_user': _("用户名是动态的，登录资产时使用当前用户的用户名登录"),
-        }

apps/assets/hands.py

@@ -1,15 +0,0 @@
-"""
-    jumpserver.__app__.hands.py
-    ~~~~~~~~~~~~~~~~~
-
-    This app depends other apps api, function .. should be import or write mack here.
-
-    Other module of this app shouldn't connect with other app.
-
-    :copyright: (c) 2014-2018 by JumpServer Team.
-    :license: GPL v2, see LICENSE for more details.
-"""
-
-
-from common.permissions import IsAppUser, IsOrgAdmin, IsValidUser, IsOrgAdminOrAppUser
-from users.models import User, UserGroup

apps/assets/migrations/0001_initial.py

@@ -1,168 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-12-21 16:06
-from __future__ import unicode_literals
-
-import assets.models.utils
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-def add_default_group(apps, schema_editor):
-    group_model = apps.get_model("assets", "AssetGroup")
-    db_alias = schema_editor.connection.alias
-    group_model.objects.using(db_alias).create(
-        name="Default"
-    )
-
-
-def add_default_cluster(apps, schema_editor):
-    cluster_model = apps.get_model("assets", "Cluster")
-    db_alias = schema_editor.connection.alias
-    cluster_model.objects.using(db_alias).create(
-        name="Default"
-    )
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AdminUser',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
-                ('username', models.CharField(max_length=16, verbose_name='Username')),
-                ('_password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Password')),
-                ('_private_key', models.TextField(blank=True, max_length=4096, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key')),
-                ('_public_key', models.TextField(blank=True, max_length=4096, verbose_name='SSH public key')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(max_length=32, null=True, verbose_name='Created by')),
-                ('become', models.BooleanField(default=True)),
-                ('become_method', models.CharField(choices=[('sudo', 'sudo'), ('su', 'su')], default='sudo', max_length=4)),
-                ('become_user', models.CharField(default='root', max_length=64)),
-                ('_become_pass', models.CharField(default='', max_length=128)),
-            ],
-            options={
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Asset',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('ip', models.GenericIPAddressField(db_index=True, verbose_name='IP')),
-                ('hostname', models.CharField(max_length=128, unique=True, verbose_name='Hostname')),
-                ('port', models.IntegerField(default=22, verbose_name='Port')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
-                ('type', models.CharField(blank=True, choices=[('Server', 'Server'), ('VM', 'VM'), ('Switch', 'Switch'), ('Router', 'Router'), ('Firewall', 'Firewall'), ('Storage', 'Storage')], default='Server', max_length=16, null=True, verbose_name='Asset type')),
-                ('env', models.CharField(blank=True, choices=[('Prod', 'Production'), ('Dev', 'Development'), ('Test', 'Testing')], default='Prod', max_length=8, null=True, verbose_name='Asset environment')),
-                ('status', models.CharField(blank=True, choices=[('In use', 'In use'), ('Out of use', 'Out of use')], default='In use', max_length=12, null=True, verbose_name='Asset status')),
-                ('public_ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='Public IP')),
-                ('remote_card_ip', models.CharField(blank=True, max_length=16, null=True, verbose_name='Remote control card IP')),
-                ('cabinet_no', models.CharField(blank=True, max_length=32, null=True, verbose_name='Cabinet number')),
-                ('cabinet_pos', models.IntegerField(blank=True, null=True, verbose_name='Cabinet position')),
-                ('number', models.CharField(blank=True, max_length=32, null=True, verbose_name='Asset number')),
-                ('vendor', models.CharField(blank=True, max_length=64, null=True, verbose_name='Vendor')),
-                ('model', models.CharField(blank=True, max_length=54, null=True, verbose_name='Model')),
-                ('sn', models.CharField(blank=True, max_length=128, null=True, verbose_name='Serial number')),
-                ('cpu_model', models.CharField(blank=True, max_length=64, null=True, verbose_name='CPU model')),
-                ('cpu_count', models.IntegerField(null=True, verbose_name='CPU count')),
-                ('cpu_cores', models.IntegerField(null=True, verbose_name='CPU cores')),
-                ('memory', models.CharField(blank=True, max_length=64, null=True, verbose_name='Memory')),
-                ('disk_total', models.CharField(blank=True, max_length=1024, null=True, verbose_name='Disk total')),
-                ('disk_info', models.CharField(blank=True, max_length=1024, null=True, verbose_name='Disk info')),
-                ('platform', models.CharField(blank=True, max_length=128, null=True, verbose_name='Platform')),
-                ('os', models.CharField(blank=True, max_length=128, null=True, verbose_name='OS')),
-                ('os_version', models.CharField(blank=True, max_length=16, null=True, verbose_name='OS version')),
-                ('os_arch', models.CharField(blank=True, max_length=16, null=True, verbose_name='OS arch')),
-                ('hostname_raw', models.CharField(blank=True, max_length=128, null=True, verbose_name='Hostname raw')),
-                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('comment', models.TextField(blank=True, default='', max_length=128, verbose_name='Comment')),
-                ('admin_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.AdminUser', verbose_name='Admin user')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AssetGroup',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')),
-                ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-            ],
-            options={
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Cluster',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=32, verbose_name='Name')),
-                ('bandwidth', models.CharField(blank=True, max_length=32, verbose_name='Bandwidth')),
-                ('contact', models.CharField(blank=True, max_length=128, verbose_name='Contact')),
-                ('phone', models.CharField(blank=True, max_length=32, verbose_name='Phone')),
-                ('address', models.CharField(blank=True, max_length=128, verbose_name='Address')),
-                ('intranet', models.TextField(blank=True, verbose_name='Intranet')),
-                ('extranet', models.TextField(blank=True, verbose_name='Extranet')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('operator', models.CharField(blank=True, max_length=32, verbose_name='Operator')),
-                ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('admin_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.AdminUser', verbose_name='Admin user')),
-            ],
-            options={
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='SystemUser',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
-                ('username', models.CharField(max_length=16, verbose_name='Username')),
-                ('_password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Password')),
-                ('_private_key', models.TextField(blank=True, max_length=4096, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key')),
-                ('_public_key', models.TextField(blank=True, max_length=4096, verbose_name='SSH public key')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(max_length=32, null=True, verbose_name='Created by')),
-                ('priority', models.IntegerField(default=10, verbose_name='Priority')),
-                ('protocol', models.CharField(choices=[('ssh', 'ssh')], default='ssh', max_length=16, verbose_name='Protocol')),
-                ('auto_push', models.BooleanField(default=True, verbose_name='Auto push')),
-                ('sudo', models.TextField(default='/sbin/ifconfig', verbose_name='Sudo')),
-                ('shell', models.CharField(default='/bin/bash', max_length=64, verbose_name='Shell')),
-                ('cluster', models.ManyToManyField(blank=True, to='assets.Cluster', verbose_name='Cluster')),
-            ],
-            options={
-                'ordering': ['name'],
-            },
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='cluster',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assets', to='assets.Cluster', verbose_name='Cluster'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='groups',
-            field=models.ManyToManyField(blank=True, related_name='assets', to='assets.AssetGroup', verbose_name='Asset groups'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='asset',
-            unique_together=set([('ip', 'port')]),
-        ),
-
-        migrations.RunPython(add_default_cluster),
-        migrations.RunPython(add_default_group),
-    ]

apps/assets/migrations/0002_auto_20180105_1807_squashed_0009_auto_20180307_1212.py

@@ -1,158 +0,0 @@
-# Generated by Django 2.1.7 on 2019-02-28 10:16
-
-import assets.models.asset
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('assets', '0002_auto_20180105_1807'), ('assets', '0003_auto_20180109_2331'), ('assets', '0004_auto_20180125_1218'), ('assets', '0005_auto_20180126_1637'), ('assets', '0006_auto_20180130_1502'), ('assets', '0007_auto_20180225_1815'), ('assets', '0008_auto_20180306_1804'), ('assets', '0009_auto_20180307_1212')]
-
-    dependencies = [
-        ('assets', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='adminuser',
-            options={'ordering': ['name'], 'verbose_name': 'Admin user'},
-        ),
-        migrations.AlterModelOptions(
-            name='asset',
-            options={'verbose_name': 'Asset'},
-        ),
-        migrations.AlterModelOptions(
-            name='assetgroup',
-            options={'ordering': ['name'], 'verbose_name': 'Asset group'},
-        ),
-        migrations.AlterModelOptions(
-            name='cluster',
-            options={'ordering': ['name'], 'verbose_name': 'Cluster'},
-        ),
-        migrations.AlterModelOptions(
-            name='systemuser',
-            options={'ordering': ['name'], 'verbose_name': 'System user'},
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='cluster',
-        ),
-        migrations.AlterField(
-            model_name='assetgroup',
-            name='created_by',
-            field=models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by'),
-        ),
-        migrations.CreateModel(
-            name='Label',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('value', models.CharField(max_length=128, verbose_name='Value')),
-                ('category', models.CharField(choices=[('S', 'System'), ('U', 'User')], default='U', max_length=128, verbose_name='Category')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-            ],
-            options={
-                'db_table': 'assets_label',
-            },
-        ),
-        migrations.AlterUniqueTogether(
-            name='label',
-            unique_together={('name', 'value')},
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='labels',
-            field=models.ManyToManyField(blank=True, related_name='assets', to='assets.Label', verbose_name='Labels'),
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='cabinet_no',
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='cabinet_pos',
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='env',
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='remote_card_ip',
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='status',
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='type',
-        ),
-        migrations.CreateModel(
-            name='Node',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('key', models.CharField(max_length=64, unique=True, verbose_name='Key')),
-                ('value', models.CharField(max_length=128, verbose_name='Value')),
-                ('child_mark', models.IntegerField(default=0)),
-                ('date_create', models.DateTimeField(auto_now_add=True)),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='groups',
-        ),
-        migrations.RemoveField(
-            model_name='systemuser',
-            name='cluster',
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='admin_user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='assets.AdminUser', verbose_name='Admin user'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp')], default='ssh', max_length=16, verbose_name='Protocol'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='nodes',
-            field=models.ManyToManyField(default=assets.models.asset.default_node, related_name='assets', to='assets.Node', verbose_name='Nodes'),
-        ),
-        migrations.AddField(
-            model_name='systemuser',
-            name='nodes',
-            field=models.ManyToManyField(blank=True, to='assets.Node', verbose_name='Nodes'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='created_by',
-            field=models.CharField(max_length=128, null=True, verbose_name='Created by'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='username',
-            field=models.CharField(max_length=128, verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='platform',
-            field=models.CharField(choices=[('Linux', 'Linux'), ('Unix', 'Unix'), ('MacOS', 'MacOS'), ('BSD', 'BSD'), ('Windows', 'Windows'), ('Other', 'Other')], default='Linux', max_length=128, verbose_name='Platform'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='created_by',
-            field=models.CharField(max_length=128, null=True, verbose_name='Created by'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='username',
-            field=models.CharField(max_length=128, verbose_name='Username'),
-        ),
-    ]

apps/assets/migrations/0010_auto_20180307_1749_squashed_0019_auto_20180816_1320.py

@@ -1,220 +0,0 @@
-# Generated by Django 2.1.7 on 2019-02-28 10:16
-
-import assets.models.utils
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-# Functions from the following migrations need manual copying.
-# Move them and any dependencies into this file, then update the
-# RunPython operations to refer to the local versions:
-# assets.migrations.0017_auto_20180702_1415
-
-def migrate_win_to_ssh_protocol(apps, schema_editor):
-    asset_model = apps.get_model("assets", "Asset")
-    db_alias = schema_editor.connection.alias
-    asset_model.objects.using(db_alias).filter(platform__startswith='Win').update(protocol='rdp')
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('assets', '0010_auto_20180307_1749'), ('assets', '0011_auto_20180326_0957'), ('assets', '0012_auto_20180404_1302'), ('assets', '0013_auto_20180411_1135'), ('assets', '0014_auto_20180427_1245'), ('assets', '0015_auto_20180510_1235'), ('assets', '0016_auto_20180511_1203'), ('assets', '0017_auto_20180702_1415'), ('assets', '0018_auto_20180807_1116'), ('assets', '0019_auto_20180816_1320')]
-
-    dependencies = [
-        ('assets', '0009_auto_20180307_1212'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='node',
-            name='value',
-            field=models.CharField(max_length=128, unique=True, verbose_name='Value'),
-        ),
-        migrations.CreateModel(
-            name='Domain',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Gateway',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
-                ('username', models.CharField(blank=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username')),
-                ('_password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Password')),
-                ('_private_key', models.TextField(blank=True, max_length=4096, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key')),
-                ('_public_key', models.TextField(blank=True, max_length=4096, verbose_name='SSH public key')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(max_length=128, null=True, verbose_name='Created by')),
-                ('ip', models.GenericIPAddressField(db_index=True, verbose_name='IP')),
-                ('port', models.IntegerField(default=22, verbose_name='Port')),
-                ('protocol', models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp')], default='ssh', max_length=16, verbose_name='Protocol')),
-                ('comment', models.CharField(blank=True, max_length=128, null=True, verbose_name='Comment')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
-                ('domain', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Domain', verbose_name='Domain')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='domain',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assets', to='assets.Domain', verbose_name='Domain'),
-        ),
-        migrations.AddField(
-            model_name='systemuser',
-            name='assets',
-            field=models.ManyToManyField(blank=True, to='assets.Asset', verbose_name='Assets'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='sudo',
-            field=models.TextField(default='/bin/whoami', verbose_name='Sudo'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='username',
-            field=models.CharField(max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_-]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='username',
-            field=models.CharField(max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_-]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='username',
-            field=models.CharField(max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='username',
-            field=models.CharField(max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='node',
-            name='value',
-            field=models.CharField(max_length=128, verbose_name='Value'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)')], default='ssh', max_length=128, verbose_name='Protocol'),
-        ),
-        migrations.AddField(
-            model_name='systemuser',
-            name='login_mode',
-            field=models.CharField(choices=[('auto', 'Automatic login'), ('manual', 'Manually login')], default='auto', max_length=10, verbose_name='Login mode'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='username',
-            field=models.CharField(blank=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='platform',
-            field=models.CharField(choices=[('Linux', 'Linux'), ('Unix', 'Unix'), ('MacOS', 'MacOS'), ('BSD', 'BSD'), ('Windows', 'Windows'), ('Windows2016', 'Windows(2016)'), ('Other', 'Other')], default='Linux', max_length=128, verbose_name='Platform'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)')], default='ssh', max_length=16, verbose_name='Protocol'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='username',
-            field=models.CharField(blank=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.RunPython(
-            code=migrate_win_to_ssh_protocol,
-        ),
-        migrations.AddField(
-            model_name='adminuser',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='domain',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='gateway',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='label',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='node',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AddField(
-            model_name='systemuser',
-            name='org_id',
-            field=models.CharField(blank=True, default=None, max_length=36, null=True),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='name',
-            field=models.CharField(max_length=128, verbose_name='Name'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='hostname',
-            field=models.CharField(max_length=128, verbose_name='Hostname'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='name',
-            field=models.CharField(max_length=128, verbose_name='Name'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='name',
-            field=models.CharField(max_length=128, verbose_name='Name'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='adminuser',
-            unique_together={('name', 'org_id')},
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='cpu_vcpus',
-            field=models.IntegerField(null=True, verbose_name='CPU vcpus'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='asset',
-            unique_together={('org_id', 'hostname')},
-        ),
-        migrations.AlterUniqueTogether(
-            name='gateway',
-            unique_together={('name', 'org_id')},
-        ),
-        migrations.AlterUniqueTogether(
-            name='systemuser',
-            unique_together={('name', 'org_id')},
-        ),
-        migrations.AlterUniqueTogether(
-            name='label',
-            unique_together={('name', 'value', 'org_id')},
-        ),
-    ]

apps/assets/migrations/0020_auto_20180816_1652.py

@@ -1,48 +0,0 @@
-# Generated by Django 2.0.7 on 2018-08-16 08:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0019_auto_20180816_1320'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='domain',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='label',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='node',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='org_id',
-            field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'),
-        ),
-    ]

apps/assets/migrations/0021_auto_20180903_1132.py

@@ -1,25 +0,0 @@
-# Generated by Django 2.1 on 2018-09-03 03:32
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0020_auto_20180816_1652'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='domain',
-            options={'verbose_name': 'Domain'},
-        ),
-        migrations.AlterModelOptions(
-            name='gateway',
-            options={'verbose_name': 'Gateway'},
-        ),
-        migrations.AlterModelOptions(
-            name='node',
-            options={'verbose_name': 'Node'},
-        ),
-    ]

apps/assets/migrations/0022_auto_20181012_1717.py

@@ -1,56 +0,0 @@
-# Generated by Django 2.1.1 on 2018-10-12 09:17
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0021_auto_20180903_1132'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='CommandFilter',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=64, verbose_name='Name')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
-                ('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(blank=True, default='', max_length=128, verbose_name='Created by')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='CommandFilterRule',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('type', models.CharField(choices=[('regex', 'Regex'), ('command', 'Command')], default='command', max_length=16, verbose_name='Type')),
-                ('priority', models.IntegerField(default=50, help_text='1-100, the lower will be match first', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Priority')),
-                ('content', models.TextField(help_text='One line one command', max_length=1024, verbose_name='Content')),
-                ('action', models.IntegerField(choices=[(0, 'Deny'), (1, 'Allow')], default=0, verbose_name='Action')),
-                ('comment', models.CharField(blank=True, default='', max_length=64, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(blank=True, default='', max_length=128, verbose_name='Created by')),
-                ('filter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='assets.CommandFilter', verbose_name='Filter')),
-            ],
-            options={
-                'ordering': ('priority', 'action'),
-            },
-        ),
-        migrations.AddField(
-            model_name='systemuser',
-            name='cmd_filters',
-            field=models.ManyToManyField(blank=True, related_name='system_users', to='assets.CommandFilter', verbose_name='Command filter'),
-        ),
-    ]

apps/assets/migrations/0023_auto_20181016_1650.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.1.1 on 2018-10-16 08:50
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0022_auto_20181012_1717'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='commandfilterrule',
-            options={'ordering': ('-priority', 'action')},
-        ),
-        migrations.AlterField(
-            model_name='commandfilterrule',
-            name='priority',
-            field=models.IntegerField(default=50, help_text='1-100, the higher will be match first', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Priority'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='priority',
-            field=models.IntegerField(default=20, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Priority'),
-        ),
-    ]

apps/assets/migrations/0024_auto_20181219_1614.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.1.4 on 2018-12-19 08:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0023_auto_20181016_1650'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)'), ('vnc', 'vnc')], default='ssh', max_length=128, verbose_name='Protocol'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)'), ('vnc', 'vnc')], default='ssh', max_length=16, verbose_name='Protocol'),
-        ),
-    ]

apps/assets/migrations/0025_auto_20190221_1902.py

@@ -1,21 +0,0 @@
-# Generated by Django 2.1.7 on 2019-02-21 11:02
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0024_auto_20181219_1614'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='commandfilter',
-            options={'verbose_name': 'Command filter'},
-        ),
-        migrations.AlterModelOptions(
-            name='commandfilterrule',
-            options={'ordering': ('-priority', 'action'), 'verbose_name': 'Command filter rule'},
-        ),
-    ]

apps/assets/migrations/0026_auto_20190325_2035.py

@@ -1,43 +0,0 @@
-# Generated by Django 2.1.7 on 2019-03-25 12:35
-
-import assets.models.utils
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0025_auto_20190221_1902'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AuthBook',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('username', models.CharField(blank=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username')),
-                ('_password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Password')),
-                ('_private_key', models.TextField(blank=True, max_length=4096, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key')),
-                ('_public_key', models.TextField(blank=True, max_length=4096, verbose_name='SSH public key')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_updated', models.DateTimeField(auto_now=True)),
-                ('created_by', models.CharField(max_length=128, null=True, verbose_name='Created by')),
-                ('is_latest', models.BooleanField(default=False, verbose_name='Latest version')),
-                ('version', models.IntegerField(default=1, verbose_name='Version')),
-                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Asset', verbose_name='Asset')),
-            ],
-            options={
-                'verbose_name': 'AuthBook',
-            },
-        ),
-        migrations.AlterModelOptions(
-            name='node',
-            options={'ordering': ['key'], 'verbose_name': 'Node'},
-        ),
-    ]

apps/assets/migrations/0027_auto_20190521_1703.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.1.7 on 2019-05-21 09:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0026_auto_20190325_2035'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='ip',
-            field=models.CharField(db_index=True, max_length=128, verbose_name='IP'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='public_ip',
-            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Public IP'),
-        ),
-    ]

apps/assets/migrations/0028_protocol.py

@@ -1,29 +0,0 @@
-# Generated by Django 2.1.7 on 2019-05-22 02:58
-
-import django.core.validators
-from django.db import migrations, models
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0027_auto_20190521_1703'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Protocol',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('name', models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet (beta)'), ('vnc', 'vnc')], default='ssh', max_length=16, verbose_name='Name')),
-                ('port', models.IntegerField(default=22, validators=[django.core.validators.MaxValueValidator(65535), django.core.validators.MinValueValidator(1)], verbose_name='Port')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='protocols',
-            field=models.ManyToManyField(to='assets.Protocol',
-                                         verbose_name='Protocol'),
-        ),
-    ]

apps/assets/migrations/0029_auto_20190522_1114.py

@@ -1,13 +0,0 @@
-# Generated by Django 2.1.7 on 2019-05-22 03:14
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0028_protocol'),
-    ]
-
-    operations = [
-    ]

apps/assets/migrations/0030_auto_20190619_1135.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.1.7 on 2019-06-19 03:35
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0029_auto_20190522_1114'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='admin_user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='assets', to='assets.AdminUser', verbose_name='Admin user'),
-        ),
-    ]

apps/assets/migrations/0031_auto_20190621_1332.py

@@ -1,53 +0,0 @@
-# Generated by Django 2.1.7 on 2019-06-21 05:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0030_auto_20190619_1135'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Date created'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='date_updated',
-            field=models.DateTimeField(auto_now=True, verbose_name='Date updated'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Date created'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='date_updated',
-            field=models.DateTimeField(auto_now=True, verbose_name='Date updated'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Date created'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='date_updated',
-            field=models.DateTimeField(auto_now=True, verbose_name='Date updated'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Date created'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='date_updated',
-            field=models.DateTimeField(auto_now=True, verbose_name='Date updated'),
-        ),
-    ]

apps/assets/migrations/0032_auto_20190624_2108.py

@@ -1,75 +0,0 @@
-# Generated by Django 2.1.7 on 2019-06-24 13:08
-
-import assets.models.utils
-import common.fields.model
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0031_auto_20190621_1332'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='_password',
-            field=common.fields.model.EncryptCharField(blank=True, max_length=256, null=True, verbose_name='Password'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='_private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='adminuser',
-            name='_public_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH public key'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='_password',
-            field=common.fields.model.EncryptCharField(blank=True, max_length=256, null=True, verbose_name='Password'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='_private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='_public_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH public key'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='_password',
-            field=common.fields.model.EncryptCharField(blank=True, max_length=256, null=True, verbose_name='Password'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='_private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='_public_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH public key'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='_password',
-            field=common.fields.model.EncryptCharField(blank=True, max_length=256, null=True, verbose_name='Password'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='_private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, validators=[assets.models.utils.private_key_validator], verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='_public_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH public key'),
-        ),
-    ]

apps/assets/migrations/0033_auto_20190624_2108.py

@@ -1,73 +0,0 @@
-# Generated by Django 2.1.7 on 2019-06-24 13:08
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0032_auto_20190624_2108'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='adminuser',
-            old_name='_private_key',
-            new_name='private_key',
-        ),
-        migrations.RenameField(
-            model_name='adminuser',
-            old_name='_public_key',
-            new_name='public_key',
-        ),
-        migrations.RenameField(
-            model_name='authbook',
-            old_name='_private_key',
-            new_name='private_key',
-        ),
-        migrations.RenameField(
-            model_name='authbook',
-            old_name='_public_key',
-            new_name='public_key',
-        ),
-        migrations.RenameField(
-            model_name='gateway',
-            old_name='_private_key',
-            new_name='private_key',
-        ),
-        migrations.RenameField(
-            model_name='gateway',
-            old_name='_public_key',
-            new_name='public_key',
-        ),
-        migrations.RenameField(
-            model_name='systemuser',
-            old_name='_private_key',
-            new_name='private_key',
-        ),
-        migrations.RenameField(
-            model_name='systemuser',
-            old_name='_public_key',
-            new_name='public_key',
-        ),
-        migrations.RenameField(
-            model_name='adminuser',
-            old_name='_password',
-            new_name='password',
-        ),
-        migrations.RenameField(
-            model_name='authbook',
-            old_name='_password',
-            new_name='password',
-        ),
-        migrations.RenameField(
-            model_name='gateway',
-            old_name='_password',
-            new_name='password',
-        ),
-        migrations.RenameField(
-            model_name='systemuser',
-            old_name='_password',
-            new_name='password',
-        ),
-    ]

apps/assets/migrations/0034_auto_20190705_1348.py

@@ -1,39 +0,0 @@
-# Generated by Django 2.1.7 on 2019-07-05 05:48
-
-from django.db import migrations
-from django.db.models import F
-from django.db.models import CharField, Value as V
-from django.db.models.functions import Concat
-
-
-def migrate_assets_protocol(apps, schema_editor):
-    asset_model = apps.get_model("assets", "Asset")
-    db_alias = schema_editor.connection.alias
-    assets = asset_model.objects.using(db_alias).all().annotate(
-        protocols_new=Concat(
-            'protocol', V('/'), 'port',
-            output_field=CharField(),
-        ),
-    )
-    assets.update(protocols=F('protocols_new'))
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0033_auto_20190624_2108'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='asset',
-            name='protocols',
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='protocols',
-            field=CharField(blank=True, default='ssh/22', max_length=128, verbose_name='Protocols'),
-        ),
-        migrations.RunPython(migrate_assets_protocol),
-        migrations.DeleteModel(name='Protocol'),
-    ]

apps/assets/migrations/0035_auto_20190711_2018.py

@@ -1,34 +0,0 @@
-# Generated by Django 2.1.7 on 2019-07-11 12:18
-
-import common.fields.model
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0034_auto_20190705_1348'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH private key'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='private_key',
-            field=common.fields.model.EncryptTextField(blank=True, null=True, verbose_name='SSH private key'),
-        ),
-    ]

apps/assets/migrations/0036_auto_20190716_1535.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.7 on 2019-07-16 07:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0035_auto_20190711_2018'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='commandfilter',
-            name='name',
-            field=models.CharField(max_length=64, unique=True, verbose_name='Name'),
-        ),
-    ]

apps/assets/migrations/0037_auto_20190724_2002.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.7 on 2019-07-24 12:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0036_auto_20190716_1535'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='_become_pass',
-            field=models.CharField(blank=True, default='', max_length=128),
-        ),
-    ]

apps/assets/migrations/0038_auto_20190911_1634.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.1.7 on 2019-09-11 08:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0037_auto_20190724_2002'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet'), ('vnc', 'vnc')], default='ssh', max_length=128, verbose_name='Protocol'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='protocol',
-            field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet'), ('vnc', 'vnc')], default='ssh', max_length=16, verbose_name='Protocol'),
-        ),
-    ]

apps/assets/migrations/0039_authbook_is_active.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.7 on 2019-09-17 12:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0038_auto_20190911_1634'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='authbook',
-            name='is_active',
-            field=models.BooleanField(default=True, verbose_name='Is active'),
-        ),
-    ]

apps/assets/migrations/0040_auto_20190917_2056.py

@@ -1,36 +0,0 @@
-# Generated by Django 2.1.7 on 2019-09-17 12:56
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0039_authbook_is_active'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adminuser',
-            name='username',
-            field=models.CharField(blank=True, db_index=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='authbook',
-            name='username',
-            field=models.CharField(blank=True, db_index=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='gateway',
-            name='username',
-            field=models.CharField(blank=True, db_index=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-        migrations.AlterField(
-            model_name='systemuser',
-            name='username',
-            field=models.CharField(blank=True, db_index=True, max_length=32, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'),
-        ),
-    ]

apps/assets/migrations/0041_gathereduser.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.1.7 on 2019-09-18 04:10
-
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0040_auto_20190917_2056'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GatheredUser',
-            fields=[
-                ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('username', models.CharField(blank=True, db_index=True, max_length=32, verbose_name='Username')),
-                ('present', models.BooleanField(default=True, verbose_name='Present')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
-                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Asset', verbose_name='Asset')),
-            ],
-            options={'ordering': ['asset'], 'verbose_name': 'GatherUser'},
-        ),
-    ]

apps/assets/migrations/0042_favoriteasset.py

@@ -1,31 +0,0 @@
-# Generated by Django 2.2.5 on 2019-10-16 08:38
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('assets', '0041_gathereduser'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='FavoriteAsset',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
-                ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Asset')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'unique_together': {('user', 'asset')},
-            },
-        ),
-    ]

apps/assets/migrations/0043_auto_20191114_1111.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.5 on 2019-11-14 03:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0042_favoriteasset'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='gathereduser',
-            name='date_last_login',
-            field=models.DateTimeField(null=True, verbose_name='Date last login'),
-        ),
-        migrations.AddField(
-            model_name='gathereduser',
-            name='ip_last_login',
-            field=models.CharField(default='', max_length=39, verbose_name='IP last login'),
-        ),
-    ]

apps/assets/migrations/0044_platform.py

@@ -1,48 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-06 07:26
-
-import common.fields.model
-from django.db import migrations, models
-
-
-def create_internal_platform(apps, schema_editor):
-    model = apps.get_model("assets", "Platform")
-    db_alias = schema_editor.connection.alias
-    type_platforms = (
-        ('Linux', 'Linux', None),
-        ('Unix', 'Unix', None),
-        ('MacOS', 'MacOS', None),
-        ('BSD', 'BSD', None),
-        ('Windows', 'Windows', None),
-        ('Windows2016', 'Windows', {'security': 'tls'}),
-        ('Other', 'Other', None),
-    )
-    for name, base, meta in type_platforms:
-        model.objects.using(db_alias).create(
-            name=name, base=base, internal=True, meta=meta
-        )
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0043_auto_20191114_1111'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Platform',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.SlugField(allow_unicode=True, unique=True, verbose_name='Name')),
-                ('base', models.CharField(choices=[('Linux', 'Linux'), ('Unix', 'Unix'), ('MacOS', 'MacOS'), ('BSD', 'BSD'), ('Windows', 'Windows'), ('Other', 'Other')], default='Linux', max_length=16, verbose_name='Base')),
-                ('charset', models.CharField(choices=[('utf8', 'UTF-8'), ('gbk', 'GBK')], default='utf8', max_length=8, verbose_name='Charset')),
-                ('meta', common.fields.model.JsonDictTextField(blank=True, null=True, verbose_name='Meta')),
-                ('internal', models.BooleanField(default=False, verbose_name='Internal')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='Comment')),
-            ],
-            options={
-                'verbose_name': 'Platform'
-            }
-        ),
-        migrations.RunPython(create_internal_platform)
-    ]

apps/assets/migrations/0045_auto_20191206_1607.py

@@ -1,47 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-06 08:07
-
-import assets.models.asset
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-def migrate_platform_to_asset_type(apps, schema_editor):
-    asset_model = apps.get_model("assets", "Asset")
-    platform_model = apps.get_model("assets", "Platform")
-    db_alias = schema_editor.connection.alias
-
-    platforms = platform_model.objects.using(db_alias).all()
-    platforms_map = {p.name: p for p in platforms}
-    for name, p in platforms_map.items():
-        asset_model.objects.using(db_alias)\
-            .filter(_platform=name)\
-            .update(platform=p)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0044_platform'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='asset',
-            old_name='platform',
-            new_name='_platform',
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='platform',
-            field=models.ForeignKey(
-                default=assets.models.asset.Platform.default,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name='assets', to='assets.Platform',
-                verbose_name='Platform'),
-        ),
-        migrations.RunPython(migrate_platform_to_asset_type),
-        migrations.RemoveField(
-            model_name='asset',
-            name='_platform',
-        ),
-    ]