-
- 
-
+
-
+
+ {{ INTERFACE.login_title }}
+
diff --git a/apps/authentication/urls/api_urls.py b/apps/authentication/urls/api_urls.py
index e7e561ffd..3bb7898df 100644
--- a/apps/authentication/urls/api_urls.py
+++ b/apps/authentication/urls/api_urls.py
@@ -16,16 +16,9 @@ router.register('super-connection-token', api.SuperConnectionTokenViewSet, 'supe
router.register('confirm', api.UserConfirmationViewSet, 'confirm')
urlpatterns = [
- path('wecom/qr/unbind/', api.WeComQRUnBindForUserApi.as_view(), name='wecom-qr-unbind'),
- path('wecom/qr/unbind//', api.WeComQRUnBindForAdminApi.as_view(), name='wecom-qr-unbind-for-admin'),
+ path('/qr/unbind/', api.QRUnBindForUserApi.as_view(), name='qr-unbind'),
+ path('/qr/unbind//', api.QRUnBindForAdminApi.as_view(), name='qr-unbind-for-admin'),
- path('dingtalk/qr/unbind/', api.DingTalkQRUnBindForUserApi.as_view(), name='dingtalk-qr-unbind'),
- path('dingtalk/qr/unbind//', api.DingTalkQRUnBindForAdminApi.as_view(),
- name='dingtalk-qr-unbind-for-admin'),
-
- path('feishu/qr/unbind/', api.FeiShuQRUnBindForUserApi.as_view(), name='feishu-qr-unbind'),
- path('feishu/qr/unbind//', api.FeiShuQRUnBindForAdminApi.as_view(),
- name='feishu-qr-unbind-for-admin'),
path('feishu/event/subscription/callback/', api.FeiShuEventSubscriptionCallback.as_view(),
name='feishu-event-subscription-callback'),
diff --git a/apps/authentication/urls/view_urls.py b/apps/authentication/urls/view_urls.py
index ea08eddd0..a648ded51 100644
--- a/apps/authentication/urls/view_urls.py
+++ b/apps/authentication/urls/view_urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
path('wecom/bind/start/', views.WeComEnableStartView.as_view(), name='wecom-bind-start'),
path('wecom/qr/bind/', views.WeComQRBindView.as_view(), name='wecom-qr-bind'),
path('wecom/qr/login/', views.WeComQRLoginView.as_view(), name='wecom-qr-login'),
- path('wecom/qr/bind//callback/', views.WeComQRBindCallbackView.as_view(),
+ path('wecom/qr/bind/callback/', views.WeComQRBindCallbackView.as_view(),
name='wecom-qr-bind-callback'),
path('wecom/qr/login/callback/', views.WeComQRLoginCallbackView.as_view(), name='wecom-qr-login-callback'),
path('wecom/oauth/login/', views.WeComOAuthLoginView.as_view(), name='wecom-oauth-login'),
@@ -49,6 +49,12 @@ urlpatterns = [
path('feishu/qr/bind/callback/', views.FeiShuQRBindCallbackView.as_view(), name='feishu-qr-bind-callback'),
path('feishu/qr/login/callback/', views.FeiShuQRLoginCallbackView.as_view(), name='feishu-qr-login-callback'),
+ path('slack/bind/start/', views.SlackEnableStartView.as_view(), name='slack-bind-start'),
+ path('slack/qr/bind/', views.SlackQRBindView.as_view(), name='slack-qr-bind'),
+ path('slack/qr/login/', views.SlackQRLoginView.as_view(), name='slack-qr-login'),
+ path('slack/qr/bind/callback/', views.SlackQRBindCallbackView.as_view(), name='slack-qr-bind-callback'),
+ path('slack/qr/login/callback/', views.SlackQRLoginCallbackView.as_view(), name='slack-qr-login-callback'),
+
# Profile
path('profile/pubkey/generate/', users_view.UserPublicKeyGenerateView.as_view(), name='user-pubkey-generate'),
path('profile/mfa/', users_view.MFASettingView.as_view(), name='user-mfa-setting'),
diff --git a/apps/authentication/views/__init__.py b/apps/authentication/views/__init__.py
index 38cf114e1..214c8943a 100644
--- a/apps/authentication/views/__init__.py
+++ b/apps/authentication/views/__init__.py
@@ -5,3 +5,4 @@ from .mfa import *
from .wecom import *
from .dingtalk import *
from .feishu import *
+from .slack import *
diff --git a/apps/authentication/views/base.py b/apps/authentication/views/base.py
index c118680f0..598ec9a0d 100644
--- a/apps/authentication/views/base.py
+++ b/apps/authentication/views/base.py
@@ -2,6 +2,7 @@ from functools import lru_cache
from django.conf import settings
from django.db.utils import IntegrityError
+from django.contrib.auth import logout as auth_logout
from django.utils.module_loading import import_string
from django.utils.translation import gettext_lazy as _
from django.views import View
@@ -9,8 +10,10 @@ from rest_framework.request import Request
from authentication import errors
from authentication.mixins import AuthMixin
+from authentication.notifications import OAuthBindMessage
from common.utils import get_logger
from common.utils.django import reverse, get_object_or_none
+from common.utils.common import get_request_ip
from users.models import User
from users.signal_handlers import check_only_allow_exist_user_auth
from .mixins import FlashMessageMixin
@@ -18,9 +21,21 @@ from .mixins import FlashMessageMixin
logger = get_logger(__file__)
-class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
+class IMClientMixin:
client_type_path = ''
client_auth_params = {}
+
+ @property
+ @lru_cache(maxsize=1)
+ def client(self):
+ if not all([self.client_type_path, self.client_auth_params]):
+ raise NotImplementedError
+ client_init = {k: getattr(settings, v) for k, v in self.client_auth_params.items()}
+ client_type = import_string(self.client_type_path)
+ return client_type(**client_init)
+
+
+class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, IMClientMixin, View):
user_type = ''
auth_backend = None
# 提示信息
@@ -34,15 +49,6 @@ class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
def get_verify_state_failed_response(self, redirect_uri):
raise NotImplementedError
- @property
- @lru_cache(maxsize=1)
- def client(self):
- if not all([self.client_type_path, self.client_auth_params]):
- raise NotImplementedError
- client_init = {k: getattr(settings, v) for k, v in self.client_auth_params.items()}
- client_type = import_string(self.client_type_path)
- return client_type(**client_init)
-
def create_user_if_not_exist(self, user_id, **kwargs):
user = None
user_attr = self.client.get_user_detail(user_id, **kwargs)
@@ -99,3 +105,53 @@ class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
response = self.get_failed_response(login_url, title=msg, msg=msg)
return response
return self.redirect_to_guard_view()
+
+
+class BaseBindCallbackView(FlashMessageMixin, IMClientMixin, View):
+ auth_type = ''
+ auth_type_label = ''
+
+ def verify_state(self):
+ raise NotImplementedError
+
+ def get_verify_state_failed_response(self, redirect_uri):
+ raise NotImplementedError
+
+ def get_already_bound_response(self, redirect_uri):
+ raise NotImplementedError
+
+ def get(self, request: Request):
+ code = request.GET.get('code')
+ redirect_url = request.GET.get('redirect_url')
+
+ if not self.verify_state():
+ return self.get_verify_state_failed_response(redirect_url)
+
+ user = request.user
+ source_id = getattr(user, f'{self.auth_type}_id', None)
+ if source_id:
+ response = self.get_already_bound_response(redirect_url)
+ return response
+
+ auth_user_id, __ = self.client.get_user_id_by_code(code)
+ if not auth_user_id:
+ msg = _('%s query user failed') % self.auth_type_label
+ response = self.get_failed_response(redirect_url, msg, msg)
+ return response
+
+ try:
+ setattr(user, f'{self.auth_type}_id', auth_user_id)
+ user.save()
+ except IntegrityError as e:
+ if e.args[0] == 1062:
+ msg = _('The %s is already bound to another user') % self.auth_type_label
+ response = self.get_failed_response(redirect_url, msg, msg)
+ return response
+ raise e
+
+ ip = get_request_ip(request)
+ OAuthBindMessage(user, ip, self.auth_type_label, auth_user_id).publish_async()
+ msg = _('Binding %s successfully') % self.auth_type_label
+ auth_logout(request)
+ response = self.get_success_response(redirect_url, msg, msg)
+ return response
diff --git a/apps/authentication/views/dingtalk.py b/apps/authentication/views/dingtalk.py
index 536ef4155..9b7f81e25 100644
--- a/apps/authentication/views/dingtalk.py
+++ b/apps/authentication/views/dingtalk.py
@@ -18,7 +18,7 @@ from authentication.permissions import UserConfirmation
from common.sdk.im.dingtalk import URL, DingTalk
from common.utils import get_logger
from common.utils.common import get_request_ip
-from common.utils.django import get_object_or_none, reverse
+from common.utils.django import get_object_or_none, reverse, safe_next_url
from common.utils.random import random_string
from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
from users.models import User
@@ -185,6 +185,7 @@ class DingTalkQRLoginView(DingTalkQRMixin, METAMixin, View):
def get(self, request: HttpRequest):
redirect_url = request.GET.get('redirect_url') or reverse('index')
next_url = self.get_next_url_from_meta() or reverse('index')
+ next_url = safe_next_url(next_url, request=request)
redirect_uri = reverse('authentication:dingtalk-qr-login-callback', external=True)
redirect_uri += '?' + urlencode({
diff --git a/apps/authentication/views/feishu.py b/apps/authentication/views/feishu.py
index 4ceacc21b..0427c2b1b 100644
--- a/apps/authentication/views/feishu.py
+++ b/apps/authentication/views/feishu.py
@@ -1,8 +1,6 @@
from urllib.parse import urlencode
from django.conf import settings
-from django.contrib.auth import logout as auth_logout
-from django.db.utils import IntegrityError
from django.http.request import HttpRequest
from django.http.response import HttpResponseRedirect
from django.utils.translation import gettext_lazy as _
@@ -11,16 +9,14 @@ from rest_framework.exceptions import APIException
from rest_framework.permissions import AllowAny, IsAuthenticated
from authentication.const import ConfirmType
-from authentication.notifications import OAuthBindMessage
from authentication.permissions import UserConfirmation
-from common.sdk.im.feishu import URL, FeiShu
+from common.sdk.im.feishu import URL
from common.utils import get_logger
-from common.utils.common import get_request_ip
from common.utils.django import reverse
from common.utils.random import random_string
from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
from users.views import UserVerifyPasswordView
-from .base import BaseLoginCallbackView
+from .base import BaseLoginCallbackView, BaseBindCallbackView
from .mixins import FlashMessageMixin
logger = get_logger(__file__)
@@ -82,49 +78,13 @@ class FeiShuQRBindView(FeiShuQRMixin, View):
return HttpResponseRedirect(url)
-class FeiShuQRBindCallbackView(FeiShuQRMixin, View):
+class FeiShuQRBindCallbackView(FeiShuQRMixin, BaseBindCallbackView):
permission_classes = (IsAuthenticated,)
- def get(self, request: HttpRequest):
- code = request.GET.get('code')
- redirect_url = request.GET.get('redirect_url')
-
- if not self.verify_state():
- return self.get_verify_state_failed_response(redirect_url)
-
- user = request.user
-
- if user.feishu_id:
- response = self.get_already_bound_response(redirect_url)
- return response
-
- feishu = FeiShu(
- app_id=settings.FEISHU_APP_ID,
- app_secret=settings.FEISHU_APP_SECRET
- )
- user_id, __ = feishu.get_user_id_by_code(code)
-
- if not user_id:
- msg = _('FeiShu query user failed')
- response = self.get_failed_response(redirect_url, msg, msg)
- return response
-
- try:
- user.feishu_id = user_id
- user.save()
- except IntegrityError as e:
- if e.args[0] == 1062:
- msg = _('The FeiShu is already bound to another user')
- response = self.get_failed_response(redirect_url, msg, msg)
- return response
- raise e
-
- ip = get_request_ip(request)
- OAuthBindMessage(user, ip, _('FeiShu'), user_id).publish_async()
- msg = _('Binding FeiShu successfully')
- auth_logout(request)
- response = self.get_success_response(redirect_url, msg, msg)
- return response
+ client_type_path = 'common.sdk.im.feishu.FeiShu'
+ client_auth_params = {'app_id': 'FEISHU_APP_ID', 'app_secret': 'FEISHU_APP_SECRET'}
+ auth_type = 'feishu'
+ auth_type_label = _('FeiShu')
class FeiShuEnableStartView(UserVerifyPasswordView):
diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py
index 6514e14eb..23ad4d814 100644
--- a/apps/authentication/views/login.py
+++ b/apps/authentication/views/login.py
@@ -24,7 +24,7 @@ from django.views.decorators.debug import sensitive_post_parameters
from django.views.generic.base import TemplateView, RedirectView
from django.views.generic.edit import FormView
-from common.utils import FlashMessageUtil, static_or_direct
+from common.utils import FlashMessageUtil, static_or_direct, safe_next_url
from users.utils import (
redirect_user_first_login_or_index
)
@@ -91,6 +91,12 @@ class UserLoginContextMixin:
'url': reverse('authentication:feishu-qr-login'),
'logo': static('img/login_feishu_logo.png')
},
+ {
+ 'name': _('Slack'),
+ 'enabled': settings.AUTH_SLACK,
+ 'url': reverse('authentication:slack-qr-login'),
+ 'logo': static('img/login_slack_logo.png')
+ },
{
'name': _("Passkey"),
'enabled': settings.AUTH_PASSKEY,
@@ -202,6 +208,7 @@ class UserLoginView(mixins.AuthMixin, UserLoginContextMixin, FormView):
auth_name, redirect_url = auth_method['name'], auth_method['url']
next_url = request.GET.get('next') or '/'
+ next_url = safe_next_url(next_url, request=request)
query_string = request.GET.urlencode()
redirect_url = '{}?next={}&{}'.format(redirect_url, next_url, query_string)
diff --git a/apps/authentication/views/slack.py b/apps/authentication/views/slack.py
new file mode 100644
index 000000000..70edcf4c5
--- /dev/null
+++ b/apps/authentication/views/slack.py
@@ -0,0 +1,128 @@
+from urllib.parse import urlencode
+
+from django.conf import settings
+from django.http.response import HttpResponseRedirect
+from django.utils.translation import gettext_lazy as _
+from django.views import View
+from rest_framework.exceptions import APIException
+from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.request import Request
+
+from authentication.const import ConfirmType
+from authentication.permissions import UserConfirmation
+from common.sdk.im.slack import URL, SLACK_REDIRECT_URI_SESSION_KEY
+from common.utils import get_logger
+from common.utils.django import reverse
+from common.utils.random import random_string
+from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
+from users.views import UserVerifyPasswordView
+from .base import BaseLoginCallbackView, BaseBindCallbackView
+from .mixins import FlashMessageMixin
+
+logger = get_logger(__file__)
+
+SLACK_STATE_SESSION_KEY = '_slack_state'
+
+
+class SlackMixin(UserConfirmRequiredExceptionMixin, PermissionsMixin, FlashMessageMixin, View):
+ def dispatch(self, request, *args, **kwargs):
+ try:
+ return super().dispatch(request, *args, **kwargs)
+ except APIException as e:
+ msg = str(e.detail)
+ return self.get_failed_response(
+ '/',
+ _('Slack Error'),
+ msg
+ )
+
+ def verify_state(self):
+ state = self.request.GET.get('state')
+ session_state = self.request.session.get(SLACK_STATE_SESSION_KEY)
+ if state != session_state:
+ return False
+ return True
+
+ def get_verify_state_failed_response(self, redirect_uri):
+ msg = _("The system configuration is incorrect. Please contact your administrator")
+ return self.get_failed_response(redirect_uri, msg, msg)
+
+ def get_qr_url(self, redirect_uri):
+ state = random_string(16)
+ self.request.session[SLACK_STATE_SESSION_KEY] = state
+
+ params = {
+ 'client_id': settings.SLACK_CLIENT_ID,
+ 'state': state, 'scope': 'users:read,users:read.email',
+ 'redirect_uri': redirect_uri,
+ }
+ url = URL().AUTHORIZE + '?' + urlencode(params)
+ return url
+
+ def get_already_bound_response(self, redirect_url):
+ msg = _('Slack is already bound')
+ response = self.get_failed_response(redirect_url, msg, msg)
+ return response
+
+
+class SlackQRBindView(SlackMixin, View):
+ permission_classes = (IsAuthenticated, UserConfirmation.require(ConfirmType.RELOGIN))
+
+ def get(self, request: Request):
+ redirect_url = request.GET.get('redirect_url')
+
+ redirect_uri = reverse('authentication:slack-qr-bind-callback', external=True)
+ redirect_uri += '?' + urlencode({'redirect_url': redirect_url})
+ self.request.session[SLACK_REDIRECT_URI_SESSION_KEY] = redirect_uri
+ url = self.get_qr_url(redirect_uri)
+ return HttpResponseRedirect(url)
+
+
+class SlackQRBindCallbackView(SlackMixin, BaseBindCallbackView):
+ permission_classes = (IsAuthenticated,)
+
+ client_type_path = 'common.sdk.im.slack.Slack'
+ client_auth_params = {'client_id': 'SLACK_CLIENT_ID', 'client_secret': 'SLACK_CLIENT_SECRET'}
+ auth_type = 'slack'
+ auth_type_label = _('Slack')
+
+
+class SlackEnableStartView(UserVerifyPasswordView):
+
+ def get_success_url(self):
+ referer = self.request.META.get('HTTP_REFERER')
+ redirect_url = self.request.GET.get("redirect_url")
+
+ success_url = reverse('authentication:slack-qr-bind')
+ success_url += '?' + urlencode({
+ 'redirect_url': redirect_url or referer
+ })
+
+ return success_url
+
+
+class SlackQRLoginView(SlackMixin, View):
+ permission_classes = (AllowAny,)
+
+ def get(self, request: Request):
+ redirect_url = request.GET.get('redirect_url') or reverse('index')
+ redirect_uri = reverse('authentication:slack-qr-login-callback', external=True)
+ redirect_uri += '?' + urlencode({
+ 'redirect_url': redirect_url,
+ })
+ self.request.session[SLACK_REDIRECT_URI_SESSION_KEY] = redirect_uri
+ url = self.get_qr_url(redirect_uri)
+ return HttpResponseRedirect(url)
+
+
+class SlackQRLoginCallbackView(SlackMixin, BaseLoginCallbackView):
+ permission_classes = (AllowAny,)
+
+ client_type_path = 'common.sdk.im.slack.Slack'
+ client_auth_params = {'client_id': 'SLACK_CLIENT_ID', 'client_secret': 'SLACK_CLIENT_SECRET'}
+ user_type = 'slack'
+ auth_backend = 'AUTH_BACKEND_SLACK'
+
+ msg_client_err = _('Slack Error')
+ msg_user_not_bound_err = _('Slack is not bound')
+ msg_not_found_user_from_client_err = _('Failed to get user from Slack')
diff --git a/apps/authentication/views/wecom.py b/apps/authentication/views/wecom.py
index 6817c84a0..48268e516 100644
--- a/apps/authentication/views/wecom.py
+++ b/apps/authentication/views/wecom.py
@@ -1,8 +1,6 @@
from urllib.parse import urlencode
from django.conf import settings
-from django.contrib.auth import logout as auth_logout
-from django.db.utils import IntegrityError
from django.http.request import HttpRequest
from django.http.response import HttpResponseRedirect
from django.utils.translation import gettext_lazy as _
@@ -13,18 +11,17 @@ from rest_framework.permissions import IsAuthenticated, AllowAny
from authentication import errors
from authentication.const import ConfirmType
from authentication.mixins import AuthMixin
-from authentication.notifications import OAuthBindMessage
from authentication.permissions import UserConfirmation
from common.sdk.im.wecom import URL
from common.sdk.im.wecom import WeCom
from common.utils import get_logger
from common.utils.common import get_request_ip
-from common.utils.django import reverse, get_object_or_none
+from common.utils.django import reverse, get_object_or_none, safe_next_url
from common.utils.random import random_string
from common.views.mixins import UserConfirmRequiredExceptionMixin, PermissionsMixin
from users.models import User
from users.views import UserVerifyPasswordView
-from .base import BaseLoginCallbackView
+from .base import BaseLoginCallbackView, BaseBindCallbackView
from .mixins import METAMixin, FlashMessageMixin
logger = get_logger(__file__)
@@ -104,64 +101,21 @@ class WeComQRBindView(WeComQRMixin, View):
permission_classes = (IsAuthenticated, UserConfirmation.require(ConfirmType.RELOGIN))
def get(self, request: HttpRequest):
- user = request.user
redirect_url = request.GET.get('redirect_url')
-
- redirect_uri = reverse('authentication:wecom-qr-bind-callback', kwargs={'user_id': user.id}, external=True)
+ redirect_uri = reverse('authentication:wecom-qr-bind-callback', external=True)
redirect_uri += '?' + urlencode({'redirect_url': redirect_url})
url = self.get_qr_url(redirect_uri)
return HttpResponseRedirect(url)
-class WeComQRBindCallbackView(WeComQRMixin, View):
+class WeComQRBindCallbackView(WeComQRMixin, BaseBindCallbackView):
permission_classes = (IsAuthenticated,)
- def get(self, request: HttpRequest, user_id):
- code = request.GET.get('code')
- redirect_url = request.GET.get('redirect_url')
-
- if not self.verify_state():
- return self.get_verify_state_failed_response(redirect_url)
-
- user = get_object_or_none(User, id=user_id)
- if user is None:
- logger.error(f'WeComQR bind callback error, user_id invalid: user_id={user_id}')
- msg = _('Invalid user_id')
- response = self.get_failed_response(redirect_url, msg, msg)
- return response
-
- if user.wecom_id:
- response = self.get_already_bound_response(redirect_url)
- return response
-
- wecom = WeCom(
- corpid=settings.WECOM_CORPID,
- corpsecret=settings.WECOM_SECRET,
- agentid=settings.WECOM_AGENTID
- )
- wecom_userid, __ = wecom.get_user_id_by_code(code)
- if not wecom_userid:
- msg = _('WeCom query user failed')
- response = self.get_failed_response(redirect_url, msg, msg)
- return response
-
- try:
- user.wecom_id = wecom_userid
- user.save()
- except IntegrityError as e:
- if e.args[0] == 1062:
- msg = _('The WeCom is already bound to another user')
- response = self.get_failed_response(redirect_url, msg, msg)
- return response
- raise e
-
- ip = get_request_ip(request)
- OAuthBindMessage(user, ip, _('WeCom'), wecom_userid).publish_async()
- msg = _('Binding WeCom successfully')
- auth_logout(request)
- response = self.get_success_response(redirect_url, msg, msg)
- return response
+ client_type_path = 'common.sdk.im.wecom.WeCom'
+ client_auth_params = {'corpid': 'WECOM_CORPID', 'corpsecret': 'WECOM_SECRET', 'agentid': 'WECOM_AGENTID'}
+ auth_type = 'wecom'
+ auth_type_label = _('Wecom')
class WeComEnableStartView(UserVerifyPasswordView):
@@ -182,6 +136,7 @@ class WeComQRLoginView(WeComQRMixin, METAMixin, View):
def get(self, request: HttpRequest):
redirect_url = request.GET.get('redirect_url') or reverse('index')
next_url = self.get_next_url_from_meta() or reverse('index')
+ next_url = safe_next_url(next_url, request=request)
redirect_uri = reverse('authentication:wecom-qr-login-callback', external=True)
redirect_uri += '?' + urlencode({
'redirect_url': redirect_url,
diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py
index d93459104..c87d5f22a 100644
--- a/apps/common/api/mixin.py
+++ b/apps/common/api/mixin.py
@@ -11,7 +11,7 @@ from rest_framework.settings import api_settings
from common.drf.filters import (
IDSpmFilterBackend, CustomFilterBackend, IDInFilterBackend,
- IDNotFilterBackend, NotOrRelFilterBackend
+ IDNotFilterBackend, NotOrRelFilterBackend, LabelFilterBackend
)
from common.utils import get_logger, lazyproperty
from .action import RenderToJsonMixin
@@ -111,7 +111,7 @@ class ExtraFilterFieldsMixin:
"""
default_added_filters = (
CustomFilterBackend, IDSpmFilterBackend, IDInFilterBackend,
- IDNotFilterBackend,
+ IDNotFilterBackend, LabelFilterBackend
)
filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
extra_filter_fields = []
diff --git a/apps/common/decorators.py b/apps/common/decorators.py
index 353407ab1..24b2695d3 100644
--- a/apps/common/decorators.py
+++ b/apps/common/decorators.py
@@ -73,6 +73,7 @@ executor = ThreadPoolExecutor(
)
_loop_debouncer_func_task_cache = {}
_loop_debouncer_func_args_cache = {}
+_loop_debouncer_func_task_time_cache = {}
def get_loop():
@@ -92,6 +93,17 @@ def cancel_or_remove_debouncer_task(cache_key):
def run_debouncer_func(cache_key, org, ttl, func, *args, **kwargs):
cancel_or_remove_debouncer_task(cache_key)
run_func_partial = functools.partial(_run_func_with_org, cache_key, org, func)
+
+ current = time.time()
+ first_run_time = _loop_debouncer_func_task_time_cache.get(cache_key, None)
+ if first_run_time is None:
+ _loop_debouncer_func_task_time_cache[cache_key] = current
+ first_run_time = current
+
+ if current - first_run_time > ttl:
+ executor.submit(run_func_partial, *args, **kwargs)
+ return
+
loop = _loop_thread.get_loop()
_debouncer = Debouncer(run_func_partial, lambda: True, ttl, loop=loop, executor=executor)
task = asyncio.run_coroutine_threadsafe(_debouncer(*args, **kwargs), loop=loop)
@@ -130,6 +142,7 @@ def _run_func_with_org(key, org, func, *args, **kwargs):
logger.error('delay run error: %s' % e)
_loop_debouncer_func_task_cache.pop(key, None)
_loop_debouncer_func_args_cache.pop(key, None)
+ _loop_debouncer_func_task_time_cache.pop(key, None)
def delay_run(ttl=5, key=None):
@@ -142,6 +155,9 @@ def delay_run(ttl=5, key=None):
def inner(func):
suffix_key_func = key if key else default_suffix_key
+ sigs = inspect.signature(func)
+ if len(sigs.parameters) != 0:
+ raise ValueError('Merge delay run must not arguments: %s' % func.__name__)
@functools.wraps(func)
def wrapper(*args, **kwargs):
@@ -186,12 +202,11 @@ def merge_delay_run(ttl=5, key=None):
for k, v in kwargs.items():
if not isinstance(v, (tuple, list, set)):
raise ValueError('func kwargs value must be list or tuple: %s %s' % (func.__name__, v))
+ v = set(v)
if k not in cache_kwargs:
cache_kwargs[k] = v
- elif isinstance(v, set):
- cache_kwargs[k] = cache_kwargs[k].union(v)
else:
- cache_kwargs[k] = list(cache_kwargs[k]) + list(v)
+ cache_kwargs[k] = cache_kwargs[k].union(v)
_loop_debouncer_func_args_cache[cache_key] = cache_kwargs
run_debouncer_func(cache_key, org, ttl, func, *args, **cache_kwargs)
@@ -201,8 +216,8 @@ def merge_delay_run(ttl=5, key=None):
@delay_run(ttl=5)
-def test_delay_run(username):
- print("Hello, %s, now is %s" % (username, time.time()))
+def test_delay_run():
+ print("Hello, now is %s" % time.time())
@merge_delay_run(ttl=5, key=lambda users=(): users[0][0])
diff --git a/apps/common/drf/filters.py b/apps/common/drf/filters.py
index eb6878019..0fb8ca63a 100644
--- a/apps/common/drf/filters.py
+++ b/apps/common/drf/filters.py
@@ -6,6 +6,7 @@ import logging
from django.core.cache import cache
from django.core.exceptions import ImproperlyConfigured
+from django.db.models import Q, Count
from django_filters import rest_framework as drf_filters
from rest_framework import filters
from rest_framework.compat import coreapi, coreschema
@@ -21,7 +22,7 @@ __all__ = [
"DatetimeRangeFilterBackend", "IDSpmFilterBackend",
'IDInFilterBackend', "CustomFilterBackend",
"BaseFilterSet", 'IDNotFilterBackend',
- 'NotOrRelFilterBackend',
+ 'NotOrRelFilterBackend', 'LabelFilterBackend',
]
@@ -168,6 +169,73 @@ class IDNotFilterBackend(filters.BaseFilterBackend):
return queryset
+class LabelFilterBackend(filters.BaseFilterBackend):
+ def get_schema_fields(self, view):
+ return [
+ coreapi.Field(
+ name='label', location='query', required=False,
+ type='string', example='/api/v1/users/users?label=abc',
+ description='Filter by label'
+ )
+ ]
+
+ @staticmethod
+ def filter_resources(resources, labels_id):
+ label_ids = [i.strip() for i in labels_id.split(',')]
+
+ args = []
+ for label_id in label_ids:
+ kwargs = {}
+ if ':' in label_id:
+ k, v = label_id.split(':', 1)
+ kwargs['label__name'] = k.strip()
+ if v != '*':
+ kwargs['label__value'] = v.strip()
+ else:
+ kwargs['label_id'] = label_id
+ args.append(kwargs)
+
+ if len(args) == 1:
+ resources = resources.filter(**args[0])
+ return resources
+
+ q = Q()
+ for kwarg in args:
+ q |= Q(**kwarg)
+
+ resources = resources.filter(q) \
+ .values('res_id') \
+ .order_by('res_id') \
+ .annotate(count=Count('res_id')) \
+ .values('res_id', 'count') \
+ .filter(count=len(args))
+ return resources
+
+ def filter_queryset(self, request, queryset, view):
+ labels_id = request.query_params.get('labels')
+ if not labels_id:
+ return queryset
+
+ if not hasattr(queryset, 'model'):
+ return queryset
+
+ if not hasattr(queryset.model, 'labels'):
+ return queryset
+
+ model = queryset.model
+ labeled_resource_cls = model._labels.field.related_model
+ app_label = model._meta.app_label
+ model_name = model._meta.model_name
+
+ resources = labeled_resource_cls.objects.filter(
+ res_type__app_label=app_label, res_type__model=model_name,
+ )
+ resources = self.filter_resources(resources, labels_id)
+ res_ids = resources.values_list('res_id', flat=True)
+ queryset = queryset.filter(id__in=set(res_ids))
+ return queryset
+
+
class CustomFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
diff --git a/apps/common/drf/parsers/base.py b/apps/common/drf/parsers/base.py
index 6d4b70788..33b344457 100644
--- a/apps/common/drf/parsers/base.py
+++ b/apps/common/drf/parsers/base.py
@@ -9,7 +9,7 @@ from rest_framework import status
from rest_framework.exceptions import ParseError, APIException
from rest_framework.parsers import BaseParser
-from common.serializers.fields import ObjectRelatedField
+from common.serializers.fields import ObjectRelatedField, LabeledChoiceField
from common.utils import get_logger
logger = get_logger(__file__)
@@ -126,6 +126,10 @@ class BaseFileParser(BaseParser):
value = [self.id_name_to_obj(v) for v in value]
else:
value = self.id_name_to_obj(value)
+ elif isinstance(field, LabeledChoiceField):
+ value = self.id_name_to_obj(value)
+ if isinstance(value, dict) and value.get('pk'):
+ value = value.get('pk')
elif isinstance(field, serializers.ListSerializer):
value = [self.parse_value(field.child, v) for v in value]
elif isinstance(field, serializers.Serializer):
diff --git a/apps/common/drf/renders/base.py b/apps/common/drf/renders/base.py
index cdc1626ff..2c1038610 100644
--- a/apps/common/drf/renders/base.py
+++ b/apps/common/drf/renders/base.py
@@ -105,7 +105,8 @@ class BaseFileRenderer(BaseRenderer):
elif isinstance(value, bool):
value = 'Yes' if value else 'No'
elif isinstance(field, LabeledChoiceField):
- value = value.get('value', '')
+ value = value or {}
+ value = '{}({})'.format(value.get('label'), value.get('value'))
elif isinstance(field, ObjectRelatedField):
if field.many:
value = [self.to_id_name(v) for v in value]
diff --git a/apps/common/plugins/es.py b/apps/common/plugins/es.py
index 297f2e32a..8e2126f85 100644
--- a/apps/common/plugins/es.py
+++ b/apps/common/plugins/es.py
@@ -228,6 +228,18 @@ class ES(object):
datetime_range['lte'] = datetime__lte
return 'datetime', datetime_range
+ @staticmethod
+ def handle_exact_fields(exact):
+ _filter = []
+ for k, v in exact.items():
+ query = 'term'
+ if isinstance(v, list):
+ query = 'terms'
+ _filter.append({
+ query: {k: v}
+ })
+ return _filter
+
def get_query_body(self, **kwargs):
new_kwargs = {}
for k, v in kwargs.items():
@@ -235,6 +247,8 @@ class ES(object):
v = str(v)
if k == 'pk':
k = 'id'
+ if k.endswith('__in'):
+ k = k.replace('__in', '')
new_kwargs[k] = v
kwargs = new_kwargs
@@ -287,11 +301,8 @@ class ES(object):
{'match': {k: v}} for k, v in match.items()
],
'should': should,
- 'filter': [
- {
- 'term': {k: v}
- } for k, v in exact.items()
- ] + [
+ 'filter': self.handle_exact_fields(exact) +
+ [
{
'range': {
time_field_name: time_range
diff --git a/apps/common/sdk/im/slack/__init__.py b/apps/common/sdk/im/slack/__init__.py
new file mode 100644
index 000000000..bea92e78e
--- /dev/null
+++ b/apps/common/sdk/im/slack/__init__.py
@@ -0,0 +1,152 @@
+import requests
+import mistune
+
+from rest_framework.exceptions import APIException
+from django.utils.translation import gettext_lazy as _
+
+from users.utils import construct_user_email
+from common.utils.common import get_logger
+from jumpserver.utils import get_current_request
+
+logger = get_logger(__name__)
+
+
+SLACK_REDIRECT_URI_SESSION_KEY = '_slack_redirect_uri'
+
+
+class URL:
+ AUTHORIZE = 'https://slack.com/oauth/v2/authorize'
+ ACCESS_TOKEN = 'https://slack.com/api/oauth.v2.access'
+ GET_USER_INFO_BY_USER_ID = 'https://slack.com/api/users.info'
+ SEND_MESSAGE = 'https://slack.com/api/chat.postMessage'
+ AUTH_TEST = 'https://slack.com/api/auth.test'
+
+
+class SlackRenderer(mistune.Renderer):
+ def header(self, text, level, raw=None):
+ return '*' + text + '*\n'
+
+ def double_emphasis(self, text):
+ return '*' + text + '*'
+
+ def list(self, body, ordered=True):
+ lines = body.split('\n')
+ for i, line in enumerate(lines):
+ if not line:
+ continue
+ prefix = '• '
+ lines[i] = prefix + line[4:-5]
+ return '\n'.join(lines)
+
+ def block_code(self, code, lang=None):
+ return f'`{code}`'
+
+ def link(self, link, title, content):
+ if title or content:
+ label = str(title or content).strip()
+ return f'<{link}|{label}>'
+ return f'<{link}>'
+
+ def paragraph(self, text):
+ return f'{text.strip()}\n'
+
+ def linebreak(self):
+ return '\n'
+
+
+class SlackRequests:
+ def __init__(self, client_id=None, client_secret=None, bot_token=None):
+ self._client_id = client_id
+ self._client_secret = client_secret
+ self._bot_token = bot_token
+ self.access_token = None
+ self.user_id = None
+
+ def add_token(self, headers, with_bot_token, with_access_token):
+ if with_access_token:
+ headers.update({'Authorization': f'Bearer {self.access_token}'})
+ if with_bot_token:
+ headers.update({'Authorization': f'Bearer {self._bot_token}'})
+
+ def request(self, method, url, with_bot_token=True, with_access_token=False, **kwargs):
+ headers = kwargs.pop('headers', {})
+ self.add_token(headers, with_bot_token=with_bot_token, with_access_token=with_access_token)
+
+ func_handler = getattr(requests, method, requests.get)
+ data = func_handler(url, headers=headers, **kwargs).json()
+ if not data.get('ok'):
+ raise APIException(
+ detail=data.get('error', _('Unknown error occur'))
+ )
+ return data
+
+ def request_access_token(self, code):
+ request = get_current_request()
+ data = {
+ 'code': code, 'client_id': self._client_id, 'client_secret': self._client_secret,
+ 'grant_type': 'authorization_code',
+ 'redirect_uri': request.session.get(SLACK_REDIRECT_URI_SESSION_KEY)
+ }
+ response = self.request(
+ 'post', url=URL().ACCESS_TOKEN, data=data, with_bot_token=False
+ )
+ self.access_token = response['access_token']
+ self.user_id = response['authed_user']['id']
+
+
+class Slack:
+ def __init__(self, client_id=None, client_secret=None, bot_token=None, **kwargs):
+ self._client = SlackRequests(
+ client_id=client_id, client_secret=client_secret, bot_token=bot_token
+ )
+ self.markdown = mistune.Markdown(renderer=SlackRenderer())
+
+ def get_user_id_by_code(self, code):
+ self._client.request_access_token(code)
+ response = self._client.request(
+ 'get', f'{URL().GET_USER_INFO_BY_USER_ID}?user={self._client.user_id}',
+ with_bot_token=False, with_access_token=True
+ )
+ return self._client.user_id, response['user']
+
+ def is_valid(self):
+ return self._client.request('post', URL().AUTH_TEST)
+
+ def convert_to_markdown(self, message):
+ blocks = []
+ for line in message.split('\n'):
+ block = self.markdown(line)
+ if not block:
+ continue
+ if block.startswith('
'): + block_item = {'type': 'divider'} + else: + block_item = { + "type": "section", + "text": {"type": "mrkdwn", "text": block} + } + blocks.append(block_item) + return {'blocks': blocks} + + def send_text(self, user_ids, msg_body): + body = self.convert_to_markdown(msg_body) + logger.info(f'Slack send text: user_ids={user_ids} msg={body}') + for user_id in user_ids: + body['channel'] = user_id + try: + self._client.request('post', URL().SEND_MESSAGE, json=body) + except APIException as e: + # 只处理可预知的错误 + logger.exception(e) + + @staticmethod + def get_user_detail(user_id, **kwargs): + # get_user_id_by_code 已经返回个人信息，这里直接解析 + user_info = kwargs['other_info'] + username = user_info.get('name') or user_id + name = user_info.get('real_name', username) + email = user_info.get('profile', {}).get('email') + email = construct_user_email(username, email) + return { + 'username': username, 'name': name, 'email': email + } diff --git a/apps/common/sdk/sms/endpoint.py b/apps/common/sdk/sms/endpoint.py index 6f5433fa5..7618d6da9 100644 --- a/apps/common/sdk/sms/endpoint.py +++ b/apps/common/sdk/sms/endpoint.py @@ -1,12 +1,12 @@ -from collections import OrderedDict import importlib +from collections import OrderedDict -from django.utils.translation import gettext_lazy as _ -from django.db.models import TextChoices from django.conf import settings +from django.db.models import TextChoices +from django.utils.translation import gettext_lazy as _ -from common.utils import get_logger from common.exceptions import JMSException +from common.utils import get_logger from .base import BaseSMSClient logger = get_logger(__name__) @@ -18,7 +18,7 @@ class BACKENDS(TextChoices): HUAWEI = 'huawei', _('Huawei Cloud') CMPP2 = 'cmpp2', _('CMPP v2.0') CUSTOM = 'custom', _('Custom type') - CUSTOM_FILE = 'custom_file', f"{_('Custom type')}({_('File')})" + CUSTOM_FILE = 'custom_file', _('Custom type (File)') class SMS: diff --git a/apps/common/serializers/fields.py b/apps/common/serializers/fields.py index 5fe019c65..282394106 100644 --- a/apps/common/serializers/fields.py +++ b/apps/common/serializers/fields.py @@ -20,7 +20,8 @@ __all__ = [ "TreeChoicesField", "LabeledMultipleChoiceField", "PhoneField", - "JSONManyToManyField" + "JSONManyToManyField", + "LabelRelatedField", ] @@ -56,21 +57,18 @@ class EncryptedField(serializers.CharField): class LabeledChoiceField(ChoiceField): - def __init__(self, *args, **kwargs): - super(LabeledChoiceField, self).__init__(*args, **kwargs) - self.choice_mapper = { - key: value for key, value in self.choices.items() - } - def to_representation(self, key): if key is None: return key - label = self.choice_mapper.get(key, key) + label = self.choices.get(key, key) return {"value": key, "label": label} def to_internal_value(self, data): if isinstance(data, dict): data = data.get("value") + + if isinstance(data, str) and "(" in data and data.endswith(")"): + data = data.strip(")").split('(')[-1] return super(LabeledChoiceField, self).to_internal_value(data) @@ -99,6 +97,37 @@ class LabeledMultipleChoiceField(serializers.MultipleChoiceField): return data +class LabelRelatedField(serializers.RelatedField): + def __init__(self, **kwargs): + queryset = kwargs.pop("queryset", None) + if queryset is None: + from labels.models import LabeledResource + queryset = LabeledResource.objects.all() + + kwargs = {**kwargs} + read_only = kwargs.get("read_only", False) + if not read_only: + kwargs["queryset"] = queryset + super().__init__(**kwargs) + + def to_representation(self, value): + if value is None: + return value + return str(value.label) + + def to_internal_value(self, data): + from labels.models import LabeledResource, Label + if data is None: + return data + if isinstance(data, dict): + pk = data.get("id") or data.get("pk") + label = Label.objects.get(pk=pk) + else: + k, v = data.split(":", 1) + label, __ = Label.objects.get_or_create(name=k, value=v, defaults={'name': k, 'value': v}) + return LabeledResource(label=label) + + class ObjectRelatedField(serializers.RelatedField): default_error_messages = { "required": _("This field is required."), diff --git a/apps/common/serializers/mixin.py b/apps/common/serializers/mixin.py index d665d6346..d51849f07 100644 --- a/apps/common/serializers/mixin.py +++ b/apps/common/serializers/mixin.py @@ -7,6 +7,7 @@ else: from collections import Iterable from django.core.exceptions import ObjectDoesNotExist from django.db.models import NOT_PROVIDED +from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.fields import SkipField, empty @@ -14,14 +15,13 @@ from rest_framework.settings import api_settings from rest_framework.utils import html from common.db.fields import EncryptMixin -from common.serializers.fields import EncryptedField, LabeledChoiceField, ObjectRelatedField +from common.serializers.fields import EncryptedField, LabeledChoiceField, ObjectRelatedField, LabelRelatedField __all__ = [ 'BulkSerializerMixin', 'BulkListSerializerMixin', 'CommonSerializerMixin', 'CommonBulkSerializerMixin', 'SecretReadableMixin', 'CommonModelSerializer', - 'CommonBulkModelSerializer', - + 'CommonBulkModelSerializer', 'ResourceLabelsMixin', ] @@ -391,3 +391,25 @@ class CommonBulkSerializerMixin(BulkSerializerMixin, CommonSerializerMixin): class CommonBulkModelSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer): pass + + +class ResourceLabelsMixin(serializers.Serializer): + labels = LabelRelatedField(many=True, label=_('Labels'), required=False, allow_null=True) + + def update(self, instance, validated_data): + labels = validated_data.pop('labels', None) + res = super().update(instance, validated_data) + if labels is not None: + instance.labels.set(labels, bulk=False) + return res + + def create(self, validated_data): + labels = validated_data.pop('labels', None) + instance = super().create(validated_data) + if labels is not None: + instance.labels.set(labels, bulk=False) + return instance + + @classmethod + def setup_eager_loading(cls, queryset): + return queryset.prefetch_related('labels') diff --git a/apps/common/signal_handlers.py b/apps/common/signal_handlers.py index df2019b60..588a63632 100644 --- a/apps/common/signal_handlers.py +++ b/apps/common/signal_handlers.py @@ -66,6 +66,10 @@ def digest_sql_query(): for table_name, queries in table_queries.items(): if table_name.startswith('rbac_') or table_name.startswith('auth_permission'): continue + + for query in queries: + sql = query['sql'] + print(" # {}: {}".format(query['time'], sql)) if len(queries) < 3: continue print("- Table: {}".format(table_name)) diff --git a/apps/common/utils/common.py b/apps/common/utils/common.py index add6b79b3..798b4a94c 100644 --- a/apps/common/utils/common.py +++ b/apps/common/utils/common.py @@ -155,10 +155,6 @@ def is_uuid(seq): def get_request_ip(request): - x_real_ip = request.META.get('HTTP_X_REAL_IP', '') - if x_real_ip: - return x_real_ip - x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',') if x_forwarded_for and x_forwarded_for[0]: login_ip = x_forwarded_for[0] diff --git a/apps/common/utils/django.py b/apps/common/utils/django.py index ad8a218d8..fc692bc15 100644 --- a/apps/common/utils/django.py +++ b/apps/common/utils/django.py @@ -7,6 +7,7 @@ from django.db import models from django.db.models.signals import post_save, pre_save from django.shortcuts import reverse as dj_reverse from django.utils import timezone +from django.utils.http import url_has_allowed_host_and_scheme UUID_PATTERN = re.compile(r'[0-9a-zA-Z\-]{36}') @@ -94,3 +95,12 @@ def get_request_os(request): return 'linux' else: return 'unknown' + + +def safe_next_url(next_url, request=None): + safe_hosts = [*settings.ALLOWED_HOSTS] + if request: + safe_hosts.append(request.get_host()) + if not next_url or not url_has_allowed_host_and_scheme(next_url, safe_hosts): + next_url = '/' + return next_url diff --git a/apps/common/utils/random.py b/apps/common/utils/random.py index 505fbd041..7978267b9 100644 --- a/apps/common/utils/random.py +++ b/apps/common/utils/random.py @@ -32,7 +32,16 @@ def random_replace_char(s, chars, length): return ''.join(seq) -def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation): +def remove_exclude_char(s, exclude_chars): + for i in exclude_chars: + s = s.replace(i, '') + return s + + +def random_string( + length: int, lower=True, upper=True, digit=True, + special_char=False, exclude_chars='', symbols=string_punctuation +): if not any([lower, upper, digit]): raise ValueError('At least one of `lower`, `upper`, `digit` must be `True`') if length < 4: @@ -44,11 +53,13 @@ def random_string(length: int, lower=True, upper=True, digit=True, special_char= (digit, string.digits), ) chars = ''.join([i[1] for i in chars_map if i[0]]) + chars = remove_exclude_char(chars, exclude_chars) texts = list(secrets.choice(chars) for __ in range(length)) texts = ''.join(texts) # 控制一下特殊字符的数量, 别随机出来太多 if special_char: + symbols = remove_exclude_char(symbols, exclude_chars) symbol_num = length // 16 + 1 texts = random_replace_char(texts, symbols, symbol_num) return texts diff --git a/apps/common/utils/yml.py b/apps/common/utils/yml.py index 6db03ea63..4250f016e 100644 --- a/apps/common/utils/yml.py +++ b/apps/common/utils/yml.py @@ -5,20 +5,21 @@ from django.conf import settings from jinja2 import Environment -def translate(key, i18n): - lang = settings.LANGUAGE_CODE[:2] +def translate(key, i18n, lang): + lang = settings.LANGUAGE_CODE if lang is None else lang + lang = lang[:2] lang_data = i18n.get(key, {}) return lang_data.get(lang, key) -def yaml_load_with_i18n(stream): +def yaml_load_with_i18n(stream, lang=None): ori_text = stream.read() stream = io.StringIO(ori_text) yaml_data = yaml.safe_load(stream) i18n = yaml_data.get('i18n', {}) env = Environment() - env.filters['trans'] = lambda key: translate(key, i18n) + env.filters['trans'] = lambda key: translate(key, i18n, lang) template = env.from_string(ori_text) yaml_data = template.render() yaml_f = io.StringIO(yaml_data) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index ea33d178a..80790eb2e 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -405,6 +405,12 @@ class Config(dict): 'FEISHU_APP_SECRET': '', 'FEISHU_VERSION': 'feishu', + # Slack + 'AUTH_SLACK': False, + 'SLACK_CLIENT_ID': '', + 'SLACK_CLIENT_SECRET': '', + 'SLACK_BOT_TOKEN': '', + 'LOGIN_REDIRECT_TO_BACKEND': '', # 'OPENID / CAS / SAML2 'LOGIN_REDIRECT_MSG_ENABLED': True, @@ -497,7 +503,7 @@ class Config(dict): 'SECURITY_LUNA_REMEMBER_AUTH': True, 'SECURITY_WATERMARK_ENABLED': True, 'SECURITY_MFA_VERIFY_TTL': 3600, - 'SECURITY_UNCOMMON_USERS_TTL': 90, + 'SECURITY_UNCOMMON_USERS_TTL': 999, 'VERIFY_CODE_TTL': 60, 'SECURITY_SESSION_SHARE': True, 'SECURITY_CHECK_DIFFERENT_CITY_LOGIN': True, @@ -578,12 +584,23 @@ class Config(dict): 'APPLET_DOWNLOAD_HOST': '', # FTP 文件上传下载备份阈值，单位(M)，当值小于等于0时，不备份 - 'FTP_FILE_MAX_STORE': 100, + 'FTP_FILE_MAX_STORE': 0, - # API 请求次数限制 - 'MAX_LIMIT_PER_PAGE': 100, + # API 分页 + 'MAX_LIMIT_PER_PAGE': 10000, + 'DEFAULT_PAGE_SIZE': None, 'LIMIT_SUPER_PRIV': False, + + # Chat AI + 'CHAT_AI_ENABLED': False, + 'GPT_API_KEY': '', + 'GPT_BASE_URL': '', + 'GPT_PROXY': '', + 'GPT_MODEL': 'gpt-3.5-turbo', + 'VIRTUAL_APP_ENABLED': False, + + 'FILE_UPLOAD_SIZE_LIMIT_MB': 200 } old_config_map = { diff --git a/apps/jumpserver/context_processor.py b/apps/jumpserver/context_processor.py index 7b92674bb..24a96b619 100644 --- a/apps/jumpserver/context_processor.py +++ b/apps/jumpserver/context_processor.py @@ -12,6 +12,8 @@ default_interface = dict(( ('login_title', _('JumpServer Open Source Bastion Host')), ('theme', 'classic_green'), ('theme_info', {}), + ('beian_link', ''), + ('beian_text', '') )) default_context = { diff --git a/apps/jumpserver/rewriting/db.py b/apps/jumpserver/rewriting/db.py index 1ccd49d8f..c14d6bf3d 100644 --- a/apps/jumpserver/rewriting/db.py +++ b/apps/jumpserver/rewriting/db.py @@ -26,7 +26,7 @@ class OneToOneField(models.OneToOneField, ForeignKey): def set_db_constraint(): if os.getenv('DB_CONSTRAINT', '1') != '0': return - if len(sys.argv) == 2 and sys.argv[1] == 'makemigrations': + if len(sys.argv) >= 2 and sys.argv[1] in ['makemigrations', 'check']: return print("Set foreignkey db constraint False") transaction.atomic = atomic diff --git a/apps/jumpserver/rewriting/pagination.py b/apps/jumpserver/rewriting/pagination.py index a924d854a..9a5fd263d 100644 --- a/apps/jumpserver/rewriting/pagination.py +++ b/apps/jumpserver/rewriting/pagination.py @@ -1,6 +1,20 @@ from django.conf import settings +from django.core.exceptions import FieldError from rest_framework.pagination import LimitOffsetPagination class MaxLimitOffsetPagination(LimitOffsetPagination): max_limit = settings.MAX_LIMIT_PER_PAGE + + def get_count(self, queryset): + try: + return queryset.values_list('id').order_by().count() + except (AttributeError, TypeError, FieldError): + return len(queryset) + + def paginate_queryset(self, queryset, request, view=None): + if view and hasattr(view, 'page_max_limit'): + self.max_limit = view.page_max_limit + if view and hasattr(view, 'page_default_limit'): + self.default_limit = view.page_default_limit + return super().paginate_queryset(queryset, request, view) diff --git a/apps/jumpserver/rewriting/storage/permissions.py b/apps/jumpserver/rewriting/storage/permissions.py index 7af0adece..511545865 100644 --- a/apps/jumpserver/rewriting/storage/permissions.py +++ b/apps/jumpserver/rewriting/storage/permissions.py @@ -5,6 +5,7 @@ path_perms_map = { 'settings': '*', 'replay': 'default', 'applets': 'terminal.view_applet', + 'virtual_apps': 'terminal.view_virtualapp', 'playbooks': 'ops.view_playbook' } diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py index 5b6a1cd35..94c45b135 100644 --- a/apps/jumpserver/settings/auth.py +++ b/apps/jumpserver/settings/auth.py @@ -140,6 +140,12 @@ FEISHU_APP_ID = CONFIG.FEISHU_APP_ID FEISHU_APP_SECRET = CONFIG.FEISHU_APP_SECRET FEISHU_VERSION = CONFIG.FEISHU_VERSION +# Slack auth +AUTH_SLACK = CONFIG.AUTH_SLACK +SLACK_CLIENT_ID = CONFIG.SLACK_CLIENT_ID +SLACK_CLIENT_SECRET = CONFIG.SLACK_CLIENT_SECRET +SLACK_BOT_TOKEN = CONFIG.SLACK_BOT_TOKEN + # Saml2 auth AUTH_SAML2 = CONFIG.AUTH_SAML2 AUTH_SAML2_PROVIDER_AUTHORIZATION_ENDPOINT = CONFIG.AUTH_SAML2_PROVIDER_AUTHORIZATION_ENDPOINT @@ -201,6 +207,7 @@ AUTH_BACKEND_SSO = 'authentication.backends.sso.SSOAuthentication' AUTH_BACKEND_WECOM = 'authentication.backends.sso.WeComAuthentication' AUTH_BACKEND_DINGTALK = 'authentication.backends.sso.DingTalkAuthentication' AUTH_BACKEND_FEISHU = 'authentication.backends.sso.FeiShuAuthentication' +AUTH_BACKEND_SLACK = 'authentication.backends.sso.SlackAuthentication' AUTH_BACKEND_AUTH_TOKEN = 'authentication.backends.sso.AuthorizationTokenAuthentication' AUTH_BACKEND_SAML2 = 'authentication.backends.saml2.SAML2Backend' AUTH_BACKEND_OAUTH2 = 'authentication.backends.oauth2.OAuth2Backend' @@ -216,7 +223,7 @@ AUTHENTICATION_BACKENDS = [ AUTH_BACKEND_CAS, AUTH_BACKEND_OIDC_PASSWORD, AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_SAML2, AUTH_BACKEND_OAUTH2, # 扫码模式 - AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU, + AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU, AUTH_BACKEND_SLACK, # Token模式 AUTH_BACKEND_AUTH_TOKEN, AUTH_BACKEND_SSO, AUTH_BACKEND_TEMP_TOKEN, AUTH_BACKEND_PASSKEY diff --git a/apps/jumpserver/settings/base.py b/apps/jumpserver/settings/base.py index 4da1dfc7e..e2bfbc5c1 100644 --- a/apps/jumpserver/settings/base.py +++ b/apps/jumpserver/settings/base.py @@ -109,6 +109,7 @@ for host_port in ALLOWED_DOMAINS: continue CSRF_TRUSTED_ORIGINS.append('{}://*.{}'.format(schema, origin)) +CORS_ALLOWED_ORIGINS = [o.replace('*.', '') for o in CSRF_TRUSTED_ORIGINS] CSRF_FAILURE_VIEW = 'jumpserver.views.other.csrf_failure' # print("CSRF_TRUSTED_ORIGINS: ") # for origin in CSRF_TRUSTED_ORIGINS: @@ -134,6 +135,7 @@ INSTALLED_APPS = [ 'acls.apps.AclsConfig', 'notifications.apps.NotificationsConfig', 'rbac.apps.RBACConfig', + 'labels.apps.LabelsConfig', 'rest_framework', 'rest_framework_swagger', 'drf_yasg', @@ -142,6 +144,7 @@ INSTALLED_APPS = [ 'django_filters', 'bootstrap3', 'captcha', + 'corsheaders', 'private_storage', 'django_celery_beat', 'django.contrib.auth', @@ -160,6 +163,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index dd75f56ec..fad5f0e9d 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -207,7 +207,19 @@ SESSION_RSA_PUBLIC_KEY_NAME = 'jms_public_key' OPERATE_LOG_ELASTICSEARCH_CONFIG = CONFIG.OPERATE_LOG_ELASTICSEARCH_CONFIG MAX_LIMIT_PER_PAGE = CONFIG.MAX_LIMIT_PER_PAGE +DEFAULT_PAGE_SIZE = CONFIG.DEFAULT_PAGE_SIZE # Magnus DB Port MAGNUS_ORACLE_PORTS = CONFIG.MAGNUS_ORACLE_PORTS LIMIT_SUPER_PRIV = CONFIG.LIMIT_SUPER_PRIV + +# Chat AI +CHAT_AI_ENABLED = CONFIG.CHAT_AI_ENABLED +GPT_API_KEY = CONFIG.GPT_API_KEY +GPT_BASE_URL = CONFIG.GPT_BASE_URL +GPT_PROXY = CONFIG.GPT_PROXY +GPT_MODEL = CONFIG.GPT_MODEL + +VIRTUAL_APP_ENABLED = CONFIG.VIRTUAL_APP_ENABLED + +FILE_UPLOAD_SIZE_LIMIT_MB = CONFIG.FILE_UPLOAD_SIZE_LIMIT_MB diff --git a/apps/jumpserver/settings/libs.py b/apps/jumpserver/settings/libs.py index 3679320c4..1f2c333ec 100644 --- a/apps/jumpserver/settings/libs.py +++ b/apps/jumpserver/settings/libs.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # import os -from urllib.parse import urlencode from .base import ( REDIS_SSL_CA, REDIS_SSL_CERT, REDIS_SSL_KEY, REDIS_SSL_REQUIRED, REDIS_USE_SSL, @@ -47,6 +46,7 @@ REST_FRAMEWORK = { 'DATETIME_FORMAT': '%Y/%m/%d %H:%M:%S %z', 'DATETIME_INPUT_FORMATS': ['%Y/%m/%d %H:%M:%S %z', 'iso-8601', '%Y-%m-%d %H:%M:%S %z'], 'DEFAULT_PAGINATION_CLASS': 'jumpserver.rewriting.pagination.MaxLimitOffsetPagination', + 'PAGE_SIZE': CONFIG.DEFAULT_PAGE_SIZE, 'EXCEPTION_HANDLER': 'common.drf.exc_handlers.common_exception_handler', } @@ -88,7 +88,6 @@ REDIS_LAYERS_HOST = { REDIS_LAYERS_SSL_PARAMS = {} if REDIS_USE_SSL: REDIS_LAYERS_SSL_PARAMS.update({ - 'ssl': REDIS_USE_SSL, 'ssl_cert_reqs': REDIS_SSL_REQUIRED, "ssl_keyfile": REDIS_SSL_KEY, "ssl_certfile": REDIS_SSL_CERT, @@ -115,9 +114,7 @@ else: protocol=REDIS_PROTOCOL, password=CONFIG.REDIS_PASSWORD, host=CONFIG.REDIS_HOST, port=CONFIG.REDIS_PORT, db=CONFIG.REDIS_DB_WS ) - REDIS_LAYERS_SSL_PARAMS.pop('ssl', None) - REDIS_LAYERS_HOST['address'] = '{}?{}'.format(REDIS_LAYERS_ADDRESS, - urlencode(REDIS_LAYERS_SSL_PARAMS)) + REDIS_LAYERS_HOST['address'] = REDIS_LAYERS_ADDRESS CHANNEL_LAYERS = { 'default': { diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index 8fbea643c..881d5c57a 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -28,6 +28,7 @@ api_v1 = [ path('acls/', include('acls.urls.api_urls', namespace='api-acls')), path('notifications/', include('notifications.urls.api_urls', namespace='api-notifications')), path('rbac/', include('rbac.urls.api_urls', namespace='api-rbac')), + path('labels/', include('labels.urls', namespace='api-label')), path('prometheus/metrics/', api.PrometheusMetricsApi.as_view()), ] diff --git a/apps/labels/__init__.py b/apps/labels/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/labels/admin.py b/apps/labels/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/apps/labels/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apps/labels/api.py b/apps/labels/api.py new file mode 100644 index 000000000..44a6702e7 --- /dev/null +++ b/apps/labels/api.py @@ -0,0 +1,151 @@ +from django.shortcuts import get_object_or_404 +from rest_framework.decorators import action +from rest_framework.response import Response + +from common.api.generic import JMSModelViewSet +from orgs.mixins.api import OrgBulkModelViewSet +from orgs.mixins.models import OrgModelMixin +from orgs.utils import current_org +from rbac.models import ContentType +from rbac.serializers import ContentTypeSerializer +from . import serializers +from .const import label_resource_types +from .models import Label, LabeledResource + +__all__ = ['LabelViewSet', 'ContentTypeViewSet'] + + +class ContentTypeViewSet(JMSModelViewSet): + serializer_class = ContentTypeSerializer + http_method_names = ['get', 'head', 'options'] + rbac_perms = { + 'default': 'labels.view_contenttype', + 'resources': 'labels.view_contenttype', + } + page_default_limit = None + can_labeled_content_type = [] + model = ContentType + + def get_queryset(self): + return label_resource_types + + @action(methods=['GET'], detail=True, serializer_class=serializers.ContentTypeResourceSerializer) + def resources(self, request, *args, **kwargs): + self.page_default_limit = 100 + content_type = self.get_object() + model = content_type.model_class() + + if issubclass(model, OrgModelMixin): + queryset = model.objects.filter(org_id=current_org.id) + elif hasattr(model, 'get_queryset'): + queryset = model.get_queryset() + else: + queryset = model.objects.all() + + keyword = request.query_params.get('search') + if keyword: + queryset = content_type.filter_queryset(queryset, keyword) + return self.get_paginated_response_from_queryset(queryset) + + +class LabelContentTypeResourceViewSet(JMSModelViewSet): + serializer_class = serializers.ContentTypeResourceSerializer + rbac_perms = { + 'default': 'labels.view_labeledresource', + 'update': 'labels.change_labeledresource', + } + ordering_fields = ('res_type', 'date_created') + + def get_queryset(self): + label_pk = self.kwargs.get('label') + res_type = self.kwargs.get('res_type') + label = get_object_or_404(Label, pk=label_pk) + content_type = get_object_or_404(ContentType, id=res_type) + bound = self.request.query_params.get('bound', '1') + res_ids = LabeledResource.objects \ + .filter(res_type=content_type, label=label) \ + .values_list('res_id', flat=True) + res_ids = set(res_ids) + model = content_type.model_class() + if hasattr(model, 'get_queryset'): + queryset = model.get_queryset() + else: + queryset = model.objects.all() + if bound == '1': + queryset = queryset.filter(id__in=list(res_ids)) + elif bound == '0': + queryset = queryset.exclude(id__in=list(res_ids)) + keyword = self.request.query_params.get('search') + if keyword: + queryset = content_type.filter_queryset(queryset, keyword) + return queryset + + def put(self, request, *args, **kwargs): + label_pk = self.kwargs.get('label') + res_type = self.kwargs.get('res_type') + content_type = get_object_or_404(ContentType, id=res_type) + label = get_object_or_404(Label, pk=label_pk) + res_ids = request.data.get('res_ids', []) + + LabeledResource.objects \ + .filter(res_type=content_type, label=label) \ + .exclude(res_id__in=res_ids).delete() + resources = [] + for res_id in res_ids: + resources.append(LabeledResource(res_type=content_type, res_id=res_id, label=label, org_id=current_org.id)) + LabeledResource.objects.bulk_create(resources, ignore_conflicts=True) + return Response({"total": len(res_ids)}) + + +class LabelViewSet(OrgBulkModelViewSet): + model = Label + filterset_fields = ("name", "value") + search_fields = filterset_fields + serializer_classes = { + 'default': serializers.LabelSerializer, + 'resource_types': ContentTypeSerializer, + } + rbac_perms = { + 'resource_types': 'labels.view_label', + 'keys': 'labels.view_label', + } + + @action(methods=['GET'], detail=False) + def keys(self, request, *args, **kwargs): + queryset = Label.objects.all() + keyword = request.query_params.get('search') + if keyword: + queryset = queryset.filter(name__icontains=keyword) + keys = queryset.values_list('name', flat=True).distinct() + return Response(keys) + + +class LabeledResourceViewSet(OrgBulkModelViewSet): + model = LabeledResource + filterset_fields = ("label__name", "label__value", "res_type", "res_id", "label") + search_fields = [] + serializer_classes = { + 'default': serializers.LabeledResourceSerializer, + } + ordering_fields = ('res_type', 'date_created') + + # Todo: 这里需要优化，查询 sql 太多 + def filter_search(self, queryset): + keyword = self.request.query_params.get('search') + if not keyword: + return queryset + matched = [] + for instance in queryset: + if keyword.lower() in str(instance.resource).lower(): + matched.append(instance.id) + return queryset.filter(id__in=matched) + + def get_queryset(self): + queryset = super().get_queryset() + queryset = queryset.order_by('res_type') + return queryset + + def filter_queryset(self, queryset): + queryset = super().filter_queryset(queryset) + queryset = self.filter_search(queryset) + return queryset diff --git a/apps/labels/apps.py b/apps/labels/apps.py new file mode 100644 index 000000000..a3bf4dabd --- /dev/null +++ b/apps/labels/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class LabelsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'labels' + verbose_name = _('Labels') diff --git a/apps/labels/const.py b/apps/labels/const.py new file mode 100644 index 000000000..108b07df0 --- /dev/null +++ b/apps/labels/const.py @@ -0,0 +1,25 @@ +from django.utils.functional import LazyObject + + +class LabeledResourceType(LazyObject): + @staticmethod + def get_res_types(): + from rbac.models import ContentType + from .mixins import LabeledMixin + content_types = ContentType.objects.all() + ids = [] + for ct in content_types: + model_cls = ct.model_class() + if not model_cls: + continue + if model_cls._meta.parents: + continue + if issubclass(model_cls, LabeledMixin): + ids.append(ct.id) + return ContentType.objects.filter(id__in=ids) + + def _setup(self): + self._wrapped = self.get_res_types() + + +label_resource_types = LabeledResourceType() diff --git a/apps/labels/migrations/0001_initial.py b/apps/labels/migrations/0001_initial.py new file mode 100644 index 000000000..cefe74e5c --- /dev/null +++ b/apps/labels/migrations/0001_initial.py @@ -0,0 +1,54 @@ +# Generated by Django 4.1.10 on 2023-11-06 10:38 + +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ] + + operations = [ + migrations.CreateModel( + name='Label', + fields=[ + ('created_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by')), + ('updated_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated 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')), + ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), + ('internal', models.BooleanField(default=False, verbose_name='Internal')), + ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), + ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), + ('name', models.CharField(db_index=True, max_length=64, verbose_name='Name')), + ('value', models.CharField(max_length=64, verbose_name='Value')), + ], + options={ + 'verbose_name': 'Label', + 'unique_together': {('name', 'value', 'org_id')}, + }, + ), + migrations.CreateModel( + name='LabeledResource', + fields=[ + ('created_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by')), + ('updated_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated 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')), + ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), + ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), + ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), + ('res_id', models.CharField(db_index=True, max_length=36, verbose_name='Resource ID')), + ('label', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='labels.label')), + ('res_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/labels/migrations/0002_auto_20231103_1659.py b/apps/labels/migrations/0002_auto_20231103_1659.py new file mode 100644 index 000000000..49386ed39 --- /dev/null +++ b/apps/labels/migrations/0002_auto_20231103_1659.py @@ -0,0 +1,52 @@ +# Generated by Django 4.1.10 on 2023-11-03 08:59 + +from django.db import migrations + + +def migrate_assets_labels(apps, schema_editor): + old_label_model = apps.get_model('assets', 'Label') + new_label_model = apps.get_model('labels', 'Label') + asset_model = apps.get_model('assets', 'Asset') + labeled_item_model = apps.get_model('labels', 'LabeledResource') + + old_labels = old_label_model.objects.all() + new_labels = [] + old_new_label_map = {} + for label in old_labels: + new_label = new_label_model(name=label.name, value=label.value, org_id=label.org_id) + old_new_label_map[label.id] = new_label + new_labels.append(new_label) + new_label_model.objects.bulk_create(new_labels, ignore_conflicts=True) + + label_relations = asset_model.labels.through.objects.all() + bulk_size = 1000 + count = 0 + content_type = apps.get_model('contenttypes', 'contenttype').objects.get_for_model(asset_model) + + while True: + relations = label_relations[count:count + bulk_size] + if not relations: + break + count += bulk_size + + tagged_items = [] + for relation in relations: + new_label = old_new_label_map[relation.label_id] + tagged_item = labeled_item_model( + label_id=new_label.id, res_type=content_type, + res_id=relation.asset_id, org_id=new_label.org_id + ) + tagged_items.append(tagged_item) + labeled_item_model.objects.bulk_create(tagged_items, ignore_conflicts=True) + + +class Migration(migrations.Migration): + + dependencies = [ + ('labels', '0001_initial'), + ('assets', '0125_auto_20231011_1053') + ] + + operations = [ + migrations.RunPython(migrate_assets_labels), + ] diff --git a/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py new file mode 100644 index 000000000..c879b7888 --- /dev/null +++ b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.1.10 on 2023-11-15 10:58 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('labels', '0002_auto_20231103_1659'), + ] + + operations = [ + migrations.AlterModelOptions( + name='labeledresource', + options={'verbose_name': 'Labeled resource'}, + ), + migrations.AlterField( + model_name='labeledresource', + name='label', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labeled_resources', to='labels.label', verbose_name='Label'), + ), + migrations.AlterUniqueTogether( + name='labeledresource', + unique_together={('label', 'res_type', 'res_id', 'org_id')}, + ), + ] diff --git a/apps/labels/migrations/__init__.py b/apps/labels/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/labels/mixins.py b/apps/labels/mixins.py new file mode 100644 index 000000000..90b76f3ed --- /dev/null +++ b/apps/labels/mixins.py @@ -0,0 +1,21 @@ +from django.contrib.contenttypes.fields import GenericRelation +from django.db import models + +from .models import LabeledResource + +__all__ = ['LabeledMixin'] + + +class LabeledMixin(models.Model): + _labels = GenericRelation(LabeledResource, object_id_field='res_id', content_type_field='res_type') + + class Meta: + abstract = True + + @property + def labels(self): + return self._labels + + @labels.setter + def labels(self, value): + self._labels.set(value, bulk=False) diff --git a/apps/labels/models.py b/apps/labels/models.py new file mode 100644 index 000000000..3bf9213f5 --- /dev/null +++ b/apps/labels/models.py @@ -0,0 +1,44 @@ +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType +from django.db import models +from django.utils.translation import gettext_lazy as _ + +from common.utils import lazyproperty +from orgs.mixins.models import JMSOrgBaseModel + + +class Label(JMSOrgBaseModel): + name = models.CharField(max_length=64, verbose_name=_("Name"), db_index=True) + value = models.CharField(max_length=64, unique=False, verbose_name=_("Value")) + internal = models.BooleanField(default=False, verbose_name=_("Internal")) + + class Meta: + unique_together = [('name', 'value', 'org_id')] + verbose_name = _('Label') + + @lazyproperty + def res_count(self): + return self.labeled_resources.count() + + @lazyproperty + def display_name(self): + return '{}:{}'.format(self.name, self.value) + + def __str__(self): + return '{}:{}'.format(self.name, self.value) + + +class LabeledResource(JMSOrgBaseModel): + label = models.ForeignKey( + Label, on_delete=models.CASCADE, related_name='labeled_resources', verbose_name=_("Label") + ) + res_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + res_id = models.CharField(max_length=36, verbose_name=_("Resource ID"), db_index=True) + resource = GenericForeignKey('res_type', 'res_id') + + class Meta: + unique_together = [('label', 'res_type', 'res_id', 'org_id')] + verbose_name = _('Labeled resource') + + def __str__(self): + return '{} => {}'.format(self.label, self.resource) diff --git a/apps/labels/serializers.py b/apps/labels/serializers.py new file mode 100644 index 000000000..803843ad8 --- /dev/null +++ b/apps/labels/serializers.py @@ -0,0 +1,77 @@ +from django.db.models import Count +from django.utils.translation import gettext_lazy as _ +from rest_framework import serializers + +from common.serializers.fields import ObjectRelatedField, LabeledChoiceField +from orgs.mixins.serializers import BulkOrgResourceModelSerializer +from .const import label_resource_types +from .models import Label, LabeledResource + +__all__ = ['LabelSerializer', 'LabeledResourceSerializer', 'ContentTypeResourceSerializer'] + + +class LabelSerializer(BulkOrgResourceModelSerializer): + class Meta: + model = Label + fields = [ + 'id', 'name', 'value', 'res_count', 'comment', + 'date_created', 'date_updated' + ] + read_only_fields = ('date_created', 'date_updated', 'res_count') + extra_kwargs = { + 'res_count': {'label': _('Resource count')}, + } + + @staticmethod + def validate_name(value): + if ':' in value or ',' in value: + raise serializers.ValidationError(_('Cannot contain ":,"')) + return value + + def validate_value(self, value): + return self.validate_name(value) + + @classmethod + def setup_eager_loading(cls, queryset): + """ Perform necessary eager loading of data. """ + queryset = queryset.annotate(res_count=Count('labeled_resources')) + return queryset + + +class LabeledResourceSerializer(serializers.ModelSerializer): + res_type = LabeledChoiceField( + choices=[], label=_("Resource type"), source='res_type_id', required=False + ) + label = ObjectRelatedField(queryset=Label.objects, attrs=('id', 'display_name'), label=_("Label")) + resource = serializers.CharField(label=_("Resource")) + + class Meta: + model = LabeledResource + fields = ('id', 'label', 'res_type', 'res_id', 'date_created', 'resource', 'date_updated') + read_only_fields = ('date_created', 'date_updated', 'resource') + + @classmethod + def setup_eager_loading(cls, queryset): + """ Perform necessary eager loading of data. """ + queryset = queryset.select_related('label', 'res_type') + return queryset + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.set_res_type_choices() + + def set_res_type_choices(self): + res_type_field = self.fields.get('res_type') + if not res_type_field: + return + + res_type_field.choices = [(ct.id, ct.name) for ct in label_resource_types] + + +class ContentTypeResourceSerializer(serializers.Serializer): + id = serializers.CharField() + name = serializers.SerializerMethodField() + + @staticmethod + def get_name(obj): + return str(obj) diff --git a/apps/labels/tests.py b/apps/labels/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/apps/labels/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apps/labels/urls.py b/apps/labels/urls.py new file mode 100644 index 000000000..a3971917f --- /dev/null +++ b/apps/labels/urls.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# + +from rest_framework_bulk.routes import BulkRouter + +from . import api + +app_name = 'labels' + +router = BulkRouter() +router.register(r'labels', api.LabelViewSet, 'label') +router.register(r'labels/(?P
"
+#: labels/models.py:36
+msgid "Resource ID"
+msgstr "リソースID"
+
+#: labels/models.py:41
+msgid "Labeled resource"
+msgstr ""
+
+#: labels/serializers.py:22
+msgid "Resource count"
+msgstr "リソース数"
+
+#: labels/serializers.py:28
+msgid "Cannot contain \":,\""
+msgstr "\":，\"を含めることはできません"
+
+#: labels/serializers.py:43
+msgid "Resource type"
+msgstr "リソースタイプ"
+
#: notifications/backends/__init__.py:13
msgid "Site message"
msgstr "サイトメッセージ"
@@ -3932,30 +4032,42 @@ msgstr "システムメッセージ"
msgid "Publish the station message"
msgstr "投稿サイトニュース"
-#: ops/ansible/inventory.py:95 ops/models/job.py:61
+#: ops/ansible/inventory.py:97 ops/models/job.py:62
msgid "No account available"
msgstr "利用可能なアカウントがありません"
-#: ops/ansible/inventory.py:259
+#: ops/ansible/inventory.py:264
msgid "Ansible disabled"
msgstr "Ansible 無効"
-#: ops/ansible/inventory.py:275
+#: ops/ansible/inventory.py:280
msgid "Skip hosts below:"
msgstr "次のホストをスキップします: "
-#: ops/api/celery.py:64 ops/api/celery.py:79
+#: ops/api/celery.py:65 ops/api/celery.py:80
msgid "Waiting task start"
msgstr "タスク開始待ち"
-#: ops/api/celery.py:162
+#: ops/api/celery.py:203
msgid "Task {} not found"
msgstr "タスクは存在しません"
-#: ops/api/celery.py:167
+#: ops/api/celery.py:208
msgid "Task {} args or kwargs error"
msgstr "タスク実行パラメータエラー"
+#: ops/api/job.py:132
+msgid "Duplicate file exists"
+msgstr "重複したファイルが存在する"
+
+#: ops/api/job.py:137
+#, python-brace-format
+msgid ""
+"File size exceeds maximum limit. Please select a file smaller than {limit}MB"
+msgstr ""
+"ファイルサイズが最大制限を超えています。{limit}MB より小さいファイルを選択し"
+"てください。"
+
#: ops/api/playbook.py:39
msgid "Currently playbook is being used in a job"
msgstr "現在プレイブックは1つのジョブで使用されています"
@@ -3984,7 +4096,7 @@ msgstr "ファイルキーこのフィールドは必須です"
msgid "This file can not be delete"
msgstr "このファイルを削除できません"
-#: ops/apps.py:9 ops/notifications.py:17 rbac/tree.py:55
+#: ops/apps.py:9 ops/notifications.py:17 rbac/tree.py:57
msgid "App ops"
msgstr "アプリ操作"
@@ -4024,51 +4136,55 @@ msgstr "VCS"
msgid "Adhoc"
msgstr "コマンド＃コマンド＃"
-#: ops/const.py:39 ops/models/job.py:138
+#: ops/const.py:39 ops/models/job.py:143
msgid "Playbook"
msgstr "Playbook"
-#: ops/const.py:43
+#: ops/const.py:40
+msgid "Upload File"
+msgstr "ファイルのアップロード"
+
+#: ops/const.py:44
msgid "Privileged Only"
msgstr "特権アカウントのみ"
-#: ops/const.py:44
+#: ops/const.py:45
msgid "Privileged First"
msgstr "特権アカウント優先"
-#: ops/const.py:50 ops/const.py:60
+#: ops/const.py:51 ops/const.py:61
msgid "Powershell"
msgstr "PowerShell"
-#: ops/const.py:51 ops/const.py:61
+#: ops/const.py:52 ops/const.py:62
msgid "Python"
msgstr "Python"
-#: ops/const.py:52 ops/const.py:62
+#: ops/const.py:53 ops/const.py:63
msgid "MySQL"
msgstr "MySQL"
-#: ops/const.py:53 ops/const.py:64
+#: ops/const.py:54 ops/const.py:65
msgid "PostgreSQL"
msgstr "PostgreSQL"
-#: ops/const.py:54 ops/const.py:65
+#: ops/const.py:55 ops/const.py:66
msgid "SQLServer"
msgstr "SQLServer"
-#: ops/const.py:55 ops/const.py:67
+#: ops/const.py:56 ops/const.py:68
msgid "Raw"
msgstr ""
-#: ops/const.py:63
+#: ops/const.py:64
msgid "MariaDB"
msgstr "MariaDB"
-#: ops/const.py:66
+#: ops/const.py:67
msgid "Oracle"
msgstr "Oracle"
-#: ops/const.py:73
+#: ops/const.py:74
msgid "Timeout"
msgstr "タイムアウト"
@@ -4105,15 +4221,17 @@ msgstr "定期的または定期的に設定を行う必要があります"
msgid "Pattern"
msgstr "パターン"
-#: ops/models/adhoc.py:23 ops/models/job.py:133
+#: ops/models/adhoc.py:23 ops/models/job.py:140
msgid "Module"
msgstr "モジュール"
-#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:131
+#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:138
#: terminal/models/component/task.py:14
msgid "Args"
msgstr "アルグ"
+# msgid "Creator"
+# msgstr "作成者"
#: ops/models/base.py:19
msgid "Account policy"
msgstr "アカウント ポリシー"
@@ -4122,16 +4240,16 @@ msgstr "アカウント ポリシー"
msgid "Last execution"
msgstr "最後の実行"
-#: ops/models/base.py:22 ops/serializers/job.py:19
+#: ops/models/base.py:22 ops/serializers/job.py:17
msgid "Date last run"
msgstr "最終実行日"
-#: ops/models/base.py:51 ops/models/job.py:227
-#: xpack/plugins/cloud/models.py:199
+#: ops/models/base.py:51 ops/models/job.py:231
+#: xpack/plugins/cloud/models.py:202
msgid "Result"
msgstr "結果"
-#: ops/models/base.py:52 ops/models/job.py:228
+#: ops/models/base.py:52 ops/models/job.py:232
msgid "Summary"
msgstr "概要"
@@ -4164,43 +4282,43 @@ msgstr "発売日"
msgid "Celery Task Execution"
msgstr "Celery タスク実行"
-#: ops/models/job.py:135
+#: ops/models/job.py:141
msgid "Chdir"
msgstr "実行ディレクトリ"
-#: ops/models/job.py:136
+#: ops/models/job.py:142
msgid "Timeout (Seconds)"
msgstr "タイムアウト（秒）"
-#: ops/models/job.py:143
+#: ops/models/job.py:147
msgid "Use Parameter Define"
msgstr "パラメータ定義を使用する"
-#: ops/models/job.py:144
+#: ops/models/job.py:148
msgid "Parameters define"
msgstr "パラメータ定義"
-#: ops/models/job.py:145
+#: ops/models/job.py:149
msgid "Runas"
msgstr "ユーザーとして実行"
-#: ops/models/job.py:147
+#: ops/models/job.py:151
msgid "Runas policy"
msgstr "ユーザー ポリシー"
-#: ops/models/job.py:211
+#: ops/models/job.py:215
msgid "Job"
msgstr "ジョブ＃ジョブ＃"
-#: ops/models/job.py:234
+#: ops/models/job.py:238
msgid "Material"
msgstr "Material"
-#: ops/models/job.py:236
+#: ops/models/job.py:240
msgid "Material Type"
msgstr "Material を選択してオプションを設定します。"
-#: ops/models/job.py:536
+#: ops/models/job.py:557
msgid "Job Execution"
msgstr "ジョブ実行"
@@ -4240,19 +4358,19 @@ msgstr "{max_threshold}%: => {value} を超える使用メモリ"
msgid "CPU load more than {max_threshold}: => {value}"
msgstr "{max_threshold} を超えるCPUロード: => {value}"
-#: ops/serializers/job.py:17
+#: ops/serializers/job.py:15
msgid "Run after save"
msgstr "保存後に実行"
-#: ops/serializers/job.py:54
+#: ops/serializers/job.py:62
msgid "Job type"
msgstr "タスクの種類"
-#: ops/serializers/job.py:57 terminal/serializers/session.py:53
+#: ops/serializers/job.py:65 terminal/serializers/session.py:53
msgid "Is finished"
msgstr "終了しました"
-#: ops/serializers/job.py:58
+#: ops/serializers/job.py:66
msgid "Time cost"
msgstr "時を過ごす"
@@ -4343,7 +4461,7 @@ msgstr ""
msgid "The organization have resource ({}) cannot be deleted"
msgstr "組織のリソース ({}) は削除できません"
-#: orgs/apps.py:7 rbac/tree.py:126
+#: orgs/apps.py:7 rbac/tree.py:128
msgid "App organizations"
msgstr "アプリ組織"
@@ -4372,7 +4490,8 @@ msgstr "デフォルト組織"
msgid "SYSTEM"
msgstr "システム組織"
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41
+#: orgs/models.py:83 rbac/models/role.py:36 settings/models.py:183
+#: terminal/models/applet/applet.py:41
msgid "Builtin"
msgstr "ビルトイン"
@@ -4432,7 +4551,7 @@ msgstr "転送"
msgid "Clipboard"
msgstr "クリップボード"
-#: perms/models/asset_permission.py:88
+#: perms/models/asset_permission.py:89
msgid "Asset permission"
msgstr "資産権限"
@@ -4468,6 +4587,11 @@ msgstr "認定アカウント"
msgid "today"
msgstr "今日"
+#: perms/notifications.py:12 perms/notifications.py:44
+#: settings/serializers/feature.py:106
+msgid "day"
+msgstr "日"
+
#: perms/notifications.py:15
msgid "You permed assets is about to expire"
msgstr "パーマ資産の有効期限が近づいています"
@@ -4497,11 +4621,11 @@ msgstr "アセット許可の有効期限通知を送信する"
#, python-format
msgid ""
"\n"
-" The following %(item_type)s will expire in %(count)s days\n"
+" The following %(item_type)s will expire in %(count)s\n"
" "
msgstr ""
"\n"
-" 次の %(item_type)s は %(count)s 日以内に期限切れになります\n"
+" 次の %(item_type)s は %(count)s 以内に期限切れになります\n"
" "
#: rbac/api/role.py:35
@@ -4512,7 +4636,7 @@ msgstr "内部の役割は、破壊することはできません"
msgid "The role has been bound to users, can't be destroy"
msgstr "ロールはユーザーにバインドされており、破壊することはできません"
-#: rbac/api/role.py:87
+#: rbac/api/role.py:100
msgid "Internal role, can't be update"
msgstr "内部ロール、更新できません"
@@ -4576,7 +4700,7 @@ msgstr "ファイルマネージャを表示できます"
msgid "Can view System Tools"
msgstr "システムツールを表示できます"
-#: rbac/models/permission.py:27 rbac/models/role.py:34
+#: rbac/models/permission.py:78 rbac/models/role.py:34
msgid "Permissions"
msgstr "権限"
@@ -4586,7 +4710,7 @@ msgid "Scope"
msgstr "スコープ"
#: rbac/models/role.py:46 rbac/models/rolebinding.py:52
-#: users/models/user.py:803
+#: users/models/user.py:810
msgid "Role"
msgstr "ロール"
@@ -4625,11 +4749,12 @@ msgstr "システムロールバインディング"
msgid "Perms"
msgstr "パーマ"
-#: rbac/serializers/role.py:27 users/serializers/group.py:30
+#: rbac/serializers/role.py:27 users/serializers/group.py:31
msgid "Users amount"
msgstr "ユーザー数"
#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34
+#: terminal/models/virtualapp/virtualapp.py:20
msgid "Display name"
msgstr "表示名"
@@ -4653,7 +4778,7 @@ msgstr "ワークスペースビュー"
msgid "Audit view"
msgstr "監査ビュー"
-#: rbac/tree.py:27 settings/models.py:158
+#: rbac/tree.py:27 settings/models.py:159
msgid "System setting"
msgstr "システム設定"
@@ -4661,59 +4786,64 @@ msgstr "システム設定"
msgid "Session audits"
msgstr "セッション監査"
-#: rbac/tree.py:47
+#: rbac/tree.py:49
msgid "Cloud import"
msgstr "クラウドインポート"
-#: rbac/tree.py:48
+#: rbac/tree.py:50
msgid "Backup account"
msgstr "バックアップアカウント"
-#: rbac/tree.py:49
+#: rbac/tree.py:51
msgid "Gather account"
msgstr "アカウントを集める"
-#: rbac/tree.py:51
+#: rbac/tree.py:53
msgid "Asset change auth"
msgstr "資産の改ざん"
-#: rbac/tree.py:52
+#: rbac/tree.py:54
msgid "Terminal setting"
msgstr "ターミナル設定"
-#: rbac/tree.py:53
+#: rbac/tree.py:55
msgid "Task Center"
msgstr "タスクセンター"
-#: rbac/tree.py:54
+#: rbac/tree.py:56
msgid "My assets"
msgstr "私の資産"
-#: rbac/tree.py:56 terminal/models/applet/applet.py:52
-#: terminal/models/applet/applet.py:315 terminal/models/applet/host.py:30
+#: rbac/tree.py:58 terminal/models/applet/applet.py:52
+#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:30
#: terminal/serializers/applet.py:15
msgid "Applet"
msgstr "リモートアプリケーション"
-#: rbac/tree.py:127
+#: rbac/tree.py:129
msgid "Ticket comment"
msgstr "チケットコメント"
-#: rbac/tree.py:128 settings/serializers/feature.py:58
+#: rbac/tree.py:130 settings/serializers/feature.py:98
#: tickets/models/ticket/general.py:307
msgid "Ticket"
msgstr "チケット"
-#: rbac/tree.py:129
+#: rbac/tree.py:131
msgid "Common setting"
msgstr "共通設定"
-#: rbac/tree.py:130
+#: rbac/tree.py:132
msgid "View permission tree"
msgstr "権限ツリーの表示"
-#: settings/api/dingtalk.py:31 settings/api/feishu.py:36
-#: settings/api/sms.py:160 settings/api/vault.py:40 settings/api/wecom.py:37
+#: settings/api/chat.py:40
+msgid "Chat AI is not enabled"
+msgstr "チャットAIがオンになっていない"
+
+#: settings/api/chat.py:79 settings/api/dingtalk.py:31
+#: settings/api/feishu.py:36 settings/api/slack.py:34 settings/api/sms.py:160
+#: settings/api/vault.py:40 settings/api/wecom.py:37
msgid "Test success"
msgstr "テストの成功"
@@ -4721,23 +4851,18 @@ msgstr "テストの成功"
msgid "Test mail sent to {}, please check"
msgstr "{}に送信されたテストメールを確認してください"
-#: settings/api/ldap.py:176
-msgid "Synchronization start, please wait."
-msgstr "同期開始、お待ちください。"
+#: settings/api/ldap.py:101
+msgid ""
+"Users are not synchronized, please click the user synchronization button"
+msgstr ""
+"ユーザーは同期されていません。「ユーザーを同期」ボタンをクリックしてくださ"
+"い。"
-#: settings/api/ldap.py:180
-msgid "Synchronization is running, please wait."
-msgstr "同期が実行中です。しばらくお待ちください。"
-
-#: settings/api/ldap.py:185
-msgid "Synchronization error: {}"
-msgstr "同期エラー: {}"
-
-#: settings/api/ldap.py:223
+#: settings/api/ldap.py:137
msgid "Get ldap users is None"
msgstr "Ldapユーザーを取得するにはNone"
-#: settings/api/ldap.py:233
+#: settings/api/ldap.py:147
msgid "Imported {} users successfully (Organization: {})"
msgstr "{} 人のユーザーを正常にインポートしました (組織: {})"
@@ -4753,66 +4878,78 @@ msgstr "携帯番号をテストこのフィールドは必須です"
msgid "Settings"
msgstr "設定"
-#: settings/models.py:35 users/models/preference.py:14
+#: settings/models.py:36 users/models/preference.py:14
msgid "Encrypted"
msgstr "暗号化された"
-#: settings/models.py:160
+#: settings/models.py:161
msgid "Can change email setting"
msgstr "メール設定を変更できます"
-#: settings/models.py:161
+#: settings/models.py:162
msgid "Can change auth setting"
msgstr "資格認定の設定"
-#: settings/models.py:162
+#: settings/models.py:163
msgid "Can change auth ops"
msgstr "タスクセンターの設定"
-#: settings/models.py:163
+#: settings/models.py:164
msgid "Can change auth ticket"
msgstr "製造オーダ設定"
-#: settings/models.py:164
+#: settings/models.py:165
+msgid "Can change virtual app setting"
+msgstr "仮想アプリケーション設定を変更できます"
+
+#: settings/models.py:166
msgid "Can change auth announcement"
msgstr "公告の設定"
-#: settings/models.py:165
+#: settings/models.py:167
msgid "Can change vault setting"
msgstr "金庫の設定を変えることができます"
-#: settings/models.py:166
+#: settings/models.py:168
+msgid "Can change chat ai setting"
+msgstr "チャットAI設定を変更できます"
+
+#: settings/models.py:169
msgid "Can change system msg sub setting"
msgstr "システムmsgサブ设定を変更できます"
-#: settings/models.py:167
+#: settings/models.py:170
msgid "Can change sms setting"
msgstr "Smsの設定を変えることができます"
-#: settings/models.py:168
+#: settings/models.py:171
msgid "Can change security setting"
msgstr "セキュリティ設定を変更できます"
-#: settings/models.py:169
+#: settings/models.py:172
msgid "Can change clean setting"
msgstr "きれいな設定を変えることができます"
-#: settings/models.py:170
+#: settings/models.py:173
msgid "Can change interface setting"
msgstr "インターフェイスの設定を変えることができます"
-#: settings/models.py:171
+#: settings/models.py:174
msgid "Can change license setting"
msgstr "ライセンス設定を変更できます"
-#: settings/models.py:172
+#: settings/models.py:175
msgid "Can change terminal setting"
msgstr "ターミナルの設定を変えることができます"
-#: settings/models.py:173
+#: settings/models.py:176
msgid "Can change other setting"
msgstr "他の設定を変えることができます"
+#: settings/models.py:186
+msgid "Chat prompt"
+msgstr "チャットのヒント"
+
#: settings/serializers/auth/base.py:12
msgid "LDAP Auth"
msgstr "LDAP 認証"
@@ -4846,22 +4983,26 @@ msgid "FeiShu Auth"
msgstr "飛本 認証"
#: settings/serializers/auth/base.py:20
+msgid "Slack Auth"
+msgstr "Slack 認証"
+
+#: settings/serializers/auth/base.py:21
msgid "WeCom Auth"
msgstr "企業微信 認証"
-#: settings/serializers/auth/base.py:21
+#: settings/serializers/auth/base.py:22
msgid "SSO Auth"
msgstr "SSO Token 認証"
-#: settings/serializers/auth/base.py:22
+#: settings/serializers/auth/base.py:23
msgid "Passkey Auth"
msgstr "Passkey 認証"
-#: settings/serializers/auth/base.py:25
+#: settings/serializers/auth/base.py:26
msgid "Forgot password url"
msgstr "パスワードのURLを忘れた"
-#: settings/serializers/auth/base.py:28
+#: settings/serializers/auth/base.py:29
msgid "Enable login redirect msg"
msgstr "ログインリダイレクトの有効化msg"
@@ -5163,6 +5304,10 @@ msgstr "SP プライベートキー"
msgid "SP cert"
msgstr "SP 証明書"
+#: settings/serializers/auth/slack.py:12
+msgid "Enable Slack Auth"
+msgstr "Slack 認証の有効化"
+
#: settings/serializers/auth/sms.py:17
msgid "Enable SMS"
msgstr "SMSの有効化"
@@ -5242,11 +5387,6 @@ msgstr "URL"
msgid "Request method"
msgstr "請求方法です"
-#: settings/serializers/auth/sms.py:117
-#, python-format
-msgid "The value in the parameter must contain %s"
-msgstr "パラメータの値には必ず %s が含まれます"
-
#: settings/serializers/auth/sso.py:16
msgid "Enable SSO auth"
msgstr "SSO Token認証の有効化"
@@ -5261,7 +5401,7 @@ msgid "SSO auth key TTL"
msgstr "Token有効期間"
#: settings/serializers/auth/sso.py:20
-#: xpack/plugins/cloud/serializers/account_attrs.py:193
+#: xpack/plugins/cloud/serializers/account_attrs.py:200
msgid "Unit: second"
msgstr "単位: 秒"
@@ -5269,11 +5409,11 @@ msgstr "単位: 秒"
msgid "Enable WeCom Auth"
msgstr "企業微信認証の有効化"
-#: settings/serializers/basic.py:9
+#: settings/serializers/basic.py:11
msgid "Site url"
msgstr "サイトURL"
-#: settings/serializers/basic.py:11
+#: settings/serializers/basic.py:13
msgid ""
"External URL, email links or other system callbacks are used to access it, "
"eg: http://dev.jumpserver.org:8080"
@@ -5281,38 +5421,42 @@ msgstr ""
"外部URL、メールリンクまたは他のシステムコールバックにアクセスするには、"
"http://dev.jumpserver.org:8080などを使用します"
-#: settings/serializers/basic.py:16
+#: settings/serializers/basic.py:18
msgid "User guide url"
msgstr "ユーザーガイドurl"
-#: settings/serializers/basic.py:17
+#: settings/serializers/basic.py:19
msgid "User first login update profile done redirect to it"
msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました"
-#: settings/serializers/basic.py:20
+#: settings/serializers/basic.py:22
msgid "Global organization name"
msgstr "グローバル組織名"
-#: settings/serializers/basic.py:21
+#: settings/serializers/basic.py:23
msgid "The name of global organization to display"
msgstr "表示するグローバル組織の名前"
-#: settings/serializers/basic.py:24
+#: settings/serializers/basic.py:26
msgid "Help Docs URL"
msgstr "ドキュメントリンク"
-#: settings/serializers/basic.py:25
+#: settings/serializers/basic.py:27
msgid "default: http://docs.jumpserver.org"
msgstr "デフォルト: http://docs.jumpserver.org"
-#: settings/serializers/basic.py:28
+#: settings/serializers/basic.py:30
msgid "Help Support URL"
msgstr "サポートリンク"
-#: settings/serializers/basic.py:29
+#: settings/serializers/basic.py:31
msgid "default: http://www.jumpserver.org/support/"
msgstr "デフォルト: http://www.jumpserver.org/support/"
+#: settings/serializers/basic.py:44
+msgid "Organization name already exists"
+msgstr "組織名はすでに存在します。"
+
#: settings/serializers/cleaning.py:11
msgid "Period clean"
msgstr "定時清掃"
@@ -5357,70 +5501,98 @@ msgstr ""
"この期間を超えるセッション、録音、およびコマンド レコードは削除されます (デー"
"タベースのバックアップに影響し、OSS などには影響しません)"
-#: settings/serializers/feature.py:16
+#: settings/serializers/feature.py:18
msgid "Subject"
msgstr "件名"
-#: settings/serializers/feature.py:20
+#: settings/serializers/feature.py:22
msgid "More url"
msgstr "もっとURL"
-#: settings/serializers/feature.py:34 settings/serializers/feature.py:37
+#: settings/serializers/feature.py:36 settings/serializers/feature.py:39
msgid "Announcement"
msgstr "発表"
-#: settings/serializers/feature.py:36
+#: settings/serializers/feature.py:38
msgid "Enable announcement"
msgstr "アナウンスの有効化"
-#: settings/serializers/feature.py:44
+#: settings/serializers/feature.py:46
msgid "Enable Vault"
msgstr "有効化 Vault"
-#: settings/serializers/feature.py:53
+#: settings/serializers/feature.py:55
msgid "Mount Point"
msgstr "マウントポイント"
#: settings/serializers/feature.py:60
+msgid "Chat AI"
+msgstr "チャットAI"
+
+#: settings/serializers/feature.py:64
+msgid "Enable Chat AI"
+msgstr "チャットAIを起動する"
+
+#: settings/serializers/feature.py:67
+msgid "Base Url"
+msgstr "基本的なUrl"
+
+#: settings/serializers/feature.py:70 templates/_header_bar.html:90
+msgid "API Key"
+msgstr "API Key"
+
+#: settings/serializers/feature.py:76
+msgid "GPT Model"
+msgstr "GPTモデル"
+
+#: settings/serializers/feature.py:100
msgid "Enable tickets"
msgstr "チケットを有効にする"
-#: settings/serializers/feature.py:63
+#: settings/serializers/feature.py:103
msgid "Ticket authorize default time"
msgstr "デフォルト製造オーダ承認時間"
-#: settings/serializers/feature.py:66
-msgid "day"
-msgstr "日"
-
-#: settings/serializers/feature.py:66
+#: settings/serializers/feature.py:106
msgid "hour"
msgstr "時"
-#: settings/serializers/feature.py:67
+#: settings/serializers/feature.py:107
msgid "Ticket authorize default time unit"
msgstr "デフォルト製造オーダ承認時間単位"
-#: settings/serializers/feature.py:72
+#: settings/serializers/feature.py:112
msgid "Feature"
msgstr "機能"
-#: settings/serializers/feature.py:75
+#: settings/serializers/feature.py:115
msgid "Operation center"
msgstr "職業センター"
-#: settings/serializers/feature.py:76
+#: settings/serializers/feature.py:116
msgid "Allow user run batch command or not using ansible"
msgstr "ユーザー実行バッチコマンドを許可するか、ansibleを使用しない"
-#: settings/serializers/feature.py:80
+#: settings/serializers/feature.py:120
msgid "Operation center command blacklist"
msgstr "オペレーション センター コマンド ブラックリスト"
-#: settings/serializers/feature.py:81
+#: settings/serializers/feature.py:121
msgid "Commands that are not allowed execute."
msgstr "実行が許可されていないコマンド"
+#: settings/serializers/feature.py:126
+#: terminal/models/virtualapp/provider.py:17
+#: terminal/models/virtualapp/virtualapp.py:36
+#: terminal/models/virtualapp/virtualapp.py:97
+#: terminal/serializers/virtualapp.py:32
+msgid "Virtual app"
+msgstr "仮想アプリケーション"
+
+#: settings/serializers/feature.py:129
+msgid "Enable virtual app"
+msgstr "仮想アプリケーションの有効化"
+
#: settings/serializers/msg.py:24
msgid "SMTP host"
msgstr "SMTPホスト"
@@ -5822,7 +5994,7 @@ msgstr "複数のユーザーを使用して、分割"
msgid "[%s] %s"
msgstr "[%s] %s"
-#: settings/serializers/terminal.py:9
+#: settings/serializers/terminal.py:9 terminal/models/virtualapp/provider.py:11
msgid "Hostname"
msgstr "ホスト名"
@@ -5886,100 +6058,104 @@ msgstr "LDAP ユーザーを定期的にインポートする"
msgid "Registration periodic import ldap user task"
msgstr "登録サイクルLDAPユーザータスクのインポート"
-#: settings/utils/ldap.py:494
+#: settings/utils/ldap.py:492
msgid "ldap:// or ldaps:// protocol is used."
msgstr "ldap:// または ldaps:// プロトコルが使用されます。"
-#: settings/utils/ldap.py:505
+#: settings/utils/ldap.py:503
msgid "Host or port is disconnected: {}"
msgstr "ホストまたはポートが切断されました: {}"
-#: settings/utils/ldap.py:507
+#: settings/utils/ldap.py:505
msgid "The port is not the port of the LDAP service: {}"
msgstr "ポートはLDAPサービスのポートではありません: {}"
-#: settings/utils/ldap.py:509
+#: settings/utils/ldap.py:507
msgid "Please add certificate: {}"
msgstr "証明書を追加してください: {}"
-#: settings/utils/ldap.py:513 settings/utils/ldap.py:540
-#: settings/utils/ldap.py:570 settings/utils/ldap.py:598
+#: settings/utils/ldap.py:511 settings/utils/ldap.py:538
+#: settings/utils/ldap.py:568 settings/utils/ldap.py:596
msgid "Unknown error: {}"
msgstr "不明なエラー: {}"
-#: settings/utils/ldap.py:527
+#: settings/utils/ldap.py:525
msgid "Bind DN or Password incorrect"
msgstr "DNまたはパスワードのバインドが正しくありません"
-#: settings/utils/ldap.py:534
+#: settings/utils/ldap.py:532
msgid "Please enter Bind DN: {}"
msgstr "バインドDN: {} を入力してください"
-#: settings/utils/ldap.py:536
+#: settings/utils/ldap.py:534
msgid "Please enter Password: {}"
msgstr "パスワードを入力してください: {}"
-#: settings/utils/ldap.py:538
+#: settings/utils/ldap.py:536
msgid "Please enter correct Bind DN and Password: {}"
msgstr "正しいバインドDNとパスワードを入力してください: {}"
-#: settings/utils/ldap.py:556
+#: settings/utils/ldap.py:554
msgid "Invalid User OU or User search filter: {}"
msgstr "無効なユーザー OU またはユーザー検索フィルター: {}"
-#: settings/utils/ldap.py:587
+#: settings/utils/ldap.py:585
msgid "LDAP User attr map not include: {}"
msgstr "LDAP ユーザーattrマップは含まれません: {}"
-#: settings/utils/ldap.py:594
+#: settings/utils/ldap.py:592
msgid "LDAP User attr map is not dict"
msgstr "LDAPユーザーattrマップはdictではありません"
-#: settings/utils/ldap.py:613
+#: settings/utils/ldap.py:611
msgid "LDAP authentication is not enabled"
msgstr "LDAP 認証が有効になっていない"
-#: settings/utils/ldap.py:631
+#: settings/utils/ldap.py:629
msgid "Error (Invalid LDAP server): {}"
msgstr "エラー (LDAPサーバーが無効): {}"
-#: settings/utils/ldap.py:633
+#: settings/utils/ldap.py:631
msgid "Error (Invalid Bind DN): {}"
msgstr "エラー (DNのバインドが無効): {}"
-#: settings/utils/ldap.py:635
+#: settings/utils/ldap.py:633
msgid "Error (Invalid LDAP User attr map): {}"
msgstr "エラー (LDAPユーザーattrマップが無効): {}"
-#: settings/utils/ldap.py:637
+#: settings/utils/ldap.py:635
msgid "Error (Invalid User OU or User search filter): {}"
msgstr "エラー (ユーザーOUまたはユーザー検索フィルターが無効): {}"
-#: settings/utils/ldap.py:639
+#: settings/utils/ldap.py:637
msgid "Error (Not enabled LDAP authentication): {}"
msgstr "エラー (LDAP認証が有効化されていません): {}"
-#: settings/utils/ldap.py:641
+#: settings/utils/ldap.py:639
msgid "Error (Unknown): {}"
msgstr "エラー (不明): {}"
-#: settings/utils/ldap.py:644
+#: settings/utils/ldap.py:642
msgid "Succeed: Match {} s user"
msgstr "成功: {} 人のユーザーに一致"
-#: settings/utils/ldap.py:677
+#: settings/utils/ldap.py:653
+msgid "Please test the connection first"
+msgstr "まず接続をテストしてください"
+
+#: settings/utils/ldap.py:675
msgid "Authentication failed (configuration incorrect): {}"
msgstr "認証に失敗しました (設定が正しくありません): {}"
-#: settings/utils/ldap.py:681
+#: settings/utils/ldap.py:679
msgid "Authentication failed (username or password incorrect): {}"
msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません): {}"
-#: settings/utils/ldap.py:683
+#: settings/utils/ldap.py:681
msgid "Authentication failed (Unknown): {}"
msgstr "認証に失敗しました (不明): {}"
-#: settings/utils/ldap.py:686
+#: settings/utils/ldap.py:684
msgid "Authentication success: {}"
msgstr "認証成功: {}"
@@ -6043,10 +6219,6 @@ msgstr "ページの管理"
msgid "User page"
msgstr "ユーザーページ"
-#: templates/_header_bar.html:90
-msgid "API Key"
-msgstr "API Key"
-
#: templates/_header_bar.html:91
msgid "Logout"
msgstr "ログアウト"
@@ -6144,7 +6316,7 @@ msgid "Home page"
msgstr "ホームページ"
#: templates/resource_download.html:18 templates/resource_download.html:33
-#: users/const.py:53
+#: users/const.py:60
msgid "Client"
msgstr "クライアント"
@@ -6189,11 +6361,13 @@ msgstr ""
msgid "Offline video player"
msgstr "オフラインビデオプレーヤー"
-#: terminal/api/applet/applet.py:48 terminal/api/applet/applet.py:51
+#: terminal/api/applet/applet.py:50 terminal/api/applet/applet.py:53
+#: terminal/api/virtualapp/virtualapp.py:43
+#: terminal/api/virtualapp/virtualapp.py:46
msgid "Invalid zip file"
msgstr "zip ファイルが無効です"
-#: terminal/api/applet/applet.py:65
+#: terminal/api/applet/applet.py:72
msgid "This is enterprise edition applet"
msgstr "これはエンタープライズ版アプレットです"
@@ -6315,7 +6489,7 @@ msgstr "クリティカル"
msgid "High"
msgstr "高い"
-#: terminal/const.py:47 terminal/const.py:83
+#: terminal/const.py:47 terminal/const.py:84
#: users/templates/users/reset_password.html:50
msgid "Normal"
msgstr "正常"
@@ -6324,46 +6498,50 @@ msgstr "正常"
msgid "Offline"
msgstr "オフライン"
-#: terminal/const.py:79
+#: terminal/const.py:80
msgid "Mismatch"
msgstr "一致しない"
-#: terminal/const.py:84
+#: terminal/const.py:85
msgid "Tunnel"
msgstr "ちかチャネル"
-#: terminal/const.py:90
+#: terminal/const.py:91
msgid "Read only"
msgstr "読み取り専用"
-#: terminal/const.py:91
+#: terminal/const.py:92
msgid "Writable"
msgstr "書き込み可能"
-#: terminal/const.py:95
+#: terminal/const.py:96
msgid "Kill session"
msgstr "セッションを終了する"
-#: terminal/const.py:96
+#: terminal/const.py:97
msgid "Lock session"
msgstr "セッションをロックする"
-#: terminal/const.py:97
+#: terminal/const.py:98
msgid "Unlock session"
msgstr "セッションのロックを解除する"
-#: terminal/const.py:102
+#: terminal/const.py:103
msgid "Replay create failed"
msgstr "ビデオの作成に失敗しました"
-#: terminal/const.py:103
+#: terminal/const.py:104
msgid "Replay upload failed"
msgstr "動画のアップロードに失敗しました"
-#: terminal/const.py:104
+#: terminal/const.py:105
msgid "Replay convert failed"
msgstr "ビデオのトランスコーディングに失敗しました"
+#: terminal/const.py:106
+msgid "Replay unsupported"
+msgstr "録画はサポートされていません"
+
#: terminal/exceptions.py:8
msgid "Bulk create not support"
msgstr "一括作成非サポート"
@@ -6381,6 +6559,7 @@ msgid "Enterprise"
msgstr "エンタープライズ版"
#: terminal/models/applet/applet.py:36
+#: terminal/models/virtualapp/virtualapp.py:22
msgid "Author"
msgstr "著者"
@@ -6393,6 +6572,7 @@ msgid "Can concurrent"
msgstr "同時実行可能"
#: terminal/models/applet/applet.py:44
+#: terminal/models/virtualapp/virtualapp.py:29
msgid "Tags"
msgstr "ラベル"
@@ -6401,6 +6581,7 @@ msgid "Hosts"
msgstr "ホスト"
#: terminal/models/applet/applet.py:93
+#: terminal/models/virtualapp/virtualapp.py:66
msgid "Applet pkg not valid, Missing file {}"
msgstr "無効なアプレット パッケージ、ファイル {} がありません"
@@ -6416,12 +6597,12 @@ msgstr "カスタムプラットフォームのみをサポート"
msgid "Missing type in platform.yml"
msgstr "platform.ymlにタイプがありません"
-#: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:36
+#: terminal/models/applet/applet.py:318 terminal/models/applet/host.py:36
#: terminal/models/applet/host.py:138
msgid "Hosting"
msgstr "ホスト マシン"
-#: terminal/models/applet/host.py:18 terminal/serializers/applet_host.py:57
+#: terminal/models/applet/host.py:18 terminal/serializers/applet_host.py:69
msgid "Deploy options"
msgstr "展開パラメーター"
@@ -6447,7 +6628,7 @@ msgstr "同期日"
#: terminal/models/applet/host.py:28
msgid "Using same account"
-msgstr "同じ名前のアカウントを使用"
+msgstr "同じアカウントを使用する"
#: terminal/models/applet/host.py:139
msgid "Initial"
@@ -6485,15 +6666,19 @@ msgstr "PostgreSQL ポート"
msgid "Redis port"
msgstr "Redis ポート"
-#: terminal/models/component/endpoint.py:29
-#: terminal/models/component/endpoint.py:102
+#: terminal/models/component/endpoint.py:23
+msgid "SQLServer port"
+msgstr "SQLServer ポート"
+
+#: terminal/models/component/endpoint.py:30
+#: terminal/models/component/endpoint.py:103
#: terminal/serializers/endpoint.py:73 terminal/serializers/storage.py:41
#: terminal/serializers/storage.py:53 terminal/serializers/storage.py:83
#: terminal/serializers/storage.py:93 terminal/serializers/storage.py:101
msgid "Endpoint"
msgstr "エンドポイント"
-#: terminal/models/component/endpoint.py:108
+#: terminal/models/component/endpoint.py:109
msgid "Endpoint rule"
msgstr "エンドポイントルール"
@@ -6551,7 +6736,7 @@ msgstr "リモートアドレス"
msgid "Application User"
msgstr "ユーザーの適用"
-#: terminal/models/component/terminal.py:166
+#: terminal/models/component/terminal.py:176
msgid "Can view terminal config"
msgstr "ターミナル構成を表示できます"
@@ -6673,6 +6858,19 @@ msgstr "検証コードが無効"
msgid "You have already joined this session"
msgstr "すでにこのセッションに参加しています"
+#: terminal/models/virtualapp/virtualapp.py:32
+msgid "Providers"
+msgstr "プロバイダ"
+
+#: terminal/models/virtualapp/virtualapp.py:94
+#: terminal/serializers/virtualapp.py:34
+msgid "App Provider"
+msgstr "アプリケーションプロバイダ"
+
+#: terminal/models/virtualapp/virtualapp.py:102
+msgid "Virtual app publication"
+msgstr "仮想アプリケーションの公開"
+
#: terminal/notifications.py:25
msgid "Sessions"
msgstr "セッション"
@@ -6710,7 +6908,7 @@ msgstr "テスト失敗: アカウントが無効"
msgid "Invalid storage"
msgstr "無効なストレージ"
-#: terminal/serializers/applet.py:28
+#: terminal/serializers/applet.py:28 terminal/serializers/virtualapp.py:15
msgid "Icon"
msgstr "アイコン"
@@ -6765,19 +6963,36 @@ msgstr "RDS 認可モード"
msgid "RDS Single Session Per User"
msgstr "RDS シングル ユーザー シングル セッション"
-#: terminal/serializers/applet_host.py:52
-msgid "RDS Max Disconnection Time"
-msgstr "最大切断時間"
-
#: terminal/serializers/applet_host.py:53
-msgid "RDS Remote App Logoff Time Limit"
-msgstr "RDS 远程应用注销时间限制"
+msgid "RDS Max Disconnection Time (ms)"
+msgstr "最大切断時間（ミリ秒）"
-#: terminal/serializers/applet_host.py:59 terminal/serializers/terminal.py:47
+#: terminal/serializers/applet_host.py:55
+msgid ""
+"Tips: Set the maximum duration for keeping a disconnected session active on "
+"the server (log off the session after 60000 milliseconds)."
+msgstr ""
+"ヒント：サーバー上で切断されたセッションがアクティブな状態で維持される最大時"
+"間を設定します（60000ミリ秒後にセッションをログオフ）。"
+
+#: terminal/serializers/applet_host.py:60
+msgid "RDS Remote App Logoff Time Limit (ms)"
+msgstr "RDSリモートアプリケーションのログアウト時間制限（ミリ秒）"
+
+#: terminal/serializers/applet_host.py:62
+msgid ""
+"Tips: Set the logoff time for RemoteApp sessions after closing all RemoteApp "
+"programs (0 milliseconds, log off the session immediately)."
+msgstr ""
+"ヒント：すべてのRemoteAppプログラムを閉じた後、RemoteAppセッションのログオフ"
+"時間を設定します（0ミリ秒、セッションを即座にログオフ）。"
+
+#: terminal/serializers/applet_host.py:71 terminal/serializers/terminal.py:47
+#: terminal/serializers/virtualapp_provider.py:13
msgid "Load status"
msgstr "ロードステータス"
-#: terminal/serializers/applet_host.py:73
+#: terminal/serializers/applet_host.py:85
msgid ""
"These accounts are used to connect to the published application, the account "
"is now divided into two types, one is dedicated to each account, each user "
@@ -6791,11 +7006,11 @@ msgstr ""
"開されています。アプリケーションが複数のオープンをサポートしていない場合、お"
"よび特別なものが使用されている場合、公開アカウントが使用されます。"
-#: terminal/serializers/applet_host.py:80
+#: terminal/serializers/applet_host.py:92
msgid "The number of public accounts created automatically"
msgstr "自動的に作成される公開アカウントの数"
-#: terminal/serializers/applet_host.py:83
+#: terminal/serializers/applet_host.py:95
msgid ""
"Connect to the host using the same account first. For security reasons, "
"please set the configuration item CACHE_LOGIN_PASSWORD_ENABLED=true and "
@@ -6926,7 +7141,7 @@ msgstr "アクセスキー"
msgid "Access key secret"
msgstr "アクセスキーシークレット"
-#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:250
+#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:253
msgid "Region"
msgstr "リージョン"
@@ -6946,8 +7161,8 @@ msgstr "エンドポイントサフィックス"
msgid "HOST"
msgstr "ホスト"
-#: terminal/serializers/storage.py:146 users/models/user.py:823
-#: xpack/plugins/cloud/serializers/account_attrs.py:206
+#: terminal/serializers/storage.py:146 users/models/user.py:830
+#: xpack/plugins/cloud/serializers/account_attrs.py:213
msgid "Private key"
msgstr "ssh秘密鍵"
@@ -6991,6 +7206,26 @@ msgstr "セッション"
msgid "Not found"
msgstr "見つかりません"
+#: terminal/serializers/virtualapp_provider.py:26
+msgid "Container ID"
+msgstr "コンテナID"
+
+#: terminal/serializers/virtualapp_provider.py:27
+msgid "Container Image"
+msgstr "コンテナミラーリング"
+
+#: terminal/serializers/virtualapp_provider.py:28
+msgid "Container Name"
+msgstr "コンテナー名"
+
+#: terminal/serializers/virtualapp_provider.py:29
+msgid "Container Status"
+msgstr "コンテナステータス"
+
+#: terminal/serializers/virtualapp_provider.py:30
+msgid "Container Ports"
+msgstr "コンテナポート"
+
#: terminal/tasks.py:33
msgid "Periodic delete terminal status"
msgstr "端末の状態を定期的にクリーンアップする"
@@ -7272,19 +7507,19 @@ msgstr "チケット基本情報"
msgid "Ticket applied info"
msgstr "チケット適用情報"
-#: tickets/notifications.py:109
+#: tickets/notifications.py:111
msgid "Your has a new ticket, applicant - {}"
msgstr "新しいチケットがあります- {}"
-#: tickets/notifications.py:113
+#: tickets/notifications.py:115
msgid "{}: New Ticket - {} ({})"
msgstr "新しいチケット- {} ({})"
-#: tickets/notifications.py:157
+#: tickets/notifications.py:159
msgid "Your ticket has been processed, processor - {}"
msgstr "チケットが処理されました。プロセッサー- {}"
-#: tickets/notifications.py:161
+#: tickets/notifications.py:163
msgid "Ticket has processed - {} ({})"
msgstr "チケットが処理済み- {} ({})"
@@ -7337,11 +7572,11 @@ msgstr "'{}'という名前の権限は既に存在します"
msgid "The ticket flow `{}` does not exist"
msgstr "チケットフロー '{}'が存在しない"
-#: tickets/templates/tickets/_msg_ticket.html:20
+#: tickets/templates/tickets/_msg_ticket.html:21
msgid "View details"
msgstr "詳細の表示"
-#: tickets/templates/tickets/_msg_ticket.html:25
+#: tickets/templates/tickets/_msg_ticket.html:26
msgid "Direct approval"
msgstr "直接承認"
@@ -7349,12 +7584,12 @@ msgstr "直接承認"
msgid "Ticket information"
msgstr "作業指示情報"
-#: tickets/templates/tickets/approve_check_password.html:29
+#: tickets/templates/tickets/approve_check_password.html:28
#: tickets/views/approve.py:40 tickets/views/approve.py:77
msgid "Ticket approval"
msgstr "作業指示の承認"
-#: tickets/templates/tickets/approve_check_password.html:44
+#: tickets/templates/tickets/approve_check_password.html:43
msgid "Approval"
msgstr "承認"
@@ -7381,11 +7616,11 @@ msgstr "無効な承認アクション"
msgid "This user is not authorized to approve this ticket"
msgstr "このユーザーはこの作業指示を承認する権限がありません"
-#: users/api/user.py:141
+#: users/api/user.py:137
msgid "Can not invite self"
msgstr "自分自身を招待することはできません"
-#: users/api/user.py:194
+#: users/api/user.py:190
msgid "Could not reset self otp, use profile reset instead"
msgstr "自己otpをリセットできませんでした、代わりにプロファイルリセットを使用"
@@ -7429,11 +7664,11 @@ msgstr "マルチスクリーンディスプレイ"
msgid "Drives redirect"
msgstr "ディスクマウント"
-#: users/const.py:57
+#: users/const.py:64
msgid "Replace"
msgstr "置換"
-#: users/const.py:58
+#: users/const.py:65
msgid "Suffix"
msgstr "接尾辞を付ける"
@@ -7520,8 +7755,8 @@ msgstr "公開鍵は古いものと同じであってはなりません。"
msgid "Not a valid ssh public key"
msgstr "有効なssh公開鍵ではありません"
-#: users/forms/profile.py:173 users/models/user.py:826
-#: xpack/plugins/cloud/serializers/account_attrs.py:203
+#: users/forms/profile.py:173 users/models/user.py:833
+#: xpack/plugins/cloud/serializers/account_attrs.py:210
msgid "Public key"
msgstr "公開キー"
@@ -7529,72 +7764,74 @@ msgstr "公開キー"
msgid "Preference"
msgstr "ユーザー設定"
-#: users/models/user.py:643 users/serializers/profile.py:94
+#: users/models/user.py:646 users/serializers/profile.py:94
msgid "Force enable"
msgstr "強制有効"
-#: users/models/user.py:805 users/serializers/user.py:169
+#: users/models/user.py:812 users/serializers/user.py:169
msgid "Is service account"
msgstr "サービスアカウントです"
-#: users/models/user.py:807
+#: users/models/user.py:814
msgid "Avatar"
msgstr "アバター"
-#: users/models/user.py:810
+#: users/models/user.py:817
msgid "Wechat"
msgstr "微信"
-#: users/models/user.py:813 users/serializers/user.py:106
+#: users/models/user.py:820 users/serializers/user.py:106
msgid "Phone"
msgstr "電話"
-#: users/models/user.py:819
+#: users/models/user.py:826
msgid "OTP secret key"
msgstr "OTP 秘密"
-#: users/models/user.py:831 users/serializers/profile.py:128
+# msgid "Private key"
+# msgstr "ssh秘密鍵"
+#: users/models/user.py:838 users/serializers/profile.py:128
#: users/serializers/user.py:166
msgid "Is first login"
msgstr "最初のログインです"
-#: users/models/user.py:841
+#: users/models/user.py:848
msgid "Date password last updated"
msgstr "最終更新日パスワード"
-#: users/models/user.py:844
+#: users/models/user.py:851
msgid "Need update password"
msgstr "更新パスワードが必要"
-#: users/models/user.py:846
+#: users/models/user.py:853
msgid "Date api key used"
msgstr "Api key 最後に使用した日付"
-#: users/models/user.py:969
+#: users/models/user.py:984
msgid "Can not delete admin user"
msgstr "管理者ユーザーを削除できませんでした"
-#: users/models/user.py:995
+#: users/models/user.py:1011
msgid "Can invite user"
msgstr "ユーザーを招待できます"
-#: users/models/user.py:996
+#: users/models/user.py:1012
msgid "Can remove user"
msgstr "ユーザーを削除できます"
-#: users/models/user.py:997
+#: users/models/user.py:1013
msgid "Can match user"
msgstr "ユーザーに一致できます"
-#: users/models/user.py:1006
+#: users/models/user.py:1022
msgid "Administrator"
msgstr "管理者"
-#: users/models/user.py:1009
+#: users/models/user.py:1025
msgid "Administrator is the super user of system"
msgstr "管理者はシステムのスーパーユーザーです"
-#: users/models/user.py:1034
+#: users/models/user.py:1050
msgid "User password history"
msgstr "ユーザーパスワード履歴"
@@ -7666,37 +7903,49 @@ msgid "RDP client option"
msgstr "RDPクライアントオプション"
#: users/serializers/preference/luna.py:45
+msgid "RDP color quality"
+msgstr ""
+
+#: users/serializers/preference/luna.py:49
msgid "Rdp smart size"
msgstr "RDPインテリジェントサイズ"
-#: users/serializers/preference/luna.py:46
+#: users/serializers/preference/luna.py:50
msgid ""
"Determines whether the client computer should scale the content on the "
"remote computer to fit the window size of the client computer when the "
"window is resized."
-msgstr "ウィンドウサイズを変更するときにクライアントコンピュータがクライアントコンピュータのウィンドウサイズに合わせるためにリモートコンピュータ上のコンテンツをスケーリングすべきかどうかを判断する"
+msgstr ""
-#: users/serializers/preference/luna.py:51
+# msgid ""
+# "Determines whether the client computer should scale the content on the "
+# "remote computer to fit the window size of the client computer when the "
+# "window is resized."
+# msgstr ""
+# "ウィンドウサイズを変更するときにクライアントコンピュータがクライアントコン"
+# "ピュータのウィンドウサイズに合わせるためにリモートコンピュータ上のコンテンツ"
+# "をスケーリングすべきかどうかを判断する"
+#: users/serializers/preference/luna.py:55
msgid "Remote application connection method"
msgstr "リモートアプリケーション接続方式"
-#: users/serializers/preference/luna.py:58
+#: users/serializers/preference/luna.py:62
msgid "Character terminal font size"
msgstr "文字終端フォントサイズ"
-#: users/serializers/preference/luna.py:61
+#: users/serializers/preference/luna.py:65
msgid "Backspace as Ctrl+H"
msgstr "文字終端Backspace As Ctrl+H"
-#: users/serializers/preference/luna.py:64
+#: users/serializers/preference/luna.py:68
msgid "Right click quickly paste"
msgstr "右クリックでクイック貼り付け"
-#: users/serializers/preference/luna.py:70
+#: users/serializers/preference/luna.py:74
msgid "Graphics"
msgstr "図形化"
-#: users/serializers/preference/luna.py:71
+#: users/serializers/preference/luna.py:75
msgid "Command line"
msgstr "コマンドライン"
@@ -7756,15 +8005,15 @@ msgstr "アバターURL"
msgid "MFA level"
msgstr "MFA レベル"
-#: users/serializers/user.py:282
+#: users/serializers/user.py:287
msgid "Select users"
msgstr "ユーザーの選択"
-#: users/serializers/user.py:283
+#: users/serializers/user.py:288
msgid "For security, only list several users"
msgstr "セキュリティのために、複数のユーザーのみをリストします"
-#: users/serializers/user.py:316
+#: users/serializers/user.py:321
msgid "name not unique"
msgstr "名前が一意ではない"
@@ -7795,9 +8044,9 @@ msgstr "ユーザーの有効期限の定期的な検出"
#: users/tasks.py:84
msgid "Check unused users"
-msgstr "未使用のユーザーを確認する"
+msgstr "未使用のユーザーのチェック"
-#: users/tasks.py:114
+#: users/tasks.py:123
msgid "The user has not logged in recently and has been disabled."
msgstr "ユーザーは最近ログインしておらず、無効になっています。"
@@ -8063,6 +8312,11 @@ msgstr "パスワードの成功をリセットし、ログインページに戻
msgid "XPACK"
msgstr "XPack"
+#: xpack/exceptions.py:7
+msgid ""
+"The current task is not synchronized with unmatched policy assets, skipping"
+msgstr ""
+
#: xpack/plugins/cloud/api.py:56
msgid "Test connection successful"
msgstr "テスト接続成功"
@@ -8143,47 +8397,67 @@ msgstr "スカイウィング私有雲"
msgid "OpenStack"
msgstr "OpenStack"
-#: xpack/plugins/cloud/const.py:28
+#: xpack/plugins/cloud/const.py:28 xpack/plugins/cloud/providers/zstack.py:21
+msgid "ZStack"
+msgstr "ZStack"
+
+#: xpack/plugins/cloud/const.py:29
msgid "Fusion Compute"
msgstr "融合計算"
-#: xpack/plugins/cloud/const.py:33
+#: xpack/plugins/cloud/const.py:30
+msgid "SCP"
+msgstr "SCP"
+
+#: xpack/plugins/cloud/const.py:31
+msgid "Apsara Stack"
+msgstr "Apsara Stack"
+
+#: xpack/plugins/cloud/const.py:36
msgid "Private IP"
msgstr "プライベートIP"
-#: xpack/plugins/cloud/const.py:34
+#: xpack/plugins/cloud/const.py:37
msgid "Public IP"
msgstr "パブリックIP"
-#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295
+#: xpack/plugins/cloud/const.py:41 xpack/plugins/cloud/models.py:303
msgid "Instance name"
msgstr "インスタンス名"
-#: xpack/plugins/cloud/const.py:39
+#: xpack/plugins/cloud/const.py:42
msgid "Instance name and Partial IP"
msgstr "インスタンス名と部分IP"
-#: xpack/plugins/cloud/const.py:44
+#: xpack/plugins/cloud/const.py:47
msgid "Succeed"
msgstr "成功"
-#: xpack/plugins/cloud/const.py:48
+#: xpack/plugins/cloud/const.py:51
msgid "Unsync"
msgstr "同期していません"
-#: xpack/plugins/cloud/const.py:49
+#: xpack/plugins/cloud/const.py:52
msgid "New Sync"
msgstr "新しい同期"
-#: xpack/plugins/cloud/const.py:50
+#: xpack/plugins/cloud/const.py:53
msgid "Synced"
msgstr "同期済み"
-#: xpack/plugins/cloud/const.py:51
+#: xpack/plugins/cloud/const.py:54
msgid "Released"
msgstr "リリース済み"
-#: xpack/plugins/cloud/manager.py:54
+#: xpack/plugins/cloud/const.py:58
+msgid "And"
+msgstr "そして"
+
+#: xpack/plugins/cloud/const.py:59
+msgid "Or"
+msgstr "または"
+
+#: xpack/plugins/cloud/manager.py:56
msgid "Account unavailable"
msgstr "利用できないアカウント"
@@ -8207,7 +8481,7 @@ msgstr "クラウドアカウント"
msgid "Test cloud account"
msgstr "クラウドアカウントのテスト"
-#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151
+#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:159
msgid "Regions"
msgstr "リージョン"
@@ -8216,122 +8490,134 @@ msgid "Hostname strategy"
msgstr "ホスト名戦略"
#: xpack/plugins/cloud/models.py:100
-#: xpack/plugins/cloud/serializers/task.py:154
+#: xpack/plugins/cloud/serializers/task.py:162
msgid "IP network segment group"
msgstr "IPネットワークセグメントグループ"
#: xpack/plugins/cloud/models.py:103
-#: xpack/plugins/cloud/serializers/task.py:159
+#: xpack/plugins/cloud/serializers/task.py:167
msgid "Sync IP type"
msgstr "同期IPタイプ"
#: xpack/plugins/cloud/models.py:106
-#: xpack/plugins/cloud/serializers/task.py:177
+#: xpack/plugins/cloud/serializers/task.py:185
msgid "Always update"
msgstr "常に更新"
-#: xpack/plugins/cloud/models.py:112
+#: xpack/plugins/cloud/models.py:108
+msgid "Fully synchronous"
+msgstr "完全同期"
+
+#: xpack/plugins/cloud/models.py:113
msgid "Date last sync"
msgstr "最終同期日"
-#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313
-#: xpack/plugins/cloud/models.py:337
+#: xpack/plugins/cloud/models.py:116 xpack/plugins/cloud/models.py:321
+#: xpack/plugins/cloud/models.py:345
msgid "Strategy"
msgstr "戦略"
-#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197
+#: xpack/plugins/cloud/models.py:121 xpack/plugins/cloud/models.py:200
msgid "Sync instance task"
msgstr "インスタンスの同期タスク"
-#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260
+#: xpack/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:263
msgid "Date sync"
msgstr "日付の同期"
-#: xpack/plugins/cloud/models.py:212
+#: xpack/plugins/cloud/models.py:215
msgid "Sync instance snapshot"
msgstr "インスタンススナップショットの同期"
-#: xpack/plugins/cloud/models.py:216
+#: xpack/plugins/cloud/models.py:219
msgid "Sync instance task execution"
msgstr "インスタンスタスクの同期実行"
-#: xpack/plugins/cloud/models.py:240
+#: xpack/plugins/cloud/models.py:243
msgid "Sync task"
msgstr "同期タスク"
-#: xpack/plugins/cloud/models.py:244
+#: xpack/plugins/cloud/models.py:247
msgid "Sync instance task history"
msgstr "インスタンスタスク履歴の同期"
-#: xpack/plugins/cloud/models.py:247
+#: xpack/plugins/cloud/models.py:250
msgid "Instance"
msgstr "インスタンス"
-#: xpack/plugins/cloud/models.py:264
+#: xpack/plugins/cloud/models.py:267
msgid "Sync instance detail"
msgstr "同期インスタンスの詳細"
-#: xpack/plugins/cloud/models.py:281
+#: xpack/plugins/cloud/models.py:279 xpack/plugins/cloud/serializers/task.py:72
+msgid "Rule relation"
+msgstr "条件関係"
+
+#: xpack/plugins/cloud/models.py:288
msgid "Task strategy"
msgstr "ミッション戦略です"
-#: xpack/plugins/cloud/models.py:285
+#: xpack/plugins/cloud/models.py:292
msgid "Equal"
msgstr "等しい"
-#: xpack/plugins/cloud/models.py:286
+#: xpack/plugins/cloud/models.py:293
msgid "Not Equal"
msgstr "不等于"
-#: xpack/plugins/cloud/models.py:287
+#: xpack/plugins/cloud/models.py:294
msgid "In"
msgstr "で..."
-#: xpack/plugins/cloud/models.py:288
+#: xpack/plugins/cloud/models.py:295
msgid "Contains"
msgstr "含む"
-#: xpack/plugins/cloud/models.py:289
+#: xpack/plugins/cloud/models.py:296
+msgid "Exclude"
+msgstr "除外"
+
+#: xpack/plugins/cloud/models.py:297
msgid "Startswith"
msgstr "始まる..."
-#: xpack/plugins/cloud/models.py:290
+#: xpack/plugins/cloud/models.py:298
msgid "Endswith"
msgstr "終わる..."
-#: xpack/plugins/cloud/models.py:296
+#: xpack/plugins/cloud/models.py:304
msgid "Instance platform"
msgstr "インスタンス名"
-#: xpack/plugins/cloud/models.py:297
+#: xpack/plugins/cloud/models.py:305
msgid "Instance address"
msgstr "インスタンスアドレス"
-#: xpack/plugins/cloud/models.py:304
+#: xpack/plugins/cloud/models.py:312
msgid "Rule attr"
msgstr "ルール属性"
-#: xpack/plugins/cloud/models.py:308
+#: xpack/plugins/cloud/models.py:316
msgid "Rule match"
msgstr "ルール一致"
-#: xpack/plugins/cloud/models.py:310
+#: xpack/plugins/cloud/models.py:318
msgid "Rule value"
msgstr "ルール値"
-#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70
+#: xpack/plugins/cloud/models.py:325 xpack/plugins/cloud/serializers/task.py:75
msgid "Strategy rule"
msgstr "戦略ルール"
-#: xpack/plugins/cloud/models.py:332
+#: xpack/plugins/cloud/models.py:340
msgid "Action attr"
msgstr "アクション属性"
-#: xpack/plugins/cloud/models.py:334
+#: xpack/plugins/cloud/models.py:342
msgid "Action value"
msgstr "アクション値"
-#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73
+#: xpack/plugins/cloud/models.py:349 xpack/plugins/cloud/serializers/task.py:78
msgid "Strategy action"
msgstr "戦略アクション"
@@ -8525,11 +8811,11 @@ msgstr "TR-Istanbul"
msgid "CN East-Suqian"
msgstr "華東-宿遷"
-#: xpack/plugins/cloud/serializers/account.py:64
+#: xpack/plugins/cloud/serializers/account.py:68
msgid "Validity display"
msgstr "有効表示"
-#: xpack/plugins/cloud/serializers/account.py:65
+#: xpack/plugins/cloud/serializers/account.py:69
msgid "Provider display"
msgstr "プロバイダ表示"
@@ -8546,50 +8832,50 @@ msgid "Subscription ID"
msgstr "サブスクリプションID"
#: xpack/plugins/cloud/serializers/account_attrs.py:98
-#: xpack/plugins/cloud/serializers/account_attrs.py:103
-#: xpack/plugins/cloud/serializers/account_attrs.py:119
-#: xpack/plugins/cloud/serializers/account_attrs.py:149
-#: xpack/plugins/cloud/serializers/account_attrs.py:199
+#: xpack/plugins/cloud/serializers/account_attrs.py:102
+#: xpack/plugins/cloud/serializers/account_attrs.py:126
+#: xpack/plugins/cloud/serializers/account_attrs.py:156
+#: xpack/plugins/cloud/serializers/account_attrs.py:206
msgid "API Endpoint"
msgstr "APIエンドポイント"
-#: xpack/plugins/cloud/serializers/account_attrs.py:109
+#: xpack/plugins/cloud/serializers/account_attrs.py:108
msgid "Auth url"
msgstr "認証アドレス"
-#: xpack/plugins/cloud/serializers/account_attrs.py:110
+#: xpack/plugins/cloud/serializers/account_attrs.py:109
msgid "eg: http://openstack.example.com:5000/v3"
msgstr "例えば: http://openstack.example.com:5000/v3"
-#: xpack/plugins/cloud/serializers/account_attrs.py:113
+#: xpack/plugins/cloud/serializers/account_attrs.py:112
msgid "User domain"
msgstr "ユーザードメイン"
-#: xpack/plugins/cloud/serializers/account_attrs.py:120
+#: xpack/plugins/cloud/serializers/account_attrs.py:127
msgid "Cert File"
msgstr "証明書ファイル"
-#: xpack/plugins/cloud/serializers/account_attrs.py:121
+#: xpack/plugins/cloud/serializers/account_attrs.py:128
msgid "Key File"
msgstr "キーファイル"
-#: xpack/plugins/cloud/serializers/account_attrs.py:137
+#: xpack/plugins/cloud/serializers/account_attrs.py:144
msgid "Service account key"
msgstr "サービスアカウントキー"
-#: xpack/plugins/cloud/serializers/account_attrs.py:138
+#: xpack/plugins/cloud/serializers/account_attrs.py:145
msgid "The file is in JSON format"
msgstr "ファイルはJSON形式です。"
-#: xpack/plugins/cloud/serializers/account_attrs.py:156
+#: xpack/plugins/cloud/serializers/account_attrs.py:163
msgid "IP address invalid `{}`, {}"
msgstr "IPアドレスが無効: '{}', {}"
-#: xpack/plugins/cloud/serializers/account_attrs.py:172
+#: xpack/plugins/cloud/serializers/account_attrs.py:179
msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255"
msgstr "例：192.168.1.0/24、10.0.0.0.0-10.0.0.255"
-#: xpack/plugins/cloud/serializers/account_attrs.py:175
+#: xpack/plugins/cloud/serializers/account_attrs.py:182
msgid ""
"The port is used to detect the validity of the IP address. When the "
"synchronization task is executed, only the valid IP address will be "
@@ -8599,27 +8885,27 @@ msgstr ""
"実行されると、有効な IP アドレスのみが同期されます。 '): + block_item = {'type': 'divider'} + else: + block_item = { + "type": "section", + "text": {"type": "mrkdwn", "text": block} + } + blocks.append(block_item) + return {'blocks': blocks} + + def send_text(self, user_ids, msg_body): + body = self.convert_to_markdown(msg_body) + logger.info(f'Slack send text: user_ids={user_ids} msg={body}') + for user_id in user_ids: + body['channel'] = user_id + try: + self._client.request('post', URL().SEND_MESSAGE, json=body) + except APIException as e: + # 只处理可预知的错误 + logger.exception(e) + + @staticmethod + def get_user_detail(user_id, **kwargs): + # get_user_id_by_code 已经返回个人信息，这里直接解析 + user_info = kwargs['other_info'] + username = user_info.get('name') or user_id + name = user_info.get('real_name', username) + email = user_info.get('profile', {}).get('email') + email = construct_user_email(username, email) + return { + 'username': username, 'name': name, 'email': email + } diff --git a/apps/common/sdk/sms/endpoint.py b/apps/common/sdk/sms/endpoint.py index 6f5433fa5..7618d6da9 100644 --- a/apps/common/sdk/sms/endpoint.py +++ b/apps/common/sdk/sms/endpoint.py @@ -1,12 +1,12 @@ -from collections import OrderedDict import importlib +from collections import OrderedDict -from django.utils.translation import gettext_lazy as _ -from django.db.models import TextChoices from django.conf import settings +from django.db.models import TextChoices +from django.utils.translation import gettext_lazy as _ -from common.utils import get_logger from common.exceptions import JMSException +from common.utils import get_logger from .base import BaseSMSClient logger = get_logger(__name__) @@ -18,7 +18,7 @@ class BACKENDS(TextChoices): HUAWEI = 'huawei', _('Huawei Cloud') CMPP2 = 'cmpp2', _('CMPP v2.0') CUSTOM = 'custom', _('Custom type') - CUSTOM_FILE = 'custom_file', f"{_('Custom type')}({_('File')})" + CUSTOM_FILE = 'custom_file', _('Custom type (File)') class SMS: diff --git a/apps/common/serializers/fields.py b/apps/common/serializers/fields.py index 5fe019c65..282394106 100644 --- a/apps/common/serializers/fields.py +++ b/apps/common/serializers/fields.py @@ -20,7 +20,8 @@ __all__ = [ "TreeChoicesField", "LabeledMultipleChoiceField", "PhoneField", - "JSONManyToManyField" + "JSONManyToManyField", + "LabelRelatedField", ] @@ -56,21 +57,18 @@ class EncryptedField(serializers.CharField): class LabeledChoiceField(ChoiceField): - def __init__(self, *args, **kwargs): - super(LabeledChoiceField, self).__init__(*args, **kwargs) - self.choice_mapper = { - key: value for key, value in self.choices.items() - } - def to_representation(self, key): if key is None: return key - label = self.choice_mapper.get(key, key) + label = self.choices.get(key, key) return {"value": key, "label": label} def to_internal_value(self, data): if isinstance(data, dict): data = data.get("value") + + if isinstance(data, str) and "(" in data and data.endswith(")"): + data = data.strip(")").split('(')[-1] return super(LabeledChoiceField, self).to_internal_value(data) @@ -99,6 +97,37 @@ class LabeledMultipleChoiceField(serializers.MultipleChoiceField): return data +class LabelRelatedField(serializers.RelatedField): + def __init__(self, **kwargs): + queryset = kwargs.pop("queryset", None) + if queryset is None: + from labels.models import LabeledResource + queryset = LabeledResource.objects.all() + + kwargs = {**kwargs} + read_only = kwargs.get("read_only", False) + if not read_only: + kwargs["queryset"] = queryset + super().__init__(**kwargs) + + def to_representation(self, value): + if value is None: + return value + return str(value.label) + + def to_internal_value(self, data): + from labels.models import LabeledResource, Label + if data is None: + return data + if isinstance(data, dict): + pk = data.get("id") or data.get("pk") + label = Label.objects.get(pk=pk) + else: + k, v = data.split(":", 1) + label, __ = Label.objects.get_or_create(name=k, value=v, defaults={'name': k, 'value': v}) + return LabeledResource(label=label) + + class ObjectRelatedField(serializers.RelatedField): default_error_messages = { "required": _("This field is required."), diff --git a/apps/common/serializers/mixin.py b/apps/common/serializers/mixin.py index d665d6346..d51849f07 100644 --- a/apps/common/serializers/mixin.py +++ b/apps/common/serializers/mixin.py @@ -7,6 +7,7 @@ else: from collections import Iterable from django.core.exceptions import ObjectDoesNotExist from django.db.models import NOT_PROVIDED +from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.fields import SkipField, empty @@ -14,14 +15,13 @@ from rest_framework.settings import api_settings from rest_framework.utils import html from common.db.fields import EncryptMixin -from common.serializers.fields import EncryptedField, LabeledChoiceField, ObjectRelatedField +from common.serializers.fields import EncryptedField, LabeledChoiceField, ObjectRelatedField, LabelRelatedField __all__ = [ 'BulkSerializerMixin', 'BulkListSerializerMixin', 'CommonSerializerMixin', 'CommonBulkSerializerMixin', 'SecretReadableMixin', 'CommonModelSerializer', - 'CommonBulkModelSerializer', - + 'CommonBulkModelSerializer', 'ResourceLabelsMixin', ] @@ -391,3 +391,25 @@ class CommonBulkSerializerMixin(BulkSerializerMixin, CommonSerializerMixin): class CommonBulkModelSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer): pass + + +class ResourceLabelsMixin(serializers.Serializer): + labels = LabelRelatedField(many=True, label=_('Labels'), required=False, allow_null=True) + + def update(self, instance, validated_data): + labels = validated_data.pop('labels', None) + res = super().update(instance, validated_data) + if labels is not None: + instance.labels.set(labels, bulk=False) + return res + + def create(self, validated_data): + labels = validated_data.pop('labels', None) + instance = super().create(validated_data) + if labels is not None: + instance.labels.set(labels, bulk=False) + return instance + + @classmethod + def setup_eager_loading(cls, queryset): + return queryset.prefetch_related('labels') diff --git a/apps/common/signal_handlers.py b/apps/common/signal_handlers.py index df2019b60..588a63632 100644 --- a/apps/common/signal_handlers.py +++ b/apps/common/signal_handlers.py @@ -66,6 +66,10 @@ def digest_sql_query(): for table_name, queries in table_queries.items(): if table_name.startswith('rbac_') or table_name.startswith('auth_permission'): continue + + for query in queries: + sql = query['sql'] + print(" # {}: {}".format(query['time'], sql)) if len(queries) < 3: continue print("- Table: {}".format(table_name)) diff --git a/apps/common/utils/common.py b/apps/common/utils/common.py index add6b79b3..798b4a94c 100644 --- a/apps/common/utils/common.py +++ b/apps/common/utils/common.py @@ -155,10 +155,6 @@ def is_uuid(seq): def get_request_ip(request): - x_real_ip = request.META.get('HTTP_X_REAL_IP', '') - if x_real_ip: - return x_real_ip - x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',') if x_forwarded_for and x_forwarded_for[0]: login_ip = x_forwarded_for[0] diff --git a/apps/common/utils/django.py b/apps/common/utils/django.py index ad8a218d8..fc692bc15 100644 --- a/apps/common/utils/django.py +++ b/apps/common/utils/django.py @@ -7,6 +7,7 @@ from django.db import models from django.db.models.signals import post_save, pre_save from django.shortcuts import reverse as dj_reverse from django.utils import timezone +from django.utils.http import url_has_allowed_host_and_scheme UUID_PATTERN = re.compile(r'[0-9a-zA-Z\-]{36}') @@ -94,3 +95,12 @@ def get_request_os(request): return 'linux' else: return 'unknown' + + +def safe_next_url(next_url, request=None): + safe_hosts = [*settings.ALLOWED_HOSTS] + if request: + safe_hosts.append(request.get_host()) + if not next_url or not url_has_allowed_host_and_scheme(next_url, safe_hosts): + next_url = '/' + return next_url diff --git a/apps/common/utils/random.py b/apps/common/utils/random.py index 505fbd041..7978267b9 100644 --- a/apps/common/utils/random.py +++ b/apps/common/utils/random.py @@ -32,7 +32,16 @@ def random_replace_char(s, chars, length): return ''.join(seq) -def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation): +def remove_exclude_char(s, exclude_chars): + for i in exclude_chars: + s = s.replace(i, '') + return s + + +def random_string( + length: int, lower=True, upper=True, digit=True, + special_char=False, exclude_chars='', symbols=string_punctuation +): if not any([lower, upper, digit]): raise ValueError('At least one of `lower`, `upper`, `digit` must be `True`') if length < 4: @@ -44,11 +53,13 @@ def random_string(length: int, lower=True, upper=True, digit=True, special_char= (digit, string.digits), ) chars = ''.join([i[1] for i in chars_map if i[0]]) + chars = remove_exclude_char(chars, exclude_chars) texts = list(secrets.choice(chars) for __ in range(length)) texts = ''.join(texts) # 控制一下特殊字符的数量, 别随机出来太多 if special_char: + symbols = remove_exclude_char(symbols, exclude_chars) symbol_num = length // 16 + 1 texts = random_replace_char(texts, symbols, symbol_num) return texts diff --git a/apps/common/utils/yml.py b/apps/common/utils/yml.py index 6db03ea63..4250f016e 100644 --- a/apps/common/utils/yml.py +++ b/apps/common/utils/yml.py @@ -5,20 +5,21 @@ from django.conf import settings from jinja2 import Environment -def translate(key, i18n): - lang = settings.LANGUAGE_CODE[:2] +def translate(key, i18n, lang): + lang = settings.LANGUAGE_CODE if lang is None else lang + lang = lang[:2] lang_data = i18n.get(key, {}) return lang_data.get(lang, key) -def yaml_load_with_i18n(stream): +def yaml_load_with_i18n(stream, lang=None): ori_text = stream.read() stream = io.StringIO(ori_text) yaml_data = yaml.safe_load(stream) i18n = yaml_data.get('i18n', {}) env = Environment() - env.filters['trans'] = lambda key: translate(key, i18n) + env.filters['trans'] = lambda key: translate(key, i18n, lang) template = env.from_string(ori_text) yaml_data = template.render() yaml_f = io.StringIO(yaml_data) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index ea33d178a..80790eb2e 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -405,6 +405,12 @@ class Config(dict): 'FEISHU_APP_SECRET': '', 'FEISHU_VERSION': 'feishu', + # Slack + 'AUTH_SLACK': False, + 'SLACK_CLIENT_ID': '', + 'SLACK_CLIENT_SECRET': '', + 'SLACK_BOT_TOKEN': '', + 'LOGIN_REDIRECT_TO_BACKEND': '', # 'OPENID / CAS / SAML2 'LOGIN_REDIRECT_MSG_ENABLED': True, @@ -497,7 +503,7 @@ class Config(dict): 'SECURITY_LUNA_REMEMBER_AUTH': True, 'SECURITY_WATERMARK_ENABLED': True, 'SECURITY_MFA_VERIFY_TTL': 3600, - 'SECURITY_UNCOMMON_USERS_TTL': 90, + 'SECURITY_UNCOMMON_USERS_TTL': 999, 'VERIFY_CODE_TTL': 60, 'SECURITY_SESSION_SHARE': True, 'SECURITY_CHECK_DIFFERENT_CITY_LOGIN': True, @@ -578,12 +584,23 @@ class Config(dict): 'APPLET_DOWNLOAD_HOST': '', # FTP 文件上传下载备份阈值，单位(M)，当值小于等于0时，不备份 - 'FTP_FILE_MAX_STORE': 100, + 'FTP_FILE_MAX_STORE': 0, - # API 请求次数限制 - 'MAX_LIMIT_PER_PAGE': 100, + # API 分页 + 'MAX_LIMIT_PER_PAGE': 10000, + 'DEFAULT_PAGE_SIZE': None, 'LIMIT_SUPER_PRIV': False, + + # Chat AI + 'CHAT_AI_ENABLED': False, + 'GPT_API_KEY': '', + 'GPT_BASE_URL': '', + 'GPT_PROXY': '', + 'GPT_MODEL': 'gpt-3.5-turbo', + 'VIRTUAL_APP_ENABLED': False, + + 'FILE_UPLOAD_SIZE_LIMIT_MB': 200 } old_config_map = { diff --git a/apps/jumpserver/context_processor.py b/apps/jumpserver/context_processor.py index 7b92674bb..24a96b619 100644 --- a/apps/jumpserver/context_processor.py +++ b/apps/jumpserver/context_processor.py @@ -12,6 +12,8 @@ default_interface = dict(( ('login_title', _('JumpServer Open Source Bastion Host')), ('theme', 'classic_green'), ('theme_info', {}), + ('beian_link', ''), + ('beian_text', '') )) default_context = { diff --git a/apps/jumpserver/rewriting/db.py b/apps/jumpserver/rewriting/db.py index 1ccd49d8f..c14d6bf3d 100644 --- a/apps/jumpserver/rewriting/db.py +++ b/apps/jumpserver/rewriting/db.py @@ -26,7 +26,7 @@ class OneToOneField(models.OneToOneField, ForeignKey): def set_db_constraint(): if os.getenv('DB_CONSTRAINT', '1') != '0': return - if len(sys.argv) == 2 and sys.argv[1] == 'makemigrations': + if len(sys.argv) >= 2 and sys.argv[1] in ['makemigrations', 'check']: return print("Set foreignkey db constraint False") transaction.atomic = atomic diff --git a/apps/jumpserver/rewriting/pagination.py b/apps/jumpserver/rewriting/pagination.py index a924d854a..9a5fd263d 100644 --- a/apps/jumpserver/rewriting/pagination.py +++ b/apps/jumpserver/rewriting/pagination.py @@ -1,6 +1,20 @@ from django.conf import settings +from django.core.exceptions import FieldError from rest_framework.pagination import LimitOffsetPagination class MaxLimitOffsetPagination(LimitOffsetPagination): max_limit = settings.MAX_LIMIT_PER_PAGE + + def get_count(self, queryset): + try: + return queryset.values_list('id').order_by().count() + except (AttributeError, TypeError, FieldError): + return len(queryset) + + def paginate_queryset(self, queryset, request, view=None): + if view and hasattr(view, 'page_max_limit'): + self.max_limit = view.page_max_limit + if view and hasattr(view, 'page_default_limit'): + self.default_limit = view.page_default_limit + return super().paginate_queryset(queryset, request, view) diff --git a/apps/jumpserver/rewriting/storage/permissions.py b/apps/jumpserver/rewriting/storage/permissions.py index 7af0adece..511545865 100644 --- a/apps/jumpserver/rewriting/storage/permissions.py +++ b/apps/jumpserver/rewriting/storage/permissions.py @@ -5,6 +5,7 @@ path_perms_map = { 'settings': '*', 'replay': 'default', 'applets': 'terminal.view_applet', + 'virtual_apps': 'terminal.view_virtualapp', 'playbooks': 'ops.view_playbook' } diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py index 5b6a1cd35..94c45b135 100644 --- a/apps/jumpserver/settings/auth.py +++ b/apps/jumpserver/settings/auth.py @@ -140,6 +140,12 @@ FEISHU_APP_ID = CONFIG.FEISHU_APP_ID FEISHU_APP_SECRET = CONFIG.FEISHU_APP_SECRET FEISHU_VERSION = CONFIG.FEISHU_VERSION +# Slack auth +AUTH_SLACK = CONFIG.AUTH_SLACK +SLACK_CLIENT_ID = CONFIG.SLACK_CLIENT_ID +SLACK_CLIENT_SECRET = CONFIG.SLACK_CLIENT_SECRET +SLACK_BOT_TOKEN = CONFIG.SLACK_BOT_TOKEN + # Saml2 auth AUTH_SAML2 = CONFIG.AUTH_SAML2 AUTH_SAML2_PROVIDER_AUTHORIZATION_ENDPOINT = CONFIG.AUTH_SAML2_PROVIDER_AUTHORIZATION_ENDPOINT @@ -201,6 +207,7 @@ AUTH_BACKEND_SSO = 'authentication.backends.sso.SSOAuthentication' AUTH_BACKEND_WECOM = 'authentication.backends.sso.WeComAuthentication' AUTH_BACKEND_DINGTALK = 'authentication.backends.sso.DingTalkAuthentication' AUTH_BACKEND_FEISHU = 'authentication.backends.sso.FeiShuAuthentication' +AUTH_BACKEND_SLACK = 'authentication.backends.sso.SlackAuthentication' AUTH_BACKEND_AUTH_TOKEN = 'authentication.backends.sso.AuthorizationTokenAuthentication' AUTH_BACKEND_SAML2 = 'authentication.backends.saml2.SAML2Backend' AUTH_BACKEND_OAUTH2 = 'authentication.backends.oauth2.OAuth2Backend' @@ -216,7 +223,7 @@ AUTHENTICATION_BACKENDS = [ AUTH_BACKEND_CAS, AUTH_BACKEND_OIDC_PASSWORD, AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_SAML2, AUTH_BACKEND_OAUTH2, # 扫码模式 - AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU, + AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU, AUTH_BACKEND_SLACK, # Token模式 AUTH_BACKEND_AUTH_TOKEN, AUTH_BACKEND_SSO, AUTH_BACKEND_TEMP_TOKEN, AUTH_BACKEND_PASSKEY diff --git a/apps/jumpserver/settings/base.py b/apps/jumpserver/settings/base.py index 4da1dfc7e..e2bfbc5c1 100644 --- a/apps/jumpserver/settings/base.py +++ b/apps/jumpserver/settings/base.py @@ -109,6 +109,7 @@ for host_port in ALLOWED_DOMAINS: continue CSRF_TRUSTED_ORIGINS.append('{}://*.{}'.format(schema, origin)) +CORS_ALLOWED_ORIGINS = [o.replace('*.', '') for o in CSRF_TRUSTED_ORIGINS] CSRF_FAILURE_VIEW = 'jumpserver.views.other.csrf_failure' # print("CSRF_TRUSTED_ORIGINS: ") # for origin in CSRF_TRUSTED_ORIGINS: @@ -134,6 +135,7 @@ INSTALLED_APPS = [ 'acls.apps.AclsConfig', 'notifications.apps.NotificationsConfig', 'rbac.apps.RBACConfig', + 'labels.apps.LabelsConfig', 'rest_framework', 'rest_framework_swagger', 'drf_yasg', @@ -142,6 +144,7 @@ INSTALLED_APPS = [ 'django_filters', 'bootstrap3', 'captcha', + 'corsheaders', 'private_storage', 'django_celery_beat', 'django.contrib.auth', @@ -160,6 +163,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index dd75f56ec..fad5f0e9d 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -207,7 +207,19 @@ SESSION_RSA_PUBLIC_KEY_NAME = 'jms_public_key' OPERATE_LOG_ELASTICSEARCH_CONFIG = CONFIG.OPERATE_LOG_ELASTICSEARCH_CONFIG MAX_LIMIT_PER_PAGE = CONFIG.MAX_LIMIT_PER_PAGE +DEFAULT_PAGE_SIZE = CONFIG.DEFAULT_PAGE_SIZE # Magnus DB Port MAGNUS_ORACLE_PORTS = CONFIG.MAGNUS_ORACLE_PORTS LIMIT_SUPER_PRIV = CONFIG.LIMIT_SUPER_PRIV + +# Chat AI +CHAT_AI_ENABLED = CONFIG.CHAT_AI_ENABLED +GPT_API_KEY = CONFIG.GPT_API_KEY +GPT_BASE_URL = CONFIG.GPT_BASE_URL +GPT_PROXY = CONFIG.GPT_PROXY +GPT_MODEL = CONFIG.GPT_MODEL + +VIRTUAL_APP_ENABLED = CONFIG.VIRTUAL_APP_ENABLED + +FILE_UPLOAD_SIZE_LIMIT_MB = CONFIG.FILE_UPLOAD_SIZE_LIMIT_MB diff --git a/apps/jumpserver/settings/libs.py b/apps/jumpserver/settings/libs.py index 3679320c4..1f2c333ec 100644 --- a/apps/jumpserver/settings/libs.py +++ b/apps/jumpserver/settings/libs.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # import os -from urllib.parse import urlencode from .base import ( REDIS_SSL_CA, REDIS_SSL_CERT, REDIS_SSL_KEY, REDIS_SSL_REQUIRED, REDIS_USE_SSL, @@ -47,6 +46,7 @@ REST_FRAMEWORK = { 'DATETIME_FORMAT': '%Y/%m/%d %H:%M:%S %z', 'DATETIME_INPUT_FORMATS': ['%Y/%m/%d %H:%M:%S %z', 'iso-8601', '%Y-%m-%d %H:%M:%S %z'], 'DEFAULT_PAGINATION_CLASS': 'jumpserver.rewriting.pagination.MaxLimitOffsetPagination', + 'PAGE_SIZE': CONFIG.DEFAULT_PAGE_SIZE, 'EXCEPTION_HANDLER': 'common.drf.exc_handlers.common_exception_handler', } @@ -88,7 +88,6 @@ REDIS_LAYERS_HOST = { REDIS_LAYERS_SSL_PARAMS = {} if REDIS_USE_SSL: REDIS_LAYERS_SSL_PARAMS.update({ - 'ssl': REDIS_USE_SSL, 'ssl_cert_reqs': REDIS_SSL_REQUIRED, "ssl_keyfile": REDIS_SSL_KEY, "ssl_certfile": REDIS_SSL_CERT, @@ -115,9 +114,7 @@ else: protocol=REDIS_PROTOCOL, password=CONFIG.REDIS_PASSWORD, host=CONFIG.REDIS_HOST, port=CONFIG.REDIS_PORT, db=CONFIG.REDIS_DB_WS ) - REDIS_LAYERS_SSL_PARAMS.pop('ssl', None) - REDIS_LAYERS_HOST['address'] = '{}?{}'.format(REDIS_LAYERS_ADDRESS, - urlencode(REDIS_LAYERS_SSL_PARAMS)) + REDIS_LAYERS_HOST['address'] = REDIS_LAYERS_ADDRESS CHANNEL_LAYERS = { 'default': { diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index 8fbea643c..881d5c57a 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -28,6 +28,7 @@ api_v1 = [ path('acls/', include('acls.urls.api_urls', namespace='api-acls')), path('notifications/', include('notifications.urls.api_urls', namespace='api-notifications')), path('rbac/', include('rbac.urls.api_urls', namespace='api-rbac')), + path('labels/', include('labels.urls', namespace='api-label')), path('prometheus/metrics/', api.PrometheusMetricsApi.as_view()), ] diff --git a/apps/labels/__init__.py b/apps/labels/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/labels/admin.py b/apps/labels/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/apps/labels/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apps/labels/api.py b/apps/labels/api.py new file mode 100644 index 000000000..44a6702e7 --- /dev/null +++ b/apps/labels/api.py @@ -0,0 +1,151 @@ +from django.shortcuts import get_object_or_404 +from rest_framework.decorators import action +from rest_framework.response import Response + +from common.api.generic import JMSModelViewSet +from orgs.mixins.api import OrgBulkModelViewSet +from orgs.mixins.models import OrgModelMixin +from orgs.utils import current_org +from rbac.models import ContentType +from rbac.serializers import ContentTypeSerializer +from . import serializers +from .const import label_resource_types +from .models import Label, LabeledResource + +__all__ = ['LabelViewSet', 'ContentTypeViewSet'] + + +class ContentTypeViewSet(JMSModelViewSet): + serializer_class = ContentTypeSerializer + http_method_names = ['get', 'head', 'options'] + rbac_perms = { + 'default': 'labels.view_contenttype', + 'resources': 'labels.view_contenttype', + } + page_default_limit = None + can_labeled_content_type = [] + model = ContentType + + def get_queryset(self): + return label_resource_types + + @action(methods=['GET'], detail=True, serializer_class=serializers.ContentTypeResourceSerializer) + def resources(self, request, *args, **kwargs): + self.page_default_limit = 100 + content_type = self.get_object() + model = content_type.model_class() + + if issubclass(model, OrgModelMixin): + queryset = model.objects.filter(org_id=current_org.id) + elif hasattr(model, 'get_queryset'): + queryset = model.get_queryset() + else: + queryset = model.objects.all() + + keyword = request.query_params.get('search') + if keyword: + queryset = content_type.filter_queryset(queryset, keyword) + return self.get_paginated_response_from_queryset(queryset) + + +class LabelContentTypeResourceViewSet(JMSModelViewSet): + serializer_class = serializers.ContentTypeResourceSerializer + rbac_perms = { + 'default': 'labels.view_labeledresource', + 'update': 'labels.change_labeledresource', + } + ordering_fields = ('res_type', 'date_created') + + def get_queryset(self): + label_pk = self.kwargs.get('label') + res_type = self.kwargs.get('res_type') + label = get_object_or_404(Label, pk=label_pk) + content_type = get_object_or_404(ContentType, id=res_type) + bound = self.request.query_params.get('bound', '1') + res_ids = LabeledResource.objects \ + .filter(res_type=content_type, label=label) \ + .values_list('res_id', flat=True) + res_ids = set(res_ids) + model = content_type.model_class() + if hasattr(model, 'get_queryset'): + queryset = model.get_queryset() + else: + queryset = model.objects.all() + if bound == '1': + queryset = queryset.filter(id__in=list(res_ids)) + elif bound == '0': + queryset = queryset.exclude(id__in=list(res_ids)) + keyword = self.request.query_params.get('search') + if keyword: + queryset = content_type.filter_queryset(queryset, keyword) + return queryset + + def put(self, request, *args, **kwargs): + label_pk = self.kwargs.get('label') + res_type = self.kwargs.get('res_type') + content_type = get_object_or_404(ContentType, id=res_type) + label = get_object_or_404(Label, pk=label_pk) + res_ids = request.data.get('res_ids', []) + + LabeledResource.objects \ + .filter(res_type=content_type, label=label) \ + .exclude(res_id__in=res_ids).delete() + resources = [] + for res_id in res_ids: + resources.append(LabeledResource(res_type=content_type, res_id=res_id, label=label, org_id=current_org.id)) + LabeledResource.objects.bulk_create(resources, ignore_conflicts=True) + return Response({"total": len(res_ids)}) + + +class LabelViewSet(OrgBulkModelViewSet): + model = Label + filterset_fields = ("name", "value") + search_fields = filterset_fields + serializer_classes = { + 'default': serializers.LabelSerializer, + 'resource_types': ContentTypeSerializer, + } + rbac_perms = { + 'resource_types': 'labels.view_label', + 'keys': 'labels.view_label', + } + + @action(methods=['GET'], detail=False) + def keys(self, request, *args, **kwargs): + queryset = Label.objects.all() + keyword = request.query_params.get('search') + if keyword: + queryset = queryset.filter(name__icontains=keyword) + keys = queryset.values_list('name', flat=True).distinct() + return Response(keys) + + +class LabeledResourceViewSet(OrgBulkModelViewSet): + model = LabeledResource + filterset_fields = ("label__name", "label__value", "res_type", "res_id", "label") + search_fields = [] + serializer_classes = { + 'default': serializers.LabeledResourceSerializer, + } + ordering_fields = ('res_type', 'date_created') + + # Todo: 这里需要优化，查询 sql 太多 + def filter_search(self, queryset): + keyword = self.request.query_params.get('search') + if not keyword: + return queryset + matched = [] + for instance in queryset: + if keyword.lower() in str(instance.resource).lower(): + matched.append(instance.id) + return queryset.filter(id__in=matched) + + def get_queryset(self): + queryset = super().get_queryset() + queryset = queryset.order_by('res_type') + return queryset + + def filter_queryset(self, queryset): + queryset = super().filter_queryset(queryset) + queryset = self.filter_search(queryset) + return queryset diff --git a/apps/labels/apps.py b/apps/labels/apps.py new file mode 100644 index 000000000..a3bf4dabd --- /dev/null +++ b/apps/labels/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class LabelsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'labels' + verbose_name = _('Labels') diff --git a/apps/labels/const.py b/apps/labels/const.py new file mode 100644 index 000000000..108b07df0 --- /dev/null +++ b/apps/labels/const.py @@ -0,0 +1,25 @@ +from django.utils.functional import LazyObject + + +class LabeledResourceType(LazyObject): + @staticmethod + def get_res_types(): + from rbac.models import ContentType + from .mixins import LabeledMixin + content_types = ContentType.objects.all() + ids = [] + for ct in content_types: + model_cls = ct.model_class() + if not model_cls: + continue + if model_cls._meta.parents: + continue + if issubclass(model_cls, LabeledMixin): + ids.append(ct.id) + return ContentType.objects.filter(id__in=ids) + + def _setup(self): + self._wrapped = self.get_res_types() + + +label_resource_types = LabeledResourceType() diff --git a/apps/labels/migrations/0001_initial.py b/apps/labels/migrations/0001_initial.py new file mode 100644 index 000000000..cefe74e5c --- /dev/null +++ b/apps/labels/migrations/0001_initial.py @@ -0,0 +1,54 @@ +# Generated by Django 4.1.10 on 2023-11-06 10:38 + +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ] + + operations = [ + migrations.CreateModel( + name='Label', + fields=[ + ('created_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by')), + ('updated_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated 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')), + ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), + ('internal', models.BooleanField(default=False, verbose_name='Internal')), + ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), + ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), + ('name', models.CharField(db_index=True, max_length=64, verbose_name='Name')), + ('value', models.CharField(max_length=64, verbose_name='Value')), + ], + options={ + 'verbose_name': 'Label', + 'unique_together': {('name', 'value', 'org_id')}, + }, + ), + migrations.CreateModel( + name='LabeledResource', + fields=[ + ('created_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by')), + ('updated_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated 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')), + ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), + ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), + ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), + ('res_id', models.CharField(db_index=True, max_length=36, verbose_name='Resource ID')), + ('label', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='labels.label')), + ('res_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/labels/migrations/0002_auto_20231103_1659.py b/apps/labels/migrations/0002_auto_20231103_1659.py new file mode 100644 index 000000000..49386ed39 --- /dev/null +++ b/apps/labels/migrations/0002_auto_20231103_1659.py @@ -0,0 +1,52 @@ +# Generated by Django 4.1.10 on 2023-11-03 08:59 + +from django.db import migrations + + +def migrate_assets_labels(apps, schema_editor): + old_label_model = apps.get_model('assets', 'Label') + new_label_model = apps.get_model('labels', 'Label') + asset_model = apps.get_model('assets', 'Asset') + labeled_item_model = apps.get_model('labels', 'LabeledResource') + + old_labels = old_label_model.objects.all() + new_labels = [] + old_new_label_map = {} + for label in old_labels: + new_label = new_label_model(name=label.name, value=label.value, org_id=label.org_id) + old_new_label_map[label.id] = new_label + new_labels.append(new_label) + new_label_model.objects.bulk_create(new_labels, ignore_conflicts=True) + + label_relations = asset_model.labels.through.objects.all() + bulk_size = 1000 + count = 0 + content_type = apps.get_model('contenttypes', 'contenttype').objects.get_for_model(asset_model) + + while True: + relations = label_relations[count:count + bulk_size] + if not relations: + break + count += bulk_size + + tagged_items = [] + for relation in relations: + new_label = old_new_label_map[relation.label_id] + tagged_item = labeled_item_model( + label_id=new_label.id, res_type=content_type, + res_id=relation.asset_id, org_id=new_label.org_id + ) + tagged_items.append(tagged_item) + labeled_item_model.objects.bulk_create(tagged_items, ignore_conflicts=True) + + +class Migration(migrations.Migration): + + dependencies = [ + ('labels', '0001_initial'), + ('assets', '0125_auto_20231011_1053') + ] + + operations = [ + migrations.RunPython(migrate_assets_labels), + ] diff --git a/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py new file mode 100644 index 000000000..c879b7888 --- /dev/null +++ b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.1.10 on 2023-11-15 10:58 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('labels', '0002_auto_20231103_1659'), + ] + + operations = [ + migrations.AlterModelOptions( + name='labeledresource', + options={'verbose_name': 'Labeled resource'}, + ), + migrations.AlterField( + model_name='labeledresource', + name='label', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labeled_resources', to='labels.label', verbose_name='Label'), + ), + migrations.AlterUniqueTogether( + name='labeledresource', + unique_together={('label', 'res_type', 'res_id', 'org_id')}, + ), + ] diff --git a/apps/labels/migrations/__init__.py b/apps/labels/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/labels/mixins.py b/apps/labels/mixins.py new file mode 100644 index 000000000..90b76f3ed --- /dev/null +++ b/apps/labels/mixins.py @@ -0,0 +1,21 @@ +from django.contrib.contenttypes.fields import GenericRelation +from django.db import models + +from .models import LabeledResource + +__all__ = ['LabeledMixin'] + + +class LabeledMixin(models.Model): + _labels = GenericRelation(LabeledResource, object_id_field='res_id', content_type_field='res_type') + + class Meta: + abstract = True + + @property + def labels(self): + return self._labels + + @labels.setter + def labels(self, value): + self._labels.set(value, bulk=False) diff --git a/apps/labels/models.py b/apps/labels/models.py new file mode 100644 index 000000000..3bf9213f5 --- /dev/null +++ b/apps/labels/models.py @@ -0,0 +1,44 @@ +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType +from django.db import models +from django.utils.translation import gettext_lazy as _ + +from common.utils import lazyproperty +from orgs.mixins.models import JMSOrgBaseModel + + +class Label(JMSOrgBaseModel): + name = models.CharField(max_length=64, verbose_name=_("Name"), db_index=True) + value = models.CharField(max_length=64, unique=False, verbose_name=_("Value")) + internal = models.BooleanField(default=False, verbose_name=_("Internal")) + + class Meta: + unique_together = [('name', 'value', 'org_id')] + verbose_name = _('Label') + + @lazyproperty + def res_count(self): + return self.labeled_resources.count() + + @lazyproperty + def display_name(self): + return '{}:{}'.format(self.name, self.value) + + def __str__(self): + return '{}:{}'.format(self.name, self.value) + + +class LabeledResource(JMSOrgBaseModel): + label = models.ForeignKey( + Label, on_delete=models.CASCADE, related_name='labeled_resources', verbose_name=_("Label") + ) + res_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + res_id = models.CharField(max_length=36, verbose_name=_("Resource ID"), db_index=True) + resource = GenericForeignKey('res_type', 'res_id') + + class Meta: + unique_together = [('label', 'res_type', 'res_id', 'org_id')] + verbose_name = _('Labeled resource') + + def __str__(self): + return '{} => {}'.format(self.label, self.resource) diff --git a/apps/labels/serializers.py b/apps/labels/serializers.py new file mode 100644 index 000000000..803843ad8 --- /dev/null +++ b/apps/labels/serializers.py @@ -0,0 +1,77 @@ +from django.db.models import Count +from django.utils.translation import gettext_lazy as _ +from rest_framework import serializers + +from common.serializers.fields import ObjectRelatedField, LabeledChoiceField +from orgs.mixins.serializers import BulkOrgResourceModelSerializer +from .const import label_resource_types +from .models import Label, LabeledResource + +__all__ = ['LabelSerializer', 'LabeledResourceSerializer', 'ContentTypeResourceSerializer'] + + +class LabelSerializer(BulkOrgResourceModelSerializer): + class Meta: + model = Label + fields = [ + 'id', 'name', 'value', 'res_count', 'comment', + 'date_created', 'date_updated' + ] + read_only_fields = ('date_created', 'date_updated', 'res_count') + extra_kwargs = { + 'res_count': {'label': _('Resource count')}, + } + + @staticmethod + def validate_name(value): + if ':' in value or ',' in value: + raise serializers.ValidationError(_('Cannot contain ":,"')) + return value + + def validate_value(self, value): + return self.validate_name(value) + + @classmethod + def setup_eager_loading(cls, queryset): + """ Perform necessary eager loading of data. """ + queryset = queryset.annotate(res_count=Count('labeled_resources')) + return queryset + + +class LabeledResourceSerializer(serializers.ModelSerializer): + res_type = LabeledChoiceField( + choices=[], label=_("Resource type"), source='res_type_id', required=False + ) + label = ObjectRelatedField(queryset=Label.objects, attrs=('id', 'display_name'), label=_("Label")) + resource = serializers.CharField(label=_("Resource")) + + class Meta: + model = LabeledResource + fields = ('id', 'label', 'res_type', 'res_id', 'date_created', 'resource', 'date_updated') + read_only_fields = ('date_created', 'date_updated', 'resource') + + @classmethod + def setup_eager_loading(cls, queryset): + """ Perform necessary eager loading of data. """ + queryset = queryset.select_related('label', 'res_type') + return queryset + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.set_res_type_choices() + + def set_res_type_choices(self): + res_type_field = self.fields.get('res_type') + if not res_type_field: + return + + res_type_field.choices = [(ct.id, ct.name) for ct in label_resource_types] + + +class ContentTypeResourceSerializer(serializers.Serializer): + id = serializers.CharField() + name = serializers.SerializerMethodField() + + @staticmethod + def get_name(obj): + return str(obj) diff --git a/apps/labels/tests.py b/apps/labels/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/apps/labels/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apps/labels/urls.py b/apps/labels/urls.py new file mode 100644 index 000000000..a3971917f --- /dev/null +++ b/apps/labels/urls.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# + +from rest_framework_bulk.routes import BulkRouter + +from . import api + +app_name = 'labels' + +router = BulkRouter() +router.register(r'labels', api.LabelViewSet, 'label') +router.register(r'labels/(?P
ポートが0の場合、す" "べてのIPアドレスが有効です。" -#: xpack/plugins/cloud/serializers/account_attrs.py:183 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "ホスト名プレフィックス" -#: xpack/plugins/cloud/serializers/account_attrs.py:186 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP セグメント" -#: xpack/plugins/cloud/serializers/account_attrs.py:190 +#: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "テストポート" -#: xpack/plugins/cloud/serializers/account_attrs.py:193 +#: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "テストタイムアウト" -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:143 +#: xpack/plugins/cloud/serializers/task.py:151 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -8633,11 +8919,11 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:149 +#: xpack/plugins/cloud/serializers/task.py:157 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "Instance count" msgstr "インスタンス数" @@ -8681,7 +8967,15 @@ msgstr "ログアウトページのロゴ" msgid "Theme" msgstr "テーマ" -#: xpack/plugins/interface/models.py:44 xpack/plugins/interface/models.py:85 +#: xpack/plugins/interface/models.py:42 +msgid "Beian link" +msgstr "公安オンライン申告ジャンプリンク" + +#: xpack/plugins/interface/models.py:43 +msgid "Beian text" +msgstr "公安網登録番号" + +#: xpack/plugins/interface/models.py:46 xpack/plugins/interface/models.py:87 msgid "Interface setting" msgstr "インターフェイスの設定" @@ -8713,17 +9007,17 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" -#~ msgid "Copy" -#~ msgstr "コピー" +#~ msgid "Password can not contains `{{` or `}}`" +#~ msgstr "パスワードには `{` または `}` 文字を含めることはできません" -#~ msgid "Paste" -#~ msgstr "貼り付け" +#~ msgid "Password can not contains `{%` or `%}`" +#~ msgstr "パスワードには `{%` または `%}` 文字を含めることはできません" -#~ msgid "Password can not contains `'` " -#~ msgstr "パスワードには `'` を含まない" +#~ msgid "FeiShu query user failed" +#~ msgstr "FeiShuクエリユーザーが失敗しました" -#~ msgid "Password can not contains `\"` " -#~ msgstr "パスワードには `\"` を含まない" +#~ msgid "The FeiShu is already bound to another user" +#~ msgstr "FeiShuはすでに別のユーザーにバインドされています" -#~ msgid "Object Storage" -#~ msgstr "オブジェクトストレージ" +#~ msgid "Binding FeiShu successfully" +#~ msgstr "本を飛ばすのバインドに成功" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index ef1eef0a1..abcc5b418 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8324031d40c7cbcd9e332221ee8f607396836b87907847b7f94e879269cc97c8 -size 135739 +oid sha256:853320b42ac7795fa983c4216f89b3a776a889453d90e11dc425d1388ff9b803 +size 139012 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index dff3dd204..bd5989a79 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-16 15:05+0800\n" +"POT-Creation-Date: 2023-12-21 16:12+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler
\n" " Don't close this page" @@ -3466,43 +3529,47 @@ msgstr "" "等待 {} 确认, 你也可以复制链接发给他/她
\n" " 不要关闭本页面" -#: authentication/views/login.py:360 +#: authentication/views/login.py:367 msgid "No ticket found" msgstr "没有发现工单" -#: authentication/views/login.py:396 +#: authentication/views/login.py:403 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:397 +#: authentication/views/login.py:404 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: authentication/views/wecom.py:43 +#: authentication/views/slack.py:35 authentication/views/slack.py:126 +msgid "Slack Error" +msgstr "Slack 错误" + +#: authentication/views/slack.py:63 +msgid "Slack is already bound" +msgstr "Slack 已经绑定" + +#: authentication/views/slack.py:128 +msgid "Failed to get user from Slack" +msgstr "从 Slack 获取用户失败" + +#: authentication/views/wecom.py:40 msgid "WeCom Error, Please contact your system administrator" msgstr "企业微信错误，请联系系统管理员" -#: authentication/views/wecom.py:46 authentication/views/wecom.py:203 +#: authentication/views/wecom.py:43 authentication/views/wecom.py:158 msgid "WeCom Error" msgstr "企业微信错误" -#: authentication/views/wecom.py:145 -msgid "WeCom query user failed" -msgstr "企业微信查询用户失败" +#: authentication/views/wecom.py:118 +msgid "Wecom" +msgstr "" -#: authentication/views/wecom.py:154 -msgid "The WeCom is already bound to another user" -msgstr "该企业微信已经绑定其他用户" - -#: authentication/views/wecom.py:161 -msgid "Binding WeCom successfully" -msgstr "绑定 企业微信 成功" - -#: authentication/views/wecom.py:205 authentication/views/wecom.py:240 +#: authentication/views/wecom.py:160 authentication/views/wecom.py:195 msgid "Failed to get user from WeCom" msgstr "从企业微信获取用户失败" -#: authentication/views/wecom.py:247 +#: authentication/views/wecom.py:202 msgid "Please login with a password and then bind the WeCom" msgstr "请使用密码登录，然后绑定企业微信" @@ -3522,12 +3589,12 @@ msgstr "定时触发" msgid "Ready" msgstr "准备" -#: common/const/choices.py:16 terminal/const.py:76 tickets/const.py:29 +#: common/const/choices.py:16 terminal/const.py:77 tickets/const.py:29 #: tickets/const.py:39 msgid "Pending" msgstr "待定的" -#: common/const/choices.py:17 ops/const.py:71 +#: common/const/choices.py:17 ops/const.py:72 msgid "Running" msgstr "运行中" @@ -3596,10 +3663,10 @@ msgid "Invalid ids for ids, should be a list" msgstr "无效的ID，应为列表" #: common/db/fields.py:585 common/db/fields.py:590 -#: common/serializers/fields.py:104 tickets/serializers/ticket/common.py:58 +#: common/serializers/fields.py:134 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 -#: xpack/plugins/cloud/serializers/account_attrs.py:143 +#: xpack/plugins/cloud/serializers/account_attrs.py:150 msgid "This field is required." msgstr "该字段是必填项。" @@ -3619,7 +3686,7 @@ msgstr "忽略的" msgid "discard time" msgstr "忽略时间" -#: common/db/models.py:33 users/models/user.py:837 +#: common/db/models.py:33 users/models/user.py:844 msgid "Updated by" msgstr "最后更新者" @@ -3639,7 +3706,7 @@ msgstr "组织 ID" msgid "The file content overflowed (The maximum length `{}` bytes)" msgstr "文件内容太大 (最大长度 `{}` 字节)" -#: common/drf/parsers/base.py:195 +#: common/drf/parsers/base.py:199 msgid "Parse file error: {}" msgstr "解析文件错误: {}" @@ -3647,7 +3714,7 @@ msgstr "解析文件错误: {}" msgid "Invalid excel file" msgstr "无效的 excel 文件" -#: common/drf/renders/base.py:206 +#: common/drf/renders/base.py:207 msgid "" "{} - The encryption password has not been set - please go to personal " "information -> file encryption password to set the encryption password" @@ -3694,6 +3761,10 @@ msgstr "不支持 Elasticsearch8" msgid "Network error, please contact system administrator" msgstr "网络错误，请联系系统管理员" +#: common/sdk/im/slack/__init__.py:79 +msgid "Unknown error occur" +msgstr "发生未知错误" + #: common/sdk/im/wecom/__init__.py:16 msgid "WeCom error, please contact system administrator" msgstr "企业微信错误，请联系系统管理员" @@ -3735,6 +3806,10 @@ msgstr "华为云" msgid "CMPP v2.0" msgstr "CMPP v2.0" +#: common/sdk/sms/endpoint.py:21 +msgid "Custom type (File)" +msgstr "自定义 (文件)" + #: common/sdk/sms/endpoint.py:32 msgid "SMS provider not support: {}" msgstr "短信服务商不支持：{}" @@ -3759,24 +3834,30 @@ msgstr "请在 {} 秒后发送" msgid "Children" msgstr "节点" -#: common/serializers/fields.py:105 +#: common/serializers/fields.py:135 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "错误的 pk \"{pk_value}\" - 对象不存在" -#: common/serializers/fields.py:106 +#: common/serializers/fields.py:136 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "错误类型。期望 pk 值，收到 {data_type}。" -#: common/serializers/fields.py:180 +#: common/serializers/fields.py:210 msgid "Invalid data type, should be list" msgstr "错误的数据类型，应该是列表" -#: common/serializers/fields.py:195 +#: common/serializers/fields.py:225 msgid "Invalid choice: {}" msgstr "无效选项: {}" +#: common/serializers/mixin.py:397 labels/apps.py:8 +msgid "Labels" +msgstr "标签管理" + +# msgid "Labels" +# msgstr "标签管理" #: common/tasks.py:21 common/utils/verify_code.py:16 msgid "Send email" msgstr "发件邮件" @@ -3814,16 +3895,16 @@ msgstr "不能包含特殊字符" msgid "The mobile phone number format is incorrect" msgstr "手机号格式不正确" -#: jumpserver/conf.py:444 +#: jumpserver/conf.py:450 #, python-brace-format msgid "The verification code is: {code}" msgstr "验证码为: {code}" -#: jumpserver/conf.py:448 +#: jumpserver/conf.py:454 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:450 +#: jumpserver/conf.py:456 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3858,6 +3939,26 @@ msgstr "" "div>
如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运"
+#: labels/models.py:36
+msgid "Resource ID"
+msgstr "资源 ID"
+
+#: labels/models.py:41
+msgid "Labeled resource"
+msgstr "关联的资源"
+
+#: labels/serializers.py:22
+msgid "Resource count"
+msgstr "资源数量"
+
+#: labels/serializers.py:28
+msgid "Cannot contain \":,\""
+msgstr "不能包含\"：，\""
+
+#: labels/serializers.py:43
+msgid "Resource type"
+msgstr "资源类型"
+
#: notifications/backends/__init__.py:13
msgid "Site message"
msgstr "站内信"
@@ -3882,30 +3983,40 @@ msgstr "系统信息"
msgid "Publish the station message"
msgstr "发布站内消息"
-#: ops/ansible/inventory.py:95 ops/models/job.py:61
+#: ops/ansible/inventory.py:97 ops/models/job.py:62
msgid "No account available"
msgstr "无可用账号"
-#: ops/ansible/inventory.py:259
+#: ops/ansible/inventory.py:264
msgid "Ansible disabled"
msgstr "Ansible 已禁用"
-#: ops/ansible/inventory.py:275
+#: ops/ansible/inventory.py:280
msgid "Skip hosts below:"
msgstr "跳过以下主机: "
-#: ops/api/celery.py:64 ops/api/celery.py:79
+#: ops/api/celery.py:65 ops/api/celery.py:80
msgid "Waiting task start"
msgstr "等待任务开始"
-#: ops/api/celery.py:162
+#: ops/api/celery.py:203
msgid "Task {} not found"
msgstr "任务 {} 不存在"
-#: ops/api/celery.py:167
+#: ops/api/celery.py:208
msgid "Task {} args or kwargs error"
msgstr "任务 {} 执行参数错误"
+#: ops/api/job.py:132
+msgid "Duplicate file exists"
+msgstr "存在同名文件"
+
+#: ops/api/job.py:137
+#, python-brace-format
+msgid ""
+"File size exceeds maximum limit. Please select a file smaller than {limit}MB"
+msgstr "文件大小超过最大限制。请选择小于 {limit}MB 的文件。"
+
#: ops/api/playbook.py:39
msgid "Currently playbook is being used in a job"
msgstr "当前 playbook 正在作业中使用"
@@ -3934,7 +4045,7 @@ msgstr "文件密钥该字段是必填项。"
msgid "This file can not be delete"
msgstr "无法删除此文件"
-#: ops/apps.py:9 ops/notifications.py:17 rbac/tree.py:55
+#: ops/apps.py:9 ops/notifications.py:17 rbac/tree.py:57
msgid "App ops"
msgstr "作业中心"
@@ -3974,51 +4085,55 @@ msgstr "VCS"
msgid "Adhoc"
msgstr "命令"
-#: ops/const.py:39 ops/models/job.py:138
+#: ops/const.py:39 ops/models/job.py:143
msgid "Playbook"
msgstr "Playbook"
-#: ops/const.py:43
+#: ops/const.py:40
+msgid "Upload File"
+msgstr "上传"
+
+#: ops/const.py:44
msgid "Privileged Only"
msgstr "仅限特权账号"
-#: ops/const.py:44
+#: ops/const.py:45
msgid "Privileged First"
msgstr "特权账号优先"
-#: ops/const.py:50 ops/const.py:60
+#: ops/const.py:51 ops/const.py:61
msgid "Powershell"
msgstr "PowerShell"
-#: ops/const.py:51 ops/const.py:61
+#: ops/const.py:52 ops/const.py:62
msgid "Python"
msgstr "Python"
-#: ops/const.py:52 ops/const.py:62
+#: ops/const.py:53 ops/const.py:63
msgid "MySQL"
msgstr "MySQL"
-#: ops/const.py:53 ops/const.py:64
+#: ops/const.py:54 ops/const.py:65
msgid "PostgreSQL"
msgstr "PostgreSQL"
-#: ops/const.py:54 ops/const.py:65
+#: ops/const.py:55 ops/const.py:66
msgid "SQLServer"
msgstr "SQLServer"
-#: ops/const.py:55 ops/const.py:67
+#: ops/const.py:56 ops/const.py:68
msgid "Raw"
msgstr "Raw"
-#: ops/const.py:63
+#: ops/const.py:64
msgid "MariaDB"
msgstr "MariaDB"
-#: ops/const.py:66
+#: ops/const.py:67
msgid "Oracle"
msgstr "Oracle"
-#: ops/const.py:73
+#: ops/const.py:74
msgid "Timeout"
msgstr "超时"
@@ -4055,15 +4170,17 @@ msgstr "需要周期或定期设置"
msgid "Pattern"
msgstr "模式"
-#: ops/models/adhoc.py:23 ops/models/job.py:133
+#: ops/models/adhoc.py:23 ops/models/job.py:140
msgid "Module"
msgstr "模块"
-#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:131
+#: ops/models/adhoc.py:24 ops/models/celery.py:58 ops/models/job.py:138
#: terminal/models/component/task.py:14
msgid "Args"
msgstr "参数"
+# msgid "Creator"
+# msgstr "创建者"
#: ops/models/base.py:19
msgid "Account policy"
msgstr "账号策略"
@@ -4072,16 +4189,16 @@ msgstr "账号策略"
msgid "Last execution"
msgstr "最后执行"
-#: ops/models/base.py:22 ops/serializers/job.py:19
+#: ops/models/base.py:22 ops/serializers/job.py:17
msgid "Date last run"
msgstr "最后运行日期"
-#: ops/models/base.py:51 ops/models/job.py:227
-#: xpack/plugins/cloud/models.py:199
+#: ops/models/base.py:51 ops/models/job.py:231
+#: xpack/plugins/cloud/models.py:202
msgid "Result"
msgstr "结果"
-#: ops/models/base.py:52 ops/models/job.py:228
+#: ops/models/base.py:52 ops/models/job.py:232
msgid "Summary"
msgstr "汇总"
@@ -4114,43 +4231,43 @@ msgstr "发布日期"
msgid "Celery Task Execution"
msgstr "Celery 任务执行"
-#: ops/models/job.py:135
+#: ops/models/job.py:141
msgid "Chdir"
msgstr "运行目录"
-#: ops/models/job.py:136
+#: ops/models/job.py:142
msgid "Timeout (Seconds)"
msgstr "超时时间 (秒)"
-#: ops/models/job.py:143
+#: ops/models/job.py:147
msgid "Use Parameter Define"
msgstr "使用参数定义"
-#: ops/models/job.py:144
+#: ops/models/job.py:148
msgid "Parameters define"
msgstr "参数定义"
-#: ops/models/job.py:145
+#: ops/models/job.py:149
msgid "Runas"
msgstr "运行用户"
-#: ops/models/job.py:147
+#: ops/models/job.py:151
msgid "Runas policy"
msgstr "用户策略"
-#: ops/models/job.py:211
+#: ops/models/job.py:215
msgid "Job"
msgstr "作业"
-#: ops/models/job.py:234
+#: ops/models/job.py:238
msgid "Material"
msgstr "Material"
-#: ops/models/job.py:236
+#: ops/models/job.py:240
msgid "Material Type"
msgstr "Material 类型"
-#: ops/models/job.py:536
+#: ops/models/job.py:557
msgid "Job Execution"
msgstr "作业执行"
@@ -4190,19 +4307,19 @@ msgstr "内存使用率超过 {max_threshold}%: => {value}"
msgid "CPU load more than {max_threshold}: => {value}"
msgstr "CPU 使用率超过 {max_threshold}: => {value}"
-#: ops/serializers/job.py:17
+#: ops/serializers/job.py:15
msgid "Run after save"
msgstr "保存后执行"
-#: ops/serializers/job.py:54
+#: ops/serializers/job.py:62
msgid "Job type"
msgstr "任务类型"
-#: ops/serializers/job.py:57 terminal/serializers/session.py:53
+#: ops/serializers/job.py:65 terminal/serializers/session.py:53
msgid "Is finished"
msgstr "是否完成"
-#: ops/serializers/job.py:58
+#: ops/serializers/job.py:66
msgid "Time cost"
msgstr "花费时间"
@@ -4292,7 +4409,7 @@ msgstr "LDAP 同步设置组织为当前组织，请切换其他组织后再进
msgid "The organization have resource ({}) cannot be deleted"
msgstr "组织存在资源 ({}) 不能被删除"
-#: orgs/apps.py:7 rbac/tree.py:126
+#: orgs/apps.py:7 rbac/tree.py:128
msgid "App organizations"
msgstr "组织管理"
@@ -4321,7 +4438,8 @@ msgstr "默认组织"
msgid "SYSTEM"
msgstr "系统组织"
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41
+#: orgs/models.py:83 rbac/models/role.py:36 settings/models.py:183
+#: terminal/models/applet/applet.py:41
msgid "Builtin"
msgstr "内置的"
@@ -4381,7 +4499,7 @@ msgstr "文件传输"
msgid "Clipboard"
msgstr "剪贴板"
-#: perms/models/asset_permission.py:88
+#: perms/models/asset_permission.py:89
msgid "Asset permission"
msgstr "资产授权"
@@ -4417,6 +4535,11 @@ msgstr "授权账号"
msgid "today"
msgstr "今天"
+#: perms/notifications.py:12 perms/notifications.py:44
+#: settings/serializers/feature.py:106
+msgid "day"
+msgstr "天"
+
#: perms/notifications.py:15
msgid "You permed assets is about to expire"
msgstr "你授权的资产即将到期"
@@ -4446,11 +4569,11 @@ msgstr "发送资产权限过期通知"
#, python-format
msgid ""
"\n"
-" The following %(item_type)s will expire in %(count)s days\n"
+" The following %(item_type)s will expire in %(count)s\n"
" "
msgstr ""
"\n"
-" 以下 %(item_type)s 即将在 %(count)s 天后过期\n"
+" 以下 %(item_type)s 即将在 %(count)s 后过期\n"
" "
#: rbac/api/role.py:35
@@ -4461,7 +4584,7 @@ msgstr "内部角色，不能删除"
msgid "The role has been bound to users, can't be destroy"
msgstr "角色已绑定用户，不能删除"
-#: rbac/api/role.py:87
+#: rbac/api/role.py:100
msgid "Internal role, can't be update"
msgstr "内部角色，不能更新"
@@ -4525,7 +4648,7 @@ msgstr "文件管理"
msgid "Can view System Tools"
msgstr "可以查看系统工具"
-#: rbac/models/permission.py:27 rbac/models/role.py:34
+#: rbac/models/permission.py:78 rbac/models/role.py:34
msgid "Permissions"
msgstr "授权"
@@ -4535,7 +4658,7 @@ msgid "Scope"
msgstr "范围"
#: rbac/models/role.py:46 rbac/models/rolebinding.py:52
-#: users/models/user.py:803
+#: users/models/user.py:810
msgid "Role"
msgstr "角色"
@@ -4573,11 +4696,12 @@ msgstr "系统角色绑定"
msgid "Perms"
msgstr "权限"
-#: rbac/serializers/role.py:27 users/serializers/group.py:30
+#: rbac/serializers/role.py:27 users/serializers/group.py:31
msgid "Users amount"
msgstr "用户数量"
#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34
+#: terminal/models/virtualapp/virtualapp.py:20
msgid "Display name"
msgstr "显示名称"
@@ -4601,7 +4725,7 @@ msgstr "工作台"
msgid "Audit view"
msgstr "审计台"
-#: rbac/tree.py:27 settings/models.py:158
+#: rbac/tree.py:27 settings/models.py:159
msgid "System setting"
msgstr "系统设置"
@@ -4609,59 +4733,64 @@ msgstr "系统设置"
msgid "Session audits"
msgstr "会话审计"
-#: rbac/tree.py:47
+#: rbac/tree.py:49
msgid "Cloud import"
msgstr "云同步"
-#: rbac/tree.py:48
+#: rbac/tree.py:50
msgid "Backup account"
msgstr "备份账号"
-#: rbac/tree.py:49
+#: rbac/tree.py:51
msgid "Gather account"
msgstr "收集账号"
-#: rbac/tree.py:51
+#: rbac/tree.py:53
msgid "Asset change auth"
msgstr "资产改密"
-#: rbac/tree.py:52
+#: rbac/tree.py:54
msgid "Terminal setting"
msgstr "终端设置"
-#: rbac/tree.py:53
+#: rbac/tree.py:55
msgid "Task Center"
msgstr "任务中心"
-#: rbac/tree.py:54
+#: rbac/tree.py:56
msgid "My assets"
msgstr "我的资产"
-#: rbac/tree.py:56 terminal/models/applet/applet.py:52
-#: terminal/models/applet/applet.py:315 terminal/models/applet/host.py:30
+#: rbac/tree.py:58 terminal/models/applet/applet.py:52
+#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:30
#: terminal/serializers/applet.py:15
msgid "Applet"
msgstr "远程应用"
-#: rbac/tree.py:127
+#: rbac/tree.py:129
msgid "Ticket comment"
msgstr "工单评论"
-#: rbac/tree.py:128 settings/serializers/feature.py:58
+#: rbac/tree.py:130 settings/serializers/feature.py:98
#: tickets/models/ticket/general.py:307
msgid "Ticket"
msgstr "工单管理"
-#: rbac/tree.py:129
+#: rbac/tree.py:131
msgid "Common setting"
msgstr "一般设置"
-#: rbac/tree.py:130
+#: rbac/tree.py:132
msgid "View permission tree"
msgstr "查看授权树"
-#: settings/api/dingtalk.py:31 settings/api/feishu.py:36
-#: settings/api/sms.py:160 settings/api/vault.py:40 settings/api/wecom.py:37
+#: settings/api/chat.py:40
+msgid "Chat AI is not enabled"
+msgstr "聊天 AI 没有开启"
+
+#: settings/api/chat.py:79 settings/api/dingtalk.py:31
+#: settings/api/feishu.py:36 settings/api/slack.py:34 settings/api/sms.py:160
+#: settings/api/vault.py:40 settings/api/wecom.py:37
msgid "Test success"
msgstr "测试成功"
@@ -4669,23 +4798,16 @@ msgstr "测试成功"
msgid "Test mail sent to {}, please check"
msgstr "邮件已经发送{}, 请检查"
-#: settings/api/ldap.py:176
-msgid "Synchronization start, please wait."
-msgstr "同步开始，请稍等"
+#: settings/api/ldap.py:101
+msgid ""
+"Users are not synchronized, please click the user synchronization button"
+msgstr "用户未同步，请点击同步用户按钮"
-#: settings/api/ldap.py:180
-msgid "Synchronization is running, please wait."
-msgstr "同步正在运行，请稍等"
-
-#: settings/api/ldap.py:185
-msgid "Synchronization error: {}"
-msgstr "同步错误: {}"
-
-#: settings/api/ldap.py:223
+#: settings/api/ldap.py:137
msgid "Get ldap users is None"
msgstr "获取 LDAP 用户为 None"
-#: settings/api/ldap.py:233
+#: settings/api/ldap.py:147
msgid "Imported {} users successfully (Organization: {})"
msgstr "成功导入 {} 个用户 ( 组织: {} )"
@@ -4701,66 +4823,78 @@ msgstr "测试手机号 该字段是必填项。"
msgid "Settings"
msgstr "系统设置"
-#: settings/models.py:35 users/models/preference.py:14
+#: settings/models.py:36 users/models/preference.py:14
msgid "Encrypted"
msgstr "加密的"
-#: settings/models.py:160
+#: settings/models.py:161
msgid "Can change email setting"
msgstr "邮件设置"
-#: settings/models.py:161
+#: settings/models.py:162
msgid "Can change auth setting"
msgstr "认证设置"
-#: settings/models.py:162
+#: settings/models.py:163
msgid "Can change auth ops"
msgstr "任务中心设置"
-#: settings/models.py:163
+#: settings/models.py:164
msgid "Can change auth ticket"
msgstr "工单设置"
-#: settings/models.py:164
+#: settings/models.py:165
+msgid "Can change virtual app setting"
+msgstr "可以更改虚拟应用设置"
+
+#: settings/models.py:166
msgid "Can change auth announcement"
msgstr "公告设置"
-#: settings/models.py:165
+#: settings/models.py:167
msgid "Can change vault setting"
msgstr "可以更改 vault 设置"
-#: settings/models.py:166
+#: settings/models.py:168
+msgid "Can change chat ai setting"
+msgstr "可以修改聊天 AI 设置"
+
+#: settings/models.py:169
msgid "Can change system msg sub setting"
msgstr "消息订阅设置"
-#: settings/models.py:167
+#: settings/models.py:170
msgid "Can change sms setting"
msgstr "短信设置"
-#: settings/models.py:168
+#: settings/models.py:171
msgid "Can change security setting"
msgstr "安全设置"
-#: settings/models.py:169
+#: settings/models.py:172
msgid "Can change clean setting"
msgstr "定期清理"
-#: settings/models.py:170
+#: settings/models.py:173
msgid "Can change interface setting"
msgstr "界面设置"
-#: settings/models.py:171
+#: settings/models.py:174
msgid "Can change license setting"
msgstr "许可证设置"
-#: settings/models.py:172
+#: settings/models.py:175
msgid "Can change terminal setting"
msgstr "终端设置"
-#: settings/models.py:173
+#: settings/models.py:176
msgid "Can change other setting"
msgstr "其它设置"
+#: settings/models.py:186
+msgid "Chat prompt"
+msgstr "聊天提示"
+
#: settings/serializers/auth/base.py:12
msgid "LDAP Auth"
msgstr "LDAP 认证"
@@ -4794,22 +4928,26 @@ msgid "FeiShu Auth"
msgstr "飞书 认证"
#: settings/serializers/auth/base.py:20
+msgid "Slack Auth"
+msgstr "Slack 认证"
+
+#: settings/serializers/auth/base.py:21
msgid "WeCom Auth"
msgstr "企业微信 认证"
-#: settings/serializers/auth/base.py:21
+#: settings/serializers/auth/base.py:22
msgid "SSO Auth"
msgstr "SSO 令牌认证"
-#: settings/serializers/auth/base.py:22
+#: settings/serializers/auth/base.py:23
msgid "Passkey Auth"
msgstr "Passkey 认证"
-#: settings/serializers/auth/base.py:25
+#: settings/serializers/auth/base.py:26
msgid "Forgot password url"
msgstr "忘记密码 URL"
-#: settings/serializers/auth/base.py:28
+#: settings/serializers/auth/base.py:29
msgid "Enable login redirect msg"
msgstr "启用登录跳转提示"
@@ -5110,6 +5248,10 @@ msgstr "SP 密钥"
msgid "SP cert"
msgstr "SP 证书"
+#: settings/serializers/auth/slack.py:12
+msgid "Enable Slack Auth"
+msgstr "启用 Slack 认证"
+
#: settings/serializers/auth/sms.py:17
msgid "Enable SMS"
msgstr "启用 SMS"
@@ -5188,11 +5330,6 @@ msgstr "URL"
msgid "Request method"
msgstr "请求方式"
-#: settings/serializers/auth/sms.py:117
-#, python-format
-msgid "The value in the parameter must contain %s"
-msgstr "参数中的值必须包含 %s"
-
#: settings/serializers/auth/sso.py:16
msgid "Enable SSO auth"
msgstr "启用 SSO 令牌认证"
@@ -5206,7 +5343,7 @@ msgid "SSO auth key TTL"
msgstr "令牌有效期"
#: settings/serializers/auth/sso.py:20
-#: xpack/plugins/cloud/serializers/account_attrs.py:193
+#: xpack/plugins/cloud/serializers/account_attrs.py:200
msgid "Unit: second"
msgstr "单位: 秒"
@@ -5214,11 +5351,11 @@ msgstr "单位: 秒"
msgid "Enable WeCom Auth"
msgstr "启用企业微信认证"
-#: settings/serializers/basic.py:9
+#: settings/serializers/basic.py:11
msgid "Site url"
msgstr "当前站点 URL"
-#: settings/serializers/basic.py:11
+#: settings/serializers/basic.py:13
msgid ""
"External URL, email links or other system callbacks are used to access it, "
"eg: http://dev.jumpserver.org:8080"
@@ -5226,38 +5363,42 @@ msgstr ""
"外部可访问的 URL, 用于邮件链接或其它系统回调, 例如: http://dev.jumpserver."
"org:8080"
-#: settings/serializers/basic.py:16
+#: settings/serializers/basic.py:18
msgid "User guide url"
msgstr "用户向导URL"
-#: settings/serializers/basic.py:17
+#: settings/serializers/basic.py:19
msgid "User first login update profile done redirect to it"
msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档"
-#: settings/serializers/basic.py:20
+#: settings/serializers/basic.py:22
msgid "Global organization name"
msgstr "全局组织名"
-#: settings/serializers/basic.py:21
+#: settings/serializers/basic.py:23
msgid "The name of global organization to display"
msgstr "全局组织的显示名称，默认为 全局组织"
-#: settings/serializers/basic.py:24
+#: settings/serializers/basic.py:26
msgid "Help Docs URL"
msgstr "文档链接"
-#: settings/serializers/basic.py:25
+#: settings/serializers/basic.py:27
msgid "default: http://docs.jumpserver.org"
msgstr "默认: http://dev.jumpserver.org:8080"
-#: settings/serializers/basic.py:28
+#: settings/serializers/basic.py:30
msgid "Help Support URL"
msgstr "支持链接"
-#: settings/serializers/basic.py:29
+#: settings/serializers/basic.py:31
msgid "default: http://www.jumpserver.org/support/"
msgstr "默认: http://www.jumpserver.org/support/"
+#: settings/serializers/basic.py:44
+msgid "Organization name already exists"
+msgstr "组织名称已存在"
+
#: settings/serializers/cleaning.py:11
msgid "Period clean"
msgstr "定時清掃"
@@ -5301,70 +5442,98 @@ msgid ""
msgstr ""
"会话、录像，命令记录超过该时长将会被清除 (影响数据库存储，OSS 等不受影响)"
-#: settings/serializers/feature.py:16
+#: settings/serializers/feature.py:18
msgid "Subject"
msgstr "主题"
-#: settings/serializers/feature.py:20
+#: settings/serializers/feature.py:22
msgid "More url"
msgstr "更多信息 URL"
-#: settings/serializers/feature.py:34 settings/serializers/feature.py:37
+#: settings/serializers/feature.py:36 settings/serializers/feature.py:39
msgid "Announcement"
msgstr "公告"
-#: settings/serializers/feature.py:36
+#: settings/serializers/feature.py:38
msgid "Enable announcement"
msgstr "启用公告"
-#: settings/serializers/feature.py:44
+#: settings/serializers/feature.py:46
msgid "Enable Vault"
msgstr "启用 Vault"
-#: settings/serializers/feature.py:53
+#: settings/serializers/feature.py:55
msgid "Mount Point"
msgstr "挂在点"
#: settings/serializers/feature.py:60
+msgid "Chat AI"
+msgstr "聊天 AI"
+
+#: settings/serializers/feature.py:64
+msgid "Enable Chat AI"
+msgstr "启动聊天 AI"
+
+#: settings/serializers/feature.py:67
+msgid "Base Url"
+msgstr "基本地址"
+
+#: settings/serializers/feature.py:70 templates/_header_bar.html:90
+msgid "API Key"
+msgstr "API Key"
+
+#: settings/serializers/feature.py:76
+msgid "GPT Model"
+msgstr "GPT 模型"
+
+#: settings/serializers/feature.py:100
msgid "Enable tickets"
msgstr "启用工单"
-#: settings/serializers/feature.py:63
+#: settings/serializers/feature.py:103
msgid "Ticket authorize default time"
msgstr "默认工单授权时间"
-#: settings/serializers/feature.py:66
-msgid "day"
-msgstr "天"
-
-#: settings/serializers/feature.py:66
+#: settings/serializers/feature.py:106
msgid "hour"
msgstr "时"
-#: settings/serializers/feature.py:67
+#: settings/serializers/feature.py:107
msgid "Ticket authorize default time unit"
msgstr "默认工单授权时间单位"
-#: settings/serializers/feature.py:72
+#: settings/serializers/feature.py:112
msgid "Feature"
msgstr "功能"
-#: settings/serializers/feature.py:75
+#: settings/serializers/feature.py:115
msgid "Operation center"
msgstr "作业中心"
-#: settings/serializers/feature.py:76
+#: settings/serializers/feature.py:116
msgid "Allow user run batch command or not using ansible"
msgstr "是否允许用户使用 ansible 执行批量命令"
-#: settings/serializers/feature.py:80
+#: settings/serializers/feature.py:120
msgid "Operation center command blacklist"
msgstr "作业中心命令黑名单"
-#: settings/serializers/feature.py:81
+#: settings/serializers/feature.py:121
msgid "Commands that are not allowed execute."
msgstr "不允许执行的命令"
+#: settings/serializers/feature.py:126
+#: terminal/models/virtualapp/provider.py:17
+#: terminal/models/virtualapp/virtualapp.py:36
+#: terminal/models/virtualapp/virtualapp.py:97
+#: terminal/serializers/virtualapp.py:32
+msgid "Virtual app"
+msgstr "虚拟应用"
+
+#: settings/serializers/feature.py:129
+msgid "Enable virtual app"
+msgstr "启用虚拟应用"
+
#: settings/serializers/msg.py:24
msgid "SMTP host"
msgstr "SMTP 主机"
@@ -5744,7 +5913,7 @@ msgstr "多个用户，使用 , 分割"
msgid "[%s] %s"
msgstr "[%s] %s"
-#: settings/serializers/terminal.py:9
+#: settings/serializers/terminal.py:9 terminal/models/virtualapp/provider.py:11
msgid "Hostname"
msgstr "主机名"
@@ -5806,100 +5975,104 @@ msgstr "周期导入 LDAP 用户"
msgid "Registration periodic import ldap user task"
msgstr "注册周期导入 LDAP 用户 任务"
-#: settings/utils/ldap.py:494
+#: settings/utils/ldap.py:492
msgid "ldap:// or ldaps:// protocol is used."
msgstr "使用 ldap:// 或 ldaps:// 协议"
-#: settings/utils/ldap.py:505
+#: settings/utils/ldap.py:503
msgid "Host or port is disconnected: {}"
msgstr "主机或端口不可连接: {}"
-#: settings/utils/ldap.py:507
+#: settings/utils/ldap.py:505
msgid "The port is not the port of the LDAP service: {}"
msgstr "端口不是LDAP服务端口: {}"
-#: settings/utils/ldap.py:509
+#: settings/utils/ldap.py:507
msgid "Please add certificate: {}"
msgstr "请添加证书"
-#: settings/utils/ldap.py:513 settings/utils/ldap.py:540
-#: settings/utils/ldap.py:570 settings/utils/ldap.py:598
+#: settings/utils/ldap.py:511 settings/utils/ldap.py:538
+#: settings/utils/ldap.py:568 settings/utils/ldap.py:596
msgid "Unknown error: {}"
msgstr "未知错误: {}"
-#: settings/utils/ldap.py:527
+#: settings/utils/ldap.py:525
msgid "Bind DN or Password incorrect"
msgstr "绑定DN或密码错误"
-#: settings/utils/ldap.py:534
+#: settings/utils/ldap.py:532
msgid "Please enter Bind DN: {}"
msgstr "请输入绑定DN: {}"
-#: settings/utils/ldap.py:536
+#: settings/utils/ldap.py:534
msgid "Please enter Password: {}"
msgstr "请输入密码: {}"
-#: settings/utils/ldap.py:538
+#: settings/utils/ldap.py:536
msgid "Please enter correct Bind DN and Password: {}"
msgstr "请输入正确的绑定DN和密码: {}"
-#: settings/utils/ldap.py:556
+#: settings/utils/ldap.py:554
msgid "Invalid User OU or User search filter: {}"
msgstr "不合法的用户OU或用户过滤器: {}"
-#: settings/utils/ldap.py:587
+#: settings/utils/ldap.py:585
msgid "LDAP User attr map not include: {}"
msgstr "LDAP属性映射没有包含: {}"
-#: settings/utils/ldap.py:594
+#: settings/utils/ldap.py:592
msgid "LDAP User attr map is not dict"
msgstr "LDAP属性映射不合法"
-#: settings/utils/ldap.py:613
+#: settings/utils/ldap.py:611
msgid "LDAP authentication is not enabled"
msgstr "LDAP认证没有启用"
-#: settings/utils/ldap.py:631
+#: settings/utils/ldap.py:629
msgid "Error (Invalid LDAP server): {}"
msgstr "错误 (不合法的LDAP服务器地址): {}"
-#: settings/utils/ldap.py:633
+#: settings/utils/ldap.py:631
msgid "Error (Invalid Bind DN): {}"
msgstr "错误 (不合法的绑定DN): {}"
-#: settings/utils/ldap.py:635
+#: settings/utils/ldap.py:633
msgid "Error (Invalid LDAP User attr map): {}"
msgstr "错误 (不合法的LDAP属性映射): {}"
-#: settings/utils/ldap.py:637
+#: settings/utils/ldap.py:635
msgid "Error (Invalid User OU or User search filter): {}"
msgstr "错误 (不合法的用户OU或用户过滤器): {}"
-#: settings/utils/ldap.py:639
+#: settings/utils/ldap.py:637
msgid "Error (Not enabled LDAP authentication): {}"
msgstr "错误 (没有启用LDAP认证): {}"
-#: settings/utils/ldap.py:641
+#: settings/utils/ldap.py:639
msgid "Error (Unknown): {}"
msgstr "错误 (未知): {}"
-#: settings/utils/ldap.py:644
+#: settings/utils/ldap.py:642
msgid "Succeed: Match {} s user"
msgstr "成功匹配 {} 个用户"
-#: settings/utils/ldap.py:677
+#: settings/utils/ldap.py:653
+msgid "Please test the connection first"
+msgstr "请先测试连接"
+
+#: settings/utils/ldap.py:675
msgid "Authentication failed (configuration incorrect): {}"
msgstr "认证失败 (配置错误): {}"
-#: settings/utils/ldap.py:681
+#: settings/utils/ldap.py:679
msgid "Authentication failed (username or password incorrect): {}"
msgstr "认证失败 (用户名或密码不正确): {}"
-#: settings/utils/ldap.py:683
+#: settings/utils/ldap.py:681
msgid "Authentication failed (Unknown): {}"
msgstr "认证失败: (未知): {}"
-#: settings/utils/ldap.py:686
+#: settings/utils/ldap.py:684
msgid "Authentication success: {}"
msgstr "认证成功: {}"
@@ -5959,10 +6132,6 @@ msgstr "管理页面"
msgid "User page"
msgstr "用户页面"
-#: templates/_header_bar.html:90
-msgid "API Key"
-msgstr "API Key"
-
#: templates/_header_bar.html:91
msgid "Logout"
msgstr "注销登录"
@@ -6059,7 +6228,7 @@ msgid "Home page"
msgstr "首页"
#: templates/resource_download.html:18 templates/resource_download.html:33
-#: users/const.py:53
+#: users/const.py:60
msgid "Client"
msgstr "客户端"
@@ -6099,11 +6268,13 @@ msgstr "OpenSSH 是在 windows 远程应用发布服务器中用来连接远程
msgid "Offline video player"
msgstr "离线录像播放器"
-#: terminal/api/applet/applet.py:48 terminal/api/applet/applet.py:51
+#: terminal/api/applet/applet.py:50 terminal/api/applet/applet.py:53
+#: terminal/api/virtualapp/virtualapp.py:43
+#: terminal/api/virtualapp/virtualapp.py:46
msgid "Invalid zip file"
msgstr "无效的 zip 文件"
-#: terminal/api/applet/applet.py:65
+#: terminal/api/applet/applet.py:72
msgid "This is enterprise edition applet"
msgstr "企业版远程应用，在社区版中不能使用"
@@ -6225,7 +6396,7 @@ msgstr "严重"
msgid "High"
msgstr "较高"
-#: terminal/const.py:47 terminal/const.py:83
+#: terminal/const.py:47 terminal/const.py:84
#: users/templates/users/reset_password.html:50
msgid "Normal"
msgstr "正常"
@@ -6234,46 +6405,50 @@ msgstr "正常"
msgid "Offline"
msgstr "离线"
-#: terminal/const.py:79
+#: terminal/const.py:80
msgid "Mismatch"
msgstr "未匹配"
-#: terminal/const.py:84
+#: terminal/const.py:85
msgid "Tunnel"
msgstr "隧道"
-#: terminal/const.py:90
+#: terminal/const.py:91
msgid "Read only"
msgstr "只读"
-#: terminal/const.py:91
+#: terminal/const.py:92
msgid "Writable"
msgstr "读写"
-#: terminal/const.py:95
+#: terminal/const.py:96
msgid "Kill session"
msgstr "终断会话"
-#: terminal/const.py:96
+#: terminal/const.py:97
msgid "Lock session"
msgstr "锁定会话"
-#: terminal/const.py:97
+#: terminal/const.py:98
msgid "Unlock session"
msgstr "解锁会话"
-#: terminal/const.py:102
+#: terminal/const.py:103
msgid "Replay create failed"
msgstr "录像创建失败"
-#: terminal/const.py:103
+#: terminal/const.py:104
msgid "Replay upload failed"
msgstr "录像上传失败"
-#: terminal/const.py:104
+#: terminal/const.py:105
msgid "Replay convert failed"
msgstr "录像转码失败"
+#: terminal/const.py:106
+msgid "Replay unsupported"
+msgstr "不支持录像"
+
#: terminal/exceptions.py:8
msgid "Bulk create not support"
msgstr "不支持批量创建"
@@ -6291,6 +6466,7 @@ msgid "Enterprise"
msgstr "企业版"
#: terminal/models/applet/applet.py:36
+#: terminal/models/virtualapp/virtualapp.py:22
msgid "Author"
msgstr "作者"
@@ -6303,6 +6479,7 @@ msgid "Can concurrent"
msgstr "可以并发"
#: terminal/models/applet/applet.py:44
+#: terminal/models/virtualapp/virtualapp.py:29
msgid "Tags"
msgstr "标签"
@@ -6311,6 +6488,7 @@ msgid "Hosts"
msgstr "主机"
#: terminal/models/applet/applet.py:93
+#: terminal/models/virtualapp/virtualapp.py:66
msgid "Applet pkg not valid, Missing file {}"
msgstr "Applet pkg 无效，缺少文件 {}"
@@ -6326,12 +6504,12 @@ msgstr "只支持自定义平台"
msgid "Missing type in platform.yml"
msgstr "在 platform.yml 中缺少类型"
-#: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:36
+#: terminal/models/applet/applet.py:318 terminal/models/applet/host.py:36
#: terminal/models/applet/host.py:138
msgid "Hosting"
msgstr "宿主机"
-#: terminal/models/applet/host.py:18 terminal/serializers/applet_host.py:57
+#: terminal/models/applet/host.py:18 terminal/serializers/applet_host.py:69
msgid "Deploy options"
msgstr "部署参数"
@@ -6395,15 +6573,19 @@ msgstr "PostgreSQL 端口"
msgid "Redis port"
msgstr "Redis 端口"
-#: terminal/models/component/endpoint.py:29
-#: terminal/models/component/endpoint.py:102
+#: terminal/models/component/endpoint.py:23
+msgid "SQLServer port"
+msgstr "SQLServer 端口"
+
+#: terminal/models/component/endpoint.py:30
+#: terminal/models/component/endpoint.py:103
#: terminal/serializers/endpoint.py:73 terminal/serializers/storage.py:41
#: terminal/serializers/storage.py:53 terminal/serializers/storage.py:83
#: terminal/serializers/storage.py:93 terminal/serializers/storage.py:101
msgid "Endpoint"
msgstr "端点"
-#: terminal/models/component/endpoint.py:108
+#: terminal/models/component/endpoint.py:109
msgid "Endpoint rule"
msgstr "端点规则"
@@ -6461,7 +6643,7 @@ msgstr "远端地址"
msgid "Application User"
msgstr "应用用户"
-#: terminal/models/component/terminal.py:166
+#: terminal/models/component/terminal.py:176
msgid "Can view terminal config"
msgstr "可以查看终端配置"
@@ -6583,6 +6765,19 @@ msgstr "验证码不正确"
msgid "You have already joined this session"
msgstr "您已经加入过此会话"
+#: terminal/models/virtualapp/virtualapp.py:32
+msgid "Providers"
+msgstr "提供商"
+
+#: terminal/models/virtualapp/virtualapp.py:94
+#: terminal/serializers/virtualapp.py:34
+msgid "App Provider"
+msgstr "应用提供商"
+
+#: terminal/models/virtualapp/virtualapp.py:102
+msgid "Virtual app publication"
+msgstr "虚拟应用发布"
+
#: terminal/notifications.py:25
msgid "Sessions"
msgstr "会话管理"
@@ -6620,7 +6815,7 @@ msgstr "测试失败: 账号无效"
msgid "Invalid storage"
msgstr "无效的存储"
-#: terminal/serializers/applet.py:28
+#: terminal/serializers/applet.py:28 terminal/serializers/virtualapp.py:15
msgid "Icon"
msgstr "图标"
@@ -6673,19 +6868,36 @@ msgstr "RDS 授权模式"
msgid "RDS Single Session Per User"
msgstr "RDS 单用户单会话"
-#: terminal/serializers/applet_host.py:52
-msgid "RDS Max Disconnection Time"
-msgstr "RDS 最大断开时间"
-
#: terminal/serializers/applet_host.py:53
-msgid "RDS Remote App Logoff Time Limit"
-msgstr "RDS 远程应用注销时间限制"
+msgid "RDS Max Disconnection Time (ms)"
+msgstr "RDS 最大断开时间（毫秒）"
-#: terminal/serializers/applet_host.py:59 terminal/serializers/terminal.py:47
+#: terminal/serializers/applet_host.py:55
+msgid ""
+"Tips: Set the maximum duration for keeping a disconnected session active on "
+"the server (log off the session after 60000 milliseconds)."
+msgstr ""
+"提示：设置某个已断开连接的会话在服务器上能保持活动状态的最长时间（60000 毫秒"
+"后注销会话）"
+
+#: terminal/serializers/applet_host.py:60
+msgid "RDS Remote App Logoff Time Limit (ms)"
+msgstr "RDS 远程应用注销时间限制（毫秒）"
+
+#: terminal/serializers/applet_host.py:62
+msgid ""
+"Tips: Set the logoff time for RemoteApp sessions after closing all RemoteApp "
+"programs (0 milliseconds, log off the session immediately)."
+msgstr ""
+"提示：关闭所有 RemoteApp 程序之后设置 RemoteAPP 会话的注销时间（0 毫秒，立即"
+"注销会话）"
+
+#: terminal/serializers/applet_host.py:71 terminal/serializers/terminal.py:47
+#: terminal/serializers/virtualapp_provider.py:13
msgid "Load status"
msgstr "负载状态"
-#: terminal/serializers/applet_host.py:73
+#: terminal/serializers/applet_host.py:85
msgid ""
"These accounts are used to connect to the published application, the account "
"is now divided into two types, one is dedicated to each account, each user "
@@ -6696,13 +6908,13 @@ msgstr ""
"这些账号用于连接发布的应用，账号现在分为两种类型:
一种是专用的，每个用" "户都有一个专用账号。 另一种是公共的，当应用不支持多开且专用的已经被使用时，会" "使用公共账号连接;
注意: 如果不开启自动创建账号, 当前发布机仅能被指定标" -"签的资产调度到，默认不会放到调度池中" +"签的资产调度到，默认不会放到调度池中，且需要手动维护账号" -#: terminal/serializers/applet_host.py:80 +#: terminal/serializers/applet_host.py:92 msgid "The number of public accounts created automatically" msgstr "公用账号自动创建的数量" -#: terminal/serializers/applet_host.py:83 +#: terminal/serializers/applet_host.py:95 msgid "" "Connect to the host using the same account first. For security reasons, " "please set the configuration item CACHE_LOGIN_PASSWORD_ENABLED=true and " @@ -6829,7 +7041,7 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:250 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:253 msgid "Region" msgstr "地域" @@ -6849,8 +7061,8 @@ msgstr "端点后缀" msgid "HOST" msgstr "主机" -#: terminal/serializers/storage.py:146 users/models/user.py:823 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: terminal/serializers/storage.py:146 users/models/user.py:830 +#: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" @@ -6894,6 +7106,26 @@ msgstr "会话 ID" msgid "Not found" msgstr "没有发现" +#: terminal/serializers/virtualapp_provider.py:26 +msgid "Container ID" +msgstr "容器 ID" + +#: terminal/serializers/virtualapp_provider.py:27 +msgid "Container Image" +msgstr "容器镜像" + +#: terminal/serializers/virtualapp_provider.py:28 +msgid "Container Name" +msgstr "容器名称" + +#: terminal/serializers/virtualapp_provider.py:29 +msgid "Container Status" +msgstr "容器状态" + +#: terminal/serializers/virtualapp_provider.py:30 +msgid "Container Ports" +msgstr "容器端口" + #: terminal/tasks.py:33 msgid "Periodic delete terminal status" msgstr "周期清理终端状态" @@ -7171,19 +7403,19 @@ msgstr "工单基本信息" msgid "Ticket applied info" msgstr "工单申请信息" -#: tickets/notifications.py:109 +#: tickets/notifications.py:111 msgid "Your has a new ticket, applicant - {}" msgstr "你有一个新的工单, 申请人 - {}" -#: tickets/notifications.py:113 +#: tickets/notifications.py:115 msgid "{}: New Ticket - {} ({})" msgstr "新工单 - {} ({})" -#: tickets/notifications.py:157 +#: tickets/notifications.py:159 msgid "Your ticket has been processed, processor - {}" msgstr "你的工单已被处理, 处理人 - {}" -#: tickets/notifications.py:161 +#: tickets/notifications.py:163 msgid "Ticket has processed - {} ({})" msgstr "你的工单已被处理, 处理人 - {} ({})" @@ -7236,11 +7468,11 @@ msgstr "授权名称 `{}` 已存在" msgid "The ticket flow `{}` does not exist" msgstr "工单流程 `{}` 不存在" -#: tickets/templates/tickets/_msg_ticket.html:20 +#: tickets/templates/tickets/_msg_ticket.html:21 msgid "View details" msgstr "查看详情" -#: tickets/templates/tickets/_msg_ticket.html:25 +#: tickets/templates/tickets/_msg_ticket.html:26 msgid "Direct approval" msgstr "直接批准" @@ -7248,12 +7480,12 @@ msgstr "直接批准" msgid "Ticket information" msgstr "工单信息" -#: tickets/templates/tickets/approve_check_password.html:29 +#: tickets/templates/tickets/approve_check_password.html:28 #: tickets/views/approve.py:40 tickets/views/approve.py:77 msgid "Ticket approval" msgstr "工单审批" -#: tickets/templates/tickets/approve_check_password.html:44 +#: tickets/templates/tickets/approve_check_password.html:43 msgid "Approval" msgstr "同意" @@ -7278,11 +7510,11 @@ msgstr "无效的审批动作" msgid "This user is not authorized to approve this ticket" msgstr "此用户无权审批此工单" -#: users/api/user.py:141 +#: users/api/user.py:137 msgid "Can not invite self" msgstr "不能邀请自己" -#: users/api/user.py:194 +#: users/api/user.py:190 msgid "Could not reset self otp, use profile reset instead" msgstr "不能在该页面重置 MFA 多因子认证, 请去个人信息页面重置" @@ -7326,11 +7558,11 @@ msgstr "多屏显示" msgid "Drives redirect" msgstr "磁盘挂载" -#: users/const.py:57 +#: users/const.py:64 msgid "Replace" msgstr "替换" -#: users/const.py:58 +#: users/const.py:65 msgid "Suffix" msgstr "加后缀" @@ -7417,8 +7649,8 @@ msgstr "不能和原来的密钥相同" msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:173 users/models/user.py:826 -#: xpack/plugins/cloud/serializers/account_attrs.py:203 +#: users/forms/profile.py:173 users/models/user.py:833 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "SSH公钥" @@ -7426,72 +7658,74 @@ msgstr "SSH公钥" msgid "Preference" msgstr "用户设置" -#: users/models/user.py:643 users/serializers/profile.py:94 +#: users/models/user.py:646 users/serializers/profile.py:94 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:805 users/serializers/user.py:169 +#: users/models/user.py:812 users/serializers/user.py:169 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:807 +#: users/models/user.py:814 msgid "Avatar" msgstr "头像" -#: users/models/user.py:810 +#: users/models/user.py:817 msgid "Wechat" msgstr "微信" -#: users/models/user.py:813 users/serializers/user.py:106 +#: users/models/user.py:820 users/serializers/user.py:106 msgid "Phone" msgstr "手机" -#: users/models/user.py:819 +#: users/models/user.py:826 msgid "OTP secret key" msgstr "OTP 密钥" -#: users/models/user.py:831 users/serializers/profile.py:128 +# msgid "Private key" +# msgstr "ssh私钥" +#: users/models/user.py:838 users/serializers/profile.py:128 #: users/serializers/user.py:166 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:841 +#: users/models/user.py:848 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:844 +#: users/models/user.py:851 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:846 +#: users/models/user.py:853 msgid "Date api key used" msgstr "Api key 最后使用日期" -#: users/models/user.py:969 +#: users/models/user.py:984 msgid "Can not delete admin user" msgstr "无法删除管理员用户" -#: users/models/user.py:995 +#: users/models/user.py:1011 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:996 +#: users/models/user.py:1012 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:997 +#: users/models/user.py:1013 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:1006 +#: users/models/user.py:1022 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1009 +#: users/models/user.py:1025 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1034 +#: users/models/user.py:1050 msgid "User password history" msgstr "用户密码历史" @@ -7563,37 +7797,45 @@ msgid "RDP client option" msgstr "RDP 客户端选项" #: users/serializers/preference/luna.py:45 -msgid "Rdp smart size" -msgstr "RDP 智能大小" +msgid "RDP color quality" +msgstr "" -#: users/serializers/preference/luna.py:46 +#: users/serializers/preference/luna.py:49 +msgid "Rdp smart size" +msgstr "" + +# msgid "Rdp smart size" +# msgstr "RDP 智能大小" +#: users/serializers/preference/luna.py:50 msgid "" "Determines whether the client computer should scale the content on the " "remote computer to fit the window size of the client computer when the " "window is resized." -msgstr "确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机的窗口大小" +msgstr "" +"确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机" +"的窗口大小" -#: users/serializers/preference/luna.py:51 +#: users/serializers/preference/luna.py:55 msgid "Remote application connection method" msgstr "远程应用连接方式" -#: users/serializers/preference/luna.py:58 +#: users/serializers/preference/luna.py:62 msgid "Character terminal font size" msgstr "字符终端字体大小" -#: users/serializers/preference/luna.py:61 +#: users/serializers/preference/luna.py:65 msgid "Backspace as Ctrl+H" msgstr "字符终端Backspace As Ctrl+H" -#: users/serializers/preference/luna.py:64 +#: users/serializers/preference/luna.py:68 msgid "Right click quickly paste" msgstr "右键快速粘贴" -#: users/serializers/preference/luna.py:70 +#: users/serializers/preference/luna.py:74 msgid "Graphics" msgstr "图形化" -#: users/serializers/preference/luna.py:71 +#: users/serializers/preference/luna.py:75 msgid "Command line" msgstr "命令行" @@ -7653,15 +7895,15 @@ msgstr "头像路径" msgid "MFA level" msgstr "MFA 级别" -#: users/serializers/user.py:282 +#: users/serializers/user.py:287 msgid "Select users" msgstr "选择用户" -#: users/serializers/user.py:283 +#: users/serializers/user.py:288 msgid "For security, only list several users" msgstr "为了安全，仅列出几个用户" -#: users/serializers/user.py:316 +#: users/serializers/user.py:321 msgid "name not unique" msgstr "名称重复" @@ -7691,9 +7933,9 @@ msgstr "周期检测用户过期" #: users/tasks.py:84 msgid "Check unused users" -msgstr "校验用户已过期" +msgstr "检查未使用的用户" -#: users/tasks.py:114 +#: users/tasks.py:123 msgid "The user has not logged in recently and has been disabled." msgstr "该用户最近未登录，已被禁用。" @@ -7947,6 +8189,11 @@ msgstr "重置密码成功，返回到登录页面" msgid "XPACK" msgstr "XPack" +#: xpack/exceptions.py:7 +msgid "" +"The current task is not synchronized with unmatched policy assets, skipping" +msgstr "" + #: xpack/plugins/cloud/api.py:56 msgid "Test connection successful" msgstr "测试成功" @@ -8027,47 +8274,67 @@ msgstr "天翼私有云" msgid "OpenStack" msgstr "OpenStack" -#: xpack/plugins/cloud/const.py:28 +#: xpack/plugins/cloud/const.py:28 xpack/plugins/cloud/providers/zstack.py:21 +msgid "ZStack" +msgstr "ZStack" + +#: xpack/plugins/cloud/const.py:29 msgid "Fusion Compute" msgstr "融合计算" -#: xpack/plugins/cloud/const.py:33 +#: xpack/plugins/cloud/const.py:30 +msgid "SCP" +msgstr "深信服SCP" + +#: xpack/plugins/cloud/const.py:31 +msgid "Apsara Stack" +msgstr "阿里云专有云" + +#: xpack/plugins/cloud/const.py:36 msgid "Private IP" msgstr "私有IP" -#: xpack/plugins/cloud/const.py:34 +#: xpack/plugins/cloud/const.py:37 msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/const.py:41 xpack/plugins/cloud/models.py:303 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/const.py:39 +#: xpack/plugins/cloud/const.py:42 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/const.py:44 +#: xpack/plugins/cloud/const.py:47 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:48 +#: xpack/plugins/cloud/const.py:51 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:49 +#: xpack/plugins/cloud/const.py:52 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:50 +#: xpack/plugins/cloud/const.py:53 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:51 +#: xpack/plugins/cloud/const.py:54 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/manager.py:54 +#: xpack/plugins/cloud/const.py:58 +msgid "And" +msgstr "与" + +#: xpack/plugins/cloud/const.py:59 +msgid "Or" +msgstr "或" + +#: xpack/plugins/cloud/manager.py:56 msgid "Account unavailable" msgstr "账号无效" @@ -8091,7 +8358,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:159 msgid "Regions" msgstr "地域" @@ -8100,122 +8367,134 @@ msgid "Hostname strategy" msgstr "主机名策略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:154 +#: xpack/plugins/cloud/serializers/task.py:162 msgid "IP network segment group" msgstr "IP网段组" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/serializers/task.py:167 msgid "Sync IP type" msgstr "同步IP类型" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:177 +#: xpack/plugins/cloud/serializers/task.py:185 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:108 +msgid "Fully synchronous" +msgstr "完全同步" + +#: xpack/plugins/cloud/models.py:113 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 -#: xpack/plugins/cloud/models.py:337 +#: xpack/plugins/cloud/models.py:116 xpack/plugins/cloud/models.py:321 +#: xpack/plugins/cloud/models.py:345 msgid "Strategy" msgstr "策略" -#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 +#: xpack/plugins/cloud/models.py:121 xpack/plugins/cloud/models.py:200 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:263 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:212 +#: xpack/plugins/cloud/models.py:215 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:219 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:243 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:244 +#: xpack/plugins/cloud/models.py:247 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:247 +#: xpack/plugins/cloud/models.py:250 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:267 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:281 +#: xpack/plugins/cloud/models.py:279 xpack/plugins/cloud/serializers/task.py:72 +msgid "Rule relation" +msgstr "条件关系" + +#: xpack/plugins/cloud/models.py:288 msgid "Task strategy" msgstr "任务策略" -#: xpack/plugins/cloud/models.py:285 +#: xpack/plugins/cloud/models.py:292 msgid "Equal" msgstr "等于" -#: xpack/plugins/cloud/models.py:286 +#: xpack/plugins/cloud/models.py:293 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:287 +#: xpack/plugins/cloud/models.py:294 msgid "In" msgstr "在...中" -#: xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:295 msgid "Contains" msgstr "包含" -#: xpack/plugins/cloud/models.py:289 +#: xpack/plugins/cloud/models.py:296 +msgid "Exclude" +msgstr "排除" + +#: xpack/plugins/cloud/models.py:297 msgid "Startswith" msgstr "以...开头" -#: xpack/plugins/cloud/models.py:290 +#: xpack/plugins/cloud/models.py:298 msgid "Endswith" msgstr "以...结尾" -#: xpack/plugins/cloud/models.py:296 +#: xpack/plugins/cloud/models.py:304 msgid "Instance platform" msgstr "实例平台" -#: xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:305 msgid "Instance address" msgstr "实例地址" -#: xpack/plugins/cloud/models.py:304 +#: xpack/plugins/cloud/models.py:312 msgid "Rule attr" msgstr "规则属性" -#: xpack/plugins/cloud/models.py:308 +#: xpack/plugins/cloud/models.py:316 msgid "Rule match" msgstr "规则匹配" -#: xpack/plugins/cloud/models.py:310 +#: xpack/plugins/cloud/models.py:318 msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:325 xpack/plugins/cloud/serializers/task.py:75 msgid "Strategy rule" msgstr "条件" -#: xpack/plugins/cloud/models.py:332 +#: xpack/plugins/cloud/models.py:340 msgid "Action attr" msgstr "动作属性" -#: xpack/plugins/cloud/models.py:334 +#: xpack/plugins/cloud/models.py:342 msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/models.py:349 xpack/plugins/cloud/serializers/task.py:78 msgid "Strategy action" msgstr "动作" @@ -8409,11 +8688,11 @@ msgstr "TR-Istanbul" msgid "CN East-Suqian" msgstr "华东-宿迁" -#: xpack/plugins/cloud/serializers/account.py:64 +#: xpack/plugins/cloud/serializers/account.py:68 msgid "Validity display" msgstr "有效性显示" -#: xpack/plugins/cloud/serializers/account.py:65 +#: xpack/plugins/cloud/serializers/account.py:69 msgid "Provider display" msgstr "服务商显示" @@ -8430,50 +8709,50 @@ msgid "Subscription ID" msgstr "订阅 ID" #: xpack/plugins/cloud/serializers/account_attrs.py:98 -#: xpack/plugins/cloud/serializers/account_attrs.py:103 -#: xpack/plugins/cloud/serializers/account_attrs.py:119 -#: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:199 +#: xpack/plugins/cloud/serializers/account_attrs.py:102 +#: xpack/plugins/cloud/serializers/account_attrs.py:126 +#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "API Endpoint" msgstr "API 端点" -#: xpack/plugins/cloud/serializers/account_attrs.py:109 +#: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "认证地址" -#: xpack/plugins/cloud/serializers/account_attrs.py:110 +#: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "如: http://openstack.example.com:5000/v3" -#: xpack/plugins/cloud/serializers/account_attrs.py:113 +#: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "用户域" -#: xpack/plugins/cloud/serializers/account_attrs.py:120 +#: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "证书文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:121 +#: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "密钥文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:137 +#: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "服务账号密钥" -#: xpack/plugins/cloud/serializers/account_attrs.py:138 +#: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "JSON 格式的文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" -#: xpack/plugins/cloud/serializers/account_attrs.py:172 +#: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" -#: xpack/plugins/cloud/serializers/account_attrs.py:175 +#: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " "synchronization task is executed, only the valid IP address will be " @@ -8482,27 +8761,27 @@ msgstr "" "端口用来检测 IP 地址的有效性，在同步任务执行时，只会同步有效的 IP 地址。
" "如果端口为 0，则表示所有 IP 地址均有效。" -#: xpack/plugins/cloud/serializers/account_attrs.py:183 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "主机名前缀" -#: xpack/plugins/cloud/serializers/account_attrs.py:186 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP 网段" -#: xpack/plugins/cloud/serializers/account_attrs.py:190 +#: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "测试端口" -#: xpack/plugins/cloud/serializers/account_attrs.py:193 +#: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:143 +#: xpack/plugins/cloud/serializers/task.py:151 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -8514,11 +8793,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:149 +#: xpack/plugins/cloud/serializers/task.py:157 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "Instance count" msgstr "实例个数" @@ -8562,7 +8841,15 @@ msgstr "退出页面logo" msgid "Theme" msgstr "主题" -#: xpack/plugins/interface/models.py:44 xpack/plugins/interface/models.py:85 +#: xpack/plugins/interface/models.py:42 +msgid "Beian link" +msgstr "公安联网备案跳转链接" + +#: xpack/plugins/interface/models.py:43 +msgid "Beian text" +msgstr "公安联网备案号" + +#: xpack/plugins/interface/models.py:46 xpack/plugins/interface/models.py:87 msgid "Interface setting" msgstr "界面设置" @@ -8594,17 +8881,17 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" -#~ msgid "Copy" -#~ msgstr "复制" +#~ msgid "Password can not contains `{{` or `}}`" +#~ msgstr "密码不能包含 `{{` 或 `}}` 字符" -#~ msgid "Paste" -#~ msgstr "粘贴" +#~ msgid "Password can not contains `{%` or `%}`" +#~ msgstr "密码不能包含 `{%` 或 `%}` 字符" -#~ msgid "Password can not contains `'` " -#~ msgstr "密码不能包含 `'` 字符" +#~ msgid "FeiShu query user failed" +#~ msgstr "飞书查询用户失败" -#~ msgid "Password can not contains `\"` " -#~ msgstr "密码不能包含 `\"` 字符" +#~ msgid "The FeiShu is already bound to another user" +#~ msgstr "该飞书已经绑定其他用户" -#~ msgid "Object Storage" -#~ msgstr "对象存储" +#~ msgid "Binding FeiShu successfully" +#~ msgstr "绑定 飞书 成功" diff --git a/apps/notifications/backends/__init__.py b/apps/notifications/backends/__init__.py index 2e95bd437..047123e57 100644 --- a/apps/notifications/backends/__init__.py +++ b/apps/notifications/backends/__init__.py @@ -12,6 +12,7 @@ class BACKEND(models.TextChoices): DINGTALK = 'dingtalk', _('DingTalk') SITE_MSG = 'site_msg', _('Site message') FEISHU = 'feishu', _('FeiShu') + SLACK = 'slack', _('Slack') # SMS = 'sms', _('SMS') @property diff --git a/apps/notifications/backends/slack.py b/apps/notifications/backends/slack.py new file mode 100644 index 000000000..95e0bde60 --- /dev/null +++ b/apps/notifications/backends/slack.py @@ -0,0 +1,21 @@ +from django.conf import settings + +from common.sdk.im.slack import Slack as Client +from .base import BackendBase + + +class Slack(BackendBase): + account_field = 'slack_id' + is_enable_field_in_settings = 'AUTH_SLACK' + + def __init__(self): + self.client = Client( + bot_token=settings.SLACK_BOT_TOKEN, + ) + + def send_msg(self, users, message, subject=None): + accounts, __, __ = self.get_accounts(users) + return self.client.send_text(accounts, message) + + +backend = Slack diff --git a/apps/notifications/notifications.py b/apps/notifications/notifications.py index 19a86ac94..5ceb629c3 100644 --- a/apps/notifications/notifications.py +++ b/apps/notifications/notifications.py @@ -202,6 +202,9 @@ class Message(metaclass=MessageType): def get_site_msg_msg(self) -> dict: return self.html_msg + def get_slack_msg(self) -> dict: + return self.markdown_msg + def get_sms_msg(self) -> dict: return self.text_msg_with_sign diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index 1426ffc01..0dfa0b575 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -13,7 +13,7 @@ class JMSInventory: def __init__( self, assets, account_policy='privileged_first', account_prefer='root,Administrator', host_callback=None, - exclude_localhost=False, task_type=None + exclude_localhost=False, task_type=None, protocol=None ): """ :param assets: @@ -27,6 +27,7 @@ class JMSInventory: self.exclude_hosts = {} self.exclude_localhost = exclude_localhost self.task_type = task_type + self.protocol = protocol @staticmethod def clean_assets(assets): @@ -71,8 +72,9 @@ class JMSInventory: } if not account.secret: return var + if account.secret_type == 'password': - var['ansible_password'] = account.secret + var['ansible_password'] = account.escape_jinja2_syntax(account.secret) elif account.secret_type == 'ssh_key': var['ansible_ssh_private_key_file'] = account.private_key_path return var @@ -84,7 +86,7 @@ class JMSInventory: 'custom_become': True, 'custom_become_method': su_method, 'custom_become_user': account.su_from.username, - 'custom_become_password': account.su_from.secret, + 'custom_become_password': account.escape_jinja2_syntax(account.su_from.secret), 'custom_become_private_key_path': account.su_from.private_key_path } return var @@ -109,13 +111,13 @@ class JMSInventory: host.update(self.make_account_ansible_vars(account)) host['ansible_become'] = True host['ansible_become_user'] = 'root' - host['ansible_become_password'] = account.secret + host['ansible_become_password'] = account.escape_jinja2_syntax(account.secret) else: host.update(self.make_account_ansible_vars(account)) if gateway: ansible_connection = host.get('ansible_connection', 'ssh') - if ansible_connection in ('local', 'winrm'): + if ansible_connection in ('local', 'winrm', 'rdp'): host['gateway'] = { 'address': gateway.address, 'port': gateway.port, 'username': gateway.username, 'secret': gateway.password, @@ -127,19 +129,20 @@ class JMSInventory: host['jms_asset'].update(ansible_ssh_common_args) host.update(ansible_ssh_common_args) - @staticmethod - def get_primary_protocol(ansible_config, protocols): + def get_primary_protocol(self, ansible_config, protocols): invalid_protocol = type('protocol', (), {'name': 'null', 'port': 0}) ansible_connection = ansible_config.get('ansible_connection') # 数值越小，优先级越高，若用户在 ansible_config 中配置了，则提高用户配置方式的优先级 protocol_priority = {'ssh': 10, 'winrm': 9, ansible_connection: 1} + if self.protocol: + protocol_priority.update({self.protocol: 0}) protocol_sorted = sorted(protocols, key=lambda x: protocol_priority.get(x.name, 999)) protocol = protocol_sorted[0] if protocol_sorted else invalid_protocol return protocol @staticmethod def fill_ansible_config(ansible_config, protocol): - if protocol.name in ('ssh', 'winrm'): + if protocol.name in ('ssh', 'winrm', 'rdp'): ansible_config['ansible_connection'] = protocol.name if protocol.name == 'winrm': if protocol.setting.get('use_ssl', False): @@ -173,11 +176,13 @@ class JMSInventory: }, 'jms_account': { 'id': str(account.id), 'username': account.username, - 'secret': account.secret, 'secret_type': account.secret_type, - 'private_key_path': account.private_key_path + 'secret': account.escape_jinja2_syntax(account.secret), + 'secret_type': account.secret_type, 'private_key_path': account.private_key_path } if account else None } + protocols = host['jms_asset']['protocols'] + host['jms_asset'].update({f"{p['name']}_port": p['port'] for p in protocols}) if host['jms_account'] and tp == 'oracle': host['jms_account']['mode'] = 'sysdba' if account.privileged else None diff --git a/apps/ops/ansible/runner.py b/apps/ops/ansible/runner.py index 4610ddfd2..c5fee5fd9 100644 --- a/apps/ops/ansible/runner.py +++ b/apps/ops/ansible/runner.py @@ -1,8 +1,9 @@ import os import uuid - +import shutil import ansible_runner from django.conf import settings +from django.utils._os import safe_join from .callback import DefaultCallback from ..utils import get_ansible_log_verbosity @@ -85,6 +86,34 @@ class PlaybookRunner: return self.cb +class UploadFileRunner: + def __init__(self, inventory, job_id, dest_path, callback=None): + self.id = uuid.uuid4() + self.inventory = inventory + self.cb = DefaultCallback() + upload_file_dir = safe_join(settings.DATA_DIR, 'job_upload_file') + self.src_paths = safe_join(upload_file_dir, str(job_id)) + self.dest_path = safe_join("/tmp", dest_path) + + def run(self, verbosity=0, **kwargs): + verbosity = get_ansible_log_verbosity(verbosity) + ansible_runner.run( + host_pattern="*", + inventory=self.inventory, + module='copy', + module_args=f"src={self.src_paths}/ dest={self.dest_path}", + verbosity=verbosity, + event_handler=self.cb.event_handler, + status_handler=self.cb.status_handler, + **kwargs + ) + try: + shutil.rmtree(self.src_paths) + except OSError as e: + print(f"del upload tmp dir {self.src_paths} failed! {e}") + return self.cb + + class CommandRunner(AdHocRunner): def __init__(self, inventory, command, pattern='*', project_dir='/tmp/'): super().__init__(inventory, 'shell', command, pattern, project_dir) diff --git a/apps/ops/api/celery.py b/apps/ops/api/celery.py index a7baaf6e4..797d00c5e 100644 --- a/apps/ops/api/celery.py +++ b/apps/ops/api/celery.py @@ -7,14 +7,15 @@ from celery.result import AsyncResult from django.shortcuts import get_object_or_404 from django.utils.translation import gettext as _ from django_celery_beat.models import PeriodicTask +from django_filters import rest_framework as drf_filters from rest_framework import generics, viewsets, mixins, status from rest_framework.response import Response -from django_filters import rest_framework as drf_filters from common.api import LogTailApi, CommonApiMixin +from common.drf.filters import BaseFilterSet from common.exceptions import JMSException from common.permissions import IsValidUser -from common.drf.filters import BaseFilterSet +from common.utils.timezone import local_now from ops.celery import app from ..ansible.utils import get_ansible_task_log_path from ..celery.utils import get_celery_task_log_path @@ -138,6 +139,46 @@ class CeleryTaskViewSet( def get_queryset(self): return CeleryTask.objects.exclude(name__startswith='celery') + @staticmethod + def extract_schedule(input_string): + pattern = r'(\S+ \S+ \S+ \S+ \S+).*' + match = re.match(pattern, input_string) + if match: + return match.group(1) + else: + return input_string + + def generate_execute_time(self, queryset): + names = [i.name for i in queryset] + periodic_tasks = PeriodicTask.objects.filter(name__in=names) + periodic_task_dict = {task.name: task for task in periodic_tasks} + now = local_now() + for i in queryset: + task = periodic_task_dict.get(i.name) + if not task: + continue + i.exec_cycle = self.extract_schedule(str(task.scheduler)) + + last_run_at = task.last_run_at or now + next_run_at = task.schedule.remaining_estimate(last_run_at) + if next_run_at.total_seconds() < 0: + next_run_at = task.schedule.remaining_estimate(now) + i.next_exec_time = now + next_run_at + return queryset + + def list(self, request, *args, **kwargs): + queryset = self.filter_queryset(self.get_queryset()) + + page = self.paginate_queryset(queryset) + if page is not None: + page = self.generate_execute_time(page) + serializer = self.get_serializer(page, many=True) + return self.get_paginated_response(serializer.data) + + queryset = self.generate_execute_time(queryset) + serializer = self.get_serializer(queryset, many=True) + return Response(serializer.data) + class CeleryTaskExecutionViewSet(CommonApiMixin, viewsets.ModelViewSet): serializer_class = CeleryTaskExecutionSerializer diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py index f2bf92cae..f16fefde2 100644 --- a/apps/ops/api/job.py +++ b/apps/ops/api/job.py @@ -1,16 +1,22 @@ +import json +import os + from django.conf import settings from django.db import transaction from django.db.models import Count -from django.db.transaction import atomic from django.shortcuts import get_object_or_404 +from django.utils._os import safe_join +from django.utils.translation import gettext_lazy as _ +from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.views import APIView from assets.models import Asset +from common.const.http import POST from common.permissions import IsValidUser from ops.const import Types from ops.models import Job, JobExecution -from ops.serializers.job import JobSerializer, JobExecutionSerializer +from ops.serializers.job import JobSerializer, JobExecutionSerializer, FileSerializer __all__ = [ 'JobViewSet', 'JobExecutionViewSet', 'JobRunVariableHelpAPIView', @@ -24,6 +30,7 @@ from orgs.utils import tmp_to_org, get_current_org from accounts.models import Account from perms.models import PermNode from perms.utils import UserPermAssetUtil +from jumpserver.settings import get_file_md5 def set_task_to_serializer_data(serializer, task_id): @@ -61,7 +68,7 @@ class JobViewSet(OrgBulkModelViewSet): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset.filter(creator=self.request.user) + queryset = queryset.filter(creator=self.request.user).exclude(type=Types.upload_file) if self.action != 'retrieve': return queryset.filter(instant=False) return queryset @@ -91,6 +98,65 @@ class JobViewSet(OrgBulkModelViewSet): transaction.on_commit( lambda: run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id))) + @staticmethod + def get_duplicates_files(files): + seen = set() + duplicates = set() + for file in files: + if file in seen: + duplicates.add(file) + else: + seen.add(file) + return list(duplicates) + + @staticmethod + def get_exceeds_limit_files(files): + exceeds_limit_files = [] + for file in files: + if file.size > settings.FILE_UPLOAD_SIZE_LIMIT_MB * 1024 * 1024: + exceeds_limit_files.append(file) + return exceeds_limit_files + + @action(methods=[POST], detail=False, serializer_class=FileSerializer, permission_classes=[IsValidUser, ], + url_path='upload') + def upload(self, request, *args, **kwargs): + uploaded_files = request.FILES.getlist('files') + serializer = self.get_serializer(data=request.data) + + if not serializer.is_valid(): + msg = 'Upload data invalid: {}'.format(serializer.errors) + return Response({'error': msg}, status=400) + + same_files = self.get_duplicates_files(uploaded_files) + if same_files: + return Response({'error': _("Duplicate file exists")}, status=400) + + exceeds_limit_files = self.get_exceeds_limit_files(uploaded_files) + if exceeds_limit_files: + return Response( + {'error': _("File size exceeds maximum limit. Please select a file smaller than {limit}MB").format( + limit=settings.FILE_UPLOAD_SIZE_LIMIT_MB)}, + status=400) + + job_id = request.data.get('job_id', '') + job = get_object_or_404(Job, pk=job_id) + job_args = json.loads(job.args) + src_path_info = [] + upload_file_dir = safe_join(settings.DATA_DIR, 'job_upload_file', job_id) + for uploaded_file in uploaded_files: + filename = uploaded_file.name + saved_path = safe_join(upload_file_dir, f'{filename}') + os.makedirs(os.path.dirname(saved_path), exist_ok=True) + with open(saved_path, 'wb+') as destination: + for chunk in uploaded_file.chunks(): + destination.write(chunk) + src_path_info.append({'filename': filename, 'md5': get_file_md5(saved_path)}) + job_args['src_path_info'] = src_path_info + job.args = json.dumps(job_args) + job.save() + self.run_job(job, serializer) + return Response({'task_id': serializer.data.get('task_id')}, status=201) + class JobExecutionViewSet(OrgBulkModelViewSet): serializer_class = JobExecutionSerializer @@ -101,7 +167,7 @@ class JobExecutionViewSet(OrgBulkModelViewSet): @staticmethod def start_deploy(instance, serializer): - task = run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) + run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) def perform_create(self, serializer): instance = serializer.save() @@ -113,7 +179,8 @@ class JobExecutionViewSet(OrgBulkModelViewSet): set_task_to_serializer_data(serializer, instance.id) transaction.on_commit( - lambda: run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id))) + lambda: run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) + ) def get_queryset(self): queryset = super().get_queryset() diff --git a/apps/ops/const.py b/apps/ops/const.py index 7fa636a0f..578697c48 100644 --- a/apps/ops/const.py +++ b/apps/ops/const.py @@ -37,6 +37,7 @@ class CreateMethods(models.TextChoices): class Types(models.TextChoices): adhoc = 'adhoc', _('Adhoc') playbook = 'playbook', _('Playbook') + upload_file = 'upload_file', _('Upload File') class RunasPolicies(models.TextChoices): diff --git a/apps/ops/migrations/0023_auto_20220912_0021.py b/apps/ops/migrations/0023_auto_20220912_0021.py index 0fc0de0ba..a55ba48f1 100644 --- a/apps/ops/migrations/0023_auto_20220912_0021.py +++ b/apps/ops/migrations/0023_auto_20220912_0021.py @@ -1,12 +1,13 @@ # Generated by Django 3.2.14 on 2022-12-28 10:03 +import uuid + +import django.db.models.deletion import private_storage.fields import private_storage.storage.files +import simple_history.models from django.conf import settings from django.db import migrations, models -import django.db.models.deletion -import simple_history.models -import uuid class Migration(migrations.Migration): @@ -70,8 +71,9 @@ class Migration(migrations.Migration): default='shell', max_length=128, null=True, verbose_name='Module')), ('chdir', models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Chdir')), ('timeout', models.IntegerField(default=-1, verbose_name='Timeout (Seconds)')), - ('type', models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Type')), + ('type', models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Type')), ('runas', models.CharField(default='root', max_length=128, verbose_name='Runas')), ('runas_policy', models.CharField( choices=[('privileged_only', 'Privileged Only'), ('privileged_first', 'Privileged First'), @@ -173,8 +175,9 @@ class Migration(migrations.Migration): default='shell', max_length=128, null=True, verbose_name='Module')), ('chdir', models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Chdir')), ('timeout', models.IntegerField(default=-1, verbose_name='Timeout (Seconds)')), - ('type', models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Type')), + ('type', models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Type')), ('runas', models.CharField(default='root', max_length=128, verbose_name='Runas')), ('runas_policy', models.CharField( choices=[('privileged_only', 'Privileged Only'), ('privileged_first', 'Privileged First'), diff --git a/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py b/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py index 26c5d2cd7..3b7192f60 100644 --- a/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py +++ b/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py @@ -56,8 +56,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='jobexecution', name='job_type', - field=models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Material Type'), + field=models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Material Type'), ), migrations.AddField( model_name='jobexecution', diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index 56d826e86..9fcc079ca 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -20,8 +20,9 @@ from simple_history.models import HistoricalRecords from accounts.models import Account from acls.models import CommandFilterACL from assets.models import Asset +from assets.automations.base.manager import SSHTunnelManager from common.db.encoder import ModelJSONFieldEncoder -from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException +from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException, UploadFileRunner from ops.mixin import PeriodTaskModelMixin from ops.variables import * from ops.const import Types, RunasPolicies, JobStatus, JobModules @@ -79,6 +80,13 @@ class JMSPermedInventory(JMSInventory): host['login_password'] = account.secret host['login_db'] = asset.spec_info.get('db_name', '') host['ansible_python_interpreter'] = sys.executable + if gateway: + host['gateway'] = { + 'address': gateway.address, 'port': gateway.port, + 'username': gateway.username, 'secret': gateway.password, + 'private_key_path': gateway.private_key_path + } + host['jms_asset']['port'] = protocol.port return host return super().make_account_vars(host, asset, account, automation, protocol, platform, gateway) @@ -126,17 +134,13 @@ class JMSPermedInventory(JMSInventory): class Job(JMSOrgBaseModel, PeriodTaskModelMixin): name = models.CharField(max_length=128, null=True, verbose_name=_('Name')) - instant = models.BooleanField(default=False) args = models.CharField(max_length=8192, default='', verbose_name=_('Args'), null=True, blank=True) module = models.CharField(max_length=128, choices=JobModules.choices, default=JobModules.shell, - verbose_name=_('Module'), - null=True) + verbose_name=_('Module'), null=True) chdir = models.CharField(default="", max_length=1024, verbose_name=_('Chdir'), null=True, blank=True) timeout = models.IntegerField(default=-1, verbose_name=_('Timeout (Seconds)')) - playbook = models.ForeignKey('ops.Playbook', verbose_name=_("Playbook"), null=True, on_delete=models.SET_NULL) - type = models.CharField(max_length=128, choices=Types.choices, default=Types.adhoc, verbose_name=_("Type")) creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True) assets = models.ManyToManyField('assets.Asset', verbose_name=_("Assets")) @@ -320,7 +324,6 @@ class JobExecution(JMSOrgBaseModel): "login_password={{login_password}} " \ "login_port={{login_port}} " \ "%s={{login_db}}" % login_db_token - print(login_args) shell = "{} {}=\"{}\" ".format(login_args, query_token, self.current_job.args) return module, shell @@ -354,7 +357,7 @@ class JobExecution(JMSOrgBaseModel): static_variables = self.gather_static_variables() extra_vars.update(static_variables) - if self.current_job.type == 'adhoc': + if self.current_job.type == Types.adhoc: module, args = self.compile_shell() runner = AdHocRunner( @@ -366,10 +369,15 @@ class JobExecution(JMSOrgBaseModel): project_dir=self.private_dir, extra_vars=extra_vars, ) - elif self.current_job.type == 'playbook': + elif self.current_job.type == Types.playbook: runner = PlaybookRunner( self.inventory_path, self.current_job.playbook.entry ) + elif self.current_job.type == Types.upload_file: + job_id = self.current_job.id + args = json.loads(self.current_job.args) + dst_path = args.get('dst_path', '/') + runner = UploadFileRunner(self.inventory_path, job_id, dst_path) else: raise Exception("unsupported job type") return runner @@ -530,6 +538,8 @@ class JobExecution(JMSOrgBaseModel): self.before_start() runner = self.get_runner() + ssh_tunnel = SSHTunnelManager() + ssh_tunnel.local_gateway_prepare(runner) try: cb = runner.run(**kwargs) self.set_result(cb) @@ -540,6 +550,8 @@ class JobExecution(JMSOrgBaseModel): except Exception as e: logging.error(e, exc_info=True) self.set_error(e) + finally: + ssh_tunnel.local_gateway_clean(runner) class Meta: verbose_name = _("Job Execution") diff --git a/apps/ops/serializers/celery.py b/apps/ops/serializers/celery.py index 5166aa755..a4e9c7e8d 100644 --- a/apps/ops/serializers/celery.py +++ b/apps/ops/serializers/celery.py @@ -30,9 +30,15 @@ class CeleryPeriodTaskSerializer(serializers.ModelSerializer): class CeleryTaskSerializer(serializers.ModelSerializer): + exec_cycle = serializers.CharField(read_only=True) + next_exec_time = serializers.DateTimeField(format="%Y/%m/%d %H:%M:%S", read_only=True) + class Meta: model = CeleryTask - read_only_fields = ['id', 'name', 'meta', 'summary', 'state', 'date_last_publish'] + read_only_fields = [ + 'id', 'name', 'meta', 'summary', 'state', + 'date_last_publish', 'exec_cycle', 'next_exec_time' + ] fields = read_only_fields diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index 011bea4e2..75729f988 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -3,9 +3,7 @@ import uuid from django.utils.translation import gettext_lazy as _ from rest_framework import serializers -from assets.models import Node, Asset -from perms.models import PermNode -from perms.utils.user_perm import UserPermAssetUtil +from assets.models import Asset from common.serializers.fields import ReadableHiddenField from ops.mixin import PeriodTaskSerializerMixin from ops.models import Job, JobExecution @@ -18,14 +16,16 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): nodes = serializers.ListField(required=False, child=serializers.CharField()) date_last_run = serializers.DateTimeField(label=_('Date last run'), read_only=True) name = serializers.CharField(label=_('Name'), max_length=128, allow_blank=True, required=False) - assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects, many=True, - required=False) + assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects, many=True, required=False) def to_internal_value(self, data): instant = data.get('instant', False) + job_type = data.get('type', '') + _uid = str(uuid.uuid4()).split('-')[-1] if instant: - _uid = str(uuid.uuid4()).split('-')[-1] data['name'] = f'job-{_uid}' + if job_type == 'upload_file': + data['name'] = f'upload_file-{_uid}' return super().to_internal_value(data) def get_request_user(self): @@ -36,7 +36,8 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): class Meta: model = Job read_only_fields = [ - "id", "date_last_run", "date_created", "date_updated", "average_time_cost" + "id", "date_last_run", "date_created", + "date_updated", "average_time_cost" ] fields = read_only_fields + [ "name", "instant", "type", "module", @@ -45,10 +46,17 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): "use_parameter_define", "parameters_define", "timeout", "chdir", "comment", "summary", "is_periodic", "interval", "crontab", "nodes", - "run_after_save", + "run_after_save" ] +class FileSerializer(serializers.Serializer): + files = serializers.FileField(allow_empty_file=False, max_length=128) + + class Meta: + ref_name = "JobFileSerializer" + + class JobExecutionSerializer(BulkOrgResourceModelSerializer): creator = ReadableHiddenField(default=serializers.CurrentUserDefault()) job_type = serializers.ReadOnlyField(label=_("Job type")) diff --git a/apps/ops/serializers/playbook.py b/apps/ops/serializers/playbook.py index eac89850b..1ff48906a 100644 --- a/apps/ops/serializers/playbook.py +++ b/apps/ops/serializers/playbook.py @@ -5,7 +5,6 @@ from rest_framework import serializers from common.serializers.fields import ReadableHiddenField from ops.models import Playbook from orgs.mixins.serializers import BulkOrgResourceModelSerializer -from django.utils.translation import gettext_lazy as _ def parse_playbook_name(path): @@ -27,5 +26,6 @@ class PlaybookSerializer(BulkOrgResourceModelSerializer): model = Playbook read_only_fields = ["id", "date_created", "date_updated"] fields = read_only_fields + [ - "id", 'path', "name", "comment", "creator", 'create_method', 'vcs_url', + "id", 'path', "name", "comment", "creator", + 'create_method', 'vcs_url', ] diff --git a/apps/orgs/signal_handlers/common.py b/apps/orgs/signal_handlers/common.py index 83edeb425..57333a2e8 100644 --- a/apps/orgs/signal_handlers/common.py +++ b/apps/orgs/signal_handlers/common.py @@ -53,7 +53,7 @@ def subscribe_orgs_mapping_expire(sender, **kwargs): @delay_run(ttl=5) -def expire_user_orgs(*args): +def expire_user_orgs(): User.expire_users_rbac_perms_cache() diff --git a/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py b/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py index f7f191f4a..12d8e70ce 100644 --- a/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py +++ b/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py @@ -80,7 +80,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='assetpermission', name='nodes', - field=models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Node', verbose_name='Nodes'), + field=models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Node', verbose_name='Node'), ), # migrations.RunPython( # code=migrate_node_permissions, diff --git a/apps/perms/models/asset_permission.py b/apps/perms/models/asset_permission.py index cee80f562..5ecf824c0 100644 --- a/apps/perms/models/asset_permission.py +++ b/apps/perms/models/asset_permission.py @@ -10,6 +10,7 @@ from accounts.models import Account from assets.models import Asset from common.utils import date_expired_default from common.utils.timezone import local_now +from labels.mixins import LabeledMixin from orgs.mixins.models import JMSOrgBaseModel from orgs.mixins.models import OrgManager from perms.const import ActionChoices @@ -56,7 +57,7 @@ def default_protocols(): return ['all'] -class AssetPermission(JMSOrgBaseModel): +class AssetPermission(LabeledMixin, JMSOrgBaseModel): name = models.CharField(max_length=128, verbose_name=_('Name')) users = models.ManyToManyField( 'users.User', related_name='%(class)ss', blank=True, verbose_name=_("User") @@ -68,7 +69,7 @@ class AssetPermission(JMSOrgBaseModel): 'assets.Asset', related_name='granted_by_permissions', blank=True, verbose_name=_("Asset") ) nodes = models.ManyToManyField( - 'assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Nodes") + 'assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Node") ) # 特殊的账号: @ALL, @INPUT @USER 默认包含，将来在全局设置中进行控制. accounts = models.JSONField(default=list, verbose_name=_("Account")) diff --git a/apps/perms/notifications.py b/apps/perms/notifications.py index 2a8aa0c2d..5c82c2589 100644 --- a/apps/perms/notifications.py +++ b/apps/perms/notifications.py @@ -9,7 +9,7 @@ class PermedAssetsWillExpireUserMsg(UserMessage): def __init__(self, user, assets, day_count=0): super().__init__(user) self.assets = assets - self.day_count = _('today') if day_count == 0 else day_count + self.day_count = _('today') if day_count == 0 else day_count + _('day') def get_html_msg(self) -> dict: subject = _("You permed assets is about to expire") @@ -41,7 +41,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage): super().__init__(user) self.perms = perms self.org = org - self.day_count = _('today') if day_count == 0 else day_count + self.day_count = _('today') if day_count == 0 else day_count + _('day') def get_items_with_url(self): items_with_url = [] diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index 26afba67c..d09c33538 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -4,9 +4,11 @@ from django.db.models import Q from django.utils.translation import gettext_lazy as _ from rest_framework import serializers +from accounts.const import Source from accounts.models import AccountTemplate, Account from accounts.tasks import push_accounts_to_assets_task from assets.models import Asset, Node +from common.serializers import ResourceLabelsMixin from common.serializers.fields import BitChoicesField, ObjectRelatedField from orgs.mixins.serializers import BulkOrgResourceModelSerializer from perms.models import ActionChoices, AssetPermission @@ -26,7 +28,7 @@ class ActionChoicesField(BitChoicesField): return data -class AssetPermissionSerializer(BulkOrgResourceModelSerializer): +class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer): users = ObjectRelatedField(queryset=User.objects, many=True, required=False, label=_('User')) user_groups = ObjectRelatedField( queryset=UserGroup.objects, many=True, required=False, label=_('User group') @@ -50,7 +52,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): "is_valid", "comment", "from_ticket", ] fields_small = fields_mini + fields_generic - fields_m2m = ["users", "user_groups", "assets", "nodes"] + fields_m2m = ["users", "user_groups", "assets", "nodes", "labels"] fields = fields_mini + fields_m2m + fields_generic read_only_fields = ["created_by", "date_created", "from_ticket"] extra_kwargs = { @@ -84,6 +86,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): ] for asset in assets: asset_exist_accounts = Account.objects.none() + asset_exist_account_names = asset.accounts.values_list('name', flat=True) for template in self.template_accounts: asset_exist_accounts |= asset.accounts.filter( username=template.username, @@ -95,11 +98,13 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): 'username': template.username, 'secret_type': template.secret_type } - if condition in username_secret_type_dict: + if condition in username_secret_type_dict or \ + template.name in asset_exist_account_names: continue account_data = {key: getattr(template, key) for key in account_attribute} account_data['su_from'] = template.get_su_from_account(asset) - account_data['name'] = f"{account_data['name']}-{_('Account template')}" + account_data['source'] = Source.TEMPLATE + account_data['source_id'] = str(template.id) need_create_accounts.append(Account(**{'asset_id': asset.id, **account_data})) return Account.objects.bulk_create(need_create_accounts) @@ -130,7 +135,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): """Perform necessary eager loading of data.""" queryset = queryset.prefetch_related( "users", "user_groups", "assets", "nodes", - ) + ).prefetch_related('labels', 'labels__label') return queryset @staticmethod diff --git a/apps/perms/templates/perms/_msg_item_permissions_expire.html b/apps/perms/templates/perms/_msg_item_permissions_expire.html index 9a9dc8244..eba2e7e5b 100644 --- a/apps/perms/templates/perms/_msg_item_permissions_expire.html +++ b/apps/perms/templates/perms/_msg_item_permissions_expire.html @@ -5,7 +5,7 @@
+
-
一种是专用的，每个用" "户都有一个专用账号。 另一种是公共的，当应用不支持多开且专用的已经被使用时，会" "使用公共账号连接;
注意: 如果不开启自动创建账号, 当前发布机仅能被指定标" -"签的资产调度到，默认不会放到调度池中" +"签的资产调度到，默认不会放到调度池中，且需要手动维护账号" -#: terminal/serializers/applet_host.py:80 +#: terminal/serializers/applet_host.py:92 msgid "The number of public accounts created automatically" msgstr "公用账号自动创建的数量" -#: terminal/serializers/applet_host.py:83 +#: terminal/serializers/applet_host.py:95 msgid "" "Connect to the host using the same account first. For security reasons, " "please set the configuration item CACHE_LOGIN_PASSWORD_ENABLED=true and " @@ -6829,7 +7041,7 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:250 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:253 msgid "Region" msgstr "地域" @@ -6849,8 +7061,8 @@ msgstr "端点后缀" msgid "HOST" msgstr "主机" -#: terminal/serializers/storage.py:146 users/models/user.py:823 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: terminal/serializers/storage.py:146 users/models/user.py:830 +#: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" @@ -6894,6 +7106,26 @@ msgstr "会话 ID" msgid "Not found" msgstr "没有发现" +#: terminal/serializers/virtualapp_provider.py:26 +msgid "Container ID" +msgstr "容器 ID" + +#: terminal/serializers/virtualapp_provider.py:27 +msgid "Container Image" +msgstr "容器镜像" + +#: terminal/serializers/virtualapp_provider.py:28 +msgid "Container Name" +msgstr "容器名称" + +#: terminal/serializers/virtualapp_provider.py:29 +msgid "Container Status" +msgstr "容器状态" + +#: terminal/serializers/virtualapp_provider.py:30 +msgid "Container Ports" +msgstr "容器端口" + #: terminal/tasks.py:33 msgid "Periodic delete terminal status" msgstr "周期清理终端状态" @@ -7171,19 +7403,19 @@ msgstr "工单基本信息" msgid "Ticket applied info" msgstr "工单申请信息" -#: tickets/notifications.py:109 +#: tickets/notifications.py:111 msgid "Your has a new ticket, applicant - {}" msgstr "你有一个新的工单, 申请人 - {}" -#: tickets/notifications.py:113 +#: tickets/notifications.py:115 msgid "{}: New Ticket - {} ({})" msgstr "新工单 - {} ({})" -#: tickets/notifications.py:157 +#: tickets/notifications.py:159 msgid "Your ticket has been processed, processor - {}" msgstr "你的工单已被处理, 处理人 - {}" -#: tickets/notifications.py:161 +#: tickets/notifications.py:163 msgid "Ticket has processed - {} ({})" msgstr "你的工单已被处理, 处理人 - {} ({})" @@ -7236,11 +7468,11 @@ msgstr "授权名称 `{}` 已存在" msgid "The ticket flow `{}` does not exist" msgstr "工单流程 `{}` 不存在" -#: tickets/templates/tickets/_msg_ticket.html:20 +#: tickets/templates/tickets/_msg_ticket.html:21 msgid "View details" msgstr "查看详情" -#: tickets/templates/tickets/_msg_ticket.html:25 +#: tickets/templates/tickets/_msg_ticket.html:26 msgid "Direct approval" msgstr "直接批准" @@ -7248,12 +7480,12 @@ msgstr "直接批准" msgid "Ticket information" msgstr "工单信息" -#: tickets/templates/tickets/approve_check_password.html:29 +#: tickets/templates/tickets/approve_check_password.html:28 #: tickets/views/approve.py:40 tickets/views/approve.py:77 msgid "Ticket approval" msgstr "工单审批" -#: tickets/templates/tickets/approve_check_password.html:44 +#: tickets/templates/tickets/approve_check_password.html:43 msgid "Approval" msgstr "同意" @@ -7278,11 +7510,11 @@ msgstr "无效的审批动作" msgid "This user is not authorized to approve this ticket" msgstr "此用户无权审批此工单" -#: users/api/user.py:141 +#: users/api/user.py:137 msgid "Can not invite self" msgstr "不能邀请自己" -#: users/api/user.py:194 +#: users/api/user.py:190 msgid "Could not reset self otp, use profile reset instead" msgstr "不能在该页面重置 MFA 多因子认证, 请去个人信息页面重置" @@ -7326,11 +7558,11 @@ msgstr "多屏显示" msgid "Drives redirect" msgstr "磁盘挂载" -#: users/const.py:57 +#: users/const.py:64 msgid "Replace" msgstr "替换" -#: users/const.py:58 +#: users/const.py:65 msgid "Suffix" msgstr "加后缀" @@ -7417,8 +7649,8 @@ msgstr "不能和原来的密钥相同" msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:173 users/models/user.py:826 -#: xpack/plugins/cloud/serializers/account_attrs.py:203 +#: users/forms/profile.py:173 users/models/user.py:833 +#: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "SSH公钥" @@ -7426,72 +7658,74 @@ msgstr "SSH公钥" msgid "Preference" msgstr "用户设置" -#: users/models/user.py:643 users/serializers/profile.py:94 +#: users/models/user.py:646 users/serializers/profile.py:94 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:805 users/serializers/user.py:169 +#: users/models/user.py:812 users/serializers/user.py:169 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:807 +#: users/models/user.py:814 msgid "Avatar" msgstr "头像" -#: users/models/user.py:810 +#: users/models/user.py:817 msgid "Wechat" msgstr "微信" -#: users/models/user.py:813 users/serializers/user.py:106 +#: users/models/user.py:820 users/serializers/user.py:106 msgid "Phone" msgstr "手机" -#: users/models/user.py:819 +#: users/models/user.py:826 msgid "OTP secret key" msgstr "OTP 密钥" -#: users/models/user.py:831 users/serializers/profile.py:128 +# msgid "Private key" +# msgstr "ssh私钥" +#: users/models/user.py:838 users/serializers/profile.py:128 #: users/serializers/user.py:166 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:841 +#: users/models/user.py:848 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:844 +#: users/models/user.py:851 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:846 +#: users/models/user.py:853 msgid "Date api key used" msgstr "Api key 最后使用日期" -#: users/models/user.py:969 +#: users/models/user.py:984 msgid "Can not delete admin user" msgstr "无法删除管理员用户" -#: users/models/user.py:995 +#: users/models/user.py:1011 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:996 +#: users/models/user.py:1012 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:997 +#: users/models/user.py:1013 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:1006 +#: users/models/user.py:1022 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1009 +#: users/models/user.py:1025 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1034 +#: users/models/user.py:1050 msgid "User password history" msgstr "用户密码历史" @@ -7563,37 +7797,45 @@ msgid "RDP client option" msgstr "RDP 客户端选项" #: users/serializers/preference/luna.py:45 -msgid "Rdp smart size" -msgstr "RDP 智能大小" +msgid "RDP color quality" +msgstr "" -#: users/serializers/preference/luna.py:46 +#: users/serializers/preference/luna.py:49 +msgid "Rdp smart size" +msgstr "" + +# msgid "Rdp smart size" +# msgstr "RDP 智能大小" +#: users/serializers/preference/luna.py:50 msgid "" "Determines whether the client computer should scale the content on the " "remote computer to fit the window size of the client computer when the " "window is resized." -msgstr "确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机的窗口大小" +msgstr "" +"确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机" +"的窗口大小" -#: users/serializers/preference/luna.py:51 +#: users/serializers/preference/luna.py:55 msgid "Remote application connection method" msgstr "远程应用连接方式" -#: users/serializers/preference/luna.py:58 +#: users/serializers/preference/luna.py:62 msgid "Character terminal font size" msgstr "字符终端字体大小" -#: users/serializers/preference/luna.py:61 +#: users/serializers/preference/luna.py:65 msgid "Backspace as Ctrl+H" msgstr "字符终端Backspace As Ctrl+H" -#: users/serializers/preference/luna.py:64 +#: users/serializers/preference/luna.py:68 msgid "Right click quickly paste" msgstr "右键快速粘贴" -#: users/serializers/preference/luna.py:70 +#: users/serializers/preference/luna.py:74 msgid "Graphics" msgstr "图形化" -#: users/serializers/preference/luna.py:71 +#: users/serializers/preference/luna.py:75 msgid "Command line" msgstr "命令行" @@ -7653,15 +7895,15 @@ msgstr "头像路径" msgid "MFA level" msgstr "MFA 级别" -#: users/serializers/user.py:282 +#: users/serializers/user.py:287 msgid "Select users" msgstr "选择用户" -#: users/serializers/user.py:283 +#: users/serializers/user.py:288 msgid "For security, only list several users" msgstr "为了安全，仅列出几个用户" -#: users/serializers/user.py:316 +#: users/serializers/user.py:321 msgid "name not unique" msgstr "名称重复" @@ -7691,9 +7933,9 @@ msgstr "周期检测用户过期" #: users/tasks.py:84 msgid "Check unused users" -msgstr "校验用户已过期" +msgstr "检查未使用的用户" -#: users/tasks.py:114 +#: users/tasks.py:123 msgid "The user has not logged in recently and has been disabled." msgstr "该用户最近未登录，已被禁用。" @@ -7947,6 +8189,11 @@ msgstr "重置密码成功，返回到登录页面" msgid "XPACK" msgstr "XPack" +#: xpack/exceptions.py:7 +msgid "" +"The current task is not synchronized with unmatched policy assets, skipping" +msgstr "" + #: xpack/plugins/cloud/api.py:56 msgid "Test connection successful" msgstr "测试成功" @@ -8027,47 +8274,67 @@ msgstr "天翼私有云" msgid "OpenStack" msgstr "OpenStack" -#: xpack/plugins/cloud/const.py:28 +#: xpack/plugins/cloud/const.py:28 xpack/plugins/cloud/providers/zstack.py:21 +msgid "ZStack" +msgstr "ZStack" + +#: xpack/plugins/cloud/const.py:29 msgid "Fusion Compute" msgstr "融合计算" -#: xpack/plugins/cloud/const.py:33 +#: xpack/plugins/cloud/const.py:30 +msgid "SCP" +msgstr "深信服SCP" + +#: xpack/plugins/cloud/const.py:31 +msgid "Apsara Stack" +msgstr "阿里云专有云" + +#: xpack/plugins/cloud/const.py:36 msgid "Private IP" msgstr "私有IP" -#: xpack/plugins/cloud/const.py:34 +#: xpack/plugins/cloud/const.py:37 msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/const.py:41 xpack/plugins/cloud/models.py:303 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/const.py:39 +#: xpack/plugins/cloud/const.py:42 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/const.py:44 +#: xpack/plugins/cloud/const.py:47 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:48 +#: xpack/plugins/cloud/const.py:51 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:49 +#: xpack/plugins/cloud/const.py:52 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:50 +#: xpack/plugins/cloud/const.py:53 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:51 +#: xpack/plugins/cloud/const.py:54 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/manager.py:54 +#: xpack/plugins/cloud/const.py:58 +msgid "And" +msgstr "与" + +#: xpack/plugins/cloud/const.py:59 +msgid "Or" +msgstr "或" + +#: xpack/plugins/cloud/manager.py:56 msgid "Account unavailable" msgstr "账号无效" @@ -8091,7 +8358,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:159 msgid "Regions" msgstr "地域" @@ -8100,122 +8367,134 @@ msgid "Hostname strategy" msgstr "主机名策略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:154 +#: xpack/plugins/cloud/serializers/task.py:162 msgid "IP network segment group" msgstr "IP网段组" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/serializers/task.py:167 msgid "Sync IP type" msgstr "同步IP类型" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:177 +#: xpack/plugins/cloud/serializers/task.py:185 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:108 +msgid "Fully synchronous" +msgstr "完全同步" + +#: xpack/plugins/cloud/models.py:113 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 -#: xpack/plugins/cloud/models.py:337 +#: xpack/plugins/cloud/models.py:116 xpack/plugins/cloud/models.py:321 +#: xpack/plugins/cloud/models.py:345 msgid "Strategy" msgstr "策略" -#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 +#: xpack/plugins/cloud/models.py:121 xpack/plugins/cloud/models.py:200 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:263 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:212 +#: xpack/plugins/cloud/models.py:215 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:219 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:240 +#: xpack/plugins/cloud/models.py:243 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:244 +#: xpack/plugins/cloud/models.py:247 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:247 +#: xpack/plugins/cloud/models.py:250 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:264 +#: xpack/plugins/cloud/models.py:267 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack/plugins/cloud/models.py:281 +#: xpack/plugins/cloud/models.py:279 xpack/plugins/cloud/serializers/task.py:72 +msgid "Rule relation" +msgstr "条件关系" + +#: xpack/plugins/cloud/models.py:288 msgid "Task strategy" msgstr "任务策略" -#: xpack/plugins/cloud/models.py:285 +#: xpack/plugins/cloud/models.py:292 msgid "Equal" msgstr "等于" -#: xpack/plugins/cloud/models.py:286 +#: xpack/plugins/cloud/models.py:293 msgid "Not Equal" msgstr "不等于" -#: xpack/plugins/cloud/models.py:287 +#: xpack/plugins/cloud/models.py:294 msgid "In" msgstr "在...中" -#: xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:295 msgid "Contains" msgstr "包含" -#: xpack/plugins/cloud/models.py:289 +#: xpack/plugins/cloud/models.py:296 +msgid "Exclude" +msgstr "排除" + +#: xpack/plugins/cloud/models.py:297 msgid "Startswith" msgstr "以...开头" -#: xpack/plugins/cloud/models.py:290 +#: xpack/plugins/cloud/models.py:298 msgid "Endswith" msgstr "以...结尾" -#: xpack/plugins/cloud/models.py:296 +#: xpack/plugins/cloud/models.py:304 msgid "Instance platform" msgstr "实例平台" -#: xpack/plugins/cloud/models.py:297 +#: xpack/plugins/cloud/models.py:305 msgid "Instance address" msgstr "实例地址" -#: xpack/plugins/cloud/models.py:304 +#: xpack/plugins/cloud/models.py:312 msgid "Rule attr" msgstr "规则属性" -#: xpack/plugins/cloud/models.py:308 +#: xpack/plugins/cloud/models.py:316 msgid "Rule match" msgstr "规则匹配" -#: xpack/plugins/cloud/models.py:310 +#: xpack/plugins/cloud/models.py:318 msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:325 xpack/plugins/cloud/serializers/task.py:75 msgid "Strategy rule" msgstr "条件" -#: xpack/plugins/cloud/models.py:332 +#: xpack/plugins/cloud/models.py:340 msgid "Action attr" msgstr "动作属性" -#: xpack/plugins/cloud/models.py:334 +#: xpack/plugins/cloud/models.py:342 msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/models.py:349 xpack/plugins/cloud/serializers/task.py:78 msgid "Strategy action" msgstr "动作" @@ -8409,11 +8688,11 @@ msgstr "TR-Istanbul" msgid "CN East-Suqian" msgstr "华东-宿迁" -#: xpack/plugins/cloud/serializers/account.py:64 +#: xpack/plugins/cloud/serializers/account.py:68 msgid "Validity display" msgstr "有效性显示" -#: xpack/plugins/cloud/serializers/account.py:65 +#: xpack/plugins/cloud/serializers/account.py:69 msgid "Provider display" msgstr "服务商显示" @@ -8430,50 +8709,50 @@ msgid "Subscription ID" msgstr "订阅 ID" #: xpack/plugins/cloud/serializers/account_attrs.py:98 -#: xpack/plugins/cloud/serializers/account_attrs.py:103 -#: xpack/plugins/cloud/serializers/account_attrs.py:119 -#: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:199 +#: xpack/plugins/cloud/serializers/account_attrs.py:102 +#: xpack/plugins/cloud/serializers/account_attrs.py:126 +#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "API Endpoint" msgstr "API 端点" -#: xpack/plugins/cloud/serializers/account_attrs.py:109 +#: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "认证地址" -#: xpack/plugins/cloud/serializers/account_attrs.py:110 +#: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "如: http://openstack.example.com:5000/v3" -#: xpack/plugins/cloud/serializers/account_attrs.py:113 +#: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "用户域" -#: xpack/plugins/cloud/serializers/account_attrs.py:120 +#: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "证书文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:121 +#: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "密钥文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:137 +#: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "服务账号密钥" -#: xpack/plugins/cloud/serializers/account_attrs.py:138 +#: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "JSON 格式的文件" -#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" -#: xpack/plugins/cloud/serializers/account_attrs.py:172 +#: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" -#: xpack/plugins/cloud/serializers/account_attrs.py:175 +#: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " "synchronization task is executed, only the valid IP address will be " @@ -8482,27 +8761,27 @@ msgstr "" "端口用来检测 IP 地址的有效性，在同步任务执行时，只会同步有效的 IP 地址。
" "如果端口为 0，则表示所有 IP 地址均有效。" -#: xpack/plugins/cloud/serializers/account_attrs.py:183 +#: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "主机名前缀" -#: xpack/plugins/cloud/serializers/account_attrs.py:186 +#: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP 网段" -#: xpack/plugins/cloud/serializers/account_attrs.py:190 +#: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "测试端口" -#: xpack/plugins/cloud/serializers/account_attrs.py:193 +#: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:143 +#: xpack/plugins/cloud/serializers/task.py:151 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -8514,11 +8793,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:149 +#: xpack/plugins/cloud/serializers/task.py:157 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:158 msgid "Instance count" msgstr "实例个数" @@ -8562,7 +8841,15 @@ msgstr "退出页面logo" msgid "Theme" msgstr "主题" -#: xpack/plugins/interface/models.py:44 xpack/plugins/interface/models.py:85 +#: xpack/plugins/interface/models.py:42 +msgid "Beian link" +msgstr "公安联网备案跳转链接" + +#: xpack/plugins/interface/models.py:43 +msgid "Beian text" +msgstr "公安联网备案号" + +#: xpack/plugins/interface/models.py:46 xpack/plugins/interface/models.py:87 msgid "Interface setting" msgstr "界面设置" @@ -8594,17 +8881,17 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" -#~ msgid "Copy" -#~ msgstr "复制" +#~ msgid "Password can not contains `{{` or `}}`" +#~ msgstr "密码不能包含 `{{` 或 `}}` 字符" -#~ msgid "Paste" -#~ msgstr "粘贴" +#~ msgid "Password can not contains `{%` or `%}`" +#~ msgstr "密码不能包含 `{%` 或 `%}` 字符" -#~ msgid "Password can not contains `'` " -#~ msgstr "密码不能包含 `'` 字符" +#~ msgid "FeiShu query user failed" +#~ msgstr "飞书查询用户失败" -#~ msgid "Password can not contains `\"` " -#~ msgstr "密码不能包含 `\"` 字符" +#~ msgid "The FeiShu is already bound to another user" +#~ msgstr "该飞书已经绑定其他用户" -#~ msgid "Object Storage" -#~ msgstr "对象存储" +#~ msgid "Binding FeiShu successfully" +#~ msgstr "绑定 飞书 成功" diff --git a/apps/notifications/backends/__init__.py b/apps/notifications/backends/__init__.py index 2e95bd437..047123e57 100644 --- a/apps/notifications/backends/__init__.py +++ b/apps/notifications/backends/__init__.py @@ -12,6 +12,7 @@ class BACKEND(models.TextChoices): DINGTALK = 'dingtalk', _('DingTalk') SITE_MSG = 'site_msg', _('Site message') FEISHU = 'feishu', _('FeiShu') + SLACK = 'slack', _('Slack') # SMS = 'sms', _('SMS') @property diff --git a/apps/notifications/backends/slack.py b/apps/notifications/backends/slack.py new file mode 100644 index 000000000..95e0bde60 --- /dev/null +++ b/apps/notifications/backends/slack.py @@ -0,0 +1,21 @@ +from django.conf import settings + +from common.sdk.im.slack import Slack as Client +from .base import BackendBase + + +class Slack(BackendBase): + account_field = 'slack_id' + is_enable_field_in_settings = 'AUTH_SLACK' + + def __init__(self): + self.client = Client( + bot_token=settings.SLACK_BOT_TOKEN, + ) + + def send_msg(self, users, message, subject=None): + accounts, __, __ = self.get_accounts(users) + return self.client.send_text(accounts, message) + + +backend = Slack diff --git a/apps/notifications/notifications.py b/apps/notifications/notifications.py index 19a86ac94..5ceb629c3 100644 --- a/apps/notifications/notifications.py +++ b/apps/notifications/notifications.py @@ -202,6 +202,9 @@ class Message(metaclass=MessageType): def get_site_msg_msg(self) -> dict: return self.html_msg + def get_slack_msg(self) -> dict: + return self.markdown_msg + def get_sms_msg(self) -> dict: return self.text_msg_with_sign diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index 1426ffc01..0dfa0b575 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -13,7 +13,7 @@ class JMSInventory: def __init__( self, assets, account_policy='privileged_first', account_prefer='root,Administrator', host_callback=None, - exclude_localhost=False, task_type=None + exclude_localhost=False, task_type=None, protocol=None ): """ :param assets: @@ -27,6 +27,7 @@ class JMSInventory: self.exclude_hosts = {} self.exclude_localhost = exclude_localhost self.task_type = task_type + self.protocol = protocol @staticmethod def clean_assets(assets): @@ -71,8 +72,9 @@ class JMSInventory: } if not account.secret: return var + if account.secret_type == 'password': - var['ansible_password'] = account.secret + var['ansible_password'] = account.escape_jinja2_syntax(account.secret) elif account.secret_type == 'ssh_key': var['ansible_ssh_private_key_file'] = account.private_key_path return var @@ -84,7 +86,7 @@ class JMSInventory: 'custom_become': True, 'custom_become_method': su_method, 'custom_become_user': account.su_from.username, - 'custom_become_password': account.su_from.secret, + 'custom_become_password': account.escape_jinja2_syntax(account.su_from.secret), 'custom_become_private_key_path': account.su_from.private_key_path } return var @@ -109,13 +111,13 @@ class JMSInventory: host.update(self.make_account_ansible_vars(account)) host['ansible_become'] = True host['ansible_become_user'] = 'root' - host['ansible_become_password'] = account.secret + host['ansible_become_password'] = account.escape_jinja2_syntax(account.secret) else: host.update(self.make_account_ansible_vars(account)) if gateway: ansible_connection = host.get('ansible_connection', 'ssh') - if ansible_connection in ('local', 'winrm'): + if ansible_connection in ('local', 'winrm', 'rdp'): host['gateway'] = { 'address': gateway.address, 'port': gateway.port, 'username': gateway.username, 'secret': gateway.password, @@ -127,19 +129,20 @@ class JMSInventory: host['jms_asset'].update(ansible_ssh_common_args) host.update(ansible_ssh_common_args) - @staticmethod - def get_primary_protocol(ansible_config, protocols): + def get_primary_protocol(self, ansible_config, protocols): invalid_protocol = type('protocol', (), {'name': 'null', 'port': 0}) ansible_connection = ansible_config.get('ansible_connection') # 数值越小，优先级越高，若用户在 ansible_config 中配置了，则提高用户配置方式的优先级 protocol_priority = {'ssh': 10, 'winrm': 9, ansible_connection: 1} + if self.protocol: + protocol_priority.update({self.protocol: 0}) protocol_sorted = sorted(protocols, key=lambda x: protocol_priority.get(x.name, 999)) protocol = protocol_sorted[0] if protocol_sorted else invalid_protocol return protocol @staticmethod def fill_ansible_config(ansible_config, protocol): - if protocol.name in ('ssh', 'winrm'): + if protocol.name in ('ssh', 'winrm', 'rdp'): ansible_config['ansible_connection'] = protocol.name if protocol.name == 'winrm': if protocol.setting.get('use_ssl', False): @@ -173,11 +176,13 @@ class JMSInventory: }, 'jms_account': { 'id': str(account.id), 'username': account.username, - 'secret': account.secret, 'secret_type': account.secret_type, - 'private_key_path': account.private_key_path + 'secret': account.escape_jinja2_syntax(account.secret), + 'secret_type': account.secret_type, 'private_key_path': account.private_key_path } if account else None } + protocols = host['jms_asset']['protocols'] + host['jms_asset'].update({f"{p['name']}_port": p['port'] for p in protocols}) if host['jms_account'] and tp == 'oracle': host['jms_account']['mode'] = 'sysdba' if account.privileged else None diff --git a/apps/ops/ansible/runner.py b/apps/ops/ansible/runner.py index 4610ddfd2..c5fee5fd9 100644 --- a/apps/ops/ansible/runner.py +++ b/apps/ops/ansible/runner.py @@ -1,8 +1,9 @@ import os import uuid - +import shutil import ansible_runner from django.conf import settings +from django.utils._os import safe_join from .callback import DefaultCallback from ..utils import get_ansible_log_verbosity @@ -85,6 +86,34 @@ class PlaybookRunner: return self.cb +class UploadFileRunner: + def __init__(self, inventory, job_id, dest_path, callback=None): + self.id = uuid.uuid4() + self.inventory = inventory + self.cb = DefaultCallback() + upload_file_dir = safe_join(settings.DATA_DIR, 'job_upload_file') + self.src_paths = safe_join(upload_file_dir, str(job_id)) + self.dest_path = safe_join("/tmp", dest_path) + + def run(self, verbosity=0, **kwargs): + verbosity = get_ansible_log_verbosity(verbosity) + ansible_runner.run( + host_pattern="*", + inventory=self.inventory, + module='copy', + module_args=f"src={self.src_paths}/ dest={self.dest_path}", + verbosity=verbosity, + event_handler=self.cb.event_handler, + status_handler=self.cb.status_handler, + **kwargs + ) + try: + shutil.rmtree(self.src_paths) + except OSError as e: + print(f"del upload tmp dir {self.src_paths} failed! {e}") + return self.cb + + class CommandRunner(AdHocRunner): def __init__(self, inventory, command, pattern='*', project_dir='/tmp/'): super().__init__(inventory, 'shell', command, pattern, project_dir) diff --git a/apps/ops/api/celery.py b/apps/ops/api/celery.py index a7baaf6e4..797d00c5e 100644 --- a/apps/ops/api/celery.py +++ b/apps/ops/api/celery.py @@ -7,14 +7,15 @@ from celery.result import AsyncResult from django.shortcuts import get_object_or_404 from django.utils.translation import gettext as _ from django_celery_beat.models import PeriodicTask +from django_filters import rest_framework as drf_filters from rest_framework import generics, viewsets, mixins, status from rest_framework.response import Response -from django_filters import rest_framework as drf_filters from common.api import LogTailApi, CommonApiMixin +from common.drf.filters import BaseFilterSet from common.exceptions import JMSException from common.permissions import IsValidUser -from common.drf.filters import BaseFilterSet +from common.utils.timezone import local_now from ops.celery import app from ..ansible.utils import get_ansible_task_log_path from ..celery.utils import get_celery_task_log_path @@ -138,6 +139,46 @@ class CeleryTaskViewSet( def get_queryset(self): return CeleryTask.objects.exclude(name__startswith='celery') + @staticmethod + def extract_schedule(input_string): + pattern = r'(\S+ \S+ \S+ \S+ \S+).*' + match = re.match(pattern, input_string) + if match: + return match.group(1) + else: + return input_string + + def generate_execute_time(self, queryset): + names = [i.name for i in queryset] + periodic_tasks = PeriodicTask.objects.filter(name__in=names) + periodic_task_dict = {task.name: task for task in periodic_tasks} + now = local_now() + for i in queryset: + task = periodic_task_dict.get(i.name) + if not task: + continue + i.exec_cycle = self.extract_schedule(str(task.scheduler)) + + last_run_at = task.last_run_at or now + next_run_at = task.schedule.remaining_estimate(last_run_at) + if next_run_at.total_seconds() < 0: + next_run_at = task.schedule.remaining_estimate(now) + i.next_exec_time = now + next_run_at + return queryset + + def list(self, request, *args, **kwargs): + queryset = self.filter_queryset(self.get_queryset()) + + page = self.paginate_queryset(queryset) + if page is not None: + page = self.generate_execute_time(page) + serializer = self.get_serializer(page, many=True) + return self.get_paginated_response(serializer.data) + + queryset = self.generate_execute_time(queryset) + serializer = self.get_serializer(queryset, many=True) + return Response(serializer.data) + class CeleryTaskExecutionViewSet(CommonApiMixin, viewsets.ModelViewSet): serializer_class = CeleryTaskExecutionSerializer diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py index f2bf92cae..f16fefde2 100644 --- a/apps/ops/api/job.py +++ b/apps/ops/api/job.py @@ -1,16 +1,22 @@ +import json +import os + from django.conf import settings from django.db import transaction from django.db.models import Count -from django.db.transaction import atomic from django.shortcuts import get_object_or_404 +from django.utils._os import safe_join +from django.utils.translation import gettext_lazy as _ +from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.views import APIView from assets.models import Asset +from common.const.http import POST from common.permissions import IsValidUser from ops.const import Types from ops.models import Job, JobExecution -from ops.serializers.job import JobSerializer, JobExecutionSerializer +from ops.serializers.job import JobSerializer, JobExecutionSerializer, FileSerializer __all__ = [ 'JobViewSet', 'JobExecutionViewSet', 'JobRunVariableHelpAPIView', @@ -24,6 +30,7 @@ from orgs.utils import tmp_to_org, get_current_org from accounts.models import Account from perms.models import PermNode from perms.utils import UserPermAssetUtil +from jumpserver.settings import get_file_md5 def set_task_to_serializer_data(serializer, task_id): @@ -61,7 +68,7 @@ class JobViewSet(OrgBulkModelViewSet): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset.filter(creator=self.request.user) + queryset = queryset.filter(creator=self.request.user).exclude(type=Types.upload_file) if self.action != 'retrieve': return queryset.filter(instant=False) return queryset @@ -91,6 +98,65 @@ class JobViewSet(OrgBulkModelViewSet): transaction.on_commit( lambda: run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id))) + @staticmethod + def get_duplicates_files(files): + seen = set() + duplicates = set() + for file in files: + if file in seen: + duplicates.add(file) + else: + seen.add(file) + return list(duplicates) + + @staticmethod + def get_exceeds_limit_files(files): + exceeds_limit_files = [] + for file in files: + if file.size > settings.FILE_UPLOAD_SIZE_LIMIT_MB * 1024 * 1024: + exceeds_limit_files.append(file) + return exceeds_limit_files + + @action(methods=[POST], detail=False, serializer_class=FileSerializer, permission_classes=[IsValidUser, ], + url_path='upload') + def upload(self, request, *args, **kwargs): + uploaded_files = request.FILES.getlist('files') + serializer = self.get_serializer(data=request.data) + + if not serializer.is_valid(): + msg = 'Upload data invalid: {}'.format(serializer.errors) + return Response({'error': msg}, status=400) + + same_files = self.get_duplicates_files(uploaded_files) + if same_files: + return Response({'error': _("Duplicate file exists")}, status=400) + + exceeds_limit_files = self.get_exceeds_limit_files(uploaded_files) + if exceeds_limit_files: + return Response( + {'error': _("File size exceeds maximum limit. Please select a file smaller than {limit}MB").format( + limit=settings.FILE_UPLOAD_SIZE_LIMIT_MB)}, + status=400) + + job_id = request.data.get('job_id', '') + job = get_object_or_404(Job, pk=job_id) + job_args = json.loads(job.args) + src_path_info = [] + upload_file_dir = safe_join(settings.DATA_DIR, 'job_upload_file', job_id) + for uploaded_file in uploaded_files: + filename = uploaded_file.name + saved_path = safe_join(upload_file_dir, f'{filename}') + os.makedirs(os.path.dirname(saved_path), exist_ok=True) + with open(saved_path, 'wb+') as destination: + for chunk in uploaded_file.chunks(): + destination.write(chunk) + src_path_info.append({'filename': filename, 'md5': get_file_md5(saved_path)}) + job_args['src_path_info'] = src_path_info + job.args = json.dumps(job_args) + job.save() + self.run_job(job, serializer) + return Response({'task_id': serializer.data.get('task_id')}, status=201) + class JobExecutionViewSet(OrgBulkModelViewSet): serializer_class = JobExecutionSerializer @@ -101,7 +167,7 @@ class JobExecutionViewSet(OrgBulkModelViewSet): @staticmethod def start_deploy(instance, serializer): - task = run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) + run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) def perform_create(self, serializer): instance = serializer.save() @@ -113,7 +179,8 @@ class JobExecutionViewSet(OrgBulkModelViewSet): set_task_to_serializer_data(serializer, instance.id) transaction.on_commit( - lambda: run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id))) + lambda: run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) + ) def get_queryset(self): queryset = super().get_queryset() diff --git a/apps/ops/const.py b/apps/ops/const.py index 7fa636a0f..578697c48 100644 --- a/apps/ops/const.py +++ b/apps/ops/const.py @@ -37,6 +37,7 @@ class CreateMethods(models.TextChoices): class Types(models.TextChoices): adhoc = 'adhoc', _('Adhoc') playbook = 'playbook', _('Playbook') + upload_file = 'upload_file', _('Upload File') class RunasPolicies(models.TextChoices): diff --git a/apps/ops/migrations/0023_auto_20220912_0021.py b/apps/ops/migrations/0023_auto_20220912_0021.py index 0fc0de0ba..a55ba48f1 100644 --- a/apps/ops/migrations/0023_auto_20220912_0021.py +++ b/apps/ops/migrations/0023_auto_20220912_0021.py @@ -1,12 +1,13 @@ # Generated by Django 3.2.14 on 2022-12-28 10:03 +import uuid + +import django.db.models.deletion import private_storage.fields import private_storage.storage.files +import simple_history.models from django.conf import settings from django.db import migrations, models -import django.db.models.deletion -import simple_history.models -import uuid class Migration(migrations.Migration): @@ -70,8 +71,9 @@ class Migration(migrations.Migration): default='shell', max_length=128, null=True, verbose_name='Module')), ('chdir', models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Chdir')), ('timeout', models.IntegerField(default=-1, verbose_name='Timeout (Seconds)')), - ('type', models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Type')), + ('type', models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Type')), ('runas', models.CharField(default='root', max_length=128, verbose_name='Runas')), ('runas_policy', models.CharField( choices=[('privileged_only', 'Privileged Only'), ('privileged_first', 'Privileged First'), @@ -173,8 +175,9 @@ class Migration(migrations.Migration): default='shell', max_length=128, null=True, verbose_name='Module')), ('chdir', models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Chdir')), ('timeout', models.IntegerField(default=-1, verbose_name='Timeout (Seconds)')), - ('type', models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Type')), + ('type', models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Type')), ('runas', models.CharField(default='root', max_length=128, verbose_name='Runas')), ('runas_policy', models.CharField( choices=[('privileged_only', 'Privileged Only'), ('privileged_first', 'Privileged First'), diff --git a/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py b/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py index 26c5d2cd7..3b7192f60 100644 --- a/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py +++ b/apps/ops/migrations/0024_alter_celerytask_date_last_publish.py @@ -56,8 +56,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='jobexecution', name='job_type', - field=models.CharField(choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook')], default='adhoc', - max_length=128, verbose_name='Material Type'), + field=models.CharField( + choices=[('adhoc', 'Adhoc'), ('playbook', 'Playbook'), ('upload_file', 'Upload File')], + default='adhoc', max_length=128, verbose_name='Material Type'), ), migrations.AddField( model_name='jobexecution', diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index 56d826e86..9fcc079ca 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -20,8 +20,9 @@ from simple_history.models import HistoricalRecords from accounts.models import Account from acls.models import CommandFilterACL from assets.models import Asset +from assets.automations.base.manager import SSHTunnelManager from common.db.encoder import ModelJSONFieldEncoder -from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException +from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException, UploadFileRunner from ops.mixin import PeriodTaskModelMixin from ops.variables import * from ops.const import Types, RunasPolicies, JobStatus, JobModules @@ -79,6 +80,13 @@ class JMSPermedInventory(JMSInventory): host['login_password'] = account.secret host['login_db'] = asset.spec_info.get('db_name', '') host['ansible_python_interpreter'] = sys.executable + if gateway: + host['gateway'] = { + 'address': gateway.address, 'port': gateway.port, + 'username': gateway.username, 'secret': gateway.password, + 'private_key_path': gateway.private_key_path + } + host['jms_asset']['port'] = protocol.port return host return super().make_account_vars(host, asset, account, automation, protocol, platform, gateway) @@ -126,17 +134,13 @@ class JMSPermedInventory(JMSInventory): class Job(JMSOrgBaseModel, PeriodTaskModelMixin): name = models.CharField(max_length=128, null=True, verbose_name=_('Name')) - instant = models.BooleanField(default=False) args = models.CharField(max_length=8192, default='', verbose_name=_('Args'), null=True, blank=True) module = models.CharField(max_length=128, choices=JobModules.choices, default=JobModules.shell, - verbose_name=_('Module'), - null=True) + verbose_name=_('Module'), null=True) chdir = models.CharField(default="", max_length=1024, verbose_name=_('Chdir'), null=True, blank=True) timeout = models.IntegerField(default=-1, verbose_name=_('Timeout (Seconds)')) - playbook = models.ForeignKey('ops.Playbook', verbose_name=_("Playbook"), null=True, on_delete=models.SET_NULL) - type = models.CharField(max_length=128, choices=Types.choices, default=Types.adhoc, verbose_name=_("Type")) creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True) assets = models.ManyToManyField('assets.Asset', verbose_name=_("Assets")) @@ -320,7 +324,6 @@ class JobExecution(JMSOrgBaseModel): "login_password={{login_password}} " \ "login_port={{login_port}} " \ "%s={{login_db}}" % login_db_token - print(login_args) shell = "{} {}=\"{}\" ".format(login_args, query_token, self.current_job.args) return module, shell @@ -354,7 +357,7 @@ class JobExecution(JMSOrgBaseModel): static_variables = self.gather_static_variables() extra_vars.update(static_variables) - if self.current_job.type == 'adhoc': + if self.current_job.type == Types.adhoc: module, args = self.compile_shell() runner = AdHocRunner( @@ -366,10 +369,15 @@ class JobExecution(JMSOrgBaseModel): project_dir=self.private_dir, extra_vars=extra_vars, ) - elif self.current_job.type == 'playbook': + elif self.current_job.type == Types.playbook: runner = PlaybookRunner( self.inventory_path, self.current_job.playbook.entry ) + elif self.current_job.type == Types.upload_file: + job_id = self.current_job.id + args = json.loads(self.current_job.args) + dst_path = args.get('dst_path', '/') + runner = UploadFileRunner(self.inventory_path, job_id, dst_path) else: raise Exception("unsupported job type") return runner @@ -530,6 +538,8 @@ class JobExecution(JMSOrgBaseModel): self.before_start() runner = self.get_runner() + ssh_tunnel = SSHTunnelManager() + ssh_tunnel.local_gateway_prepare(runner) try: cb = runner.run(**kwargs) self.set_result(cb) @@ -540,6 +550,8 @@ class JobExecution(JMSOrgBaseModel): except Exception as e: logging.error(e, exc_info=True) self.set_error(e) + finally: + ssh_tunnel.local_gateway_clean(runner) class Meta: verbose_name = _("Job Execution") diff --git a/apps/ops/serializers/celery.py b/apps/ops/serializers/celery.py index 5166aa755..a4e9c7e8d 100644 --- a/apps/ops/serializers/celery.py +++ b/apps/ops/serializers/celery.py @@ -30,9 +30,15 @@ class CeleryPeriodTaskSerializer(serializers.ModelSerializer): class CeleryTaskSerializer(serializers.ModelSerializer): + exec_cycle = serializers.CharField(read_only=True) + next_exec_time = serializers.DateTimeField(format="%Y/%m/%d %H:%M:%S", read_only=True) + class Meta: model = CeleryTask - read_only_fields = ['id', 'name', 'meta', 'summary', 'state', 'date_last_publish'] + read_only_fields = [ + 'id', 'name', 'meta', 'summary', 'state', + 'date_last_publish', 'exec_cycle', 'next_exec_time' + ] fields = read_only_fields diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index 011bea4e2..75729f988 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -3,9 +3,7 @@ import uuid from django.utils.translation import gettext_lazy as _ from rest_framework import serializers -from assets.models import Node, Asset -from perms.models import PermNode -from perms.utils.user_perm import UserPermAssetUtil +from assets.models import Asset from common.serializers.fields import ReadableHiddenField from ops.mixin import PeriodTaskSerializerMixin from ops.models import Job, JobExecution @@ -18,14 +16,16 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): nodes = serializers.ListField(required=False, child=serializers.CharField()) date_last_run = serializers.DateTimeField(label=_('Date last run'), read_only=True) name = serializers.CharField(label=_('Name'), max_length=128, allow_blank=True, required=False) - assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects, many=True, - required=False) + assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects, many=True, required=False) def to_internal_value(self, data): instant = data.get('instant', False) + job_type = data.get('type', '') + _uid = str(uuid.uuid4()).split('-')[-1] if instant: - _uid = str(uuid.uuid4()).split('-')[-1] data['name'] = f'job-{_uid}' + if job_type == 'upload_file': + data['name'] = f'upload_file-{_uid}' return super().to_internal_value(data) def get_request_user(self): @@ -36,7 +36,8 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): class Meta: model = Job read_only_fields = [ - "id", "date_last_run", "date_created", "date_updated", "average_time_cost" + "id", "date_last_run", "date_created", + "date_updated", "average_time_cost" ] fields = read_only_fields + [ "name", "instant", "type", "module", @@ -45,10 +46,17 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): "use_parameter_define", "parameters_define", "timeout", "chdir", "comment", "summary", "is_periodic", "interval", "crontab", "nodes", - "run_after_save", + "run_after_save" ] +class FileSerializer(serializers.Serializer): + files = serializers.FileField(allow_empty_file=False, max_length=128) + + class Meta: + ref_name = "JobFileSerializer" + + class JobExecutionSerializer(BulkOrgResourceModelSerializer): creator = ReadableHiddenField(default=serializers.CurrentUserDefault()) job_type = serializers.ReadOnlyField(label=_("Job type")) diff --git a/apps/ops/serializers/playbook.py b/apps/ops/serializers/playbook.py index eac89850b..1ff48906a 100644 --- a/apps/ops/serializers/playbook.py +++ b/apps/ops/serializers/playbook.py @@ -5,7 +5,6 @@ from rest_framework import serializers from common.serializers.fields import ReadableHiddenField from ops.models import Playbook from orgs.mixins.serializers import BulkOrgResourceModelSerializer -from django.utils.translation import gettext_lazy as _ def parse_playbook_name(path): @@ -27,5 +26,6 @@ class PlaybookSerializer(BulkOrgResourceModelSerializer): model = Playbook read_only_fields = ["id", "date_created", "date_updated"] fields = read_only_fields + [ - "id", 'path', "name", "comment", "creator", 'create_method', 'vcs_url', + "id", 'path', "name", "comment", "creator", + 'create_method', 'vcs_url', ] diff --git a/apps/orgs/signal_handlers/common.py b/apps/orgs/signal_handlers/common.py index 83edeb425..57333a2e8 100644 --- a/apps/orgs/signal_handlers/common.py +++ b/apps/orgs/signal_handlers/common.py @@ -53,7 +53,7 @@ def subscribe_orgs_mapping_expire(sender, **kwargs): @delay_run(ttl=5) -def expire_user_orgs(*args): +def expire_user_orgs(): User.expire_users_rbac_perms_cache() diff --git a/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py b/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py index f7f191f4a..12d8e70ce 100644 --- a/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py +++ b/apps/perms/migrations/0002_auto_20171228_0025_squashed_0009_auto_20180903_1132.py @@ -80,7 +80,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='assetpermission', name='nodes', - field=models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Node', verbose_name='Nodes'), + field=models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Node', verbose_name='Node'), ), # migrations.RunPython( # code=migrate_node_permissions, diff --git a/apps/perms/models/asset_permission.py b/apps/perms/models/asset_permission.py index cee80f562..5ecf824c0 100644 --- a/apps/perms/models/asset_permission.py +++ b/apps/perms/models/asset_permission.py @@ -10,6 +10,7 @@ from accounts.models import Account from assets.models import Asset from common.utils import date_expired_default from common.utils.timezone import local_now +from labels.mixins import LabeledMixin from orgs.mixins.models import JMSOrgBaseModel from orgs.mixins.models import OrgManager from perms.const import ActionChoices @@ -56,7 +57,7 @@ def default_protocols(): return ['all'] -class AssetPermission(JMSOrgBaseModel): +class AssetPermission(LabeledMixin, JMSOrgBaseModel): name = models.CharField(max_length=128, verbose_name=_('Name')) users = models.ManyToManyField( 'users.User', related_name='%(class)ss', blank=True, verbose_name=_("User") @@ -68,7 +69,7 @@ class AssetPermission(JMSOrgBaseModel): 'assets.Asset', related_name='granted_by_permissions', blank=True, verbose_name=_("Asset") ) nodes = models.ManyToManyField( - 'assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Nodes") + 'assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Node") ) # 特殊的账号: @ALL, @INPUT @USER 默认包含，将来在全局设置中进行控制. accounts = models.JSONField(default=list, verbose_name=_("Account")) diff --git a/apps/perms/notifications.py b/apps/perms/notifications.py index 2a8aa0c2d..5c82c2589 100644 --- a/apps/perms/notifications.py +++ b/apps/perms/notifications.py @@ -9,7 +9,7 @@ class PermedAssetsWillExpireUserMsg(UserMessage): def __init__(self, user, assets, day_count=0): super().__init__(user) self.assets = assets - self.day_count = _('today') if day_count == 0 else day_count + self.day_count = _('today') if day_count == 0 else day_count + _('day') def get_html_msg(self) -> dict: subject = _("You permed assets is about to expire") @@ -41,7 +41,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage): super().__init__(user) self.perms = perms self.org = org - self.day_count = _('today') if day_count == 0 else day_count + self.day_count = _('today') if day_count == 0 else day_count + _('day') def get_items_with_url(self): items_with_url = [] diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index 26afba67c..d09c33538 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -4,9 +4,11 @@ from django.db.models import Q from django.utils.translation import gettext_lazy as _ from rest_framework import serializers +from accounts.const import Source from accounts.models import AccountTemplate, Account from accounts.tasks import push_accounts_to_assets_task from assets.models import Asset, Node +from common.serializers import ResourceLabelsMixin from common.serializers.fields import BitChoicesField, ObjectRelatedField from orgs.mixins.serializers import BulkOrgResourceModelSerializer from perms.models import ActionChoices, AssetPermission @@ -26,7 +28,7 @@ class ActionChoicesField(BitChoicesField): return data -class AssetPermissionSerializer(BulkOrgResourceModelSerializer): +class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer): users = ObjectRelatedField(queryset=User.objects, many=True, required=False, label=_('User')) user_groups = ObjectRelatedField( queryset=UserGroup.objects, many=True, required=False, label=_('User group') @@ -50,7 +52,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): "is_valid", "comment", "from_ticket", ] fields_small = fields_mini + fields_generic - fields_m2m = ["users", "user_groups", "assets", "nodes"] + fields_m2m = ["users", "user_groups", "assets", "nodes", "labels"] fields = fields_mini + fields_m2m + fields_generic read_only_fields = ["created_by", "date_created", "from_ticket"] extra_kwargs = { @@ -84,6 +86,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): ] for asset in assets: asset_exist_accounts = Account.objects.none() + asset_exist_account_names = asset.accounts.values_list('name', flat=True) for template in self.template_accounts: asset_exist_accounts |= asset.accounts.filter( username=template.username, @@ -95,11 +98,13 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): 'username': template.username, 'secret_type': template.secret_type } - if condition in username_secret_type_dict: + if condition in username_secret_type_dict or \ + template.name in asset_exist_account_names: continue account_data = {key: getattr(template, key) for key in account_attribute} account_data['su_from'] = template.get_su_from_account(asset) - account_data['name'] = f"{account_data['name']}-{_('Account template')}" + account_data['source'] = Source.TEMPLATE + account_data['source_id'] = str(template.id) need_create_accounts.append(Account(**{'asset_id': asset.id, **account_data})) return Account.objects.bulk_create(need_create_accounts) @@ -130,7 +135,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): """Perform necessary eager loading of data.""" queryset = queryset.prefetch_related( "users", "user_groups", "assets", "nodes", - ) + ).prefetch_related('labels', 'labels__label') return queryset @staticmethod diff --git a/apps/perms/templates/perms/_msg_item_permissions_expire.html b/apps/perms/templates/perms/_msg_item_permissions_expire.html index 9a9dc8244..eba2e7e5b 100644 --- a/apps/perms/templates/perms/_msg_item_permissions_expire.html +++ b/apps/perms/templates/perms/_msg_item_permissions_expire.html @@ -5,7 +5,7 @@
{% blocktranslate %} - The following {{ item_type }} will expire in {{ count }} days + The following {{ item_type }} will expire in {{ count }} {% endblocktranslate %}
diff --git a/apps/perms/templates/perms/_msg_permed_items_expire.html b/apps/perms/templates/perms/_msg_permed_items_expire.html index f4229b7eb..eb2a3cc47 100644 --- a/apps/perms/templates/perms/_msg_permed_items_expire.html +++ b/apps/perms/templates/perms/_msg_permed_items_expire.html @@ -5,7 +5,7 @@{% blocktranslate %} - The following {{ item_type }} will expire in {{ count }} days + The following {{ item_type }} will expire in {{ count }} {% endblocktranslate %}
@@ -15,7 +15,7 @@ {% endfor %} -+
-
{% trans 'If you have any question, please contact the administrator' %}
diff --git a/apps/rbac/api/__init__.py b/apps/rbac/api/__init__.py
index 894655045..28436525a 100644
--- a/apps/rbac/api/__init__.py
+++ b/apps/rbac/api/__init__.py
@@ -1,4 +1,4 @@
+from .content_type import *
from .permission import *
from .role import *
from .rolebinding import *
-
diff --git a/apps/rbac/api/content_type.py b/apps/rbac/api/content_type.py
new file mode 100644
index 000000000..2afe021ca
--- /dev/null
+++ b/apps/rbac/api/content_type.py
@@ -0,0 +1,11 @@
+from rest_framework import viewsets
+
+from .. import serializers
+from ..models import ContentType
+
+
+class ContentTypeViewSet(viewsets.ModelViewSet):
+ serializer_class = serializers.ContentTypeSerializer
+ filterset_fields = ("app_label", "model",)
+ search_fields = filterset_fields
+ queryset = ContentType.objects.all()
diff --git a/apps/rbac/api/role.py b/apps/rbac/api/role.py
index 387d0bc9c..b9133c5c5 100644
--- a/apps/rbac/api/role.py
+++ b/apps/rbac/api/role.py
@@ -56,9 +56,22 @@ class RoleViewSet(JMSModelViewSet):
return
instance.permissions.set(clone.get_permissions())
+ def filter_builtins(self, queryset):
+ keyword = self.request.query_params.get('search')
+ if not keyword:
+ return queryset
+
+ builtins = list(self.get_queryset().filter(builtin=True))
+ matched = [role.id for role in builtins if keyword in role.display_name]
+ if not matched:
+ return queryset
+ queryset = list(queryset.exclude(id__in=matched))
+ return queryset + builtins
+
def filter_queryset(self, queryset):
queryset = super().filter_queryset(queryset)
queryset = queryset.order_by(*self.ordering)
+ queryset = self.filter_builtins(queryset)
return queryset
def set_users_amount(self, queryset):
diff --git a/apps/rbac/const.py b/apps/rbac/const.py
index 01c8bd915..71eb47fbc 100644
--- a/apps/rbac/const.py
+++ b/apps/rbac/const.py
@@ -28,6 +28,7 @@ exclude_permissions = (
('authentication', 'superconnectiontoken', 'change,delete', 'superconnectiontoken'),
('authentication', 'temptoken', 'delete', 'temptoken'),
('users', 'userpasswordhistory', '*', '*'),
+ ('users', 'usersession', '*', '*'),
('assets', 'adminuser', '*', '*'),
('assets', 'assetgroup', '*', '*'),
('assets', 'cluster', '*', '*'),
@@ -73,7 +74,7 @@ exclude_permissions = (
('perms', 'rebuildusertreetask', '*', '*'),
('perms', 'permedasset', '*', 'permedasset'),
('perms', 'permedapplication', 'add,change,delete', 'permedapplication'),
- ('rbac', 'contenttype', '*', '*'),
+ ('rbac', 'contenttype', 'add,change,delete', '*'),
('rbac', 'permission', 'add,delete,change', 'permission'),
('rbac', 'rolebinding', '*', '*'),
('rbac', 'systemrolebinding', 'change', 'systemrolebinding'),
diff --git a/apps/rbac/migrations/0014_auto_20231208_1548.py b/apps/rbac/migrations/0014_auto_20231208_1548.py
new file mode 100644
index 000000000..5fb8cefb7
--- /dev/null
+++ b/apps/rbac/migrations/0014_auto_20231208_1548.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.10 on 2023-12-08 07:48
+
+from django.db import migrations
+
+
+def migrate_update_offline_usersession_permission_name(apps, *args):
+ perm_model = apps.get_model('auth', 'Permission')
+ perm_model.objects.filter(codename='offline_usersession').update(name='Offline user session')
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('rbac', '0013_alter_menupermission_options'),
+ ]
+
+ operations = [
+ migrations.RunPython(migrate_update_offline_usersession_permission_name)
+ ]
diff --git a/apps/rbac/models/permission.py b/apps/rbac/models/permission.py
index 17653f151..2b597c3c9 100644
--- a/apps/rbac/models/permission.py
+++ b/apps/rbac/models/permission.py
@@ -1,8 +1,10 @@
+from django.apps import apps
from django.contrib.auth.models import ContentType as DjangoContentType
from django.contrib.auth.models import Permission as DjangoPermission
from django.db.models import Q
from django.utils.translation import gettext_lazy as _
+from common.utils import lazyproperty
from .. import const
Scope = const.Scope
@@ -14,10 +16,59 @@ class ContentType(DjangoContentType):
class Meta:
proxy = True
+ _apps_map = {}
+
@property
def app_model(self):
return '%s.%s' % (self.app_label, self.model)
+ @classmethod
+ def apps_map(cls):
+ from ..tree import app_nodes_data
+ if cls._apps_map:
+ return cls._apps_map
+ mapper = {}
+ for d in app_nodes_data:
+ i = d['id']
+ name = d.get('name')
+
+ if not name:
+ config = apps.get_app_config(d['id'])
+ if config:
+ name = config.verbose_name
+ if name:
+ mapper[i] = name
+ cls._apps_map = mapper
+ return mapper
+
+ @property
+ def app_display(self):
+ return self.apps_map().get(self.app_label)
+
+ @lazyproperty
+ def fields(self):
+ model = self.model_class()
+ return model._meta.fields
+
+ @lazyproperty
+ def field_names(self):
+ return [f.name for f in self.fields]
+
+ @lazyproperty
+ def filter_field_names(self):
+ names = []
+ if 'name' in self.field_names:
+ names.append('name')
+ if 'address' in self.field_names:
+ names.append('address')
+ return names
+
+ def filter_queryset(self, queryset, keyword):
+ q = Q()
+ for name in self.filter_field_names:
+ q |= Q(**{name + '__icontains': keyword})
+ return queryset.filter(q)
+
class Permission(DjangoPermission):
""" 权限类 """
diff --git a/apps/rbac/serializers/__init__.py b/apps/rbac/serializers/__init__.py
index 894655045..28436525a 100644
--- a/apps/rbac/serializers/__init__.py
+++ b/apps/rbac/serializers/__init__.py
@@ -1,4 +1,4 @@
+from .content_type import *
from .permission import *
from .role import *
from .rolebinding import *
-
diff --git a/apps/rbac/serializers/content_type.py b/apps/rbac/serializers/content_type.py
new file mode 100644
index 000000000..8e811230c
--- /dev/null
+++ b/apps/rbac/serializers/content_type.py
@@ -0,0 +1,13 @@
+from rest_framework import serializers
+
+from ..models import ContentType
+
+__all__ = ['ContentTypeSerializer']
+
+
+class ContentTypeSerializer(serializers.ModelSerializer):
+ app_display = serializers.CharField()
+
+ class Meta:
+ model = ContentType
+ fields = ('id', 'app_label', 'app_display', 'model', 'name')
diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py
index 7a7a989f7..8e9a56831 100644
--- a/apps/rbac/tree.py
+++ b/apps/rbac/tree.py
@@ -39,7 +39,9 @@ app_nodes_data = [
{'id': 'rbac', 'view': 'view_console'},
{'id': 'settings', 'view': 'view_setting'},
{'id': 'tickets', 'view': 'view_other'},
+ {'id': 'labels', 'view': 'view_console'},
{'id': 'authentication', 'view': 'view_other'},
+ {'id': 'ops', 'view': 'view_workbench'},
]
# 额外其他节点，可以在不同的层次，需要指定父节点，可以将一些 model 归类到这个节点下面
diff --git a/apps/rbac/urls/api_urls.py b/apps/rbac/urls/api_urls.py
index 5dc080930..f68aab11d 100644
--- a/apps/rbac/urls/api_urls.py
+++ b/apps/rbac/urls/api_urls.py
@@ -6,7 +6,6 @@ from .. import api
app_name = 'rbac'
-
router = BulkRouter()
router.register(r'roles', api.RoleViewSet, 'role')
router.register(r'role-bindings', api.RoleBindingViewSet, 'role-binding')
@@ -18,6 +17,7 @@ router.register(r'org-roles', api.OrgRoleViewSet, 'org-role')
router.register(r'org-role-bindings', api.OrgRoleBindingViewSet, 'org-role-binding')
router.register(r'permissions', api.PermissionViewSet, 'permission')
+router.register(r'content-types', api.ContentTypeViewSet, 'content-type')
system_role_router = routers.NestedDefaultRouter(router, r'system-roles', lookup='system_role')
system_role_router.register(r'permissions', api.SystemRolePermissionsViewSet, 'system-role-permission')
diff --git a/apps/settings/api/__init__.py b/apps/settings/api/__init__.py
index 510925590..686a52f3b 100644
--- a/apps/settings/api/__init__.py
+++ b/apps/settings/api/__init__.py
@@ -1,3 +1,4 @@
+from .chat import *
from .dingtalk import *
from .email import *
from .feishu import *
@@ -5,6 +6,7 @@ from .ldap import *
from .public import *
from .security import *
from .settings import *
+from .slack import *
from .sms import *
from .vault import *
from .wecom import *
diff --git a/apps/settings/api/chat.py b/apps/settings/api/chat.py
new file mode 100644
index 000000000..68a80f013
--- /dev/null
+++ b/apps/settings/api/chat.py
@@ -0,0 +1,119 @@
+import httpx
+import openai
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
+from rest_framework import status
+from rest_framework.generics import GenericAPIView
+from rest_framework.response import Response
+
+from common.api import JMSModelViewSet
+from common.permissions import IsValidUser, OnlySuperUser
+from .. import serializers
+from ..models import ChatPrompt
+from ..prompt import DefaultChatPrompt
+
+
+class ChatAITestingAPI(GenericAPIView):
+ serializer_class = serializers.ChatAISettingSerializer
+ rbac_perms = {
+ 'POST': 'settings.change_chatai'
+ }
+
+ def get_config(self, request):
+ serializer = self.serializer_class(data=request.data)
+ serializer.is_valid(raise_exception=True)
+ data = self.serializer_class().data
+ data.update(serializer.validated_data)
+ for k, v in data.items():
+ if v:
+ continue
+ # 页面没有传递值, 从 settings 中获取
+ data[k] = getattr(settings, k, None)
+ return data
+
+ def post(self, request):
+ config = self.get_config(request)
+ chat_ai_enabled = config['CHAT_AI_ENABLED']
+ if not chat_ai_enabled:
+ return Response(
+ status=status.HTTP_400_BAD_REQUEST,
+ data={'msg': _('Chat AI is not enabled')}
+ )
+
+ proxy = config['GPT_PROXY']
+ model = config['GPT_MODEL']
+
+ kwargs = {
+ 'base_url': config['GPT_BASE_URL'] or None,
+ 'api_key': config['GPT_API_KEY'],
+ }
+ try:
+ if proxy:
+ kwargs['http_client'] = httpx.Client(
+ proxies=proxy,
+ transport=httpx.HTTPTransport(local_address='0.0.0.0')
+ )
+ client = openai.OpenAI(**kwargs)
+
+ ok = False
+ error = ''
+
+ client.chat.completions.create(
+ messages=[
+ {
+ "role": "user",
+ "content": "Say this is a test",
+ }
+ ],
+ model=model,
+ )
+ ok = True
+ except openai.APIConnectionError as e:
+ error = str(e.__cause__) # an underlying Exception, likely raised within httpx.
+ except openai.APIStatusError as e:
+ error = str(e.message)
+ except Exception as e:
+ ok, error = False, str(e)
+
+ if ok:
+ _status, msg = status.HTTP_200_OK, _('Test success')
+ else:
+ _status, msg = status.HTTP_400_BAD_REQUEST, error
+
+ return Response(status=_status, data={'msg': msg})
+
+
+class ChatPromptViewSet(JMSModelViewSet):
+ serializer_classes = {
+ 'default': serializers.ChatPromptSerializer,
+ }
+ permission_classes = [IsValidUser]
+ queryset = ChatPrompt.objects.all()
+ http_method_names = ['get', 'options']
+ filterset_fields = ['name']
+ search_fields = filterset_fields
+
+ def get_permissions(self):
+ if self.action in ['create', 'update', 'partial_update', 'destroy']:
+ self.permission_classes = [OnlySuperUser]
+ return super().get_permissions()
+
+ def filter_default_prompts(self):
+ lang = self.request.LANGUAGE_CODE
+ default_prompts = DefaultChatPrompt.get_prompts(lang)
+ search_query = self.request.query_params.get('search')
+ search_query = search_query or self.request.query_params.get('name')
+ if not search_query:
+ return default_prompts
+
+ search_query = search_query.lower()
+ filtered_prompts = [
+ prompt for prompt in default_prompts
+ if search_query in prompt['name'].lower()
+ ]
+ return filtered_prompts
+
+ def filter_queryset(self, queryset):
+ queryset = super().filter_queryset(queryset)
+ default_prompts = self.filter_default_prompts()
+ return list(queryset) + default_prompts
diff --git a/apps/settings/api/ldap.py b/apps/settings/api/ldap.py
index 486da3562..9c619e24d 100644
--- a/apps/settings/api/ldap.py
+++ b/apps/settings/api/ldap.py
@@ -28,71 +28,6 @@ from ..utils import (
logger = get_logger(__file__)
-class LDAPTestingConfigAPI(AsyncApiMixin, CreateAPIView):
- serializer_class = LDAPTestConfigSerializer
- perm_model = Setting
- rbac_perms = {
- 'POST': 'settings.change_auth',
- 'create': 'settings.change_auth',
- }
-
- def is_need_async(self):
- return True
-
- def create(self, request, *args, **kwargs):
- serializer = self.serializer_class(data=request.data)
- if not serializer.is_valid():
- return Response({"error": str(serializer.errors)}, status=400)
- config = self.get_ldap_config(serializer)
- ok, msg = LDAPTestUtil(config).test_config()
- status = 200 if ok else 400
- return Response(msg, status=status)
-
- @staticmethod
- def get_ldap_config(serializer):
- server_uri = serializer.validated_data["AUTH_LDAP_SERVER_URI"]
- bind_dn = serializer.validated_data["AUTH_LDAP_BIND_DN"]
- password = serializer.validated_data["AUTH_LDAP_BIND_PASSWORD"]
- use_ssl = serializer.validated_data.get("AUTH_LDAP_START_TLS", False)
- search_ou = serializer.validated_data["AUTH_LDAP_SEARCH_OU"]
- search_filter = serializer.validated_data["AUTH_LDAP_SEARCH_FILTER"]
- attr_map = serializer.validated_data["AUTH_LDAP_USER_ATTR_MAP"]
- auth_ldap = serializer.validated_data.get('AUTH_LDAP', False)
-
- if not password:
- password = settings.AUTH_LDAP_BIND_PASSWORD
-
- config = {
- 'server_uri': server_uri,
- 'bind_dn': bind_dn,
- 'password': password,
- 'use_ssl': use_ssl,
- 'search_ou': search_ou,
- 'search_filter': search_filter,
- 'attr_map': attr_map,
- 'auth_ldap': auth_ldap
- }
- return config
-
-
-class LDAPTestingLoginAPI(APIView):
- serializer_class = LDAPTestLoginSerializer
- perm_model = Setting
- rbac_perms = {
- 'POST': 'settings.change_auth'
- }
-
- def post(self, request):
- serializer = self.serializer_class(data=request.data)
- if not serializer.is_valid():
- return Response({"error": str(serializer.errors)}, status=400)
- username = serializer.validated_data['username']
- password = serializer.validated_data['password']
- ok, msg = LDAPTestUtil().test_login(username, password)
- status = 200 if ok else 400
- return Response(msg, status=status)
-
-
class LDAPUserListApi(generics.ListAPIView):
serializer_class = LDAPUserSerializer
perm_model = Setting
@@ -162,31 +97,10 @@ class LDAPUserListApi(generics.ListAPIView):
# 缓存有数据
if queryset is not None:
return super().list(request, *args, **kwargs)
-
- sync_util = LDAPSyncUtil()
- # 还没有同步任务
- if sync_util.task_no_start:
- ok, msg = LDAPTestUtil().test_config()
- if not ok:
- return Response(data={'msg': msg}, status=400)
- # 任务外部设置 task running 状态
- sync_util.set_task_status(sync_util.TASK_STATUS_IS_RUNNING)
- t = threading.Thread(target=sync_ldap_user)
- t.start()
- data = {'msg': _('Synchronization start, please wait.')}
- return Response(data=data, status=409)
- # 同步任务正在执行
- if sync_util.task_is_running:
- data = {'msg': _('Synchronization is running, please wait.')}
- return Response(data=data, status=409)
- # 同步任务执行结束
- if sync_util.task_is_over:
- msg = sync_util.get_task_error_msg()
- data = {'error': _('Synchronization error: {}'.format(msg))}
+ else:
+ data = {'msg': _('Users are not synchronized, please click the user synchronization button')}
return Response(data=data, status=400)
- return super().list(request, *args, **kwargs)
-
class LDAPUserImportAPI(APIView):
perm_model = Setting
@@ -232,18 +146,3 @@ class LDAPUserImportAPI(APIView):
return Response({
'msg': _('Imported {} users successfully (Organization: {})').format(count, orgs_name)
})
-
-
-class LDAPCacheRefreshAPI(generics.RetrieveAPIView):
- perm_model = Setting
- rbac_perms = {
- 'retrieve': 'settings.change_auth'
- }
-
- def retrieve(self, request, *args, **kwargs):
- try:
- LDAPSyncUtil().clear_cache()
- except Exception as e:
- logger.error(str(e))
- return Response(data={'msg': str(e)}, status=400)
- return Response(data={'msg': 'success'})
diff --git a/apps/settings/api/settings.py b/apps/settings/api/settings.py
index 6b5f096cf..c03e99b6c 100644
--- a/apps/settings/api/settings.py
+++ b/apps/settings/api/settings.py
@@ -39,6 +39,7 @@ class SettingsApi(generics.RetrieveUpdateAPIView):
'wecom': serializers.WeComSettingSerializer,
'dingtalk': serializers.DingTalkSettingSerializer,
'feishu': serializers.FeiShuSettingSerializer,
+ 'slack': serializers.SlackSettingSerializer,
'auth': serializers.AuthSettingSerializer,
'oidc': serializers.OIDCSettingSerializer,
'keycloak': serializers.KeycloakSettingSerializer,
@@ -56,9 +57,11 @@ class SettingsApi(generics.RetrieveUpdateAPIView):
'cmpp2': serializers.CMPP2SMSSettingSerializer,
'custom': serializers.CustomSMSSettingSerializer,
'vault': serializers.VaultSettingSerializer,
+ 'chat': serializers.ChatAISettingSerializer,
'announcement': serializers.AnnouncementSettingSerializer,
'ticket': serializers.TicketSettingSerializer,
'ops': serializers.OpsSettingSerializer,
+ 'virtualapp': serializers.VirtualAppSerializer,
}
rbac_category_permissions = {
@@ -66,6 +69,7 @@ class SettingsApi(generics.RetrieveUpdateAPIView):
'terminal': 'settings.change_terminal',
'ops': 'settings.change_ops',
'ticket': 'settings.change_ticket',
+ 'virtualapp': 'settings.change_virtualapp',
'announcement': 'settings.change_announcement',
'security': 'settings.change_security',
'security_basic': 'settings.change_security',
diff --git a/apps/settings/api/slack.py b/apps/settings/api/slack.py
new file mode 100644
index 000000000..3a4ad289d
--- /dev/null
+++ b/apps/settings/api/slack.py
@@ -0,0 +1,40 @@
+from rest_framework.views import Response
+from rest_framework.generics import GenericAPIView
+from rest_framework.exceptions import APIException
+from rest_framework import status
+from django.utils.translation import gettext_lazy as _
+
+from settings.models import Setting
+from common.sdk.im.slack import Slack
+
+from .. import serializers
+
+
+class SlackTestingAPI(GenericAPIView):
+ serializer_class = serializers.SlackSettingSerializer
+ rbac_perms = {
+ 'POST': 'settings.change_auth'
+ }
+
+ def post(self, request):
+ serializer = self.serializer_class(data=request.data)
+ serializer.is_valid(raise_exception=True)
+
+ bot_token = serializer.validated_data.get('SLACK_BOT_TOKEN')
+ if not bot_token:
+ secret = Setting.objects.filter(name='SLACK_BOT_TOKEN').first()
+ if secret:
+ bot_token = secret.cleaned_value
+
+ bot_token = bot_token or ''
+
+ try:
+ slack = Slack(bot_token=bot_token)
+ slack.is_valid()
+ return Response(status=status.HTTP_200_OK, data={'msg': _('Test success')})
+ except APIException as e:
+ try:
+ error = e.detail['errmsg']
+ except:
+ error = e.detail
+ return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': error})
diff --git a/apps/settings/migrations/0010_alter_setting_options.py b/apps/settings/migrations/0010_alter_setting_options.py
index 3d52a64da..0ce372e76 100644
--- a/apps/settings/migrations/0010_alter_setting_options.py
+++ b/apps/settings/migrations/0010_alter_setting_options.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
('settings', '0009_alter_cas_username_attribute'),
]
@@ -12,6 +11,22 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='setting',
- options={'permissions': [('change_email', 'Can change email setting'), ('change_auth', 'Can change auth setting'), ('change_ops', 'Can change auth ops'), ('change_ticket', 'Can change auth ticket'), ('change_announcement', 'Can change auth announcement'), ('change_vault', 'Can change vault setting'), ('change_systemmsgsubscription', 'Can change system msg sub setting'), ('change_sms', 'Can change sms setting'), ('change_security', 'Can change security setting'), ('change_clean', 'Can change clean setting'), ('change_interface', 'Can change interface setting'), ('change_license', 'Can change license setting'), ('change_terminal', 'Can change terminal setting'), ('change_other', 'Can change other setting')], 'verbose_name': 'System setting'},
+ options={'permissions': [
+ ('change_email', 'Can change email setting'),
+ ('change_auth', 'Can change auth setting'),
+ ('change_ops', 'Can change auth ops'),
+ ('change_ticket', 'Can change auth ticket'),
+ ('change_announcement', 'Can change auth announcement'),
+ ('change_vault', 'Can change vault setting'),
+ ('change_chatai', 'Can change chat ai setting'),
+ ('change_systemmsgsubscription', 'Can change system msg sub setting'),
+ ('change_sms', 'Can change sms setting'),
+ ('change_security', 'Can change security setting'),
+ ('change_clean', 'Can change clean setting'),
+ ('change_interface', 'Can change interface setting'),
+ ('change_license', 'Can change license setting'),
+ ('change_terminal', 'Can change terminal setting'),
+ ('change_other', 'Can change other setting')
+ ], 'verbose_name': 'System setting'},
),
]
diff --git a/apps/settings/migrations/0011_chatprompt.py b/apps/settings/migrations/0011_chatprompt.py
new file mode 100644
index 000000000..1e2b05801
--- /dev/null
+++ b/apps/settings/migrations/0011_chatprompt.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.1.10 on 2023-12-13 11:07
+
+import uuid
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('settings', '0010_alter_setting_options'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='ChatPrompt',
+ fields=[
+ ('created_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by')),
+ ('updated_by', models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated 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')),
+ ('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
+ ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+ ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
+ ('content', models.TextField(verbose_name='Content')),
+ ('builtin', models.BooleanField(default=False, verbose_name='Builtin')),
+ ],
+ options={
+ 'verbose_name': 'Chat prompt',
+ },
+ ),
+ ]
diff --git a/apps/settings/migrations/0012_alter_setting_options.py b/apps/settings/migrations/0012_alter_setting_options.py
new file mode 100644
index 000000000..f35da135f
--- /dev/null
+++ b/apps/settings/migrations/0012_alter_setting_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.10 on 2023-12-20 07:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('settings', '0011_chatprompt'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='setting',
+ options={'permissions': [('change_email', 'Can change email setting'), ('change_auth', 'Can change auth setting'), ('change_ops', 'Can change auth ops'), ('change_ticket', 'Can change auth ticket'), ('change_virtualapp', 'Can change virtual app setting'), ('change_announcement', 'Can change auth announcement'), ('change_vault', 'Can change vault setting'), ('change_chatai', 'Can change chat ai setting'), ('change_systemmsgsubscription', 'Can change system msg sub setting'), ('change_sms', 'Can change sms setting'), ('change_security', 'Can change security setting'), ('change_clean', 'Can change clean setting'), ('change_interface', 'Can change interface setting'), ('change_license', 'Can change license setting'), ('change_terminal', 'Can change terminal setting'), ('change_other', 'Can change other setting')], 'verbose_name': 'System setting'},
+ ),
+ ]
diff --git a/apps/settings/models.py b/apps/settings/models.py
index dc599bbe4..d6cda11df 100644
--- a/apps/settings/models.py
+++ b/apps/settings/models.py
@@ -8,6 +8,7 @@ from django.db import models
from django.db.utils import ProgrammingError, OperationalError
from django.utils.translation import gettext_lazy as _
+from common.db.models import JMSBaseModel
from common.utils import signer, get_logger
logger = get_logger(__name__)
@@ -161,8 +162,10 @@ class Setting(models.Model):
('change_auth', _('Can change auth setting')),
('change_ops', _('Can change auth ops')),
('change_ticket', _('Can change auth ticket')),
+ ('change_virtualapp', _('Can change virtual app setting')),
('change_announcement', _('Can change auth announcement')),
('change_vault', _('Can change vault setting')),
+ ('change_chatai', _('Can change chat ai setting')),
('change_systemmsgsubscription', _('Can change system msg sub setting')),
('change_sms', _('Can change sms setting')),
('change_security', _('Can change security setting')),
@@ -172,3 +175,15 @@ class Setting(models.Model):
('change_terminal', _('Can change terminal setting')),
('change_other', _('Can change other setting')),
]
+
+
+class ChatPrompt(JMSBaseModel):
+ name = models.CharField(max_length=128, verbose_name=_('Name'), unique=True)
+ content = models.TextField(blank=False, null=False, verbose_name=_('Content'))
+ builtin = models.BooleanField(default=False, verbose_name=_('Builtin'))
+
+ class Meta:
+ verbose_name = _("Chat prompt")
+
+ def __str__(self):
+ return self.name
diff --git a/apps/settings/prompt.py b/apps/settings/prompt.py
new file mode 100644
index 000000000..5e2b72c96
--- /dev/null
+++ b/apps/settings/prompt.py
@@ -0,0 +1,197 @@
+class DefaultChatPrompt:
+ DEFAULT = {
+ 'zh': [
+ {
+ 'name': '周报生成器',
+ 'content': '使用下面提供的文本作为中文周报的基础，生成一个简洁的摘要，突出最重要的内容。该报告应以 markdown 格式编写，'
+ '并应易于阅读和理解，以满足一般受众的需要。特别是要注重提供对利益相关者和决策者有用的见解和分析。'
+ '你也可以根据需要使用任何额外的信息或来源。',
+ },
+ {
+ 'name': '数据库专家',
+ 'content': '我希望你充当一个数据库专家的角色，当我问你 sql 相关的问题时，'
+ '我需要你转换为标准的 sql 语句，当我的描述不够精准时，请给出合适的反馈',
+ },
+ {
+ 'name': '全栈程序员',
+ 'content': '我希望你能扮演一个软件开发者的角色。我将提供一些关于网络应用需求的具体信息，'
+ '而你的工作是提出一个架构和代码，用 Golang 和 Angular 开发安全的应用。',
+ },
+ {
+ 'name': '前端开发',
+ 'content': '我希望你能担任高级前端开发员。我将描述一个项目的细节，你将用这些工具来编码项目。'
+ 'Create React App, yarn, Ant Design, List, Redux Toolkit, createSlice, thunk, axios. '
+ '你应该将文件合并到单一的 index.js 文件中，而不是其他。不要写解释。',
+ },
+ {
+ 'name': '架构师 IT',
+ 'content': '我希望你能扮演一个 IT 架构师的角色。我将提供一些关于应用程序或其他数字产品功能的细节，'
+ '而你的工作是想出将其整合到 IT 环境中的方法。这可能涉及到分析业务需求，进行差距分析，'
+ '并将新系统的功能映射到现有的 IT 环境中。接下来的步骤是创建一个解决方案设计，'
+ '一个物理网络蓝图，定义系统集成的接口和部署环境的蓝图。',
+ },
+ {
+ 'name': '代码释义器',
+ 'content': '我希望你能充当代码解释者，阐明代码的语法和语义。',
+ },
+ {
+ 'name': 'IT 编程问题',
+ 'content': '我想让你充当 Stackoverflow 的帖子。我将提出与编程有关的问题，你将回答答案是什么。'
+ '我希望你只回答给定的答案，在没有足够的细节时写出解释。当我需要用英语告诉你一些事情时，我会把文字放在大括号里{像这样}。'
+ },
+ {
+ 'name': '小红书风格',
+ 'content': '请使用 Emoji 风格编辑以下段落，该风格以引人入胜的标题、'
+ '每个段落中包含表情符号和在末尾添加相关标签为特点。请确保保持原文的意思。',
+ },
+ {
+ 'name': '写作助理',
+ 'content': '作为一名中文写作改进助理，你的任务是改进所提供文本的拼写、语法、清晰、简洁和整体可读性，'
+ '同时分解长句，减少重复，并提供改进建议。请只提供文本的更正版本，避免包括解释。',
+ },
+ {
+ 'name': 'Nature 风格润色',
+ 'content': '我希望你能充当专业的拼写和语法校对者，并改进我的文章。'
+ '我想让你用更美丽、优雅、高级的英语单词和句子替换我的简化 A0 级别的单词和句子，'
+ '保持意思不变，但使它们更具文学性，在《自然》杂志风格中提高我的表达水平。',
+ },
+ ],
+ 'en': [
+ {
+ "name": "Weekly Report Generator",
+ "content": "Using the text provided below as a basis for a Chinese weekly report, "
+ "generate a concise summary that highlights the most important content. "
+ "The report should be written in markdown format and should be easy to read "
+ "and understand for a general audience, especially focusing on providing insights "
+ "and analysis useful to stakeholders and decision-makers. You may also use any additional "
+ "information or sources as needed."
+ },
+ {
+ "name": "Database Expert",
+ "content": "I want you to act as a database expert. When I ask you questions related to SQL, "
+ "I need you to convert them into standard SQL statements. "
+ "Please provide appropriate feedback when my descriptions are not precise enough."
+ },
+ {
+ "name": "Full-Stack Programmer",
+ "content": "I want you to play the role of a software developer. "
+ "I will provide specific information about web application requirements, "
+ "and your job is to propose an architecture and code for developing a secure application "
+ "using Golang and Angular."
+ },
+ {
+ "name": "Front-End Developer",
+ "content": "I want you to act as a senior front-end developer. "
+ "I will describe the details of a project, and you will code the project using these tools:"
+ " Create React App, yarn, Ant Design, List, Redux Toolkit, createSlice, thunk, axios. "
+ "You should consolidate files into a single index.js file, and not write explanations."
+ },
+ {
+ "name": "IT Architect",
+ "content": "I want you to play the role of an IT architect. "
+ "I will provide details about the functionality of applications or other digital products, "
+ "and your job is to figure out how to integrate them into the IT environment. "
+ "This may involve analyzing business requirements, conducting gap analysis, "
+ "and mapping the new system's features to the existing IT environment. "
+ "The next steps are to create a solution design, a physical network blueprint, "
+ "define interfaces for system integration, and a blueprint for the deployment environment."
+ },
+ {
+ "name": "Code Interpreter",
+ "content": "I want you to act as a code interpreter, clarifying the syntax and semantics of code."
+ },
+ {
+ "name": "IT Programming Questions",
+ "content": "I want you to act as a Stackoverflow post. I will ask questions related to programming, "
+ "and you will answer what the answer is. Write out explanations "
+ "when there are not enough details. When I need to tell you something in English, "
+ "I will enclose the text in braces {like this}."
+ },
+ {
+ "name": "Xiaohongshu Style",
+ "content": "Please edit the following paragraphs in Emoji style. "
+ "This style is characterized by engaging titles, the inclusion of emojis in each paragraph, "
+ "and adding related tags at the end. Ensure the original meaning is maintained."
+ },
+ {
+ "name": "Writing Assistant",
+ "content": "As a Chinese writing improvement assistant, "
+ "your task is to improve the provided text in terms of spelling, grammar, clarity, "
+ "conciseness, and overall readability. Also, break down long sentences, reduce repetition, "
+ "and provide suggestions for improvement. Please only provide the corrected version of "
+ "the text, avoiding including explanations."
+ },
+ {
+ "name": "Nature Style Editing",
+ "content": "I want you to act as a professional spelling and grammar proofreader and improve "
+ "my article. I want you to replace my simplified A0 level words and sentences with "
+ "more beautiful, elegant, and advanced English words and sentences. Keep the meaning "
+ "the same but make them more literary, enhancing my expression in the style of 'Nature' "
+ "magazine."
+ },
+ ],
+ 'ja': [
+ {
+ "name": "週報ジェネレータ",
+ "content": "以下のテキストを基にして中国語の週報の簡潔な要約を作成し、最も重要な内容を強調してください。"
+ "このレポートはマークダウン形式で書かれ、一般の聴衆にとって読みやすく理解しやすいものでなければなりません。"
+ "特に、利害関係者や意思決定者に有用な洞察と分析を提供することに重点を置いてください。"
+ "必要に応じて、追加の情報やソースを使用しても構いません。"
+ },
+ {
+ "name": "データベースの専門家",
+ "content": "データベース専門家として機能し、私がsqlに関連する質問をするとき、"
+ "それを標準のsqlステートメントに変換してください。私の説明が不正確な場合は、適切なフィードバックを提供してください。"
+ },
+ {
+ "name": "フルスタックプログラマー",
+ "content": "ソフトウェア開発者の役割を果たしてください。私はウェブアプリケーションの要件に関する具体的な情報を提供します。"
+ "あなたの仕事は、GolangとAngularを使用して安全なアプリケーションを開発するためのアーキテクチャとコードを提案することです。"
+ },
+ {
+ "name": "フロントエンド開発",
+ "content": "上級フロントエンド開発者として機能してください。私はプロジェクトの詳細を説明し、"
+ "これらのツールを使用してプロジェクトをコーディングします。"
+ "Create React App、yarn、Ant Design、List、Redux Toolkit、createSlice、thunk、axiosを使用してください。"
+ "ファイルをindex.jsファイルに統合し、他のファイルではなく、説明は書かないでください。"
+ },
+ {
+ "name": "ITアーキテクト",
+ "content": "ITアーキテクトの役割を果たしてください。私はアプリケーションや他のデジタル製品の機能に関する詳細を提供します。"
+ "あなたの仕事は、それをIT環境に統合する方法を考えることです。これには、ビジネス要件の分析、ギャップ分析の実施、"
+ "新システムの機能を既存のIT環境にマッピングすることが含まれる場合があります。次のステップは、"
+ "ソリューションデザインの作成、物理的なネットワークのブループリント、システム統合のインターフェース、およびデプロイメント環境のブループリントを定義することです。"
+ },
+ {
+ "name": "コードインタープリター",
+ "content": "コードの解釈者として機能し、コードの文法と意味を明確に説明してください。"
+ },
+ {
+ "name": "ITプログラミングの問題",
+ "content": "Stackoverflowの投稿として機能してください。私はプログラミングに関連する質問をします。"
+ "あなたは答えを何であるか答えます。十分な詳細がない場合は説明を書いてください。英語で何かを伝える必要があるときは、"
+ "大括弧でテキストを囲みます{このように}。"
+ },
+ {
+ "name": "小红书風格",
+ "content": "Emojiスタイルで以下の段落を編集してください。このスタイルは、魅力的なタイトル、"
+ "各段落に絵文字を含め、関連するタグを末尾に追加することが特徴です。原文の意味を保持してください。"
+ },
+ {
+ "name": "ライティングアシスタント",
+ "content": "中国語のライティング改善アシスタントとして、提供されたテキストのスペル、"
+ "文法、明瞭さ、簡潔さ、全体的な可読性を改善し、長い文を分解し、重複を減らし、"
+ "改善提案を提供します。テキストの修正版のみを提供し、説明は含めないでください。"
+ },
+ {
+ "name": "Nature スタイルの編集",
+ "content": "プロのスペルと文法の校正者として機能し、私の記事を改善してください。"
+ "私の簡素化されたA0レベルの単語や文章を、より美しく、優雅で、"
+ "高度な英語の単語や文章に置き換えて、文学的な要素を加え、「自然」誌スタイルで表現レベルを高めてください。"
+ },
+ ]
+ }
+
+ @classmethod
+ def get_prompts(cls, lang: str) -> list:
+ return cls.DEFAULT.get(lang[:2], 'zh')
diff --git a/apps/settings/serializers/__init__.py b/apps/settings/serializers/__init__.py
index fe94eb1da..600684387 100644
--- a/apps/settings/serializers/__init__.py
+++ b/apps/settings/serializers/__init__.py
@@ -8,6 +8,7 @@ from .feature import *
from .msg import *
from .msg import *
from .other import *
+from .prompt import *
from .public import *
from .security import *
from .settings import *
diff --git a/apps/settings/serializers/auth/__init__.py b/apps/settings/serializers/auth/__init__.py
index aeca390ac..2b641114c 100644
--- a/apps/settings/serializers/auth/__init__.py
+++ b/apps/settings/serializers/auth/__init__.py
@@ -11,3 +11,4 @@ from .saml2 import *
from .sms import *
from .sso import *
from .wecom import *
+from .slack import *
diff --git a/apps/settings/serializers/auth/base.py b/apps/settings/serializers/auth/base.py
index 57034e730..fbc833124 100644
--- a/apps/settings/serializers/auth/base.py
+++ b/apps/settings/serializers/auth/base.py
@@ -17,7 +17,8 @@ class AuthSettingSerializer(serializers.Serializer):
AUTH_RADIUS = serializers.BooleanField(required=False, label=_('RADIUS Auth'))
AUTH_DINGTALK = serializers.BooleanField(default=False, label=_('DingTalk Auth'))
AUTH_FEISHU = serializers.BooleanField(default=False, label=_('FeiShu Auth'))
- AUTH_WECOM = serializers.BooleanField(default=False, label=_('WeCom Auth'))
+ AUTH_WECOM = serializers.BooleanField(default=False, label=_('Slack Auth'))
+ AUTH_SLACK = serializers.BooleanField(default=False, label=_('WeCom Auth'))
AUTH_SSO = serializers.BooleanField(default=False, label=_("SSO Auth"))
AUTH_PASSKEY = serializers.BooleanField(default=False, label=_("Passkey Auth"))
FORGOT_PASSWORD_URL = serializers.CharField(
diff --git a/apps/settings/serializers/auth/slack.py b/apps/settings/serializers/auth/slack.py
new file mode 100644
index 000000000..019137f4c
--- /dev/null
+++ b/apps/settings/serializers/auth/slack.py
@@ -0,0 +1,15 @@
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+
+from common.serializers.fields import EncryptedField
+
+__all__ = ['SlackSettingSerializer']
+
+
+class SlackSettingSerializer(serializers.Serializer):
+ PREFIX_TITLE = _('Slack')
+
+ AUTH_SLACK = serializers.BooleanField(default=False, label=_('Enable Slack Auth'))
+ SLACK_CLIENT_ID = serializers.CharField(max_length=256, required=True, label='Client ID')
+ SLACK_CLIENT_SECRET = EncryptedField(max_length=256, required=False, label='Client Secret')
+ SLACK_BOT_TOKEN = EncryptedField(max_length=256, required=False, label='Client bot Token')
diff --git a/apps/settings/serializers/basic.py b/apps/settings/serializers/basic.py
index ad1c2f8e3..4e253c602 100644
--- a/apps/settings/serializers/basic.py
+++ b/apps/settings/serializers/basic.py
@@ -1,6 +1,8 @@
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
+from orgs.models import Organization
+
class BasicSettingSerializer(serializers.Serializer):
PREFIX_TITLE = _('Basic')
@@ -34,3 +36,10 @@ class BasicSettingSerializer(serializers.Serializer):
if not s:
return 'http://127.0.0.1'
return s.strip('/')
+
+ @staticmethod
+ def validate_GLOBAL_ORG_DISPLAY_NAME(s):
+ org_names = Organization.objects.values_list('name', flat=True)
+ if s in org_names:
+ raise serializers.ValidationError(_('Organization name already exists'))
+ return s
diff --git a/apps/settings/serializers/feature.py b/apps/settings/serializers/feature.py
index f2efe5b03..8dc0de959 100644
--- a/apps/settings/serializers/feature.py
+++ b/apps/settings/serializers/feature.py
@@ -3,11 +3,13 @@ import uuid
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
+from assets.const import Protocol
from common.serializers.fields import EncryptedField
__all__ = [
'AnnouncementSettingSerializer', 'OpsSettingSerializer',
- 'VaultSettingSerializer', 'TicketSettingSerializer'
+ 'VaultSettingSerializer', 'TicketSettingSerializer',
+ 'ChatAISettingSerializer', 'VirtualAppSerializer',
]
@@ -54,6 +56,44 @@ class VaultSettingSerializer(serializers.Serializer):
)
+class ChatAISettingSerializer(serializers.Serializer):
+ PREFIX_TITLE = _('Chat AI')
+ GPT_MODEL_CHOICES = []
+
+ CHAT_AI_ENABLED = serializers.BooleanField(
+ required=False, label=_('Enable Chat AI')
+ )
+ GPT_BASE_URL = serializers.CharField(
+ max_length=256, allow_blank=True, required=False, label=_('Base Url')
+ )
+ GPT_API_KEY = EncryptedField(
+ max_length=256, allow_blank=True, required=False, label=_('API Key'),
+ )
+ GPT_PROXY = serializers.CharField(
+ max_length=256, allow_blank=True, required=False, label=_('Proxy')
+ )
+ GPT_MODEL = serializers.ChoiceField(
+ default='', choices=GPT_MODEL_CHOICES, label=_("GPT Model"), required=False,
+ )
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.set_GPT_MODEL_choices()
+
+ def set_GPT_MODEL_choices(self):
+ field_gpt_model = self.fields.get("GPT_MODEL")
+ if not field_gpt_model:
+ return
+ gpt_api_model = Protocol.gpt_protocols()[Protocol.chatgpt]['setting']['api_mode']
+ choices = gpt_api_model['choices']
+ field_gpt_model._choices = choices
+ field_gpt_model.default = gpt_api_model['default']
+ cls = self.__class__
+ if cls.GPT_MODEL_CHOICES:
+ return
+ cls.GPT_MODEL_CHOICES.extend(choices)
+
+
class TicketSettingSerializer(serializers.Serializer):
PREFIX_TITLE = _('Ticket')
@@ -80,3 +120,11 @@ class OpsSettingSerializer(serializers.Serializer):
label=_('Operation center command blacklist'),
help_text=_("Commands that are not allowed execute.")
)
+
+
+class VirtualAppSerializer(serializers.Serializer):
+ PREFIX_TITLE = _('Virtual app')
+
+ VIRTUAL_APP_ENABLED = serializers.BooleanField(
+ required=False, label=_('Enable virtual app'),
+ )
diff --git a/apps/settings/serializers/prompt.py b/apps/settings/serializers/prompt.py
new file mode 100644
index 000000000..6b7804516
--- /dev/null
+++ b/apps/settings/serializers/prompt.py
@@ -0,0 +1,11 @@
+from rest_framework import serializers
+
+from settings.models import ChatPrompt
+
+
+class ChatPromptSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = ChatPrompt
+ fields = [
+ 'id', 'name', 'content', 'builtin'
+ ]
diff --git a/apps/settings/serializers/public.py b/apps/settings/serializers/public.py
index 1b5c78609..6e5a74c8e 100644
--- a/apps/settings/serializers/public.py
+++ b/apps/settings/serializers/public.py
@@ -53,6 +53,10 @@ class PrivateSettingSerializer(PublicSettingSerializer):
CONNECTION_TOKEN_REUSABLE = serializers.BooleanField()
CACHE_LOGIN_PASSWORD_ENABLED = serializers.BooleanField()
VAULT_ENABLED = serializers.BooleanField()
+ VIRTUAL_APP_ENABLED = serializers.BooleanField()
+ CHAT_AI_ENABLED = serializers.BooleanField()
+ GPT_MODEL = serializers.CharField()
+ FILE_UPLOAD_SIZE_LIMIT_MB = serializers.IntegerField()
class ServerInfoSerializer(serializers.Serializer):
diff --git a/apps/settings/urls/api_urls.py b/apps/settings/urls/api_urls.py
index 97055bc83..fdfae5146 100644
--- a/apps/settings/urls/api_urls.py
+++ b/apps/settings/urls/api_urls.py
@@ -1,24 +1,26 @@
from __future__ import absolute_import
from django.urls import path
+from rest_framework_bulk.routes import BulkRouter
from .. import api
app_name = 'common'
+router = BulkRouter()
+router.register(r'chatai-prompts', api.ChatPromptViewSet, 'chatai-prompt')
urlpatterns = [
path('mail/testing/', api.MailTestingAPI.as_view(), name='mail-testing'),
- path('ldap/testing/config/', api.LDAPTestingConfigAPI.as_view(), name='ldap-testing-config'),
- path('ldap/testing/login/', api.LDAPTestingLoginAPI.as_view(), name='ldap-testing-login'),
path('ldap/users/', api.LDAPUserListApi.as_view(), name='ldap-user-list'),
path('ldap/users/import/', api.LDAPUserImportAPI.as_view(), name='ldap-user-import'),
- path('ldap/cache/refresh/', api.LDAPCacheRefreshAPI.as_view(), name='ldap-cache-refresh'),
path('wecom/testing/', api.WeComTestingAPI.as_view(), name='wecom-testing'),
path('dingtalk/testing/', api.DingTalkTestingAPI.as_view(), name='dingtalk-testing'),
path('feishu/testing/', api.FeiShuTestingAPI.as_view(), name='feishu-testing'),
+ path('slack/testing/', api.SlackTestingAPI.as_view(), name='slack-testing'),
path('sms/
-
-
-
- {% block content %} {% endblock %}
-
-
-
-
- {% include '_copyright.html' %}
-
+
+
-{% include '_foot_js.html' %}
{% block custom_foot_js %} {% endblock %}
+
+
+ {% block content %} {% endblock %}
+