diff --git a/apps/assets/views/domain.py b/apps/assets/views/domain.py
index 7b4dcfcce..67626b094 100644
--- a/apps/assets/views/domain.py
+++ b/apps/assets/views/domain.py
@@ -7,7 +7,7 @@ from django.views.generic.detail import SingleObjectMixin
from django.utils.translation import ugettext_lazy as _
from django.urls import reverse_lazy, reverse
-from common.permissions import PermissionsMixin ,IsOrgAdmin
+from common.permissions import PermissionsMixin, IsOrgAdmin
from common.const import create_success_msg, update_success_msg
from common.utils import get_object_or_none
from ..models import Domain, Gateway
diff --git a/apps/authentication/api/auth.py b/apps/authentication/api/auth.py
index 101d6436e..8b1ab69c0 100644
--- a/apps/authentication/api/auth.py
+++ b/apps/authentication/api/auth.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
#
-
import uuid
import time
@@ -8,19 +7,17 @@ from django.core.cache import cache
from django.urls import reverse
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext as _
-
from rest_framework.permissions import AllowAny
from rest_framework.response import Response
from rest_framework.generics import CreateAPIView
from rest_framework.views import APIView
-from common.utils import get_logger, get_request_ip
+from common.utils import get_logger, get_request_ip, get_object_or_none
from common.permissions import IsOrgAdminOrAppUser, IsValidUser
from orgs.mixins.api import RootOrgViewMixin
from users.serializers import UserSerializer
from users.models import User
from assets.models import Asset, SystemUser
-from audits.models import UserLoginLog as LoginLog
from users.utils import (
check_otp_code, increase_login_failed_count,
is_block_login, clean_failed_count
@@ -33,7 +30,7 @@ from ..signals import post_auth_success, post_auth_failed
logger = get_logger(__name__)
__all__ = [
'UserAuthApi', 'UserConnectionTokenApi', 'UserOtpAuthApi',
- 'UserOtpVerifyApi',
+ 'UserOtpVerifyApi', 'UserOrderAcceptAuthApi',
]
@@ -209,3 +206,26 @@ class UserOtpVerifyApi(CreateAPIView):
else:
return Response({"error": "Code not valid"}, status=400)
+
+class UserOrderAcceptAuthApi(APIView):
+ permission_classes = ()
+
+ def get(self, request, *args, **kwargs):
+ from orders.models import LoginConfirmOrder
+ order_id = self.request.session.get("auth_order_id")
+ logger.debug('Login confirm order id: {}'.format(order_id))
+ if not order_id:
+ order = None
+ else:
+ order = get_object_or_none(LoginConfirmOrder, pk=order_id)
+ if not order:
+ error = _("No order found or order expired")
+ return Response({"error": error, "status": "not found"}, status=404)
+ if order.status == order.STATUS_ACCEPTED:
+ self.request.session["auth_confirm"] = "1"
+ return Response({"msg": "ok"})
+ elif order.status == order.STATUS_REJECTED:
+ error = _("Order was rejected by {}").format(order.assignee_display)
+ else:
+ error = "Order status: {}".format(order.status)
+ return Response({"error": error, "status": order.status}, status=400)
diff --git a/apps/authentication/api/token.py b/apps/authentication/api/token.py
index f44e93609..8855ac1c9 100644
--- a/apps/authentication/api/token.py
+++ b/apps/authentication/api/token.py
@@ -71,7 +71,8 @@ class TokenCreateApi(CreateAPIView):
raise MFARequiredError()
self.send_auth_signal(success=True, user=user)
clean_failed_count(username, ip)
- return super().create(request, *args, **kwargs)
+ resp = super().create(request, *args, **kwargs)
+ return resp
except AuthFailedError as e:
increase_login_failed_count(username, ip)
self.send_auth_signal(success=False, user=user, username=username, reason=str(e))
@@ -80,8 +81,8 @@ class TokenCreateApi(CreateAPIView):
msg = _("MFA required")
seed = uuid.uuid4().hex
cache.set(seed, user.username, 300)
- resp = {'msg': msg, "choices": ["otp"], "req": seed}
- return Response(resp, status=300)
+ data = {'msg': msg, "choices": ["otp"], "req": seed}
+ return Response(data, status=300)
def send_auth_signal(self, success=True, user=None, username='', reason=''):
if success:
diff --git a/apps/authentication/models.py b/apps/authentication/models.py
index 21fb2aafd..bc92eb8b5 100644
--- a/apps/authentication/models.py
+++ b/apps/authentication/models.py
@@ -49,8 +49,8 @@ class LoginConfirmSetting(CommonModelMixin):
return get_object_or_none(cls, user=user)
def create_confirm_order(self, request=None):
- from orders.models import Order
- title = _('User login request confirm: {}'.format(self.user))
+ from orders.models import LoginConfirmOrder
+ title = _('User login request: {}'.format(self.user))
if request:
remote_addr = get_request_ip(request)
city = get_ip_city(remote_addr)
@@ -58,14 +58,17 @@ class LoginConfirmSetting(CommonModelMixin):
self.user, remote_addr, city, timezone.now()
)
else:
+ city = ''
+ remote_addr = ''
body = ''
reviewer = self.reviewers.all()
reviewer_names = ','.join([u.name for u in reviewer])
- order = Order.objects.create(
+ order = LoginConfirmOrder.objects.create(
user=self.user, user_display=str(self.user),
title=title, body=body,
+ city=city, ip=remote_addr,
assignees_display=reviewer_names,
- type=Order.TYPE_LOGIN_REQUEST,
+ type=LoginConfirmOrder.TYPE_LOGIN_CONFIRM,
)
order.assignees.set(reviewer)
return order
diff --git a/apps/authentication/templates/authentication/login_wait_confirm.html b/apps/authentication/templates/authentication/login_wait_confirm.html
index 54526427e..0a14e8515 100644
--- a/apps/authentication/templates/authentication/login_wait_confirm.html
+++ b/apps/authentication/templates/authentication/login_wait_confirm.html
@@ -6,13 +6,11 @@
-
+
{{ title }}
-
{% include '_head_css_js.html' %}
-
+
@@ -29,23 +27,29 @@
-
- Wait for Guanghongwei confirm, You also can copy link to her/his
- Don't close ....
+
+ {{ msg|safe }}
-
-
+
+
+
@@ -63,26 +67,76 @@
+{% include '_foot_js.html' %}
+