add asset add

.gitignore

@@ -10,6 +10,9 @@ build
 _mailinglist
 .tox
 .cache/
+migrations/
 .idea/
 db.sqlite3
 config.py
+*/migrations/*
+*.log

README.md

 
 
-## [文档和规范]
+                            // Jumpserver //
+                            
+                            
+   ~ Jumpserver是什么?
+         
+   Jumpserver是一款开源的跳板机(堡垒机)产品, 主要使用Python,Django开发
+   他实现了跳板机(堡垒机)的主要功能，删减、优化了传统堡垒机，致力于为互联网
+   运维提供服务
+   
+   ~ 版本依赖
+   
+   * Python 2.7
+   
+   * Django 1.10
+   
+   
+   ~ 快速开始
+   
+   ```
+   pip install -r requirements.txt
+   
+   cp config-example.py config.py
+   
+   cd apps/ && python manage.py loaddata init  # 初始化数据
+   
+   python manage.py runserver 0.0.0.0:80
+   
+   ```
+   
+   ~ 文档
 
-#### [项目结构描述](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/project_structure.md)
-#### [Python代码规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/python_style_guide.md)
-#### [API设计规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/api_style_guide.md)
-#### [表结构](https://code.simcu.com/jumpserver/jumpserver/wikis/table_structure_image)
+   * [项目结构描述](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/project_structure.md)
+   * [Python代码规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/python_style_guide.md)
+   * [API设计规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/api_style_guide.md)
+   * [表结构](https://code.simcu.com/jumpserver/jumpserver/wikis/table_structure_image)
 

apps/__init__.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# 
+
+
+if __name__ == '__main__':
+    pass

apps/assets/api.py

 # ~*~ coding: utf-8 ~*~
-# 
+from rest_framework import serializers
+from .models import (
+    AssetGroup,Asset,IDC,AssetExtend
+)
+from rest_framework import viewsets,serializers
 
+class AssetGroupSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AssetGroup
+        #exclude = [
+            #'password', 'first_name', 'last_name', 'secret_key_otp',
+            #'private_key', 'public_key', 'avatar',
+        #]
+
+class AssetSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Asset
+        #fields = ('id', 'title', 'code', 'linenos', 'language', 'style')
+
+class IDCSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = IDC
+        #fields = ('id', 'title', 'code', 'linenos', 'language', 'style')
+        
+class AssetGroupViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows AssetGroup to be viewed or edited.
+    """
+    queryset = AssetGroup.objects.all()
+    serializer_class = AssetGroupSerializer
+
+class AssetViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows Asset to be viewed or edited.
+    """
+    queryset = Asset.objects.all()
+    serializer_class = AssetSerializer
+
+class IDCViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows IDC to be viewed or edited.
+    """
+    queryset = IDC.objects.all()
+    serializer_class = IDCSerializer
\ No newline at end of file

apps/assets/templates/assets/asset_add.html

@@ -6,7 +6,7 @@
         <div class="col-sm-10">
             <div class="ibox float-e-margins">
                 <div id="ibox-content" class="ibox-title">
-                    <h5> 填写资产基本信息 </h5>
+                    <h5> 添加资产 </h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -22,12 +22,12 @@
 
                 <div class="ibox-content">
                     <div class="panel blank-panel">
-                        <div class="panel-options">
-                            <ul class="nav nav-tabs">
-                                <li class="active"><a href="{% url 'assets:asset-add' %}" class="text-center"><i class="fa fa-laptop"></i> 单台添加 </a></li>
+{#                        <div class="panel-options">#}
+{#                            <ul class="nav nav-tabs">#}
+{#                                <li class="active"><a href="{% url 'assets:asset-add' %}" class="text-center"><i class="fa fa-laptop"></i> 单台添加 </a></li>#}
 {#                                <li><a href="{% url 'asset_add_batch' %}" class="text-center"><i class="fa fa-bar-chart-o"></i> 批量添加 </a></li>#}
-                            </ul>
-                        </div>
+{#                            </ul>#}
+{#                        </div>#}
                         <div class="panel-body">
                             <div class="tab-content">
                                 <div id="tab-1" class="ibox float-e-margins tab-pane active">
@@ -40,6 +40,7 @@
 
                                     <form id="assetForm" method="post" class="form-horizontal">
                                         {% csrf_token %}
+                                        <h3 class="widget-head-color-box">基本信息</h3>
 
                                         {{ form.hostname|bootstrap_horizontal }}
 
@@ -79,12 +80,38 @@
                                             </div>
                                         </div>
 
-                                        <div class="hr-line-dashed"></div>
-                                        {{ form.group|bootstrap_horizontal }}
+{#                                        <div class="hr-line-dashed"></div>#}
+{#                                        {{ form.group|bootstrap_horizontal }}#}
 
 {#                                        {{ af.is_active|bootstrap_horizontal }}#}
 
                                         <div class="hr-line-dashed"></div>
+                                        {{ form.comment|bootstrap_horizontal }}
+
+
+                                        <div class="hr-line-dashed"></div>
+                                        <h3>关联资产用户</h3>
+                                        <div class="form-group">
+                                            <label for="j_group" class="col-sm-2 control-label">管理用户<span class="red-fonts"> *</span></label>
+                                            <div class="col-sm-8">
+                                                <div class="radio i-checks">
+                                                   <label><input type="radio" checked="checked" id="id_use_default_auth" name="use_default_auth"><span>使用预定义管理用户</span></label>
+                                                   <label><input type="radio" checked="checked" id="id_use_default_auth" name="use_default_auth"><span>自定义</span></label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <p class="col-sm-offset-2">Tips: 管理用户是服务器存在的root或拥有sudo的用户，用来推送系统用户</p>
+                                        <div class="form-group" id="admin_account" style="display: none">
+                                            <label class="col-sm-2 control-label"> <span class="red-fonts"></span> </label>
+                                            <div class="col-sm-3">
+                                                <input type="text" placeholder="Username" name="username" class="form-control">
+                                            </div>
+
+                                            <label class="col-sm-1 control-label"> <span class="red-fonts"></span> </label>
+                                            <div class="col-sm-4">
+                                                <input type="password" placeholder="Password" name="password" class="form-control">
+                                            </div>
+                                        </div>
                                         <div class="form-group"><label class="col-sm-2 control-label"> 是否激活<span class="red-fonts"> *</span> </label>
                                             <div class="col-sm-8">
                                                 <div class="radio i-checks">

apps/assets/urls.py

 # coding:utf-8
-from django.conf.urls import url
+from django.conf.urls import url,include
 from .views import *
-
+from .api import (
+    AssetGroupViewSet,AssetViewSet,IDCViewSet
+)
+from rest_framework import routers
+router = routers.DefaultRouter()
+router.register(r'assetgroup', AssetGroupViewSet)
+router.register(r'asset', AssetViewSet)
+router.register(r'idc', IDCViewSet)
 app_name = 'assets'
 
 urlpatterns = [
@@ -9,4 +16,5 @@ urlpatterns = [
     url(r'^$', AssetListView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/delete/$', AssetDeleteView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/detail/$', AssetDetailView.as_view(), name='asset-detail'),
+    url(r'^api/v1.0/', include(router.urls)),
 ]

apps/common/README.md

+## Celery usage 
+
+
+Jumpserver use celery to run task async. Using redis as the broker, so
+you should run a redis instance
+
+#### Run redis
+
+	$ yum -y install redis 
+	
+	or
+	
+	$ docker run -name jumpserver-redis -d -p 6379:6379 redis redis-server
+
+
+#### Write tasks in app_name/tasks.py
+
+ops/tasks.py
+
+```
+from __future__ import absolute_import
+
+import time
+from celery import shared_task
+from common import celery_app
+
+
+@shared_task
+def longtime_add(x, y):
+    print 'long time task begins'
+    # sleep 5 seconds
+    time.sleep(5)
+    print 'long time task finished'
+    return x + y
+    
+
+@celery_app.task(name='hello-world')
+def hello():
+    print 'hello world!'
+  
+```
+
+#### Run celery in development 
+
+```
+$ cd apps
+$ celery -A common worker -l info 
+```
+
+#### Test using task
+
+```
+$ ./manage.py shell
+>>> from ops.tasks import longtime_add
+>>> res = longtime_add.delay(1, 2)
+>>> res.get()
+```
+
+
+
+

apps/common/__init__.py

+from __future__ import absolute_import
+
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app
+

apps/common/apps.py

+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class CommonConfig(AppConfig):
+    name = 'common'

apps/common/celery.py

+# ~*~ coding: utf-8 ~*~
+
+from __future__ import absolute_import, unicode_literals
+
+import os
+
+from celery import Celery
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'jumpserver.settings')
+
+from django.conf import settings
+
+app = Celery('jumpserver')
+
+# Using a string here means the worker will not have to
+# pickle the object when using Windows.
+app.config_from_object('django.conf:settings')
+
+app.autodiscover_tasks(lambda: [app_config.split('.')[0] for app_config in settings.INSTALLED_APPS])
+

apps/common/models.py

+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.

apps/common/tasks.py

+from __future__ import absolute_import
+
+from celery import shared_task
+from django.core.mail import send_mail
+from django.conf import settings
+
+
+@shared_task(name='send_mail_async')
+def send_mail_async(*args, **kwargs):
+    """ Using celery to send email async
+
+    You can use it as django send_mail function
+
+    Example:
+    send_mail_sync.delay(subject, message, from_mail, recipient_list, fail_silently=False, html_message=None)
+
+    Also you can ignore the from_mail, unlike django send_mail, from_email is not a require args:
+
+    Example:
+    send_mail_sync.delay(subject, message, recipient_list, fail_silently=False, html_message=None)
+    """
+    if len(args) == 3:
+        args = list(args)
+        args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0]
+        args.insert(2, settings.EMAIL_HOST_USER)
+        args = tuple(args)
+
+    send_mail(*args, **kwargs)
+
+
+# def send_mail_async(subject, message, from_mail, recipient_list, fail_silently=False, html_message=None):
+#     if settings.CONFIG.MAIL_SUBJECT_PREFIX:
+#         subject += settings.CONFIG.MAIL_SUBJECT_PREFIX
+#     send_mail(subject, message, from_mail, recipient_list, fail_silently=fail_silently, html_message=html_message)

apps/common/templates/common/flash_message_standalone.html

+{% load static %}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <title>{{ title }}</title>
+
+    {% include '_head_css_js.html' %}
+    <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
+    <script src="{% static "js/jumpserver.js" %}"></script>
+
+</head>
+
+<body class="gray-bg">
+    <div class="passwordBox2 animated fadeInDown">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="ibox-content">
+                    <div>
+                        <img src="{% static 'img/logo.png' %}" style="margin: auto" width="82" height="82">
+                        <h2 style="display: inline">Jumpserver</h2>
+                    </div>
+                    {% if errors %}
+                    <p>
+                        <div class="alert alert-danger">
+                            {{ errors }}
+                        </div>
+                    </p>
+                    {% endif %}
+
+                    {% if messages %}
+                        <p>
+                        <div class="alert alert-success">
+                            {{ messages }}
+                        </div>
+                    </p>
+                    {% endif %}
+                    <div class="row">
+                        <div class="col-lg-3">
+                                <a href="{{ redirect_url }}" class="btn btn-primary block full-width m-b">返回</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <hr/>
+        <div class="row">
+            <div class="col-md-6">
+                Copyright Jumpserver.org
+            </div>
+            <div class="col-md-6 text-right">
+               <small>© 2014-2016</small>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

apps/common/templatetags/common_tags.py

+# ~*~ coding: utf-8 ~*~
+
+from django import template
+from django.utils import timezone
+from django.conf import settings
+
+
+register = template.Library()
+
+
+@register.filter
+def join_queryset_attr(queryset, attr, delimiter=', '):
+    return delimiter.join([getattr(obj, attr, '') for obj in queryset])
+
+
+@register.filter
+def pagination_range(total_page, current_num=1, display=5):
+    """Return Page range
+
+    :param total_page: Total numbers of paginator
+    :param current_num: current display page num
+    :param display: Display as many as [:display:] page
+
+    In order to display many page num on web like:
+    < 1 2 3 4 5 >
+    """
+    try:
+        current_num = int(current_num)
+    except ValueError:
+        current_num = 1
+
+    start = current_num - display/2 if current_num > display/2 else 1
+    end = start + display if start + display <= total_page else total_page + 1
+
+    return range(start, end)
+
+
+
+

apps/common/utils.py

+# -*- coding: utf-8 -*-
+#
+
+from __future__ import unicode_literals
+
+from django.shortcuts import reverse as dj_reverse
+from django.conf import settings
+
+
+def reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None, external=False):
+    url = dj_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, current_app=current_app)
+
+    if external:
+        url = settings.SITE_URL.strip('/') + url
+    return url
+
+
+def get_object_or_none(model, **kwargs):
+    try:
+        obj = model.objects.get(**kwargs)
+    except model.DoesNotExist:
+        obj = None
+    return obj
+

apps/common/views.py

+from __future__ import absolute_import, unicode_literals
+
+from django.shortcuts import render
+from django.views.generic import TemplateView
+
+
+

apps/fixtures/init.json

+[{"model": "users.role", "pk": 1, "fields": {"name": "Administrator", "date_added": "2016-08-20T17:03:42.631Z", "created_by": "System", "comment": "\u7ba1\u7406\u5458", "permissions": [16, 17, 18, 19, 20, 21, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 1, 2, 3, 4, 5, 6, 7, 8, 9]}}, {"model": "users.role", "pk": 2, "fields": {"name": "User", "date_added": "2016-08-20T17:03:42.671Z", "created_by": "System", "comment": "\u7528\u6237", "permissions": []}}, {"model": "users.role", "pk": 3, "fields": {"name": "Auditor", "date_added": "2016-08-20T17:03:42.683Z", "created_by": "System", "comment": "\u5ba1\u8ba1\u5458", "permissions": []}}, {"model": "users.usergroup", "pk": 1, "fields": {"name": "ALL", "comment": "Default usergroup for all user", "date_added": "2016-08-20T17:03:42.693Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$xZUhPadgI8rs$n2rm5futcOv7Ww4b4BflN8K90Vk3u7ozfnOS7GQq0ns=", "last_login": null, "is_superuser": false, "first_name": "", "last_name": "", "is_staff": false, "is_active": true, "date_joined": "2016-08-20T17:03:42.752Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "role": 1, "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "date_expired": "2086-08-03T17:03:42.753Z", "created_by": "System", "user_permissions": [], "groups": [1]}}][{"model": "users.usergroup", "pk": 1, "fields": {"name": "Default", "comment": "Default user group for all user", "date_added": "2016-08-24T08:24:34.436Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$MC3vobX7pa0C$l9qIj4UwHqODnj1hMvVy9DjLxbBumZaioQWIFrWQR7c=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-08-24T08:24:34.438Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "date_expired": "2086-08-07T08:24:34.438Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
\ No newline at end of file