[Update] 支持api key

apps/assets/api/asset.py

 # -*- coding: utf-8 -*-
 #
 
-import uuid
 import random
 
 from rest_framework import generics
-from rest_framework.views import APIView
 from rest_framework.response import Response
-from rest_framework_bulk import BulkModelViewSet
-from rest_framework_bulk import ListBulkCreateUpdateDestroyAPIView
 from rest_framework.pagination import LimitOffsetPagination
 from django.utils.translation import ugettext_lazy as _
 from django.shortcuts import get_object_or_404
-from django.urls import reverse_lazy
-from django.core.cache import cache
 from django.db.models import Q
 
-from common.mixins import IDInCacheFilterMixin, ApiMessageMixin
-
 from common.utils import get_logger, get_object_or_none
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
 from orgs.mixins import OrgBulkModelViewSet
-from ..const import CACHE_KEY_ASSET_BULK_UPDATE_ID_PREFIX
 from ..models import Asset, AdminUser, Node
 from .. import serializers
 from ..tasks import update_asset_hardware_info_manual, \

apps/authentication/api/__init__.py

@@ -4,3 +4,4 @@
 from .auth import *
 from .token import *
 from .mfa import *
+from .access_key import *

apps/authentication/api/access_key.py

+# -*- coding: utf-8 -*-
+#
+
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.pagination import LimitOffsetPagination
+
+from common.permissions import IsValidUser
+from .. import serializers
+
+
+class AccessKeyViewSet(ModelViewSet):
+    permission_classes = (IsValidUser,)
+    serializer_class = serializers.AccessKeySerializer
+    pagination_class = LimitOffsetPagination
+
+    def get_queryset(self):
+        return self.request.user.access_keys.all()
+
+    def perform_create(self, serializer):
+        user = self.request.user
+        user.create_access_key()

apps/authentication/migrations/0002_auto_20190729_1423.py

+# Generated by Django 2.1.7 on 2019-07-29 06:23
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='accesskey',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2019, 7, 29, 6, 23, 54, 115123, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='accesskey',
+            name='is_active',
+            field=models.BooleanField(default=True, verbose_name='Active'),
+        ),
+    ]

apps/authentication/models.py

@@ -12,6 +12,8 @@ class AccessKey(models.Model):
                               default=uuid.uuid4, editable=False)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='User',
                              on_delete=models.CASCADE, related_name='access_keys')
+    is_active = models.BooleanField(default=True, verbose_name=_('Active'))
+    date_created = models.DateTimeField(auto_now_add=True)
 
     def get_id(self):
         return str(self.id)

apps/authentication/serializers.py

@@ -17,8 +17,8 @@ class AccessKeySerializer(serializers.ModelSerializer):
 
     class Meta:
         model = AccessKey
-        fields = ['id', 'secret']
-        read_only_fields = ['id', 'secret']
+        fields = ['id', 'secret', 'is_active', 'date_created']
+        read_only_fields = ['id', 'secret', 'date_created']
 
 
 class OtpVerifySerializer(serializers.Serializer):

apps/authentication/templates/authentication/_access_key_modal.html

