新增二次验证码有效时间

apps/authority/api/group.py

@@ -49,7 +49,6 @@ class GroupCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Permission_PMNGROUP_CREATE'])
     def create(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(GroupCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
                 USER=request.user.full_name,
@@ -69,7 +68,6 @@ class GroupUpdateAPI(WebTokenAuthentication, generics.UpdateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Permission_PMNGROUP_UPDATE'])
     def update(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(GroupUpdateAPI, self).update(request, *args, **kwargs)
             pmngroup = self.get_object()
             return self.msg.format(
@@ -90,7 +88,6 @@ class GroupDeleteAPI(WebTokenAuthentication, generics.DestroyAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Permission_PMNGROUP_DELETE'])
     def delete(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             pmngroup = self.get_object()
             response = super(GroupDeleteAPI, self).delete(request, *args, **kwargs)
             return self.msg.format(

apps/authority/api/jumper.py

@@ -66,7 +66,6 @@ class JumperCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Jumper_JUMPER_CREATE'])
     def create(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(JumperCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
                 USER=request.user.full_name,
@@ -90,7 +89,6 @@ class JumperUpdateAPI(WebTokenAuthentication, generics.UpdateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Jumper_JUMPER_UPDATE'])
     def update(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(JumperUpdateAPI, self).update(request, *args, **kwargs)
             jumper = self.get_object()
             return self.msg.format(
@@ -115,7 +113,6 @@ class JumperDeleteAPI(WebTokenAuthentication, generics.DestroyAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Jumper_JUMPER_DELETE'])
     def delete(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             jumper = self.get_object()
             try:
                 group = jumper.group

apps/authority/api/key.py

@@ -50,7 +50,6 @@ class KeyCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Key_KEY_CREATE'])
     def create(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(KeyCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
                 USER=request.user.full_name,
@@ -73,7 +72,6 @@ class KeyUpdateAPI(WebTokenAuthentication, generics.UpdateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Key_KEY_UPDATE'])
     def update(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(KeyUpdateAPI, self).update(request, *args, **kwargs)
             key = self.get_object()
             return self.msg.format(
@@ -97,7 +95,6 @@ class KeyDeleteAPI(WebTokenAuthentication, generics.DestroyAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Key_KEY_DELETE'])
     def delete(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             key = self.get_object()
             try:
                 group = key.group

apps/authority/api/user.py

@@ -1,4 +1,8 @@
 # -*- coding:utf-8 -*-
+# !/usr/bin/env python
+# Time 17-10-25
+# Author Yo
+# Email [email protected]
 import pyotp
 import os
 from qrcode import QRCode, constants
@@ -13,13 +17,13 @@
 from deveops.utils import aes
 from authority.permission import user as UserPermission
 from timeline.decorator import decorator_api
-from .. import models,serializers,filter
+from .. import models, serializers, filter
 
 __all__ = [
     "UserLoginAPI", "UserInfoAPI", "UserListAPI",
     "UserOpsListAPI", "UserUpdateAPI", "UserDeleteAPI",
     "UserListByPageAPI", 'UserPagination', 'UserOpsListByPageAPI',
-    'UserQRCodeAPI', 'UserCreateAPI',
+    'UserQRCodeAPI', 'UserCreateAPI', 'UserExpireAPI'
 ]
 
 
@@ -96,18 +100,17 @@ class UserCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['ExtendUser_USER_CREATE'])
     def create(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(UserCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
-                USER = request.user.full_name,
-                USERNAME = response.data['username'],
-                FULLNAME = response.data['full_name'],
+                USER=request.user.full_name,
+                USERNAME=response.data['username'],
+                FULLNAME=response.data['full_name'],
             ), response
         else:
             return '', self.qrcode_response
 
 
-class UserUpdateAPI(WebTokenAuthentication,generics.UpdateAPIView):
+class UserUpdateAPI(WebTokenAuthentication, generics.UpdateAPIView):
     module = models.ExtendUser
     serializer_class = serializers.UserSerializer
     queryset = models.ExtendUser.objects.all()
@@ -117,7 +120,6 @@ class UserUpdateAPI(WebTokenAuthentication,generics.UpdateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['ExtendUser_USER_UPDATE'])
     def update(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(UserUpdateAPI, self).update(request, *args, **kwargs)
             user = self.get_object()
             return self.msg.format(
@@ -139,7 +141,6 @@ class UserDeleteAPI(WebTokenAuthentication,generics.DestroyAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['ExtendUser_USER_DELETE'])
     def delete(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             user = self.get_object()
             response = super(UserDeleteAPI, self).delete(request, *args, **kwargs)
             return self.msg.format(
@@ -152,14 +153,13 @@ def delete(self, request, *args, **kwargs):
 
 
 def get_qrcode(user):
-    if not user.qrcode: # ''
+    if not user.qrcode:
         user.qrcode = pyotp.random_base32()
         user.save()
-    file_name = str(aes.encrypt(user.qrcode),encoding='utf-8')
+    file_name = str(aes.encrypt(user.qrcode), encoding='utf-8')
     file = settings.QCODE_ROOT+'/'+file_name+'.png'
     if not os.path.exists(file):
         data = pyotp.totp.TOTP(user.qrcode).provisioning_uri(user.username, issuer_name="devEops")
-        print('data',data)
         qr = QRCode(
             version=1,
             error_correction=constants.ERROR_CORRECT_L,
@@ -170,9 +170,9 @@ def get_qrcode(user):
             qr.make(fit=True)
             img = qr.make_image()
             img.save(file)
-            return '/media/qrcode/'+ file_name +'.png'
+            return '/media/qrcode/' + file_name + '.png'
         except Exception as e:
-            return '/media/qrcode/'+ file_name +'.png'
+            return '/media/qrcode/' + file_name + '.png'
     else:
         return '/media/qrcode/' + file_name + '.png'
 
@@ -198,3 +198,12 @@ def get(self, request, *args, **kwargs):
             return '', Response({
                 'detail': settings.LANGUAGE.UserQRCodeAPIHaveQRCode
             }, status=status.HTTP_406_NOT_ACCEPTABLE)
+
+
+class UserExpireAPI(WebTokenAuthentication, APIView):
+    permission_classes = [IsAuthenticated, ]
+
+    def get(self, request, *args, **kwargs):
+        return Response({
+            'isexpire': request.user.is_expire
+        }, status=status.HTTP_200_OK)

apps/authority/filter.py

@@ -3,10 +3,10 @@
 # Time 18-6-7
 # Author Yo
 # Email [email protected]
-import django_filters
-from manager import models
 from django.contrib.auth.models import Permission,Group
 from django.db.models import Q
+import django_filters
+from manager import models
 
 __all__ = [
     'UserFilter', 'GroupFilter', 'KeyFilter', 'JumperFilter'
@@ -18,6 +18,7 @@ class UserFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(method="name_filter")
     username = django_filters.CharFilter(method="username_filter")
     is_active = django_filters.CharFilter(method="is_active_filter")
+
     class Meta:
         model = models.ExtendUser
         fields = ['phone', 'name', 'username', 'email', 'is_active']
@@ -42,6 +43,7 @@ def is_active_filter(queryset, first_name, value):
 class GroupFilter(django_filters.FilterSet):
     permission = django_filters.CharFilter(method="permission_filter")
     name = django_filters.CharFilter(method="name_filter")
+
     class Meta:
         model = Group
         fields = ['permission', 'name']
@@ -59,9 +61,10 @@ def name_filter(queryset, first_name, value):
 class KeyFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(method="name_filter")
     group_name = django_filters.CharFilter(method="group_name_filter")
+
     class Meta:
         model = models.Key
-        fields = ['name',]
+        fields = ['name', ]
 
     @staticmethod
     def name_filter(queryset, first_name, value):
@@ -76,6 +79,7 @@ def group_name_filter(queryset, first_name, value):
 class JumperFilter(django_filters.FilterSet):
     info = django_filters.CharFilter(method="info_filter")
     group_name = django_filters.CharFilter(method="group_name_filter")
+
     class Meta:
         model = models.Jumper
         fields = ['info', 'group_name']
@@ -87,4 +91,4 @@ def info_filter(queryset, first_name, value):
     @staticmethod
     def group_name_filter(queryset, first_name, value):
         groups = models.Group.objects.filter(name__icontains=value)
-        return queryset.filter(group__in=groups)
+        return queryset.filter(group__in=groups)

apps/authority/models.py

@@ -107,7 +107,7 @@ class ExtendUser(AbstractUser):
     full_name = models.CharField(max_length=11, default='未获取')
     qrcode = models.CharField(max_length=16, default='')
     have_qrcode = models.BooleanField(default=False)
-    expire = models.IntegerField(default=300)
+    expire = models.IntegerField(default=100)
     groups = models.ManyToManyField(
         Group,
         verbose_name=_('groups'),
@@ -136,19 +136,6 @@ class Meta:
             ('yo_list_permission', u'罗列所有权限')
         )
 
-    def __unicode__(self):
-        list = []
-        if self.is_superuser:
-            list.append(u'超级管理员')
-        elif self.groups.count() == 0:
-            list.append(u'无权限')
-        else:
-            for group in self.groups.all():
-                list.append(group.name)
-        return self.username + ' - ' + "|".join(list)
-
-    __str__ = __unicode__
-
     def get_8531email(self):
         return self.username + '@8531.cn'
 
@@ -158,14 +145,14 @@ def get_group_name(self):
         elif self.groups.count() == 0:
             return "无权限"
         else:
-            list = []
+            gourp_list = []
             groups = self.groups.all()
             for group in groups:
-                list.append(group.name)
-            if len(list) == 0:
+                gourp_list.append(group.name)
+            if len(gourp_list) == 0:
                 return ''
             else:
-                return "-".join(list)
+                return "-".join(gourp_list)
 
     def check_qrcode(self, verifycode):
         t = pyotp.TOTP(self.qrcode)
@@ -174,11 +161,11 @@ def check_qrcode(self, verifycode):
 
     @property
     def is_expire(self):
-        return connect.exists(self.username)
+        return not connect.exists(self.username)
 
     @is_expire.setter
     def is_expire(self, qrcode):
-        connect.set(self.username, qrcode, self.expire)
+        connect.set(self.username, qrcode, self.expire or 1)
 
 
 class Jumper(models.Model):
@@ -201,9 +188,6 @@ class Meta:
             ('yo_delete_jumper', u'删除跳板机'),
         )
 
-    def __unicode__(self):
-        return self.connect_ip + ' - ' + self.name
-
     @property
     def status(self):
         return self._status

apps/authority/serializers.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from rest_framework import serializers
 from django.contrib.auth.models import Permission
-from authority.models import ExtendUser,Group,Key,Jumper
+from authority.models import ExtendUser, Group, Key, Jumper
 from deveops.utils.sshkey import ssh_keygen
 
 __all__ = [

apps/authority/tasks.py

@@ -3,10 +3,15 @@
 # Time 17-10-25
 # Author Yo
 # Email [email protected]
-from __future__ import absolute_import, unicode_literals
-from celery import Task,task
-import socket, paramiko, os, stat, time
+import socket
+import paramiko
+import os
+import stat
+import time
 from django.conf import settings
+from celery import Task, task
+
+
 class JumperTask(Task):
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         print('{0!r} failed: {1!r}'.format(task_id, exc))
@@ -70,4 +75,4 @@ def jumper_status_flush(obj):
         return
 
     obj._status = settings.STATUS_JUMPER_CAN_BE_USE
-    obj.save()
+    obj.save()

apps/authority/urls/api_urls.py

@@ -1,10 +1,15 @@
-# from django.conf.urls import path
+# -*- coding:utf-8 -*-
+# !/usr/bin/env python
+# Time 17-10-25
+# Author Yo
+# Email [email protected]
 from django.urls import path
 from ..api import user
 from ..api import group
 from ..api import permission
 from ..api import key
 from ..api import jumper
+
 urlpatterns = [
     # Resource login api
     path(r'login/', user.UserLoginAPI.as_view()),
@@ -19,6 +24,7 @@
     path(r'v1/user/<int:pk>/update/', user.UserUpdateAPI.as_view()),
     path(r'v1/user/<int:pk>/delete/', user.UserDeleteAPI.as_view()),
     path(r'v1/user/qrcode/', user.UserQRCodeAPI.as_view()),
+    path(r'v1/user/expire/', user.UserExpireAPI.as_view()),
     #
     # Resource group api
     path(r'v1/group/', group.GroupListAPI.as_view()),

apps/manager/models.py

@@ -40,11 +40,6 @@ class Meta:
                        ('yo_delete_group', u'删除应用组'),
                        ('yo_group_sort_host', u'批量归类主机'))
 
-    def __unicode__(self):
-        return self.name
-
-    __str__ = __unicode__
-
     @property
     def status(self):
         if self.jumper is None or self.key is None:

apps/ops/api/meta.py

@@ -58,7 +58,6 @@ class OpsMetaCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['META_META_CREATE'])
     def create(self, request, *args, **kwargs):
         if self.qrcode_check(request):
-            request.data.pop('qrcode')
             response = super(OpsMetaCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
                 USER=request.user.full_name,

apps/ops/api/mission.py

@@ -79,7 +79,6 @@ class OpsMissionCreateAPI(WebTokenAuthentication, generics.CreateAPIView):
     @decorator_api(timeline_type=settings.TIMELINE_KEY_VALUE['Mission_MISSION_CREATE'])
     def create(self, request, *args, **kwargs):
         if 'qrcode' in request.data.keys() and self.request.user.check_qrcode(request.data.get('qrcode')):
-            request.data.pop('qrcode')
             response = super(OpsMissionCreateAPI, self).create(request, *args, **kwargs)
             return self.msg.format(
                 USER=request.user.full_name,