+{% extends '_modal.html' %}
+{% load i18n %}
+{% load static %}
+{% block modal_id %}access_key_modal{% endblock %}
+{% block modal_title%}{% trans "API key list" %}{% endblock %}
+{% block modal_body %}
+<style>
+    .inmodal .modal-body {
+        background: #fff;
+    }
+    #access_key_list_table_wrapper {
+        padding-top: 10px;
+    }
+
+</style>
+<table class="table table-striped table-bordered table-hover " id="access_key_list_table" style="padding-top: 10px">
+    <thead>
+    <tr>
+        <th class="text-center">
+            <input type="checkbox" id="check_all" class="ipt_check_all" >
+        </th>
+        <th class="text-center">{% trans 'ID' %}</th>
+        <th class="text-center">{% trans 'Secret' %}</th>
+        <th class="text-center">{% trans 'Date' %}</th>
+        <th class="text-center">{% trans 'Action' %}</th>
+    </tr>
+    </thead>
+    <tbody>
+    </tbody>
+</table>
+
+<div id="uc" hidden>
+    <button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>
+</div>
+
+<script>
+var table = null;
+function initTable() {
+    var options = {
+        ele: $('#access_key_list_table'),
+        columnDefs: [
+            {targets: 2, createdCell: function (td, cellData, rowData) {
+                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', cellData.id));
+            }},
+            {targets: 4, createdCell: function (td, cellData, rowData) {
+                $(td).html(update_btn + del_btn)
+            }}
+        ],
+        ajax_url: '{% url "api-auth:access-key-list" %}',
+        columns: [
+            {data: "id"},
+            {data: "id"},
+            {data: "secret"},
+            {data: "date_created"},
+            {data: "id", orderable: false}
+        ],
+        uc_html: $('#uc').html()
+    };
+    table = jumpserver.initServerSideDataTable(options);
+}
+
+$(document).ready(function () {
+}).on("show.bs.modal", "#access_key_modal", function () {
+    initTable()
+}).on("click", "#create-btn", function () {
+    var url = "{% url "api-auth:access-key-list" %}";
+    var body = {
+        url: url,
+        method: 'POST',
+        success: function () {
+            table.ajax.reload();
+        }
+    };
+    requestApi(body)
+})
+</script>
+{% endblock %}
+{% block modal_button %}
+  <button data-dismiss="modal" class="btn btn-white close_btn2" type="button">{% trans "Close" %}</button>
+{% endblock %}

apps/authentication/urls/api_urls.py

@@ -4,9 +4,14 @@
 from __future__ import absolute_import
 
 from django.urls import path
+from rest_framework.routers import DefaultRouter
 
 from .. import api
 
+router = DefaultRouter()
+router.register('access-keys', api.AccessKeyViewSet, 'access-key')
+
+
 app_name = 'authentication'
 
 
@@ -21,3 +26,5 @@ urlpatterns = [
     path('otp/verify/', api.UserOtpVerifyApi.as_view(), name='user-otp-verify'),
 ]
 
+urlpatterns += router.urls
+

apps/templates/_header_bar.html

 {% load i18n %}
+{% include 'authentication/_access_key_modal.html' %}
 <div class="row border-bottom">
     <nav class="navbar navbar-static-top white-bg" role="navigation" style="margin-bottom: 0">
         <div class="navbar-header">
             <a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
-            <!--<form role="search" class="navbar-form-custom" method="get" action="">-->
-                <!--<div class="form-group">-->
-                    <!--<input type="text" placeholder="{% trans 'Search' %}..." class="form-control" name="search" id="top-search">-->
-                <!--</div>-->
-            <!--</form>-->
         </div>
         <ul class="nav navbar-top-links navbar-right">
-{#            <li>#}
-{#                <span class="m-r-sm text-muted welcome-message">{% trans 'Welcome to use Jumpserver system' %}</span>#}
-{#            </li>#}
-
-{#            <li class="dropdown">#}
-{#                <a class="count-info" href="https://market.aliyun.com/products/53690006/cmgj026011.html?spm=5176.730005.0.0.cY2io1" target="_blank">#}
-{#                    <span class="m-r-sm text-muted welcome-message">{% trans 'Supports' %}</span>#}
-{#                </a>#}
-{#            </li>#}
-{#            <li class="dropdown">#}
-{#                <a class="count-info"  href="http://docs.jumpserver.org/" target="_blank">#}
-{#                     <span class="m-r-sm text-muted welcome-message">{% trans 'Docs' %}</span>#}
-{#                </a>#}
-{#            </li>#}
-
             <li class="dropdown">
                 <a class="count-info dropdown-toggle" data-toggle="dropdown" href="#" target="_blank">
                     <i class="fa fa-handshake-o"></i>
@@ -94,6 +75,7 @@
                             <li><a id="switch_user"><i class="fa fa-exchange"></i><span> {% trans 'User page' %}</span></a></li>
                         {% endif %}
                     {% endif %}
+                    <li><a href="#" data-toggle="modal" data-target="#access_key_modal" tabindex="0"><i class="fa fa-key"></i> {% trans 'API Key' %}</a></li>
                     <li><a href="{% url 'authentication:logout' %}"><i class="fa fa-sign-out"></i> {% trans 'Logout' %}</a></li>
                 </ul>
                 {% else %}