+
@@ -294,13 +344,13 @@
{% endif %}
+
+ 
+
+
+
+
@@ -294,13 +344,13 @@
{% endif %}
-
+
{% if form.auto_login %}
{% bootstrap_field form.auto_login form_group_class='auto_login_box' %}
{% endif %}
-
+
{% trans 'Forgot password' %}?
diff --git a/apps/authentication/templates/authentication/passkey.html b/apps/authentication/templates/authentication/passkey.html
new file mode 100644
index 000000000..6db7141e3
--- /dev/null
+++ b/apps/authentication/templates/authentication/passkey.html
@@ -0,0 +1,191 @@
+{% load static %}
+{% load i18n %}
+
+
+
+
+ Login passkey
+
+
+
+
+
+
+
diff --git a/apps/authentication/urls/api_urls.py b/apps/authentication/urls/api_urls.py
index 99805a4e8..6d40f68e8 100644
--- a/apps/authentication/urls/api_urls.py
+++ b/apps/authentication/urls/api_urls.py
@@ -4,6 +4,7 @@ from django.urls import path
from rest_framework.routers import DefaultRouter
from .. import api
+from ..backends.passkey.urls import urlpatterns as passkey_urlpatterns
app_name = 'authentication'
router = DefaultRouter()
@@ -13,17 +14,19 @@ router.register('temp-tokens', api.TempTokenViewSet, 'temp-token')
router.register('connection-token', api.ConnectionTokenViewSet, 'connection-token')
router.register('super-connection-token', api.SuperConnectionTokenViewSet, 'super-connection-token')
-
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('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('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'),
+ 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'),
path('auth/', api.TokenCreateApi.as_view(), name='user-auth'),
path('confirm/', api.ConfirmApi.as_view(), name='user-confirm'),
@@ -38,4 +41,4 @@ urlpatterns = [
path('login-confirm-ticket/status/', api.TicketStatusApi.as_view(), name='login-confirm-ticket-status'),
]
-urlpatterns += router.urls
+urlpatterns += router.urls + passkey_urlpatterns
diff --git a/apps/authentication/urls/view_urls.py b/apps/authentication/urls/view_urls.py
index bad1ded62..ea08eddd0 100644
--- a/apps/authentication/urls/view_urls.py
+++ b/apps/authentication/urls/view_urls.py
@@ -1,11 +1,11 @@
# coding:utf-8
#
-from django.urls import path, include
from django.db.transaction import non_atomic_requests
+from django.urls import path, include
-from .. import views
from users import views as users_view
+from .. import views
app_name = 'authentication'
@@ -18,7 +18,8 @@ urlpatterns = [
path('logout/', views.UserLogoutView.as_view(), name='logout'),
# 原来在users中的
- path('password/forget/previewing/', users_view.UserForgotPasswordPreviewingView.as_view(), name='forgot-previewing'),
+ path('password/forget/previewing/', users_view.UserForgotPasswordPreviewingView.as_view(),
+ name='forgot-previewing'),
path('password/forgot/', users_view.UserForgotPasswordView.as_view(), name='forgot-password'),
path('password/reset/', users_view.UserResetPasswordView.as_view(), name='reset-password'),
path('password/verify/', users_view.UserVerifyPasswordView.as_view(), name='user-verify-password'),
@@ -26,7 +27,8 @@ 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(), name='wecom-qr-bind-callback'),
+ 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'),
path('wecom/oauth/login/callback/', views.WeComOAuthLoginCallbackView.as_view(), name='wecom-oauth-login-callback'),
@@ -34,10 +36,12 @@ urlpatterns = [
path('dingtalk/bind/start/', views.DingTalkEnableStartView.as_view(), name='dingtalk-bind-start'),
path('dingtalk/qr/bind/', views.DingTalkQRBindView.as_view(), name='dingtalk-qr-bind'),
path('dingtalk/qr/login/', views.DingTalkQRLoginView.as_view(), name='dingtalk-qr-login'),
- path('dingtalk/qr/bind//callback/', views.DingTalkQRBindCallbackView.as_view(), name='dingtalk-qr-bind-callback'),
+ path('dingtalk/qr/bind//callback/', views.DingTalkQRBindCallbackView.as_view(),
+ name='dingtalk-qr-bind-callback'),
path('dingtalk/qr/login/callback/', views.DingTalkQRLoginCallbackView.as_view(), name='dingtalk-qr-login-callback'),
path('dingtalk/oauth/login/', views.DingTalkOAuthLoginView.as_view(), name='dingtalk-oauth-login'),
- path('dingtalk/oauth/login/callback/', views.DingTalkOAuthLoginCallbackView.as_view(), name='dingtalk-oauth-login-callback'),
+ path('dingtalk/oauth/login/callback/', views.DingTalkOAuthLoginCallbackView.as_view(),
+ name='dingtalk-oauth-login-callback'),
path('feishu/bind/start/', views.FeiShuEnableStartView.as_view(), name='feishu-bind-start'),
path('feishu/qr/bind/', views.FeiShuQRBindView.as_view(), name='feishu-qr-bind'),
diff --git a/apps/authentication/views/base.py b/apps/authentication/views/base.py
index 7969502c0..c118680f0 100644
--- a/apps/authentication/views/base.py
+++ b/apps/authentication/views/base.py
@@ -12,6 +12,7 @@ from authentication.mixins import AuthMixin
from common.utils import get_logger
from common.utils.django import reverse, get_object_or_none
from users.models import User
+from users.signal_handlers import check_only_allow_exist_user_auth
from .mixins import FlashMessageMixin
logger = get_logger(__file__)
@@ -49,6 +50,11 @@ class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
user, create = User.objects.get_or_create(
username=user_attr['username'], defaults=user_attr
)
+
+ if not check_only_allow_exist_user_auth(create):
+ user.delete()
+ return user, (self.msg_client_err, self.request.error_message)
+
setattr(user, f'{self.user_type}_id', user_id)
if create:
setattr(user, 'source', self.user_type)
diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py
index 459abb3cf..a222aa4d8 100644
--- a/apps/authentication/views/login.py
+++ b/apps/authentication/views/login.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
import datetime
import os
from typing import Callable
+from urllib.parse import urlparse
from django.conf import settings
from django.contrib.auth import BACKEND_SESSION_KEY
@@ -40,6 +41,7 @@ __all__ = [
class UserLoginContextMixin:
get_user_mfa_context: Callable
request: HttpRequest
+ error_origin: str
def get_support_auth_methods(self):
auth_methods = [
@@ -88,6 +90,12 @@ class UserLoginContextMixin:
'enabled': settings.AUTH_FEISHU,
'url': reverse('authentication:feishu-qr-login'),
'logo': static('img/login_feishu_logo.png')
+ },
+ {
+ 'name': _("Passkey"),
+ 'enabled': settings.AUTH_PASSKEY,
+ 'url': reverse('api-auth:passkey-login'),
+ 'logo': static('img/login_passkey.png')
}
]
return [method for method in auth_methods if method['enabled']]
@@ -134,8 +142,27 @@ class UserLoginContextMixin:
count += 1
return count
+ def set_csrf_error_if_need(self, context):
+ if not self.request.GET.get('csrf_failure'):
+ return context
+
+ http_origin = self.request.META.get('HTTP_ORIGIN')
+ http_referer = self.request.META.get('HTTP_REFERER')
+ http_origin = http_origin or http_referer
+
+ if not http_origin:
+ return context
+
+ try:
+ origin = urlparse(http_origin)
+ context['error_origin'] = str(origin.netloc)
+ except ValueError:
+ pass
+ return context
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ self.set_csrf_error_if_need(context)
context.update({
'demo_mode': os.environ.get("DEMO_MODE"),
'auth_methods': self.get_support_auth_methods(),
@@ -283,6 +310,12 @@ class UserLoginGuardView(mixins.AuthMixin, RedirectView):
age = self.request.session.get_expiry_age()
self.request.session.set_expiry(age)
+ def get(self, request, *args, **kwargs):
+ response = super().get(request, *args, **kwargs)
+ if request.user.is_authenticated:
+ response.set_cookie('jms_username', request.user.username)
+ return response
+
def get_redirect_url(self, *args, **kwargs):
try:
user = self.get_user_from_session()
diff --git a/apps/authentication/views/mixins.py b/apps/authentication/views/mixins.py
index d56206dcd..c78872603 100644
--- a/apps/authentication/views/mixins.py
+++ b/apps/authentication/views/mixins.py
@@ -16,12 +16,19 @@ class METAMixin:
class FlashMessageMixin:
@staticmethod
- def get_response(redirect_url, title, msg, m_type='message'):
- message_data = {'title': title, 'interval': 5, 'redirect_url': redirect_url, m_type: msg}
+ def get_response(redirect_url='', title='', msg='', m_type='message', interval=5):
+ message_data = {
+ 'title': title, 'interval': interval,
+ 'redirect_url': redirect_url,
+ }
+ if m_type == 'error':
+ message_data['error'] = msg
+ else:
+ message_data['message'] = msg
return FlashMessageUtil.gen_and_redirect_to(message_data)
- def get_success_response(self, redirect_url, title, msg):
- return self.get_response(redirect_url, title, msg)
+ def get_success_response(self, redirect_url, title, msg, **kwargs):
+ return self.get_response(redirect_url, title, msg, m_type='success', **kwargs)
- def get_failed_response(self, redirect_url, title, msg):
- return self.get_response(redirect_url, title, msg, 'error')
+ def get_failed_response(self, redirect_url, title, msg, interval=10):
+ return self.get_response(redirect_url, title, msg, 'error', interval)
diff --git a/apps/common/api/__init__.py b/apps/common/api/__init__.py
index 7f2c4dbc9..15797eb69 100644
--- a/apps/common/api/__init__.py
+++ b/apps/common/api/__init__.py
@@ -1,6 +1,5 @@
from .action import *
from .common import *
-from .filter import *
from .generic import *
from .mixin import *
from .patch import *
diff --git a/apps/common/api/filter.py b/apps/common/api/filter.py
deleted file mode 100644
index 56c3e6483..000000000
--- a/apps/common/api/filter.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import logging
-from itertools import chain
-
-from django.db import models
-from rest_framework.settings import api_settings
-
-from common.drf.filters import IDSpmFilter, CustomFilter, IDInFilter
-
-__all__ = ['ExtraFilterFieldsMixin', 'OrderingFielderFieldsMixin']
-
-logger = logging.getLogger('jumpserver.common')
-
-
-class ExtraFilterFieldsMixin:
- """
- 额外的 api filter
- """
- default_added_filters = [CustomFilter, IDSpmFilter, IDInFilter]
- filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
- extra_filter_fields = []
- extra_filter_backends = []
-
- def get_filter_backends(self):
- if self.filter_backends != self.__class__.filter_backends:
- return self.filter_backends
- backends = list(chain(
- self.filter_backends,
- self.default_added_filters,
- self.extra_filter_backends
- ))
- return backends
-
- def filter_queryset(self, queryset):
- for backend in self.get_filter_backends():
- queryset = backend().filter_queryset(self.request, queryset, self)
- return queryset
-
-
-class OrderingFielderFieldsMixin:
- """
- 额外的 api ordering
- """
- ordering_fields = None
- extra_ordering_fields = []
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.ordering_fields = self._get_ordering_fields()
-
- def _get_ordering_fields(self):
- if isinstance(self.__class__.ordering_fields, (list, tuple)):
- return self.__class__.ordering_fields
-
- try:
- valid_fields = self.get_valid_ordering_fields()
- except Exception as e:
- logger.debug('get_valid_ordering_fields error: %s' % e)
- # 这里千万不要这么用，会让 logging 重复，至于为什么，我也不知道
- # logging.debug('get_valid_ordering_fields error: %s' % e)
- valid_fields = []
-
- fields = list(chain(
- valid_fields,
- self.extra_ordering_fields
- ))
- return fields
-
- def get_valid_ordering_fields(self):
- if getattr(self, 'model', None):
- model = self.model
- elif getattr(self, 'queryset', None):
- model = self.queryset.model
- else:
- queryset = self.get_queryset()
- model = queryset.model
-
- if not model:
- return []
-
- excludes_fields = (
- models.UUIDField, models.Model, models.ForeignKey,
- models.FileField, models.JSONField, models.ManyToManyField,
- models.DurationField,
- )
- valid_fields = []
- for field in model._meta.fields:
- if isinstance(field, excludes_fields):
- continue
- valid_fields.append(field.name)
- return valid_fields
diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py
index cb8d6ec3e..4795673d7 100644
--- a/apps/common/api/mixin.py
+++ b/apps/common/api/mixin.py
@@ -1,19 +1,29 @@
# -*- coding: utf-8 -*-
#
from collections import defaultdict
+from itertools import chain
from typing import Callable
+from django.db import models
from django.db.models.signals import m2m_changed
from rest_framework.response import Response
+from rest_framework.settings import api_settings
+from common.drf.filters import (
+ IDSpmFilterBackend, CustomFilterBackend, IDInFilterBackend,
+ IDNotFilterBackend, NotOrRelFilterBackend
+)
+from common.utils import get_logger
from .action import RenderToJsonMixin
-from .filter import ExtraFilterFieldsMixin, OrderingFielderFieldsMixin
from .serializer import SerializerMixin
__all__ = [
'CommonApiMixin', 'PaginatedResponseMixin', 'RelationMixin',
+ 'ExtraFilterFieldsMixin',
]
+logger = get_logger(__name__)
+
class PaginatedResponseMixin:
@@ -95,6 +105,100 @@ class QuerySetMixin:
return queryset
-class CommonApiMixin(SerializerMixin, ExtraFilterFieldsMixin, OrderingFielderFieldsMixin,
- QuerySetMixin, RenderToJsonMixin, PaginatedResponseMixin):
+class ExtraFilterFieldsMixin:
+ """
+ 额外的 api filter
+ """
+ default_added_filters = (
+ CustomFilterBackend, IDSpmFilterBackend, IDInFilterBackend,
+ IDNotFilterBackend,
+ )
+ filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
+ extra_filter_fields = []
+ extra_filter_backends = []
+
+ def set_compatible_fields(self):
+ """
+ 兼容老的 filter_fields
+ """
+ if not hasattr(self, 'filter_fields') and hasattr(self, 'filterset_fields'):
+ self.filter_fields = self.filterset_fields
+
+ def get_filter_backends(self):
+ self.set_compatible_fields()
+ if self.filter_backends != self.__class__.filter_backends:
+ return self.filter_backends
+ backends = list(chain(
+ self.filter_backends,
+ self.default_added_filters,
+ self.extra_filter_backends,
+ ))
+ # 这个要放在最后
+ backends.append(NotOrRelFilterBackend)
+ return backends
+
+ def filter_queryset(self, queryset):
+ for backend in self.get_filter_backends():
+ queryset = backend().filter_queryset(self.request, queryset, self)
+ return queryset
+
+
+class OrderingFielderFieldsMixin:
+ """
+ 额外的 api ordering
+ """
+ ordering_fields = None
+ extra_ordering_fields = []
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.ordering_fields = self._get_ordering_fields()
+
+ def _get_ordering_fields(self):
+ if isinstance(self.__class__.ordering_fields, (list, tuple)):
+ return self.__class__.ordering_fields
+
+ try:
+ valid_fields = self.get_valid_ordering_fields()
+ except Exception as e:
+ logger.debug('get_valid_ordering_fields error: %s, pass' % e)
+ # 这里千万不要这么用，会让 logging 重复，至于为什么，我也不知道
+ # logging.debug('get_valid_ordering_fields error: %s' % e)
+ valid_fields = []
+
+ fields = list(chain(
+ valid_fields,
+ self.extra_ordering_fields
+ ))
+ return fields
+
+ def get_valid_ordering_fields(self):
+ if getattr(self, 'model', None):
+ model = self.model
+ elif getattr(self, 'queryset', None):
+ model = self.queryset.model
+ else:
+ queryset = self.get_queryset()
+ model = queryset.model
+
+ if not model:
+ return []
+
+ excludes_fields = (
+ models.UUIDField, models.Model, models.ForeignKey,
+ models.FileField, models.JSONField, models.ManyToManyField,
+ models.DurationField,
+ )
+ valid_fields = []
+ for field in model._meta.fields:
+ if isinstance(field, excludes_fields):
+ continue
+ valid_fields.append(field.name)
+ return valid_fields
+
+
+class CommonApiMixin(
+ SerializerMixin, ExtraFilterFieldsMixin, OrderingFielderFieldsMixin,
+ QuerySetMixin, RenderToJsonMixin, PaginatedResponseMixin
+):
pass
diff --git a/apps/common/api/patch.py b/apps/common/api/patch.py
index f79957546..71dd8a18f 100644
--- a/apps/common/api/patch.py
+++ b/apps/common/api/patch.py
@@ -88,6 +88,7 @@ class AsyncApiMixin(InterceptMixin):
if not self.is_need_async():
return handler(*args, **kwargs)
resp = self.do_async(handler, *args, **kwargs)
+ self.async_callback(*args, **kwargs)
return resp
def is_need_refresh(self):
@@ -98,6 +99,9 @@ class AsyncApiMixin(InterceptMixin):
def is_need_async(self):
return False
+ def async_callback(self, *args, **kwargs):
+ pass
+
def do_async(self, handler, *args, **kwargs):
data = self.get_cache_data()
if not data:
diff --git a/apps/common/drf/filters.py b/apps/common/drf/filters.py
index c44874fd5..bd9d3e6a1 100644
--- a/apps/common/drf/filters.py
+++ b/apps/common/drf/filters.py
@@ -13,17 +13,17 @@ from rest_framework.fields import DateTimeField
from rest_framework.serializers import ValidationError
from common import const
+from common.db.fields import RelatedManager
logger = logging.getLogger('jumpserver.common')
__all__ = [
- "DatetimeRangeFilter", "IDSpmFilter",
- 'IDInFilter', "CustomFilter",
- "BaseFilterSet"
+ "DatetimeRangeFilterBackend", "IDSpmFilterBackend",
+ 'IDInFilterBackend', "CustomFilterBackend",
+ "BaseFilterSet", 'IDNotFilterBackend',
+ 'NotOrRelFilterBackend',
]
-from common.db.fields import RelatedManager
-
class BaseFilterSet(drf_filters.FilterSet):
def do_nothing(self, queryset, name, value):
@@ -35,7 +35,7 @@ class BaseFilterSet(drf_filters.FilterSet):
return default
-class DatetimeRangeFilter(filters.BaseFilterBackend):
+class DatetimeRangeFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
ret = []
fields = self._get_date_range_filter_fields(view)
@@ -102,7 +102,7 @@ class DatetimeRangeFilter(filters.BaseFilterBackend):
return queryset
-class IDSpmFilter(filters.BaseFilterBackend):
+class IDSpmFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
return [
coreapi.Field(
@@ -130,7 +130,7 @@ class IDSpmFilter(filters.BaseFilterBackend):
return queryset
-class IDInFilter(filters.BaseFilterBackend):
+class IDInFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
return [
coreapi.Field(
@@ -149,7 +149,26 @@ class IDInFilter(filters.BaseFilterBackend):
return queryset
-class CustomFilter(filters.BaseFilterBackend):
+class IDNotFilterBackend(filters.BaseFilterBackend):
+ def get_schema_fields(self, view):
+ return [
+ coreapi.Field(
+ name='id!', location='query', required=False,
+ type='string', example='/api/v1/users/users?id!=1,2,3',
+ description='Exclude by id set'
+ )
+ ]
+
+ def filter_queryset(self, request, queryset, view):
+ ids = request.query_params.get('id!')
+ if not ids:
+ return queryset
+ id_list = [i.strip() for i in ids.split(',')]
+ queryset = queryset.exclude(id__in=id_list)
+ return queryset
+
+
+class CustomFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
fields = []
@@ -218,3 +237,25 @@ class AttrRulesFilterBackend(filters.BaseFilterBackend):
logger.debug('attr_rules: %s', attr_rules)
q = RelatedManager.get_to_filter_q(attr_rules, queryset.model)
return queryset.filter(q).distinct()
+
+
+class NotOrRelFilterBackend(filters.BaseFilterBackend):
+ def get_schema_fields(self, view):
+ return [
+ coreapi.Field(
+ name='_rel', location='query', required=False,
+ type='string', example='/api/v1/users/users?name=abc&username=def&_rel=union',
+ description='Filter by rel, or not, default is and'
+ )
+ ]
+
+ def filter_queryset(self, request, queryset, view):
+ _rel = request.query_params.get('_rel')
+ if not _rel or _rel not in ('or', 'not'):
+ return queryset
+ if _rel == 'not':
+ queryset.query.where.negated = True
+ elif _rel == 'or':
+ queryset.query.where.connector = 'OR'
+ queryset._result_cache = None
+ return queryset
diff --git a/apps/common/drf/renders/__init__.py b/apps/common/drf/renders/__init__.py
index bbefe8783..5e0120651 100644
--- a/apps/common/drf/renders/__init__.py
+++ b/apps/common/drf/renders/__init__.py
@@ -8,7 +8,8 @@ class PassthroughRenderer(renderers.BaseRenderer):
"""
Return data as-is. View should supply a Response.
"""
- media_type = ''
+ media_type = 'application/octet-stream'
format = ''
+
def render(self, data, accepted_media_type=None, renderer_context=None):
return data
diff --git a/apps/common/management/commands/check_api.py b/apps/common/management/commands/check_api.py
new file mode 100644
index 000000000..5dff77a9d
--- /dev/null
+++ b/apps/common/management/commands/check_api.py
@@ -0,0 +1,126 @@
+import re
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+from django.test import Client
+from django.urls import URLPattern, URLResolver
+
+from jumpserver.urls import api_v1
+
+path_uuid_pattern = re.compile(r'<\w+:\w+>', re.IGNORECASE)
+uuid_pattern = re.compile(r'\(\(\?P<.*>[^)]+\)/\)\?', re.IGNORECASE)
+uuid2_pattern = re.compile(r'\(\?P<.*>\[\/\.\]\+\)', re.IGNORECASE)
+uuid3_pattern = re.compile(r'\(\?P<.*>\[/\.]\+\)')
+
+
+def list_urls(patterns, path=None):
+ """ recursive """
+ if not path:
+ path = []
+ result = []
+ for pattern in patterns:
+ if isinstance(pattern, URLPattern):
+ result.append(''.join(path) + str(pattern.pattern))
+ elif isinstance(pattern, URLResolver):
+ result += list_urls(pattern.url_patterns, path + [str(pattern.pattern)])
+ return result
+
+
+def parse_to_url(url):
+ uid = '00000000-0000-0000-0000-000000000000'
+
+ url = url.replace('^', '')
+ url = url.replace('?$', '')
+ url = url.replace('(?P[a-z0-9]+)', '')
+ url = url.replace('((?P[/.]{36})/)?', uid + '/')
+ url = url.replace('(?P[/.]+)', uid)
+ url = url.replace('\.', '')
+ url = url.replace('//', '/')
+ url = url.strip('$')
+ url = re.sub(path_uuid_pattern, uid, url)
+ url = re.sub(uuid2_pattern, uid, url)
+ url = re.sub(uuid_pattern, uid + '/', url)
+ url = re.sub(uuid3_pattern, uid, url)
+ url = url.replace('(00000000-0000-0000-0000-000000000000/)?', uid + '/')
+ return url
+
+
+def get_api_urls():
+ urls = []
+ api_urls = list_urls(api_v1)
+ for ourl in api_urls:
+ url = parse_to_url(ourl)
+ if 'render-to-json' in url:
+ continue
+ url = '/api/v1/' + url
+ urls.append((url, ourl))
+ return set(urls)
+
+
+known_unauth_urls = [
+ "/api/v1/authentication/passkeys/auth/",
+ "/api/v1/prometheus/metrics/",
+ "/api/v1/authentication/auth/",
+ "/api/v1/settings/logo/",
+ "/api/v1/settings/public/open/",
+ "/api/v1/authentication/passkeys/login/",
+ "/api/v1/authentication/tokens/",
+ "/api/v1/authentication/mfa/challenge/",
+ "/api/v1/authentication/password/reset-code/",
+ "/api/v1/authentication/login-confirm-ticket/status/",
+ "/api/v1/authentication/mfa/select/",
+ "/api/v1/authentication/mfa/send-code/",
+ "/api/v1/authentication/sso/login/"
+]
+
+known_error_urls = [
+ '/api/v1/terminal/terminals/00000000-0000-0000-0000-000000000000/sessions/00000000-0000-0000-0000-000000000000/replay/download/',
+ '/api/v1/terminal/sessions/00000000-0000-0000-0000-000000000000/replay/download/',
+]
+
+errors = {}
+
+
+class Command(BaseCommand):
+ help = 'Check api if unauthorized'
+
+ def handle(self, *args, **options):
+ settings.LOG_LEVEL = 'ERROR'
+ urls = get_api_urls()
+ client = Client()
+ unauth_urls = []
+ error_urls = []
+ unformat_urls = []
+
+ for url, ourl in urls:
+ if '(' in url or '<' in url:
+ unformat_urls.append([url, ourl])
+ continue
+
+ try:
+ response = client.get(url, follow=True)
+ if response.status_code != 401:
+ errors[url] = str(response.status_code) + ' ' + str(ourl)
+ unauth_urls.append(url)
+ except Exception as e:
+ errors[url] = str(e)
+ error_urls.append(url)
+
+ unauth_urls = set(unauth_urls) - set(known_unauth_urls)
+ print("\nUnauthorized urls:")
+ if not unauth_urls:
+ print(" Empty, very good!")
+ for url in unauth_urls:
+ print('"{}", {}'.format(url, errors.get(url, '')))
+
+ print("\nError urls:")
+ if not error_urls:
+ print(" Empty, very good!")
+ for url in set(error_urls):
+ print(url, ': ' + errors.get(url))
+
+ print("\nUnformat urls:")
+ if not unformat_urls:
+ print(" Empty, very good!")
+ for url in unformat_urls:
+ print(url)
diff --git a/apps/common/permissions.py b/apps/common/permissions.py
index d28157085..5c58de68e 100644
--- a/apps/common/permissions.py
+++ b/apps/common/permissions.py
@@ -12,7 +12,7 @@ from common.utils import get_object_or_none
from orgs.utils import tmp_to_root_org
-class IsValidUser(permissions.IsAuthenticated, permissions.BasePermission):
+class IsValidUser(permissions.IsAuthenticated):
"""Allows access to valid user, is active and not expired"""
def has_permission(self, request, view):
diff --git a/apps/common/utils/random.py b/apps/common/utils/random.py
index f75e7001b..267de8d22 100644
--- a/apps/common/utils/random.py
+++ b/apps/common/utils/random.py
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
#
-import struct
import random
import socket
import string
-
+import struct
string_punctuation = '!#$%&()*+,-.:;<=>?@[]^_~'
@@ -18,35 +17,32 @@ def random_ip():
return socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
-def random_string(length: int, lower=True, upper=True, digit=True, special_char=False):
- args_names = ['lower', 'upper', 'digit', 'special_char']
- args_values = [lower, upper, digit, special_char]
- args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits, string_punctuation]
+def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation):
+ random.seed()
+ args_names = ['lower', 'upper', 'digit']
+ args_values = [lower, upper, digit]
+ args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits]
args_string_map = dict(zip(args_names, args_string))
kwargs = dict(zip(args_names, args_values))
kwargs_keys = list(kwargs.keys())
kwargs_values = list(kwargs.values())
args_true_count = len([i for i in kwargs_values if i])
+
assert any(kwargs_values), f'Parameters {kwargs_keys} must have at least one `True`'
assert length >= args_true_count, f'Expected length >= {args_true_count}, bug got {length}'
- can_startswith_special_char = args_true_count == 1 and special_char
-
chars = ''.join([args_string_map[k] for k, v in kwargs.items() if v])
+ password = list(random.choice(chars) for i in range(length))
- while True:
- password = list(random.choice(chars) for i in range(length))
- for k, v in kwargs.items():
- if v and not (set(password) & set(args_string_map[k])):
- # 没有包含指定的字符, retry
- break
- else:
- if not can_startswith_special_char and password[0] in args_string_map['special_char']:
- # 首位不能为特殊字符, retry
- continue
- else:
- # 满足要求终止 while 循环
- break
+ if special_char:
+ special_num = length // 16 + 1
+ special_index = []
+ for i in range(special_num):
+ index = random.randint(1, length - 1)
+ if index not in special_index:
+ special_index.append(index)
+ for i in special_index:
+ password[i] = random.choice(symbols)
password = ''.join(password)
return password
diff --git a/apps/common/utils/verify_code.py b/apps/common/utils/verify_code.py
index acd547296..b21e43b26 100644
--- a/apps/common/utils/verify_code.py
+++ b/apps/common/utils/verify_code.py
@@ -90,4 +90,4 @@ class SendAndVerifyCodeUtil(object):
self.__send_with_email()
cache.set(self.key, self.code, self.timeout)
- logger.info(f'Send verify code to {self.target}: {code}')
+ logger.debug(f'Send verify code to {self.target}')
diff --git a/apps/common/views/mixins.py b/apps/common/views/mixins.py
index 207888593..6f59ac21a 100644
--- a/apps/common/views/mixins.py
+++ b/apps/common/views/mixins.py
@@ -1,18 +1,17 @@
# -*- coding: utf-8 -*-
#
-from django.utils import translation
-from django.utils.translation import gettext_noop
from django.contrib.auth.mixins import UserPassesTestMixin
from django.http.response import JsonResponse
+from django.db.models import Model
+from django.utils import translation
from rest_framework import permissions
from rest_framework.request import Request
-from common.exceptions import UserConfirmRequired
-from common.utils import i18n_fmt
-from orgs.utils import current_org
+from audits.const import ActivityChoices
from audits.handler import create_or_update_operate_log
-from audits.const import ActionChoices, ActivityChoices
from audits.models import ActivityLog
+from common.exceptions import UserConfirmRequired
+from orgs.utils import current_org
__all__ = [
"PermissionsMixin",
@@ -49,66 +48,20 @@ class PermissionsMixin(UserPassesTestMixin):
class RecordViewLogMixin:
- ACTION = ActionChoices.view
+ model: Model
- @staticmethod
- def _filter_params(params):
- new_params = {}
- need_pop_params = ('format', 'order')
- for key, value in params.items():
- if key in need_pop_params:
- continue
- if isinstance(value, list):
- value = list(filter(None, value))
- if value:
- new_params[key] = value
- return new_params
-
- def get_resource_display(self, request):
- query_params = dict(request.query_params)
- params = self._filter_params(query_params)
-
- spm_filter = params.pop("spm", None)
-
- if not params and not spm_filter:
- display_message = gettext_noop("Export all")
- elif spm_filter:
- display_message = gettext_noop("Export only selected items")
- else:
- query = ",".join(
- ["%s=%s" % (key, value) for key, value in params.items()]
- )
- display_message = i18n_fmt(gettext_noop("Export filtered: %s"), query)
- return display_message
-
- def record_logs(self, ids, **kwargs):
- resource_type = self.model._meta.verbose_name
- create_or_update_operate_log(
- self.ACTION, resource_type, force=True, **kwargs
- )
- detail = i18n_fmt(
- gettext_noop('User %s view/export secret'), self.request.user
- )
- activities = [
- ActivityLog(
- resource_id=getattr(resource_id, 'pk', resource_id),
- type=ActivityChoices.operate_log, detail=detail, org_id=current_org.id,
- )
- for resource_id in ids
- ]
- ActivityLog.objects.bulk_create(activities)
-
- def list(self, request, *args, **kwargs):
- response = super().list(request, *args, **kwargs)
+ def record_logs(self, ids, action, detail, model=None, **kwargs):
with translation.override('en'):
- resource_display = self.get_resource_display(request)
- ids = [q.id for q in self.get_queryset()]
- self.record_logs(ids, resource_display=resource_display)
- return response
-
- def retrieve(self, request, *args, **kwargs):
- response = super().retrieve(request, *args, **kwargs)
- with translation.override('en'):
- resource = self.get_object()
- self.record_logs([resource.id], resource=resource)
- return response
+ model = model or self.model
+ resource_type = model._meta.verbose_name
+ create_or_update_operate_log(
+ action, resource_type, force=True, **kwargs
+ )
+ activities = [
+ ActivityLog(
+ resource_id=resource_id, type=ActivityChoices.operate_log,
+ detail=detail, org_id=current_org.id,
+ )
+ for resource_id in ids
+ ]
+ ActivityLog.objects.bulk_create(activities)
diff --git a/apps/common/views/msg.py b/apps/common/views/msg.py
index 4b0987da7..bb3cf0f98 100644
--- a/apps/common/views/msg.py
+++ b/apps/common/views/msg.py
@@ -1,7 +1,7 @@
#
+from django.http import HttpResponse
from django.utils.decorators import method_decorator
from django.views.decorators.cache import never_cache
-from django.http import HttpResponse
from django.views.generic.base import TemplateView
from common.utils import bulk_get, FlashMessageUtil
diff --git a/apps/jumpserver/api.py b/apps/jumpserver/api.py
index 3b72841f9..164620057 100644
--- a/apps/jumpserver/api.py
+++ b/apps/jumpserver/api.py
@@ -1,7 +1,9 @@
import time
+from collections import defaultdict
from django.core.cache import cache
-from django.db.models import Count, Max, F
+from django.db.models import Count, Max, F, CharField
+from django.db.models.functions import Cast
from django.http.response import JsonResponse, HttpResponse
from django.utils import timezone
from django.utils.timesince import timesince
@@ -12,6 +14,7 @@ from rest_framework.views import APIView
from assets.const import AllTypes
from assets.models import Asset
+from audits.api import OperateLogViewSet
from audits.const import LoginStatusChoices
from audits.models import UserLoginLog, PasswordChangeLog, OperateLog, FTPLog, JobLog
from common.utils import lazyproperty
@@ -52,87 +55,82 @@ class DateTimeMixin:
@lazyproperty
def date_start_end(self):
- return self.days_to_datetime.date(), local_now().date()
+ return self.days_to_datetime.date(), local_now().date() + timezone.timedelta(days=1)
@lazyproperty
def dates_list(self):
- now = local_now()
- dates = [(now - timezone.timedelta(days=i)).date() for i in range(self.days)]
- dates.reverse()
- return dates
+ return [
+ (local_now() - timezone.timedelta(days=i)).date()
+ for i in range(self.days - 1, -1, -1)
+ ]
def get_dates_metrics_date(self):
- dates_metrics_date = [d.strftime('%m-%d') for d in self.dates_list] or ['0']
- return dates_metrics_date
+ return [d.strftime('%m-%d') for d in self.dates_list] or ['0']
- @lazyproperty
- def users(self):
- return self.org.get_members()
-
- @lazyproperty
- def sessions_queryset(self):
- t = self.days_to_datetime
- sessions_queryset = Session.objects.filter(date_start__gte=t)
- return sessions_queryset
+ def get_logs_queryset_filter(self, qs, query_field, is_timestamp=False):
+ dt = self.days_to_datetime
+ t = dt.timestamp() if is_timestamp else dt
+ query = {f'{query_field}__gte': t}
+ return qs.filter(**query)
def get_logs_queryset(self, queryset, query_params):
query = {}
+ users = self.org.get_members()
if not self.org.is_root():
if query_params == 'username':
query = {
- f'{query_params}__in': self.users.values_list('username', flat=True)
+ f'{query_params}__in': users.values_list('username', flat=True)
}
else:
query = {
- f'{query_params}__in': [str(user) for user in self.users]
+ f'{query_params}__in': [str(user) for user in users]
}
queryset = queryset.filter(**query)
return queryset
+ @lazyproperty
+ def sessions_queryset(self):
+ return self.get_logs_queryset_filter(Session.objects, 'date_start')
+
@lazyproperty
def login_logs_queryset(self):
- t = self.days_to_datetime
- queryset = UserLoginLog.objects.filter(datetime__gte=t)
- queryset = self.get_logs_queryset(queryset, 'username')
+ qs = UserLoginLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'datetime')
+ queryset = self.get_logs_queryset(qs, 'username')
return queryset
@lazyproperty
def password_change_logs_queryset(self):
- t = self.days_to_datetime
- queryset = PasswordChangeLog.objects.filter(datetime__gte=t)
- queryset = self.get_logs_queryset(queryset, 'user')
+ qs = PasswordChangeLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'datetime')
+ queryset = self.get_logs_queryset(qs, 'user')
return queryset
@lazyproperty
def operate_logs_queryset(self):
- from audits.api import OperateLogViewSet
- t = self.days_to_datetime
- queryset = OperateLogViewSet().get_queryset().filter(datetime__gte=t)
- return queryset
+ qs = OperateLogViewSet().get_queryset()
+ return self.get_logs_queryset_filter(qs, 'datetime')
@lazyproperty
def ftp_logs_queryset(self):
- t = self.days_to_datetime
- queryset = FTPLog.objects.filter(date_start__gte=t)
- queryset = self.get_logs_queryset(queryset, 'user')
- return queryset
+ qs = FTPLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'date_start')
+ return self.get_logs_queryset(qs, 'user')
@lazyproperty
def command_queryset(self):
- t = self.days_to_datetime
- t = t.timestamp()
- queryset = Command.objects.filter(timestamp__gte=t)
- return queryset
+ qs = Command.objects.all()
+ return self.get_logs_queryset_filter(qs, 'timestamp', is_timestamp=True)
@lazyproperty
def job_logs_queryset(self):
- t = self.days_to_datetime
- queryset = JobLog.objects.filter(date_created__gte=t)
- return queryset
+ qs = JobLog.objects.all()
+ return self.get_logs_queryset_filter(qs, 'date_start')
class DatesLoginMetricMixin:
dates_list: list
+ date_start_end: tuple
command_queryset: Command.objects
sessions_queryset: Session.objects
ftp_logs_queryset: OperateLog.objects
@@ -141,41 +139,6 @@ class DatesLoginMetricMixin:
operate_logs_queryset: OperateLog.objects
password_change_logs_queryset: PasswordChangeLog.objects
- def get_dates_metrics_total_count_login(self):
- queryset = UserLoginLog.objects \
- .filter(datetime__range=(self.date_start_end)) \
- .values('datetime__date').annotate(id__count=Count(id)) \
- .order_by('datetime__date')
- map_date_logincount = {i['datetime__date']: i['id__count'] for i in queryset}
- return [map_date_logincount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_active_users(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count('user_id', distinct=True)) \
- .order_by('date_start__date')
- map_date_usercount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_usercount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_active_assets(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count('asset_id', distinct=True)) \
- .order_by('date_start__date')
- map_date_assetcount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_assetcount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_sessions(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count(id)) \
- .order_by('date_start__date')
- map_date_usercount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_usercount.get(d, 0) for d in self.dates_list]
-
@lazyproperty
def get_type_to_assets(self):
result = Asset.objects.annotate(type=F('platform__type')). \
@@ -187,30 +150,53 @@ class DatesLoginMetricMixin:
i['label'] = all_types_dict.get(tp, tp)
return result
+ def filter_date_start_end(self, queryset, field_name):
+ query = {f'{field_name}__range': self.date_start_end}
+ return queryset.filter(**query)
+
+ def get_date_metrics(self, queryset, field_name, count_field):
+ queryset = self.filter_date_start_end(queryset, field_name)
+ queryset = queryset.values_list(field_name, count_field)
+
+ date_group_map = defaultdict(set)
+ for datetime, count_field in queryset:
+ date_str = str(datetime.date())
+ date_group_map[date_str].add(count_field)
+
+ return [
+ len(date_group_map.get(str(d), set()))
+ for d in self.dates_list
+ ]
+
+ def get_dates_metrics_total_count_login(self):
+ return self.get_date_metrics(UserLoginLog.objects, 'datetime', 'id')
+
+ def get_dates_metrics_total_count_active_users(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'user_id')
+
+ def get_dates_metrics_total_count_active_assets(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'asset_id')
+
+ def get_dates_metrics_total_count_sessions(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'id')
+
def get_dates_login_times_assets(self):
assets = self.sessions_queryset.values("asset") \
.annotate(total=Count("asset")) \
- .annotate(last=Max("date_start")).order_by("-total")
- assets = assets[:10]
- for asset in assets:
- asset['last'] = str(asset['last'])
- return list(assets)
+ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
+ .order_by("-total")
+ return list(assets[:10])
def get_dates_login_times_users(self):
users = self.sessions_queryset.values("user_id") \
.annotate(total=Count("user_id")) \
.annotate(user=Max('user')) \
- .annotate(last=Max("date_start")).order_by("-total")
- users = users[:10]
- for user in users:
- user['last'] = str(user['last'])
- return list(users)
+ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
+ .order_by("-total")
+ return list(users[:10])
def get_dates_login_record_sessions(self):
sessions = self.sessions_queryset.order_by('-date_start')
- sessions = sessions[:10]
- for session in sessions:
- session.avatar_url = User.get_avatar_url("")
sessions = [
{
'user': session.user,
@@ -219,7 +205,7 @@ class DatesLoginMetricMixin:
'date_start': str(session.date_start),
'timesince': timesince(session.date_start)
}
- for session in sessions
+ for session in sessions[:10]
]
return sessions
@@ -253,12 +239,13 @@ class DatesLoginMetricMixin:
@lazyproperty
def job_logs_running_amount(self):
- return self.job_logs_queryset.filter(status__in=[JobStatus.running]).count()
+ return self.job_logs_queryset.filter(status=JobStatus.running).count()
@lazyproperty
def job_logs_failed_amount(self):
return self.job_logs_queryset.filter(
- status__in=[JobStatus.failed, JobStatus.timeout]).count()
+ status__in=[JobStatus.failed, JobStatus.timeout]
+ ).count()
@lazyproperty
def job_logs_amount(self):
@@ -268,6 +255,10 @@ class DatesLoginMetricMixin:
def sessions_amount(self):
return self.sessions_queryset.count()
+ @lazyproperty
+ def online_sessions_amount(self):
+ return self.sessions_queryset.filter(is_finished=False).count()
+
@lazyproperty
def ftp_logs_amount(self):
return self.ftp_logs_queryset.count()
@@ -275,9 +266,9 @@ class DatesLoginMetricMixin:
class IndexApi(DateTimeMixin, DatesLoginMetricMixin, APIView):
http_method_names = ['get']
-
- def check_permissions(self, request):
- return request.user.has_perm('rbac.view_audit | rbac.view_console')
+ rbac_perms = {
+ 'GET': ['rbac.view_audit | rbac.view_console'],
+ }
def get(self, request, *args, **kwargs):
data = {}
@@ -365,7 +356,7 @@ class IndexApi(DateTimeMixin, DatesLoginMetricMixin, APIView):
if _all or query_params.get('total_count') or query_params.get('total_count_history_sessions'):
data.update({
- 'total_count_history_sessions': self.sessions_amount - caches.total_count_online_sessions,
+ 'total_count_history_sessions': self.sessions_amount - self.online_sessions_amount,
})
if _all or query_params.get('total_count') or query_params.get('total_count_ftp_logs'):
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 60d665a04..b24ef5746 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -333,9 +333,9 @@ class Config(dict):
'CAS_ROOT_PROXIED_AS': 'https://example.com',
'CAS_LOGOUT_COMPLETELY': True,
'CAS_VERSION': 3,
- 'CAS_USERNAME_ATTRIBUTE': 'uid',
+ 'CAS_USERNAME_ATTRIBUTE': 'cas:user',
'CAS_APPLY_ATTRIBUTES_TO_USER': False,
- 'CAS_RENAME_ATTRIBUTES': {'uid': 'username'},
+ 'CAS_RENAME_ATTRIBUTES': {'cas:user': 'username'},
'CAS_CREATE_USER': True,
'AUTH_SSO': False,
@@ -382,6 +382,9 @@ class Config(dict):
'AUTH_OAUTH2_USER_ATTR_MAP': {
'name': 'name', 'username': 'username', 'email': 'email'
},
+ 'AUTH_PASSKEY': False,
+ 'FIDO_SERVER_ID': '',
+ 'FIDO_SERVER_NAME': 'JumpServer',
# 企业微信
'AUTH_WECOM': False,
@@ -457,9 +460,6 @@ class Config(dict):
'TERMINAL_SESSION_KEEP_DURATION': 200,
'TERMINAL_HOST_KEY': '',
'TERMINAL_COMMAND_STORAGE': {},
- # Luna 页面
- # 默认图形化分辨率
- 'TERMINAL_GRAPHICAL_RESOLUTION': 'Auto',
# 未来废弃(目前迁移会用)
'TERMINAL_RDP_ADDR': '',
# 保留(Luna还在用)
@@ -578,7 +578,9 @@ class Config(dict):
'FTP_FILE_MAX_STORE': 100,
# API 请求次数限制
- 'MAX_LIMIT_PER_PAGE': 100
+ 'MAX_LIMIT_PER_PAGE': 100,
+
+ 'LIMIT_SUPER_PRIV': False,
}
old_config_map = {
diff --git a/apps/jumpserver/rewriting/storage/permissions.py b/apps/jumpserver/rewriting/storage/permissions.py
index 51b1c9c40..7af0adece 100644
--- a/apps/jumpserver/rewriting/storage/permissions.py
+++ b/apps/jumpserver/rewriting/storage/permissions.py
@@ -16,6 +16,8 @@ def allow_access(private_file):
path_base = path_list[1] if len(path_list) > 1 else None
path_perm = path_perms_map.get(path_base, None)
+ if ".." in request_path:
+ return False
if not path_perm:
return False
if path_perm == '*' or request.user.has_perms([path_perm]):
diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py
index 1654ae63c..63a96fe1d 100644
--- a/apps/jumpserver/settings/auth.py
+++ b/apps/jumpserver/settings/auth.py
@@ -171,6 +171,10 @@ AUTH_OAUTH2_AUTHENTICATION_REDIRECT_URI = '/'
AUTH_OAUTH2_AUTHENTICATION_FAILURE_REDIRECT_URI = '/'
AUTH_OAUTH2_LOGOUT_URL_NAME = "authentication:oauth2:logout"
+AUTH_PASSKEY = CONFIG.AUTH_PASSKEY
+FIDO_SERVER_ID = CONFIG.FIDO_SERVER_ID
+FIDO_SERVER_NAME = CONFIG.FIDO_SERVER_NAME
+KEY_ATTACHMENT = 2 # 0 any, 1 platform, 2 cross-platform 3 none
# 临时 token
AUTH_TEMP_TOKEN = CONFIG.AUTH_TEMP_TOKEN
@@ -202,7 +206,7 @@ AUTH_BACKEND_SAML2 = 'authentication.backends.saml2.SAML2Backend'
AUTH_BACKEND_OAUTH2 = 'authentication.backends.oauth2.OAuth2Backend'
AUTH_BACKEND_TEMP_TOKEN = 'authentication.backends.token.TempTokenAuthBackend'
AUTH_BACKEND_CUSTOM = 'authentication.backends.custom.CustomAuthBackend'
-
+AUTH_BACKEND_PASSKEY = 'authentication.backends.passkey.PasskeyAuthBackend'
AUTHENTICATION_BACKENDS = [
# 只做权限校验
RBAC_BACKEND,
@@ -215,6 +219,7 @@ AUTHENTICATION_BACKENDS = [
AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU,
# Token模式
AUTH_BACKEND_AUTH_TOKEN, AUTH_BACKEND_SSO, AUTH_BACKEND_TEMP_TOKEN,
+ AUTH_BACKEND_PASSKEY
]
@@ -254,8 +259,10 @@ if MFA_CUSTOM and MFA_CUSTOM_FILE_MD5 == get_file_md5(MFA_CUSTOM_FILE_PATH):
# 自定义多因子认证模块
MFA_BACKENDS.append(MFA_BACKEND_CUSTOM)
-AUTHENTICATION_BACKENDS_THIRD_PARTY = [AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_CAS, AUTH_BACKEND_SAML2,
- AUTH_BACKEND_OAUTH2]
+AUTHENTICATION_BACKENDS_THIRD_PARTY = [
+ AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_CAS,
+ AUTH_BACKEND_SAML2, AUTH_BACKEND_OAUTH2
+]
ONLY_ALLOW_EXIST_USER_AUTH = CONFIG.ONLY_ALLOW_EXIST_USER_AUTH
ONLY_ALLOW_AUTH_FROM_SOURCE = CONFIG.ONLY_ALLOW_AUTH_FROM_SOURCE
diff --git a/apps/jumpserver/settings/base.py b/apps/jumpserver/settings/base.py
index 5bd7fb84e..4cf1c3c77 100644
--- a/apps/jumpserver/settings/base.py
+++ b/apps/jumpserver/settings/base.py
@@ -88,11 +88,12 @@ if DEBUG:
DEBUG_HOST_PORTS = ['{}:{}'.format(host, port) for host in DEBUG_HOSTS for port in DEBUG_PORT]
ALLOWED_DOMAINS.extend(DEBUG_HOST_PORTS)
-ALLOWED_HOSTS = list(set(['.' + host.split(':')[0] for host in ALLOWED_DOMAINS]))
print("ALLOWED_HOSTS: ", )
-for host in ALLOWED_HOSTS:
+for host in ALLOWED_DOMAINS:
print(' - ' + host.lstrip('.'))
+ALLOWED_HOSTS = ['*']
+
# https://docs.djangoproject.com/en/4.1/ref/settings/#std-setting-CSRF_TRUSTED_ORIGINS
CSRF_TRUSTED_ORIGINS = []
for host_port in ALLOWED_DOMAINS:
@@ -106,6 +107,7 @@ for host_port in ALLOWED_DOMAINS:
continue
CSRF_TRUSTED_ORIGINS.append('{}://*.{}'.format(schema, origin))
+CSRF_FAILURE_VIEW = 'jumpserver.views.other.csrf_failure'
# print("CSRF_TRUSTED_ORIGINS: ")
# for origin in CSRF_TRUSTED_ORIGINS:
# print(' - ' + origin)
diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index 9688f2c82..18d0bccca 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -91,8 +91,6 @@ TERMINAL_HOST_KEY = CONFIG.TERMINAL_HOST_KEY
TERMINAL_HEADER_TITLE = CONFIG.TERMINAL_HEADER_TITLE
# TERMINAL_TELNET_REGEX = CONFIG.TERMINAL_TELNET_REGEX
-# 默认图形化分辨率
-TERMINAL_GRAPHICAL_RESOLUTION = CONFIG.TERMINAL_GRAPHICAL_RESOLUTION
# Asset user auth external backend, default AuthBook backend
BACKEND_ASSET_USER_AUTH_VAULT = False
@@ -205,3 +203,4 @@ MAX_LIMIT_PER_PAGE = CONFIG.MAX_LIMIT_PER_PAGE
# Magnus DB Port
MAGNUS_ORACLE_PORTS = CONFIG.MAGNUS_ORACLE_PORTS
+LIMIT_SUPER_PRIV = CONFIG.LIMIT_SUPER_PRIV
diff --git a/apps/jumpserver/views/other.py b/apps/jumpserver/views/other.py
index 038a6fb06..6a05acaa5 100644
--- a/apps/jumpserver/views/other.py
+++ b/apps/jumpserver/views/other.py
@@ -88,3 +88,9 @@ class KokoView(View):
class ResourceDownload(TemplateView):
template_name = 'resource_download.html'
+
+
+def csrf_failure(request, reason=""):
+ from django.shortcuts import reverse
+ login_url = reverse('authentication:login') + '?csrf_failure=1&admin=1'
+ return redirect(login_url)
diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo
index 2e46fa34c..e12251412 100644
--- a/apps/locale/ja/LC_MESSAGES/django.mo
+++ b/apps/locale/ja/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:810d46e14e09a2309a8d898bc391f33082bfc5c164dec246bd95cea8436e33ee
-size 154540
+oid sha256:2ffdd50c364a510b4f5cfe7922a5f1a604e8bc7b03aa43ece1dff0250ccde6d6
+size 160575
diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po
index e541c9c8c..aa30a95b7 100644
--- a/apps/locale/ja/LC_MESSAGES/django.po
+++ b/apps/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-17 15:30+0800\n"
+"POT-Creation-Date: 2023-09-19 15:41+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -23,12 +23,12 @@ msgid "The parameter 'action' must be [{}]"
msgstr "パラメータ 'action' は [{}] でなければなりません。"
#: accounts/const/account.py:6
-#: accounts/serializers/automations/change_secret.py:33
-#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
+#: accounts/serializers/automations/change_secret.py:32
+#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:35
#: authentication/confirm/password.py:9 authentication/forms.py:32
-#: authentication/templates/authentication/login.html:274
+#: authentication/templates/authentication/login.html:286
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
-#: users/forms/profile.py:22 users/serializers/user.py:104
+#: users/forms/profile.py:22 users/serializers/user.py:105
#: users/templates/users/_msg_user_created.html:13
#: users/templates/users/user_password_verify.html:18
#: xpack/plugins/cloud/serializers/account_attrs.py:28
@@ -36,7 +36,7 @@ msgid "Password"
msgstr "パスワード"
#: accounts/const/account.py:7
-#: accounts/serializers/automations/change_secret.py:34
+#: accounts/serializers/automations/change_secret.py:33
msgid "SSH key"
msgstr "SSH キー"
@@ -45,6 +45,7 @@ msgid "Access key"
msgstr "アクセスキー"
#: accounts/const/account.py:9 assets/models/_user.py:48
+#: authentication/backends/passkey/models.py:16
#: authentication/models/sso_token.py:14 settings/serializers/feature.py:50
msgid "Token"
msgstr "トークン"
@@ -70,7 +71,7 @@ msgstr "動的コード"
msgid "Anonymous account"
msgstr "匿名ユーザー"
-#: accounts/const/account.py:25 users/models/user.py:733
+#: accounts/const/account.py:25 users/models/user.py:744
msgid "Local"
msgstr "ローカル"
@@ -87,103 +88,103 @@ msgstr "テンプレート"
msgid "Skip"
msgstr "スキップ"
-#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:233
+#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:234
#: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6
msgid "Update"
msgstr "更新"
#: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:156 audits/const.py:54
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:55
#: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
-#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43
+#: ops/const.py:62 terminal/const.py:77 xpack/plugins/cloud/const.py:43
msgid "Failed"
msgstr "失敗しました"
-#: accounts/const/automation.py:22 rbac/tree.py:50
+#: accounts/const/automation.py:24 rbac/tree.py:50
msgid "Push account"
msgstr "アカウントプッシュ"
-#: accounts/const/automation.py:23
+#: accounts/const/automation.py:25
msgid "Change secret"
msgstr "パスワードを変更する"
-#: accounts/const/automation.py:24
+#: accounts/const/automation.py:26
msgid "Verify account"
msgstr "アカウントを確認"
-#: accounts/const/automation.py:25
+#: accounts/const/automation.py:27
msgid "Gather accounts"
msgstr "アカウントのコレクション"
-#: accounts/const/automation.py:26
+#: accounts/const/automation.py:28
msgid "Verify gateway account"
msgstr "ゲートウェイ アカウントを確認する"
-#: accounts/const/automation.py:44
-msgid "Specific password"
+#: accounts/const/automation.py:46
+msgid "Specific secret"
msgstr "特定"
-#: accounts/const/automation.py:45
-msgid "Random"
-msgstr "ランダム"
+#: accounts/const/automation.py:47
+msgid "Random generate"
+msgstr "ランダム生成"
-#: accounts/const/automation.py:49 ops/const.py:13
+#: accounts/const/automation.py:51 ops/const.py:13
msgid "Append SSH KEY"
msgstr "追加"
-#: accounts/const/automation.py:50 ops/const.py:14
+#: accounts/const/automation.py:52 ops/const.py:14
msgid "Empty and append SSH KEY"
msgstr "すべてクリアして追加"
-#: accounts/const/automation.py:51 ops/const.py:15
+#: accounts/const/automation.py:53 ops/const.py:15
msgid "Replace (Replace only keys pushed by JumpServer) "
msgstr "置換（JumpServer によってプッシュされたキーのみを置換）"
-#: accounts/const/automation.py:56
+#: accounts/const/automation.py:58
msgid "On asset create"
msgstr "アセットが作成されたとき"
-#: accounts/const/automation.py:59
+#: accounts/const/automation.py:61
msgid "On perm add user"
msgstr "承認が変更されたときにユーザーを追加する"
-#: accounts/const/automation.py:61
+#: accounts/const/automation.py:63
msgid "On perm add user group"
msgstr "権限変更時にユーザーグループを追加"
-#: accounts/const/automation.py:63
+#: accounts/const/automation.py:65
msgid "On perm add asset"
msgstr "変更の承認時にアセットを追加する"
-#: accounts/const/automation.py:65
+#: accounts/const/automation.py:67
msgid "On perm add node"
msgstr "承認変更時のノードの追加"
-#: accounts/const/automation.py:67
+#: accounts/const/automation.py:69
msgid "On perm add account"
msgstr "承認が変更されたときにアカウントを追加する"
-#: accounts/const/automation.py:69
+#: accounts/const/automation.py:71
msgid "On asset join node"
msgstr "アセットの変更時にノードに追加"
-#: accounts/const/automation.py:71
+#: accounts/const/automation.py:73
msgid "On user join group"
msgstr "ユーザー変更時にユーザーグループに追加"
-#: accounts/const/automation.py:79
+#: accounts/const/automation.py:81
msgid "On perm change"
msgstr "権限が変更されたとき"
-#: accounts/const/automation.py:86
+#: accounts/const/automation.py:88
msgid "Inherit from group or node"
msgstr "ユーザーグループまたはアセットノードから継承"
-#: accounts/const/automation.py:94
+#: accounts/const/automation.py:96
msgid "Create and push"
msgstr "作成してプッシュ"
-#: accounts/const/automation.py:95
+#: accounts/const/automation.py:97
msgid "Only create"
msgstr "作成のみ"
@@ -196,17 +197,35 @@ msgstr "データベース"
msgid "HCP Vault"
msgstr "HashiCorp Vault"
+#: accounts/mixins.py:35
+msgid "Export all"
+msgstr "すべてエクスポート"
+
+#: accounts/mixins.py:37
+msgid "Export only selected items"
+msgstr "選択項目のみエクスポート"
+
+#: accounts/mixins.py:42
+#, python-format
+msgid "Export filtered: %s"
+msgstr "検索のエクスポート: %s"
+
+#: accounts/mixins.py:48
+#, python-format
+msgid "User %s view/export secret"
+msgstr "ユーザー %s がパスワードを閲覧/導き出しました"
+
#: accounts/models/account.py:48
#: accounts/models/automations/gather_account.py:16
-#: accounts/serializers/account/account.py:202
-#: accounts/serializers/account/account.py:247
+#: accounts/serializers/account/account.py:205
+#: accounts/serializers/account/account.py:250
#: accounts/serializers/account/gathered_account.py:10
-#: accounts/serializers/automations/change_secret.py:112
-#: accounts/serializers/automations/change_secret.py:132
+#: accounts/serializers/automations/change_secret.py:111
+#: accounts/serializers/automations/change_secret.py:131
#: acls/serializers/base.py:123 assets/models/asset/common.py:93
#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36
#: assets/serializers/domain.py:19 assets/serializers/label.py:27
-#: audits/models.py:53 authentication/models/connection_token.py:36
+#: audits/models.py:54 authentication/models/connection_token.py:36
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:34
#: terminal/backends/command/models.py:17 terminal/models/session/session.py:31
#: terminal/notifications.py:155 terminal/serializers/command.py:17
@@ -218,20 +237,21 @@ msgid "Asset"
msgstr "資産"
#: accounts/models/account.py:52 accounts/models/template.py:15
-#: accounts/serializers/account/account.py:209
-#: accounts/serializers/account/account.py:257
-#: accounts/serializers/account/template.py:16
+#: accounts/serializers/account/account.py:212
+#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/template.py:25
#: authentication/serializers/connect_token_secret.py:49
msgid "Su from"
msgstr "から切り替え"
-#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20
-#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34
+#: accounts/models/account.py:54 assets/const/protocol.py:168
+#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20
+#: terminal/models/applet/applet.py:35
msgid "Version"
msgstr "バージョン"
-#: accounts/models/account.py:56 accounts/serializers/account/account.py:204
-#: users/models/user.py:838
+#: accounts/models/account.py:56 accounts/serializers/account/account.py:207
+#: users/models/user.py:846
msgid "Source"
msgstr "ソース"
@@ -240,10 +260,10 @@ msgid "Source ID"
msgstr "ソース ID"
#: accounts/models/account.py:60
-#: accounts/serializers/automations/change_secret.py:113
-#: accounts/serializers/automations/change_secret.py:133
+#: accounts/serializers/automations/change_secret.py:112
+#: accounts/serializers/automations/change_secret.py:132
#: acls/serializers/base.py:124 assets/serializers/asset/common.py:125
-#: assets/serializers/gateway.py:28 audits/models.py:54 ops/models/base.py:18
+#: assets/serializers/gateway.py:28 audits/models.py:55 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:39
#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33
#: terminal/templates/terminal/_msg_command_warning.html:8
@@ -286,7 +306,7 @@ msgid "Account backup plan"
msgstr "アカウントバックアップ計画"
#: accounts/models/automations/backup_account.py:91
-#: assets/models/automations/base.py:115 audits/models.py:60
+#: assets/models/automations/base.py:115 audits/models.py:61
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228
#: ops/templates/ops/celery_task_log.html:75
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140
@@ -314,14 +334,14 @@ msgstr "アカウントのバックアップスナップショット"
msgid "Trigger mode"
msgstr "トリガーモード"
-#: accounts/models/automations/backup_account.py:105 audits/models.py:194
-#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205
+#: accounts/models/automations/backup_account.py:105 audits/models.py:195
+#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205
msgid "Reason"
msgstr "理由"
#: accounts/models/automations/backup_account.py:107
-#: accounts/serializers/automations/change_secret.py:111
-#: accounts/serializers/automations/change_secret.py:134
+#: accounts/serializers/automations/change_secret.py:110
+#: accounts/serializers/automations/change_secret.py:133
#: ops/serializers/job.py:56 terminal/serializers/session.py:46
msgid "Is success"
msgstr "成功は"
@@ -330,109 +350,84 @@ msgstr "成功は"
msgid "Account backup execution"
msgstr "アカウントバックアップの実行"
-#: accounts/models/automations/base.py:15
+#: accounts/models/automations/base.py:18
msgid "Account automation task"
msgstr "アカウント自動化タスク"
-#: accounts/models/automations/base.py:29
+#: accounts/models/automations/base.py:32
msgid "Automation execution"
msgstr "自動実行"
-#: accounts/models/automations/base.py:30
+#: accounts/models/automations/base.py:33
msgid "Automation executions"
msgstr "自動実行"
-#: accounts/models/automations/base.py:32
+#: accounts/models/automations/base.py:35
msgid "Can view change secret execution"
msgstr "改密実行の表示"
-#: accounts/models/automations/base.py:33
+#: accounts/models/automations/base.py:36
msgid "Can add change secret execution"
msgstr "改密実行の作成"
-#: accounts/models/automations/base.py:35
+#: accounts/models/automations/base.py:38
msgid "Can view gather accounts execution"
msgstr "コレクションアカウントの実行を表示"
-#: accounts/models/automations/base.py:36
+#: accounts/models/automations/base.py:39
msgid "Can add gather accounts execution"
msgstr "回収口座作成の実行"
-#: accounts/models/automations/base.py:38
+#: accounts/models/automations/base.py:41
msgid "Can view push account execution"
msgstr "プッシュ アカウントの実行を表示する"
-#: accounts/models/automations/base.py:39
+#: accounts/models/automations/base.py:42
msgid "Can add push account execution"
msgstr "プッシュ アカウントの作成の実行"
-#: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36
-#: accounts/serializers/account/account.py:429
-#: accounts/serializers/account/base.py:16
-#: accounts/serializers/automations/change_secret.py:46
-#: authentication/serializers/connect_token_secret.py:41
-#: authentication/serializers/connect_token_secret.py:50
-msgid "Secret type"
-msgstr "鍵の種類"
-
-#: accounts/models/automations/change_secret.py:20
-#: accounts/models/mixins/vault.py:48 accounts/serializers/account/base.py:19
-#: authentication/models/temp_token.py:10
-#: authentication/templates/authentication/_access_key_modal.html:31
-#: settings/serializers/auth/radius.py:19
-msgid "Secret"
-msgstr "ひみつ"
-
-#: accounts/models/automations/change_secret.py:23
-#: accounts/serializers/automations/change_secret.py:40
-msgid "Secret strategy"
-msgstr "鍵ポリシー"
-
-#: accounts/models/automations/change_secret.py:25
-msgid "Password rules"
-msgstr "パスワードルール"
-
-#: accounts/models/automations/change_secret.py:28
+#: accounts/models/automations/base.py:54
msgid "SSH key change strategy"
msgstr "SSHキープッシュ方式"
-#: accounts/models/automations/change_secret.py:64
+#: accounts/models/automations/change_secret.py:15
#: accounts/serializers/account/backup.py:34
-#: accounts/serializers/automations/change_secret.py:57
+#: accounts/serializers/automations/change_secret.py:56
msgid "Recipient"
msgstr "受信者"
-#: accounts/models/automations/change_secret.py:71
+#: accounts/models/automations/change_secret.py:22
msgid "Change secret automation"
msgstr "自動暗号化"
-#: accounts/models/automations/change_secret.py:88
+#: accounts/models/automations/change_secret.py:39
msgid "Old secret"
msgstr "オリジナルキー"
-#: accounts/models/automations/change_secret.py:89
+#: accounts/models/automations/change_secret.py:40
msgid "New secret"
msgstr "新しい鍵"
-#: accounts/models/automations/change_secret.py:90
+#: accounts/models/automations/change_secret.py:41
msgid "Date started"
msgstr "開始日"
-#: accounts/models/automations/change_secret.py:91
+#: accounts/models/automations/change_secret.py:42
#: assets/models/automations/base.py:116 ops/models/base.py:56
#: ops/models/celery.py:64 ops/models/job.py:229
#: terminal/models/applet/host.py:141
msgid "Date finished"
msgstr "終了日"
-#: accounts/models/automations/change_secret.py:93
-#: accounts/serializers/account/account.py:249 assets/const/automation.py:8
+#: accounts/models/automations/change_secret.py:44
+#: accounts/serializers/account/account.py:252 assets/const/automation.py:8
+#: authentication/templates/authentication/passkey.html:173
#: authentication/views/base.py:26 authentication/views/base.py:27
#: authentication/views/base.py:28 common/const/choices.py:20
msgid "Error"
msgstr "間違い"
-#: accounts/models/automations/change_secret.py:97
+#: accounts/models/automations/change_secret.py:48
msgid "Change secret record"
msgstr "パスワード レコードの変更"
@@ -445,15 +440,15 @@ msgid "Date last login"
msgstr "最終ログイン日"
#: accounts/models/automations/gather_account.py:17
-#: accounts/models/automations/push_account.py:15 accounts/models/base.py:34
+#: accounts/models/automations/push_account.py:15 accounts/models/base.py:65
#: accounts/serializers/account/virtual.py:21 acls/serializers/base.py:19
-#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:179
+#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:180
#: authentication/forms.py:25 authentication/forms.py:27
#: authentication/models/temp_token.py:9
#: authentication/templates/authentication/_msg_different_city.html:9
#: authentication/templates/authentication/_msg_oauth_bind.html:9
#: users/forms/profile.py:32 users/forms/profile.py:115
-#: users/models/user.py:785 users/templates/users/_msg_user_created.html:12
+#: users/models/user.py:796 users/templates/users/_msg_user_created.html:12
#: xpack/plugins/cloud/serializers/account_attrs.py:26
msgid "Username"
msgstr "ユーザー名"
@@ -481,13 +476,13 @@ msgstr "トリガー方式"
#: accounts/models/automations/push_account.py:16 acls/models/base.py:41
#: acls/serializers/base.py:57 assets/models/cmd_filter.py:81
-#: audits/models.py:87 audits/serializers.py:83
+#: audits/models.py:88 audits/serializers.py:84
#: authentication/serializers/connect_token_secret.py:116
#: authentication/templates/authentication/_access_key_modal.html:34
msgid "Action"
msgstr "アクション"
-#: accounts/models/automations/push_account.py:60
+#: accounts/models/automations/push_account.py:57
msgid "Push asset account"
msgstr "アカウントプッシュ"
@@ -495,7 +490,34 @@ msgstr "アカウントプッシュ"
msgid "Verify asset account"
msgstr "アカウントの確認"
-#: accounts/models/base.py:33 accounts/serializers/account/virtual.py:20
+#: accounts/models/base.py:37 accounts/models/base.py:67
+#: accounts/serializers/account/account.py:432
+#: accounts/serializers/account/base.py:16
+#: accounts/serializers/automations/change_secret.py:45
+#: authentication/serializers/connect_token_secret.py:41
+#: authentication/serializers/connect_token_secret.py:50
+msgid "Secret type"
+msgstr "鍵の種類"
+
+#: accounts/models/base.py:39 accounts/models/mixins/vault.py:48
+#: accounts/serializers/account/base.py:19
+#: authentication/models/temp_token.py:10
+#: authentication/templates/authentication/_access_key_modal.html:31
+#: settings/serializers/auth/radius.py:19
+msgid "Secret"
+msgstr "ひみつ"
+
+#: accounts/models/base.py:42
+#: accounts/serializers/automations/change_secret.py:39
+msgid "Secret strategy"
+msgstr "鍵ポリシー"
+
+#: accounts/models/base.py:44 accounts/serializers/account/template.py:22
+#: accounts/serializers/automations/change_secret.py:44
+msgid "Password rules"
+msgstr "パスワードルール"
+
+#: accounts/models/base.py:64 accounts/serializers/account/virtual.py:20
#: acls/models/base.py:35 acls/models/base.py:96 acls/models/command_acl.py:21
#: acls/serializers/base.py:35 applications/models.py:9
#: assets/models/_user.py:22 assets/models/asset/common.py:91
@@ -503,44 +525,57 @@ msgstr "アカウントの確認"
#: assets/models/domain.py:18 assets/models/group.py:17
#: assets/models/label.py:18 assets/models/platform.py:15
#: assets/models/platform.py:88 assets/serializers/asset/common.py:146
-#: assets/serializers/platform.py:110 assets/serializers/platform.py:223
+#: assets/serializers/platform.py:111 assets/serializers/platform.py:228
+#: authentication/backends/passkey/models.py:10
#: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21
#: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20
#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:32 settings/serializers/msg.py:82
-#: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12
+#: terminal/models/applet/applet.py:33 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:94
#: terminal/models/component/storage.py:26 terminal/models/component/task.py:13
#: terminal/models/component/terminal.py:84 users/forms/profile.py:33
-#: users/models/group.py:13 users/models/user.py:787
-#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273
-#: xpack/plugins/cloud/serializers/task.py:68
+#: users/models/group.py:13 users/models/preference.py:11
+#: users/models/user.py:798 xpack/plugins/cloud/models.py:32
+#: xpack/plugins/cloud/models.py:273 xpack/plugins/cloud/serializers/task.py:68
msgid "Name"
msgstr "名前"
-#: accounts/models/base.py:38
+#: accounts/models/base.py:69
msgid "Privileged"
msgstr "特権アカウント"
-#: accounts/models/base.py:39 assets/models/asset/common.py:156
+#: accounts/models/base.py:70 assets/models/asset/common.py:156
#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
#: assets/models/label.py:22
#: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:39
-#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
+#: terminal/models/applet/applet.py:40
+#: terminal/models/component/endpoint.py:105 users/serializers/user.py:170
msgid "Is active"
msgstr "アクティブです。"
-#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325
+#: accounts/models/template.py:17 assets/models/_user.py:53
+msgid "Auto push"
+msgstr "オートプッシュ"
+
+#: accounts/models/template.py:20
+msgid "Platforms"
+msgstr "プラットフォーム"
+
+#: accounts/models/template.py:22
+msgid "Push params"
+msgstr "パラメータをプッシュする"
+
+#: accounts/models/template.py:25 xpack/plugins/cloud/models.py:325
msgid "Account template"
msgstr "アカウント テンプレート"
-#: accounts/models/template.py:24
+#: accounts/models/template.py:30
msgid "Can view asset account template secret"
msgstr "アセット アカウント テンプレートのパスワードを表示できます"
-#: accounts/models/template.py:25
+#: accounts/models/template.py:31
msgid "Can change asset account template secret"
msgstr "アセット アカウント テンプレートのパスワードを変更できます"
@@ -622,54 +657,55 @@ msgstr "今すぐプッシュ"
msgid "Exist policy"
msgstr "アカウントの存在ポリシー"
-#: accounts/serializers/account/account.py:182 applications/models.py:11
+#: accounts/serializers/account/account.py:185 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:89
#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8
-#: assets/serializers/platform.py:128 assets/serializers/platform.py:224
+#: assets/serializers/platform.py:133 assets/serializers/platform.py:229
#: perms/serializers/user_permission.py:26 settings/models.py:34
-#: tickets/models/ticket/apply_application.py:13
+#: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12
msgid "Category"
msgstr "カテゴリ"
-#: accounts/serializers/account/account.py:183
+#: accounts/serializers/account/account.py:186
#: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:90
-#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112
-#: assets/serializers/platform.py:127 audits/serializers.py:49
+#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:113
+#: assets/serializers/platform.py:132 audits/serializers.py:50
+#: audits/serializers.py:170
#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137
-#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38
+#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39
#: terminal/models/component/storage.py:57
#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
-#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
-#: terminal/serializers/storage.py:238 tickets/models/comment.py:26
+#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228
+#: terminal/serializers/storage.py:240 tickets/models/comment.py:26
#: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16
#: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53
#: tickets/serializers/ticket/ticket.py:19
msgid "Type"
msgstr "タイプ"
-#: accounts/serializers/account/account.py:198
+#: accounts/serializers/account/account.py:201
msgid "Asset not found"
msgstr "資産が存在しません"
-#: accounts/serializers/account/account.py:238
+#: accounts/serializers/account/account.py:241
msgid "Has secret"
msgstr "エスクローされたパスワード"
-#: accounts/serializers/account/account.py:248 ops/models/celery.py:60
+#: accounts/serializers/account/account.py:251 ops/models/celery.py:60
#: tickets/models/comment.py:13 tickets/models/ticket/general.py:45
#: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14
#: tickets/serializers/ticket/ticket.py:21
msgid "State"
msgstr "状態"
-#: accounts/serializers/account/account.py:250
+#: accounts/serializers/account/account.py:253
msgid "Changed"
msgstr "編集済み"
-#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/account.py:263
#: accounts/serializers/automations/base.py:22 acls/models/base.py:97
#: assets/models/automations/base.py:19
#: assets/serializers/automations/base.py:20 ops/models/base.py:17
@@ -678,46 +714,46 @@ msgstr "編集済み"
msgid "Assets"
msgstr "資産"
-#: accounts/serializers/account/account.py:315
+#: accounts/serializers/account/account.py:318
msgid "Account already exists"
msgstr "アカウントはすでに存在しています"
-#: accounts/serializers/account/account.py:365
+#: accounts/serializers/account/account.py:368
#, python-format
msgid "Asset does not support this secret type: %s"
msgstr "アセットはアカウント タイプをサポートしていません: %s"
-#: accounts/serializers/account/account.py:397
+#: accounts/serializers/account/account.py:400
msgid "Account has exist"
msgstr "アカウントはすでに存在しています"
-#: accounts/serializers/account/account.py:430
+#: accounts/serializers/account/account.py:433
#: authentication/serializers/connect_token_secret.py:156
#: authentication/templates/authentication/_access_key_modal.html:30
#: perms/models/perm_node.py:21 users/serializers/group.py:31
msgid "ID"
msgstr "ID"
-#: accounts/serializers/account/account.py:437 acls/serializers/base.py:116
-#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49
-#: audits/models.py:85 audits/models.py:163
-#: authentication/models/connection_token.py:32
+#: accounts/serializers/account/account.py:440 acls/serializers/base.py:116
+#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:50
+#: audits/models.py:86 audits/models.py:164 audits/models.py:262
+#: audits/serializers.py:171 authentication/models/connection_token.py:32
#: authentication/models/sso_token.py:16
#: notifications/models/notification.py:12
#: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58
-#: perms/serializers/permission.py:30 rbac/builtin.py:123
+#: perms/serializers/permission.py:30 rbac/builtin.py:124
#: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17
#: terminal/backends/command/models.py:16 terminal/models/session/session.py:29
-#: terminal/models/session/sharing.py:33 terminal/notifications.py:156
+#: terminal/models/session/sharing.py:34 terminal/notifications.py:156
#: terminal/notifications.py:205 terminal/serializers/command.py:16
#: terminal/templates/terminal/_msg_command_warning.html:6
#: terminal/templates/terminal/_msg_session_sharing.html:6
-#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:981
-#: users/models/user.py:1017 users/serializers/group.py:18
+#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:996
+#: users/models/user.py:1032 users/serializers/group.py:18
msgid "User"
msgstr "ユーザー"
-#: accounts/serializers/account/account.py:438
+#: accounts/serializers/account/account.py:441
#: authentication/templates/authentication/_access_key_modal.html:33
#: terminal/notifications.py:158 terminal/notifications.py:207
msgid "Date"
@@ -736,7 +772,7 @@ msgid "Executed amount"
msgstr "実行回数"
#: accounts/serializers/account/backup.py:35
-#: accounts/serializers/automations/change_secret.py:58
+#: accounts/serializers/automations/change_secret.py:57
msgid "Currently only mail sending is supported"
msgstr "現在、メール送信のみがサポートされています"
@@ -761,27 +797,68 @@ msgstr ""
"ヒント: 認証にユーザー名が必要ない場合は、`null`を入力します。ADアカウントの"
"場合は、`username@domain`のようになります。"
+#: accounts/serializers/account/template.py:11
+#, fuzzy
+#| msgid "Password strength"
+msgid "Password length"
+msgstr "パスワードの強さ"
+
+#: accounts/serializers/account/template.py:12
+#, fuzzy
+#| msgid "Powershell"
+msgid "Lowercase"
+msgstr "PowerShell"
+
+#: accounts/serializers/account/template.py:13
+msgid "Uppercase"
+msgstr ""
+
+#: accounts/serializers/account/template.py:14
+msgid "Digit"
+msgstr ""
+
+#: accounts/serializers/account/template.py:15
+msgid "Special symbol"
+msgstr ""
+
+#: accounts/serializers/account/template.py:36
+msgid "Secret generation strategy for account creation"
+msgstr "账号创建时，密文生成策略"
+
+#: accounts/serializers/account/template.py:37
+msgid "Whether to automatically push the account to the asset"
+msgstr "是否自动推送账号到资产"
+
+#: accounts/serializers/account/template.py:40
+msgid ""
+"Associated platform, you can configure push parameters. If not associated, "
+"default parameters will be used"
+msgstr "关联平台，可以配置推送参数，如果不关联，则使用默认参数"
+
#: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27
#: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
#: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142
+#: settings/models.py:37 terminal/models/applet/applet.py:45
+#: terminal/models/applet/applet.py:302 terminal/models/applet/host.py:142
#: terminal/models/component/endpoint.py:24
#: terminal/models/component/endpoint.py:104
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
-#: tickets/models/ticket/general.py:297 users/models/user.py:826
+#: tickets/models/ticket/general.py:297 users/models/user.py:834
#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109
msgid "Comment"
msgstr "コメント"
-#: accounts/serializers/account/virtual.py:22
+#: accounts/serializers/account/virtual.py:24
msgid ""
"Current only support login from AD/LDAP. Secret priority: Same account in "
-"asset secret > Login secret > Manual input"
+"asset secret > Login secret > Manual input.
For security, please set "
+"config CACHE_LOGIN_PASSWORD_ENABLED to true"
msgstr ""
"現在、AD/LDAPからのログインのみをサポートしています。シークレットの優先順位: "
-"資産シークレット内の同じアカウント > ログインシークレット > 手動入力"
+"資産シークレット内の同じアカウント > ログインシークレット > 手動入力.
"
+"セキュリティのために、「config CACHE_LOGIN_PASSWORD_ENABLED」をtrueに設定して"
+"ください。 "
#: accounts/serializers/automations/base.py:23
#: assets/models/asset/common.py:155 assets/models/automations/base.py:18
@@ -800,31 +877,46 @@ msgstr "名前は既に存在します。"
msgid "Automation snapshot"
msgstr "自動スナップショット"
-#: accounts/serializers/automations/change_secret.py:43
+#: accounts/serializers/automations/change_secret.py:42
msgid "SSH Key strategy"
msgstr "SSHキー戦略"
-#: accounts/serializers/automations/change_secret.py:81
+#: accounts/serializers/automations/change_secret.py:80
msgid "* Please enter the correct password length"
msgstr "* 正しいパスワードの長さを入力してください"
-#: accounts/serializers/automations/change_secret.py:85
+#: accounts/serializers/automations/change_secret.py:84
msgid "* Password length range 6-30 bits"
msgstr "* パスワードの長さの範囲6-30ビット"
-#: accounts/serializers/automations/change_secret.py:115
+#: accounts/serializers/automations/change_secret.py:114
#: assets/models/automations/base.py:127
msgid "Automation task execution"
msgstr "自動タスク実行履歴"
-#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53
-#: audits/models.py:59 audits/signal_handlers/activity_log.py:33
-#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40
-#: terminal/const.py:76 terminal/models/session/sharing.py:117
-#: tickets/views/approve.py:115
+#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54
+#: audits/models.py:60 audits/signal_handlers/activity_log.py:33
+#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40
+#: terminal/const.py:76 terminal/models/session/sharing.py:121
+#: tickets/views/approve.py:119
msgid "Success"
msgstr "成功"
+#: accounts/signal_handlers.py:46
+#, python-format
+msgid "Push related accounts to assets: %s, by system"
+msgstr "関連するアカウントをアセットにプッシュ: %s, by system"
+
+#: accounts/signal_handlers.py:55
+#, python-format
+msgid "Add account: %s"
+msgstr "アカウントを追加: %s"
+
+#: accounts/signal_handlers.py:57
+#, python-format
+msgid "Delete account: %s"
+msgstr "アカウントを削除: %s"
+
#: accounts/tasks/automation.py:24
msgid "Account execute automation"
msgstr "アカウント実行の自動化"
@@ -853,19 +945,23 @@ msgstr "アセット アカウントの可用性を確認する"
msgid "Verify accounts connectivity"
msgstr "アカウント接続のテスト"
-#: accounts/utils.py:41
+#: accounts/utils.py:53
msgid "Password can not contains `{{` "
msgstr "パスワードには '{{' を含まない"
-#: accounts/utils.py:44
+#: accounts/utils.py:55
+msgid "Password can not contains `{%` "
+msgstr "パスワードには '{%' を含まない"
+
+#: accounts/utils.py:58
msgid "Password can not contains `'` "
msgstr "パスワードには `'` を含まない"
-#: accounts/utils.py:46
+#: accounts/utils.py:60
msgid "Password can not contains `\"` "
msgstr "パスワードには `\"` を含まない"
-#: accounts/utils.py:52
+#: accounts/utils.py:66
msgid "private key invalid or passphrase error"
msgstr "秘密鍵が無効またはpassphraseエラー"
@@ -910,12 +1006,12 @@ msgstr "レビュー担当者"
#: acls/models/base.py:43 authentication/models/access_key.py:17
#: authentication/models/connection_token.py:53
#: authentication/templates/authentication/_access_key_modal.html:32
-#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28
+#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29
#: tickets/const.py:37
msgid "Active"
msgstr "アクティブ"
-#: acls/models/base.py:81 users/apps.py:9
+#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16
msgid "Users"
msgstr "ユーザー"
@@ -1032,7 +1128,7 @@ msgid "None of the reviewers belong to Organization `{}`"
msgstr "いずれのレビューアも組織 '{}' に属していません"
#: acls/serializers/rules/rules.py:20
-#: xpack/plugins/cloud/serializers/task.py:133
+#: xpack/plugins/cloud/serializers/task.py:137
msgid "IP address invalid: `{}`"
msgstr "IPアドレスが無効: '{}'"
@@ -1107,6 +1203,10 @@ msgstr "アプリ資産"
msgid "{} disabled"
msgstr "{} 無効"
+#: assets/automations/base/manager.py:202
+msgid " - Platform {} ansible disabled"
+msgstr " - プラットフォーム {} ansible 無効"
+
#: assets/automations/ping_gateway/manager.py:33
#: authentication/models/connection_token.py:128
msgid "No account"
@@ -1131,7 +1231,7 @@ msgstr "認証に失敗しました"
msgid "Connect failed"
msgstr "接続に失敗しました"
-#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36
+#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37
#: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31
#: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104
msgid "Unknown"
@@ -1153,16 +1253,19 @@ msgstr "テストゲートウェイ"
msgid "Gather facts"
msgstr "資産情報の収集"
-#: assets/const/base.py:33 audits/const.py:47
+#: assets/const/base.py:33 audits/const.py:48
#: terminal/serializers/applet_host.py:32
msgid "Disabled"
msgstr "無効"
#: assets/const/base.py:34 settings/serializers/basic.py:6
+#: users/serializers/preference/koko.py:15
+#: users/serializers/preference/lina.py:32
+#: users/serializers/preference/luna.py:60
msgid "Basic"
msgstr "基本"
-#: assets/const/base.py:35 assets/const/protocol.py:230
+#: assets/const/base.py:35 assets/const/protocol.py:245
#: assets/models/asset/web.py:13
msgid "Script"
msgstr "脚本"
@@ -1184,8 +1287,8 @@ msgid "Cloud service"
msgstr "クラウド サービス"
#: assets/const/category.py:14 assets/models/asset/gpt.py:11
-#: assets/models/asset/web.py:16 audits/const.py:34
-#: terminal/models/applet/applet.py:26
+#: assets/models/asset/web.py:16 audits/const.py:35
+#: terminal/models/applet/applet.py:27 users/const.py:47
msgid "Web"
msgstr "Web"
@@ -1205,7 +1308,7 @@ msgstr "私有雲"
msgid "Kubernetes"
msgstr "Kubernetes"
-#: assets/const/device.py:7 terminal/models/applet/applet.py:25
+#: assets/const/device.py:7 terminal/models/applet/applet.py:26
#: tickets/const.py:8
msgid "General"
msgstr "一般"
@@ -1224,86 +1327,102 @@ msgstr "ファイアウォール"
#: assets/const/gpt.py:7
msgid "ChatGPT"
-msgstr ""
+msgstr "ChatGPT"
#: assets/const/host.py:12 rbac/tree.py:28
msgid "Other"
msgstr "その他"
#: assets/const/protocol.py:48
-msgid "SFTP home"
-msgstr "SFTP ルート パス"
+msgid "SFTP root"
+msgstr "SFTPルート"
-#: assets/const/protocol.py:59
+#: assets/const/protocol.py:50
+#, python-brace-format
+msgid ""
+"SFTP root directory, Support variable:
- ${ACCOUNT} The connected "
+"account username
- ${HOME} The home directory of the connected account "
+"
- ${USER} The username of the user"
+msgstr ""
+"SFTPルートディレクトリ、サポート変数：
-${ACCOUNT}接続されたアカウントの"
+"ユーザー名
-${HOME}接続されたアカウントのホームディレクトリ
-${USER}"
+"ユーザーのユーザー名"
+
+#: assets/const/protocol.py:65
msgid "Console"
msgstr "Console"
-#: assets/const/protocol.py:60
+#: assets/const/protocol.py:66
msgid "Connect to console session"
msgstr "コンソールセッションに接続"
-#: assets/const/protocol.py:64
+#: assets/const/protocol.py:70
msgid "Any"
msgstr "任意"
-#: assets/const/protocol.py:66 settings/serializers/security.py:227
+#: assets/const/protocol.py:72 settings/serializers/security.py:228
msgid "Security"
msgstr "セキュリティ"
-#: assets/const/protocol.py:67
+#: assets/const/protocol.py:73
msgid "Security layer to use for the connection"
msgstr "接続に使用するセキュリティ レイヤー"
-#: assets/const/protocol.py:73
+#: assets/const/protocol.py:79
msgid "AD domain"
msgstr "AD ドメイン"
-#: assets/const/protocol.py:88
+#: assets/const/protocol.py:94
msgid "Username prompt"
msgstr "ユーザー名プロンプト"
-#: assets/const/protocol.py:89
+#: assets/const/protocol.py:95
msgid "We will send username when we see this prompt"
msgstr "このプロンプトが表示されたらユーザー名を送信します"
-#: assets/const/protocol.py:94
+#: assets/const/protocol.py:100
msgid "Password prompt"
msgstr "パスワードプロンプト"
-#: assets/const/protocol.py:95
+#: assets/const/protocol.py:101
msgid "We will send password when we see this prompt"
msgstr "このプロンプトが表示されたらパスワードを送信します"
-#: assets/const/protocol.py:100
+#: assets/const/protocol.py:106
msgid "Success prompt"
msgstr "成功プロンプト"
-#: assets/const/protocol.py:101
+#: assets/const/protocol.py:107
msgid "We will consider login success when we see this prompt"
msgstr "このプロンプトが表示されたらログイン成功とみなします"
-#: assets/const/protocol.py:112 assets/models/asset/database.py:10
+#: assets/const/protocol.py:118 assets/models/asset/database.py:10
#: settings/serializers/msg.py:40
msgid "Use SSL"
msgstr "SSLの使用"
-#: assets/const/protocol.py:147
+#: assets/const/protocol.py:153
msgid "SYSDBA"
msgstr "SYSDBA"
-#: assets/const/protocol.py:148
+#: assets/const/protocol.py:154
msgid "Connect as SYSDBA"
msgstr "SYSDBA として接続"
-#: assets/const/protocol.py:177
+#: assets/const/protocol.py:169
+msgid ""
+"SQL Server version, Different versions have different connection drivers"
+msgstr "SQL Server のバージョン。バージョンによって接続ドライバが異なります"
+
+#: assets/const/protocol.py:192
msgid "Auth username"
msgstr "ユーザー名で認証する"
-#: assets/const/protocol.py:200
+#: assets/const/protocol.py:215
msgid "Safe mode"
msgstr "安全モード"
-#: assets/const/protocol.py:202
+#: assets/const/protocol.py:217
msgid ""
"When safe mode is enabled, some operations will be disabled, such as: New "
"tab, right click, visit other website, etc."
@@ -1311,24 +1430,24 @@ msgstr ""
"安全モードが有効になっている場合、新しいタブ、右クリック、他のウェブサイトへ"
"のアクセスなど、一部の操作が無効になります"
-#: assets/const/protocol.py:207 assets/models/asset/web.py:9
+#: assets/const/protocol.py:222 assets/models/asset/web.py:9
#: assets/serializers/asset/info/spec.py:16
msgid "Autofill"
msgstr "自動充填"
-#: assets/const/protocol.py:215 assets/models/asset/web.py:10
+#: assets/const/protocol.py:230 assets/models/asset/web.py:10
msgid "Username selector"
msgstr "ユーザー名ピッカー"
-#: assets/const/protocol.py:220 assets/models/asset/web.py:11
+#: assets/const/protocol.py:235 assets/models/asset/web.py:11
msgid "Password selector"
msgstr "パスワードセレクター"
-#: assets/const/protocol.py:225 assets/models/asset/web.py:12
+#: assets/const/protocol.py:240 assets/models/asset/web.py:12
msgid "Submit selector"
msgstr "ボタンセレクターを確認する"
-#: assets/const/protocol.py:248
+#: assets/const/protocol.py:263
msgid "API mode"
msgstr "APIモード"
@@ -1354,19 +1473,19 @@ msgstr "SSHパブリックキー"
#: assets/models/_user.py:28 assets/models/automations/base.py:114
#: assets/models/cmd_filter.py:41 assets/models/group.py:19
-#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227
-#: users/models/user.py:1018
+#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54
+#: ops/models/job.py:227 users/models/user.py:1033
msgid "Date created"
msgstr "作成された日付"
#: assets/models/_user.py:29 assets/models/cmd_filter.py:42
-#: common/db/models.py:35 users/models/user.py:847
+#: common/db/models.py:35 users/models/user.py:855
msgid "Date updated"
msgstr "更新日"
#: assets/models/_user.py:30 assets/models/cmd_filter.py:44
#: assets/models/cmd_filter.py:91 assets/models/group.py:18
-#: common/db/models.py:32 users/models/user.py:833
+#: common/db/models.py:32 users/models/user.py:841
#: users/serializers/group.py:29
msgid "Created by"
msgstr "によって作成された"
@@ -1393,15 +1512,11 @@ msgstr "ユーザーと同じユーザー名"
#: assets/models/_user.py:52 authentication/models/connection_token.py:41
#: authentication/serializers/connect_token_secret.py:111
-#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19
+#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19
#: terminal/serializers/session.py:42 terminal/serializers/storage.py:70
msgid "Protocol"
msgstr "プロトコル"
-#: assets/models/_user.py:53
-msgid "Auto push"
-msgstr "オートプッシュ"
-
#: assets/models/_user.py:54
msgid "Sudo"
msgstr "すど"
@@ -1457,6 +1572,7 @@ msgid "Address"
msgstr "アドレス"
#: assets/models/asset/common.py:151 assets/models/platform.py:119
+#: authentication/backends/passkey/models.py:12
#: authentication/serializers/connect_token_secret.py:115
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321
msgid "Platform"
@@ -1534,9 +1650,9 @@ msgstr "自動化されたタスク"
msgid "Asset automation task"
msgstr "アセットの自動化タスク"
-#: assets/models/automations/base.py:113 audits/models.py:199
-#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220
-#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139
+#: assets/models/automations/base.py:113 audits/models.py:200
+#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220
+#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139
#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18
#: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283
#: tickets/serializers/super_ticket.py:13
@@ -1563,7 +1679,7 @@ msgstr "確認済みの日付"
#: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61
#: perms/serializers/permission.py:32 users/models/group.py:25
-#: users/models/user.py:793
+#: users/models/user.py:804
msgid "User group"
msgstr "ユーザーグループ"
@@ -1604,7 +1720,7 @@ msgid "Asset group"
msgstr "資産グループ"
#: assets/models/group.py:31 assets/models/platform.py:19
-#: assets/serializers/platform.py:113
+#: assets/serializers/platform.py:114
#: xpack/plugins/cloud/providers/nutanix.py:30
msgid "Default"
msgstr "デフォルト"
@@ -1613,7 +1729,7 @@ msgstr "デフォルト"
msgid "Default asset group"
msgstr "デフォルトアセットグループ"
-#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003
+#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018
msgid "System"
msgstr "システム"
@@ -1622,12 +1738,13 @@ msgstr "システム"
#: authentication/models/connection_token.py:29
#: authentication/serializers/connect_token_secret.py:122
#: common/serializers/common.py:86 settings/models.py:33
+#: users/models/preference.py:13
msgid "Value"
msgstr "値"
#: assets/models/label.py:40 assets/serializers/asset/common.py:123
#: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13
-#: assets/serializers/platform.py:111
+#: assets/serializers/platform.py:112
#: authentication/serializers/connect_token_secret.py:121
#: common/serializers/common.py:85 perms/serializers/user_permission.py:28
#: settings/serializers/msg.py:83
@@ -1675,13 +1792,14 @@ msgstr "必要"
msgid "Public"
msgstr "開ける"
-#: assets/models/platform.py:21 assets/serializers/platform.py:48
-#: settings/serializers/settings.py:65
+#: assets/models/platform.py:21 assets/serializers/platform.py:49
+#: settings/serializers/settings.py:66
#: users/templates/users/reset_password.html:29
msgid "Setting"
msgstr "設定"
-#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36
+#: assets/models/platform.py:38 audits/const.py:49
+#: authentication/backends/passkey/models.py:11 settings/models.py:36
#: terminal/serializers/applet_host.py:33
msgid "Enabled"
msgstr "有効化"
@@ -1690,11 +1808,11 @@ msgstr "有効化"
msgid "Ansible config"
msgstr "Ansible 構成"
-#: assets/models/platform.py:41 assets/serializers/platform.py:32
+#: assets/models/platform.py:41 assets/serializers/platform.py:33
msgid "Ping enabled"
msgstr "アセット ディスカバリを有効にする"
-#: assets/models/platform.py:42 assets/serializers/platform.py:33
+#: assets/models/platform.py:42 assets/serializers/platform.py:34
msgid "Ping method"
msgstr "資産検出方法"
@@ -1703,12 +1821,12 @@ msgid "Ping params"
msgstr "資産検出パラメータ"
#: assets/models/platform.py:45 assets/models/platform.py:69
-#: assets/serializers/platform.py:34
+#: assets/serializers/platform.py:35
msgid "Gather facts enabled"
msgstr "資産情報の収集を有効にする"
#: assets/models/platform.py:47 assets/models/platform.py:71
-#: assets/serializers/platform.py:35
+#: assets/serializers/platform.py:36
msgid "Gather facts method"
msgstr "情報収集の方法"
@@ -1716,11 +1834,11 @@ msgstr "情報収集の方法"
msgid "Gather facts params"
msgstr "情報収集パラメータ"
-#: assets/models/platform.py:51 assets/serializers/platform.py:38
+#: assets/models/platform.py:51 assets/serializers/platform.py:39
msgid "Change secret enabled"
msgstr "パスワードの変更が有効"
-#: assets/models/platform.py:53 assets/serializers/platform.py:39
+#: assets/models/platform.py:53 assets/serializers/platform.py:40
msgid "Change secret method"
msgstr "パスワード変更モード"
@@ -1728,11 +1846,11 @@ msgstr "パスワード変更モード"
msgid "Change secret params"
msgstr "パスワード変更パラメータ"
-#: assets/models/platform.py:57 assets/serializers/platform.py:40
+#: assets/models/platform.py:57 assets/serializers/platform.py:41
msgid "Push account enabled"
msgstr "アカウントのプッシュを有効にする"
-#: assets/models/platform.py:59 assets/serializers/platform.py:41
+#: assets/models/platform.py:59 assets/serializers/platform.py:42
msgid "Push account method"
msgstr "アカウントプッシュ方式"
@@ -1740,11 +1858,11 @@ msgstr "アカウントプッシュ方式"
msgid "Push account params"
msgstr "アカウントプッシュパラメータ"
-#: assets/models/platform.py:63 assets/serializers/platform.py:36
+#: assets/models/platform.py:63 assets/serializers/platform.py:37
msgid "Verify account enabled"
msgstr "アカウントの確認をオンにする"
-#: assets/models/platform.py:65 assets/serializers/platform.py:37
+#: assets/models/platform.py:65 assets/serializers/platform.py:38
msgid "Verify account method"
msgstr "アカウント認証方法"
@@ -1760,23 +1878,23 @@ msgstr "メタ"
msgid "Internal"
msgstr "ビルトイン"
-#: assets/models/platform.py:96 assets/serializers/platform.py:126
+#: assets/models/platform.py:96 assets/serializers/platform.py:131
msgid "Charset"
msgstr "シャーセット"
-#: assets/models/platform.py:98 assets/serializers/platform.py:154
+#: assets/models/platform.py:98 assets/serializers/platform.py:159
msgid "Domain enabled"
msgstr "ドメインを有効にする"
-#: assets/models/platform.py:100 assets/serializers/platform.py:153
+#: assets/models/platform.py:100 assets/serializers/platform.py:158
msgid "Su enabled"
msgstr "アカウントの切り替えを有効にする"
-#: assets/models/platform.py:101 assets/serializers/platform.py:132
+#: assets/models/platform.py:101 assets/serializers/platform.py:137
msgid "Su method"
msgstr "アカウントの切り替え方法"
-#: assets/models/platform.py:102 assets/serializers/platform.py:135
+#: assets/models/platform.py:102 assets/serializers/platform.py:140
msgid "Custom fields"
msgstr "カスタムフィールド"
@@ -1793,7 +1911,7 @@ msgstr ""
"プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ"
"ラットフォーム"
-#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129
+#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134
#: authentication/serializers/connect_token_secret.py:29
#: authentication/serializers/connect_token_secret.py:72
#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324
@@ -1926,19 +2044,19 @@ msgstr "値"
msgid "Can't contains: /"
msgstr "含まれない:/"
-#: assets/serializers/platform.py:42
+#: assets/serializers/platform.py:43
msgid "Gather accounts enabled"
msgstr "アカウント収集を有効にする"
-#: assets/serializers/platform.py:43
+#: assets/serializers/platform.py:44
msgid "Gather accounts method"
msgstr "アカウントの収集方法"
-#: assets/serializers/platform.py:49
+#: assets/serializers/platform.py:50
msgid "Port from addr"
msgstr "アドレスからのポート"
-#: assets/serializers/platform.py:61
+#: assets/serializers/platform.py:62
msgid ""
"This protocol is primary, and it must be set when adding assets. "
"Additionally, there can only be one primary protocol."
@@ -1946,11 +2064,11 @@ msgstr ""
"このプロトコルはプライマリであり、資産を追加するときに設定する必要がありま"
"す。また、プライマリプロトコルは1つしかありません"
-#: assets/serializers/platform.py:66
+#: assets/serializers/platform.py:67
msgid "This protocol is required, and it must be set when adding assets."
msgstr "このプロトコルは必須であり、資産を追加するときに設定する必要があります"
-#: assets/serializers/platform.py:69
+#: assets/serializers/platform.py:70
msgid ""
"This protocol is default, when adding assets, it will be displayed by "
"default."
@@ -1958,32 +2076,32 @@ msgstr ""
"このプロトコルはデフォルトです。資産を追加するときに、デフォルトで表示されま"
"す"
-#: assets/serializers/platform.py:72
+#: assets/serializers/platform.py:73
msgid "This protocol is public, asset will show this protocol to user"
msgstr ""
"このプロトコルは公開されており、資産はこのプロトコルをユーザーに表示します"
-#: assets/serializers/platform.py:114
+#: assets/serializers/platform.py:115
msgid "Help text"
msgstr "ヘルプ"
-#: assets/serializers/platform.py:115
+#: assets/serializers/platform.py:116
msgid "Choices"
msgstr "せんたく"
-#: assets/serializers/platform.py:130
+#: assets/serializers/platform.py:135
msgid "Automation"
msgstr "オートメーション"
-#: assets/serializers/platform.py:155
+#: assets/serializers/platform.py:160
msgid "Default Domain"
msgstr "デフォルト ドメイン"
-#: assets/serializers/platform.py:176
+#: assets/serializers/platform.py:181
msgid "type is required"
msgstr "タイプ このフィールドは必須です."
-#: assets/serializers/platform.py:199
+#: assets/serializers/platform.py:204
msgid "Protocols is required"
msgstr "同意が必要です"
@@ -2077,7 +2195,7 @@ msgstr "Rmdir"
#: audits/const.py:14 audits/const.py:25
#: authentication/templates/authentication/_access_key_modal.html:65
-#: perms/const.py:17 rbac/tree.py:234
+#: perms/const.py:17 rbac/tree.py:235
msgid "Delete"
msgstr "削除"
@@ -2093,7 +2211,8 @@ msgstr "名前の変更"
msgid "Symlink"
msgstr "Symlink"
-#: audits/const.py:18 perms/const.py:14
+#: audits/const.py:18 audits/const.py:28 perms/const.py:14
+#: terminal/api/session/session.py:141
msgid "Download"
msgstr "ダウンロード"
@@ -2101,7 +2220,7 @@ msgstr "ダウンロード"
msgid "Rename dir"
msgstr "マップディレクトリ"
-#: audits/const.py:23 rbac/tree.py:232
+#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252
#: terminal/templates/terminal/_msg_command_warning.html:18
#: terminal/templates/terminal/_msg_session_sharing.html:10
msgid "View"
@@ -2109,48 +2228,48 @@ msgstr "表示"
#: audits/const.py:26
#: authentication/templates/authentication/_access_key_modal.html:22
-#: rbac/tree.py:231
+#: rbac/tree.py:232
msgid "Create"
msgstr "作成"
-#: audits/const.py:28 perms/const.py:12
+#: audits/const.py:29 perms/const.py:12
msgid "Connect"
msgstr "接続"
-#: audits/const.py:29 authentication/templates/authentication/login.html:240
-#: authentication/templates/authentication/login.html:313
-#: templates/_header_bar.html:89
+#: audits/const.py:30 authentication/templates/authentication/login.html:252
+#: authentication/templates/authentication/login.html:325
+#: templates/_header_bar.html:95
msgid "Login"
msgstr "ログイン"
-#: audits/const.py:30 ops/const.py:9
+#: audits/const.py:31 ops/const.py:9
msgid "Change password"
msgstr "パスワードを変更する"
-#: audits/const.py:35 settings/serializers/terminal.py:6
+#: audits/const.py:36 settings/serializers/terminal.py:6
#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164
#: terminal/serializers/session.py:49 terminal/serializers/session.py:63
msgid "Terminal"
msgstr "ターミナル"
-#: audits/const.py:40 audits/models.py:127
+#: audits/const.py:41 audits/models.py:128
msgid "Operate log"
msgstr "ログの操作"
-#: audits/const.py:41
+#: audits/const.py:42
msgid "Session log"
msgstr "セッションログ"
-#: audits/const.py:42
+#: audits/const.py:43
msgid "Login log"
msgstr "ログインログ"
-#: audits/const.py:43 terminal/models/applet/host.py:143
+#: audits/const.py:44 terminal/models/applet/host.py:143
#: terminal/models/component/task.py:22
msgid "Task"
msgstr "タスク"
-#: audits/const.py:49
+#: audits/const.py:50
msgid "-"
msgstr "-"
@@ -2162,120 +2281,141 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: audits/models.py:42
+#: audits/models.py:43
msgid "Job audit log"
msgstr "ジョブ監査ログ"
-#: audits/models.py:51 audits/models.py:95 audits/models.py:166
-#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109
+#: audits/models.py:52 audits/models.py:96 audits/models.py:167
+#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113
msgid "Remote addr"
msgstr "リモートaddr"
-#: audits/models.py:56 audits/serializers.py:34
+#: audits/models.py:57 audits/serializers.py:35
msgid "Operate"
msgstr "操作"
-#: audits/models.py:58
+#: audits/models.py:59
msgid "Filename"
msgstr "ファイル名"
-#: audits/models.py:61 common/serializers/common.py:98
+#: audits/models.py:62 common/serializers/common.py:98
msgid "File"
msgstr "書類"
-#: audits/models.py:62 terminal/backends/command/models.py:21
-#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19
-#: terminal/models/session/sharing.py:91
+#: audits/models.py:63 terminal/backends/command/models.py:21
+#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20
+#: terminal/models/session/sharing.py:95
#: terminal/templates/terminal/_msg_command_alert.html:10
#: terminal/templates/terminal/_msg_command_warning.html:17
#: tickets/models/ticket/command_confirm.py:15
msgid "Session"
msgstr "セッション"
-#: audits/models.py:65
+#: audits/models.py:66
msgid "File transfer log"
msgstr "ファイル転送ログ"
-#: audits/models.py:89 audits/serializers.py:85
+#: audits/models.py:90 audits/serializers.py:86
msgid "Resource Type"
msgstr "リソースタイプ"
-#: audits/models.py:90 audits/models.py:93 audits/models.py:139
-#: audits/serializers.py:84
+#: audits/models.py:91 audits/models.py:94 audits/models.py:140
+#: audits/serializers.py:85
msgid "Resource"
msgstr "リソース"
-#: audits/models.py:96 audits/models.py:142 audits/models.py:168
+#: audits/models.py:97 audits/models.py:143 audits/models.py:169
#: terminal/serializers/command.py:75
msgid "Datetime"
msgstr "時間"
-#: audits/models.py:135
+#: audits/models.py:136
msgid "Activity type"
msgstr "活動の種類"
-#: audits/models.py:145
+#: audits/models.py:146
msgid "Detail"
msgstr "詳細"
-#: audits/models.py:148
+#: audits/models.py:149
msgid "Detail ID"
msgstr "詳細 ID"
-#: audits/models.py:152
+#: audits/models.py:153
msgid "Activity log"
msgstr "活動記録"
-#: audits/models.py:164
+#: audits/models.py:165
msgid "Change by"
msgstr "による変更"
-#: audits/models.py:174
+#: audits/models.py:175
msgid "Password change log"
msgstr "パスワード変更ログ"
-#: audits/models.py:181
+#: audits/models.py:182 audits/models.py:257
msgid "Login type"
msgstr "ログインタイプ"
-#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10
+#: audits/models.py:184 audits/models.py:253
+#: tickets/models/ticket/login_confirm.py:10
msgid "Login IP"
msgstr "ログインIP"
-#: audits/models.py:185
+#: audits/models.py:186 audits/models.py:255
#: authentication/templates/authentication/_msg_different_city.html:11
#: tickets/models/ticket/login_confirm.py:11
msgid "Login city"
msgstr "ログイン都市"
-#: audits/models.py:188 audits/serializers.py:64
+#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65
msgid "User agent"
msgstr "ユーザーエージェント"
-#: audits/models.py:191 audits/serializers.py:48
+#: audits/models.py:192 audits/serializers.py:49
#: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms/profile.py:65 users/models/user.py:810
-#: users/serializers/profile.py:126
+#: users/forms/profile.py:65 users/models/user.py:821
+#: users/serializers/profile.py:102
msgid "MFA"
msgstr "MFA"
-#: audits/models.py:201
+#: audits/models.py:202
msgid "Date login"
msgstr "日付ログイン"
-#: audits/models.py:203 audits/serializers.py:66
+#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67
+#: audits/serializers.py:183
msgid "Authentication backend"
msgstr "認証バックエンド"
-#: audits/models.py:247
+#: audits/models.py:248
msgid "User login log"
msgstr "ユーザーログインログ"
-#: audits/serializers.py:65
+#: audits/models.py:254
+msgid "Session key"
+msgstr "セッションID"
+
+#: audits/models.py:260 authentication/models/connection_token.py:47
+#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74
+#: tickets/models/ticket/apply_application.py:31
+#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839
+msgid "Date expired"
+msgstr "期限切れの日付"
+
+#: audits/models.py:278
+msgid "User session"
+msgstr "ユーザーセッション"
+
+#: audits/models.py:280
+msgid "Offline ussr session"
+msgstr "ユーザー・セッションの下限"
+
+#: audits/serializers.py:66
msgid "Reason display"
msgstr "理由表示"
-#: audits/serializers.py:133
+#: audits/serializers.py:134
#, python-format
msgid "User %s %s this resource"
msgstr "ユーザー %s %s が現在のリソースをサブスクライブしました。"
@@ -2295,46 +2435,51 @@ msgstr "ユーザー %s はシステム %s にログインしています"
msgid "User %s perform a task for this resource: %s"
msgstr "ユーザー %s が現在のリソースでタスク (%s) を実行しました"
-#: audits/signal_handlers/login_log.py:27
+#: audits/signal_handlers/login_log.py:34
msgid "SSH Key"
msgstr "SSHキー"
-#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13
+#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13
msgid "SSO"
msgstr "SSO"
-#: audits/signal_handlers/login_log.py:30
+#: audits/signal_handlers/login_log.py:37
msgid "Auth Token"
msgstr "認証トークン"
-#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73
-#: authentication/views/login.py:75 authentication/views/wecom.py:159
+#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73
+#: authentication/views/login.py:77 authentication/views/wecom.py:159
#: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10
-#: users/models/user.py:740 users/models/user.py:848
+#: users/models/user.py:751 users/models/user.py:856
msgid "WeCom"
msgstr "企業微信"
-#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122
-#: authentication/views/login.py:87 notifications/backends/__init__.py:14
+#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122
+#: authentication/views/login.py:89 notifications/backends/__init__.py:14
#: settings/serializers/auth/feishu.py:10
-#: settings/serializers/auth/feishu.py:13 users/models/user.py:742
-#: users/models/user.py:850
+#: settings/serializers/auth/feishu.py:13 users/models/user.py:753
+#: users/models/user.py:858
msgid "FeiShu"
msgstr "本を飛ばす"
-#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159
-#: authentication/views/login.py:81 notifications/backends/__init__.py:12
-#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741
-#: users/models/user.py:849
+#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159
+#: authentication/views/login.py:83 notifications/backends/__init__.py:12
+#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752
+#: users/models/user.py:857
msgid "DingTalk"
msgstr "DingTalk"
-#: audits/signal_handlers/login_log.py:34
+#: audits/signal_handlers/login_log.py:41
#: authentication/models/temp_token.py:16
msgid "Temporary token"
msgstr "仮パスワード"
-#: audits/tasks.py:101
+#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95
+#: settings/serializers/auth/passkey.py:8
+msgid "Passkey"
+msgstr ""
+
+#: audits/tasks.py:101 users/signal_handlers.py:166
msgid "Clean audits session task log"
msgstr "監査セッション タスク ログのクリーンアップ"
@@ -2346,37 +2491,37 @@ msgstr "外部ストレージへのFTPファイルのアップロード"
msgid "This action require verify your MFA"
msgstr "この操作には、MFAを検証する必要があります"
-#: authentication/api/connection_token.py:258
+#: authentication/api/connection_token.py:260
msgid "Reusable connection token is not allowed, global setting not enabled"
msgstr ""
"再使用可能な接続トークンの使用は許可されていません。グローバル設定は有効に"
"なっていません"
-#: authentication/api/connection_token.py:338
+#: authentication/api/connection_token.py:351
msgid "Anonymous account is not supported for this asset"
msgstr "匿名アカウントはこのプロパティではサポートされていません"
-#: authentication/api/connection_token.py:357
+#: authentication/api/connection_token.py:370
msgid "Account not found"
msgstr "アカウントが見つかりません"
-#: authentication/api/connection_token.py:360
+#: authentication/api/connection_token.py:373
msgid "Permission expired"
msgstr "承認の有効期限が切れています"
-#: authentication/api/connection_token.py:374
+#: authentication/api/connection_token.py:387
msgid "ACL action is reject: {}({})"
msgstr "ACL アクションは拒否です: {}({})"
-#: authentication/api/connection_token.py:378
+#: authentication/api/connection_token.py:391
msgid "ACL action is review"
msgstr "ACL アクションはレビューです"
-#: authentication/api/mfa.py:57
+#: authentication/api/mfa.py:59
msgid "Current user not support mfa type: {}"
msgstr "現在のユーザーはmfaタイプをサポートしていません: {}"
-#: authentication/api/password.py:32 terminal/api/session/session.py:259
+#: authentication/api/password.py:32 terminal/api/session/session.py:300
#: users/views/profile/reset.py:44
msgid "User does not exist: {}"
msgstr "ユーザーが存在しない: {}"
@@ -2394,7 +2539,7 @@ msgstr ""
"さい。"
#: authentication/api/password.py:64
-#: authentication/templates/authentication/login.html:305
+#: authentication/templates/authentication/login.html:317
#: users/templates/users/forgot_password.html:27
#: users/templates/users/forgot_password.html:28
#: users/templates/users/forgot_password_previewing.html:13
@@ -2464,6 +2609,26 @@ msgstr ""
msgid "Invalid token or cache refreshed."
msgstr "無効なトークンまたはキャッシュの更新。"
+#: authentication/backends/passkey/api.py:52
+msgid "Auth failed"
+msgstr "認証に失敗しました"
+
+#: authentication/backends/passkey/fido.py:148
+msgid "This key is not registered"
+msgstr "このキーは登録されていません"
+
+#: authentication/backends/passkey/models.py:13
+msgid "Added on"
+msgstr "に追加"
+
+#: authentication/backends/passkey/models.py:14
+msgid "Date last used"
+msgstr "最後に使用した日付"
+
+#: authentication/backends/passkey/models.py:15
+msgid "Credential ID"
+msgstr "資格情報ID"
+
#: authentication/confirm/password.py:16
msgid "Authentication failed password incorrect"
msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません)"
@@ -2783,13 +2948,6 @@ msgstr "アセット名"
msgid "Reusable"
msgstr "再利用可能"
-#: authentication/models/connection_token.py:47
-#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74
-#: tickets/models/ticket/apply_application.py:31
-#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831
-msgid "Date expired"
-msgstr "期限切れの日付"
-
#: authentication/models/connection_token.py:51
#: perms/models/asset_permission.py:77
msgid "From ticket"
@@ -2889,7 +3047,7 @@ msgstr "アクション"
#: authentication/serializers/connection_token.py:42
#: perms/serializers/permission.py:38 perms/serializers/permission.py:57
-#: users/serializers/user.py:96 users/serializers/user.py:173
+#: users/serializers/user.py:97 users/serializers/user.py:174
msgid "Is expired"
msgstr "期限切れです"
@@ -2897,7 +3055,7 @@ msgstr "期限切れです"
#: authentication/serializers/password_mfa.py:24
#: notifications/backends/__init__.py:10 settings/serializers/msg.py:22
#: settings/serializers/msg.py:57 users/forms/profile.py:102
-#: users/forms/profile.py:109 users/models/user.py:789
+#: users/forms/profile.py:109 users/models/user.py:800
#: users/templates/users/forgot_password.html:117
#: users/views/profile/reset.py:73
msgid "Email"
@@ -2909,8 +3067,8 @@ msgid "The {} cannot be empty"
msgstr "{} 空にしてはならない"
#: authentication/serializers/token.py:79 perms/serializers/permission.py:37
-#: perms/serializers/permission.py:58 users/serializers/user.py:97
-#: users/serializers/user.py:170
+#: perms/serializers/permission.py:58 users/serializers/user.py:98
+#: users/serializers/user.py:171
msgid "Is valid"
msgstr "有効です"
@@ -2935,13 +3093,13 @@ msgid "Show"
msgstr "表示"
#: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:635 users/serializers/profile.py:116
+#: users/models/user.py:646 users/serializers/profile.py:92
#: users/templates/users/user_verify_mfa.html:36
msgid "Disable"
msgstr "無効化"
#: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:636 users/serializers/profile.py:117
+#: users/models/user.py:647 users/serializers/profile.py:93
#: users/templates/users/mfa_setting.html:26
#: users/templates/users/mfa_setting.html:68
msgid "Enable"
@@ -2986,7 +3144,7 @@ msgstr "コードエラー"
#: authentication/templates/authentication/_msg_reset_password_code.html:9
#: authentication/templates/authentication/_msg_rest_password_success.html:2
#: authentication/templates/authentication/_msg_rest_public_key_success.html:2
-#: jumpserver/conf.py:444
+#: jumpserver/conf.py:447
#: perms/templates/perms/_msg_item_permissions_expire.html:3
#: perms/templates/perms/_msg_permed_items_expire.html:3
#: tickets/templates/tickets/approve_check_password.html:33
@@ -3044,7 +3202,7 @@ msgid "request new one"
msgstr "新しいものを要求する"
#: authentication/templates/authentication/_msg_reset_password_code.html:12
-#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93
+#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97
#: terminal/templates/terminal/_msg_session_sharing.html:12
#: users/forms/profile.py:107 users/templates/users/forgot_password.html:66
msgid "Verify code"
@@ -3098,7 +3256,19 @@ msgstr ""
msgid "Cancel"
msgstr "キャンセル"
-#: authentication/templates/authentication/login.html:320
+#: authentication/templates/authentication/login.html:237
+msgid ""
+"Configuration file has problems and cannot be logged in. Please contact the "
+"administrator or view latest docs"
+msgstr ""
+"設定ファイルに問題があり、ログインできません。管理者に連絡するか、最新のド"
+"キュメントを参照してください。"
+
+#: authentication/templates/authentication/login.html:238
+msgid "If you are administrator, you can update the config resolve it, set"
+msgstr "管理者の場合は、configを更新して解決することができます。"
+
+#: authentication/templates/authentication/login.html:332
msgid "More login options"
msgstr "その他のログインオプション"
@@ -3134,6 +3304,18 @@ msgstr "返品"
msgid "Copy success"
msgstr "コピー成功"
+#: authentication/templates/authentication/passkey.html:162
+msgid ""
+"This page is not served over HTTPS. Please use HTTPS to ensure security of "
+"your credentials."
+msgstr ""
+"このページはHTTPSで提供されていません。HTTPSを使用して、資格情報のセキュリ"
+"ティを確保してください。"
+
+#: authentication/templates/authentication/passkey.html:173
+msgid "Do you want to retry ?"
+msgstr "再試行しますか？"
+
#: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24
#: xpack/plugins/cloud/const.py:29
msgid "LAN"
@@ -3210,23 +3392,23 @@ msgstr "本を飛ばすのバインドに成功"
msgid "Failed to get user from FeiShu"
msgstr "本を飛ばすからユーザーを取得できませんでした"
-#: authentication/views/login.py:183
+#: authentication/views/login.py:210
msgid "Redirecting"
msgstr "リダイレクト"
-#: authentication/views/login.py:184
+#: authentication/views/login.py:211
msgid "Redirecting to {} authentication"
msgstr "{} 認証へのリダイレクト"
-#: authentication/views/login.py:207
+#: authentication/views/login.py:234
msgid "Login timeout, please try again."
msgstr "ログインタイムアウト、もう一度お試しください"
-#: authentication/views/login.py:250
+#: authentication/views/login.py:277
msgid "User email already exists ({})"
msgstr "ユーザー メールボックスは既に存在します ({})"
-#: authentication/views/login.py:328
+#: authentication/views/login.py:361
msgid ""
"Wait for {} confirm, You also can copy link to her/him
\n"
" Don't close this page"
@@ -3234,15 +3416,15 @@ msgstr ""
"{} 確認を待ちます。彼女/彼へのリンクをコピーすることもできます
\n"
" このページを閉じないでください"
-#: authentication/views/login.py:333
+#: authentication/views/login.py:366
msgid "No ticket found"
msgstr "チケットが見つかりません"
-#: authentication/views/login.py:369
+#: authentication/views/login.py:402
msgid "Logout success"
msgstr "ログアウト成功"
-#: authentication/views/login.py:370
+#: authentication/views/login.py:403
msgid "Logout success, return login page"
msgstr "ログアウト成功、ログインページを返す"
@@ -3295,7 +3477,7 @@ msgstr "の準備を"
msgid "Pending"
msgstr "未定"
-#: common/const/choices.py:17 ops/const.py:58
+#: common/const/choices.py:17 ops/const.py:59
msgid "Running"
msgstr "ランニング"
@@ -3379,7 +3561,7 @@ msgstr "は破棄されます"
msgid "discard time"
msgstr "時間を捨てる"
-#: common/db/models.py:33 users/models/user.py:834
+#: common/db/models.py:33 users/models/user.py:842
msgid "Updated by"
msgstr "によって更新"
@@ -3510,7 +3692,7 @@ msgstr "{} 秒待ってから送信してください"
#: common/serializers/common.py:90
msgid "Children"
-msgstr ""
+msgstr "ノード"
#: common/serializers/fields.py:105
#, python-brace-format
@@ -3563,29 +3745,11 @@ msgstr "特殊文字を含むべきではない"
msgid "The mobile phone number format is incorrect"
msgstr "携帯電話番号の形式が正しくありません"
-#: common/views/mixins.py:74
-msgid "Export all"
-msgstr "すべてエクスポート"
-
-#: common/views/mixins.py:76
-msgid "Export only selected items"
-msgstr "選択項目のみエクスポート"
-
-#: common/views/mixins.py:81
-#, python-format
-msgid "Export filtered: %s"
-msgstr "検索のエクスポート: %s"
-
-#: common/views/mixins.py:90
-#, python-format
-msgid "User %s view/export secret"
-msgstr "ユーザー %s がパスワードを閲覧/導き出しました"
-
-#: jumpserver/conf.py:443
+#: jumpserver/conf.py:446
msgid "Create account successfully"
msgstr "アカウントを正常に作成"
-#: jumpserver/conf.py:445
+#: jumpserver/conf.py:448
msgid "Your account has been created successfully"
msgstr "アカウントが正常に作成されました"
@@ -3657,23 +3821,23 @@ msgstr "投稿サイトニュース"
msgid "No account available"
msgstr "利用可能なアカウントがありません"
-#: ops/ansible/inventory.py:260
+#: ops/ansible/inventory.py:263
msgid "Ansible disabled"
msgstr "Ansible 無効"
-#: ops/ansible/inventory.py:276
+#: ops/ansible/inventory.py:279
msgid "Skip hosts below:"
msgstr "次のホストをスキップします: "
-#: ops/api/celery.py:62 ops/api/celery.py:77
+#: ops/api/celery.py:64 ops/api/celery.py:79
msgid "Waiting task start"
msgstr "タスク開始待ち"
-#: ops/api/celery.py:138
+#: ops/api/celery.py:162
msgid "Task {} not found"
msgstr "タスクは存在しません"
-#: ops/api/celery.py:143
+#: ops/api/celery.py:167
msgid "Task {} args or kwargs error"
msgstr "タスク実行パラメータエラー"
@@ -3757,7 +3921,11 @@ msgstr "PostgreSQL"
msgid "SQLServer"
msgstr "SQLServer"
-#: ops/const.py:60
+#: ops/const.py:55
+msgid "Raw"
+msgstr ""
+
+#: ops/const.py:61
msgid "Timeout"
msgstr "タイムアウト"
@@ -3805,7 +3973,7 @@ msgstr "アルグ"
#: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53
#: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30
-#: terminal/models/session/sharing.py:24
+#: terminal/models/session/sharing.py:25
msgid "Creator"
msgstr "作成者"
@@ -3846,7 +4014,7 @@ msgstr "タスクモニターを表示できます"
msgid "Kwargs"
msgstr "クワーグ"
-#: ops/models/celery.py:61 terminal/models/session/sharing.py:124
+#: ops/models/celery.py:61 terminal/models/session/sharing.py:128
#: tickets/const.py:25
msgid "Finished"
msgstr "終了"
@@ -4034,7 +4202,7 @@ msgstr ""
msgid "The organization have resource ({}) cannot be deleted"
msgstr "組織のリソース ({}) は削除できません"
-#: orgs/apps.py:7 rbac/tree.py:122
+#: orgs/apps.py:7 rbac/tree.py:123
msgid "App organizations"
msgstr "アプリ組織"
@@ -4063,7 +4231,7 @@ msgstr "デフォルト組織"
msgid "SYSTEM"
msgstr "システム組織"
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40
+#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41
msgid "Builtin"
msgstr "ビルトイン"
@@ -4077,7 +4245,7 @@ msgstr "参加しているすべての組織を表示できます"
#: orgs/models.py:233
msgid "Can not delete virtual org"
-msgstr ""
+msgstr "仮想組織を削除できませんでした"
#: orgs/tasks.py:9
msgid "Refresh organization cache"
@@ -4199,27 +4367,27 @@ msgstr "{} 少なくとも1つのシステムロール"
msgid "RBAC"
msgstr "RBAC"
-#: rbac/builtin.py:114
+#: rbac/builtin.py:115
msgid "SystemAdmin"
msgstr "システム管理者"
-#: rbac/builtin.py:117
+#: rbac/builtin.py:118
msgid "SystemAuditor"
msgstr "システム監査人"
-#: rbac/builtin.py:120
+#: rbac/builtin.py:121
msgid "SystemComponent"
msgstr "システムコンポーネント"
-#: rbac/builtin.py:126
+#: rbac/builtin.py:127
msgid "OrgAdmin"
msgstr "組織管理者"
-#: rbac/builtin.py:129
+#: rbac/builtin.py:130
msgid "OrgAuditor"
msgstr "監査員を組織する"
-#: rbac/builtin.py:132
+#: rbac/builtin.py:133
msgid "OrgUser"
msgstr "組織ユーザー"
@@ -4257,7 +4425,7 @@ msgid "Scope"
msgstr "スコープ"
#: rbac/models/role.py:46 rbac/models/rolebinding.py:52
-#: users/models/user.py:797
+#: users/models/user.py:808
msgid "Role"
msgstr "ロール"
@@ -4292,7 +4460,7 @@ msgstr "組織の役割バインディング"
msgid "System role binding"
msgstr "システムロールバインディング"
-#: rbac/serializers/permission.py:25 users/serializers/profile.py:132
+#: rbac/serializers/permission.py:25 users/serializers/profile.py:108
msgid "Perms"
msgstr "パーマ"
@@ -4300,7 +4468,7 @@ msgstr "パーマ"
msgid "Users amount"
msgstr "ユーザー数"
-#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33
+#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34
msgid "Display name"
msgstr "表示名"
@@ -4360,26 +4528,26 @@ msgstr "タスクセンター"
msgid "My assets"
msgstr "私の資産"
-#: rbac/tree.py:56 terminal/models/applet/applet.py:51
-#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29
+#: rbac/tree.py:56 terminal/models/applet/applet.py:52
+#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29
#: terminal/serializers/applet.py:15
msgid "Applet"
msgstr "リモートアプリケーション"
-#: rbac/tree.py:123
+#: rbac/tree.py:124
msgid "Ticket comment"
msgstr "チケットコメント"
-#: rbac/tree.py:124 settings/serializers/feature.py:58
+#: rbac/tree.py:125 settings/serializers/feature.py:58
#: tickets/models/ticket/general.py:307
msgid "Ticket"
msgstr "チケット"
-#: rbac/tree.py:125
+#: rbac/tree.py:126
msgid "Common setting"
msgstr "共通設定"
-#: rbac/tree.py:126
+#: rbac/tree.py:127
msgid "View permission tree"
msgstr "権限ツリーの表示"
@@ -4424,7 +4592,7 @@ msgstr "携帯番号をテストこのフィールドは必須です"
msgid "Settings"
msgstr "設定"
-#: settings/models.py:35
+#: settings/models.py:35 users/models/preference.py:14
msgid "Encrypted"
msgstr "暗号化された"
@@ -4512,11 +4680,15 @@ msgstr "企業微信 認証"
msgid "SSO Auth"
msgstr "SSO Token 認証"
-#: settings/serializers/auth/base.py:24
+#: settings/serializers/auth/base.py:22
+msgid "Passkey Auth"
+msgstr "Passkey 認証"
+
+#: settings/serializers/auth/base.py:25
msgid "Forgot password url"
msgstr "パスワードのURLを忘れた"
-#: settings/serializers/auth/base.py:30
+#: settings/serializers/auth/base.py:28
msgid "Enable login redirect msg"
msgstr "ログインリダイレクトの有効化msg"
@@ -4753,6 +4925,31 @@ msgstr "使用状態"
msgid "Use nonce"
msgstr "Nonceを使用"
+#: settings/serializers/auth/passkey.py:11
+msgid "Enable passkey Auth"
+msgstr "パスキー認証を有効にする"
+
+#: settings/serializers/auth/passkey.py:12
+msgid "Only SSL domain can use passkey auth"
+msgstr "SSLドメインのみがパスキー認証を使用できます"
+
+#: settings/serializers/auth/passkey.py:15
+msgid "FIDO server ID"
+msgstr "FIDOサーバーID"
+
+#: settings/serializers/auth/passkey.py:17
+msgid ""
+"The hostname can using passkey auth, If not set, will use request host and "
+"the request host in DOMAINS, If multiple domains, use comma to separate"
+msgstr ""
+"パスキー認証を使用できるホスト名、設定されていない場合は、リクエストホストと"
+"DOMAINSのリクエストホストを使用します。複数のドメインの場合は、カンマで区切り"
+"ます"
+
+#: settings/serializers/auth/passkey.py:22
+msgid "FIDO server name"
+msgstr "FIDOサーバー名"
+
#: settings/serializers/auth/radius.py:13
msgid "Radius"
msgstr "Radius"
@@ -4899,41 +5096,43 @@ msgstr "企業微信認証の有効化"
msgid "Site url"
msgstr "サイトURL"
-#: settings/serializers/basic.py:10
+#: settings/serializers/basic.py:11
msgid ""
-"Email links or other system callbacks are used to access it, eg: http://dev."
-"jumpserver.org:8080"
+"External URL, email links or other system callbacks are used to access it, "
+"eg: http://dev.jumpserver.org:8080"
msgstr ""
+"外部URL、メールリンクまたは他のシステムコールバックにアクセスするには、"
+"http://dev.jumpserver.org:8080などを使用します"
-#: settings/serializers/basic.py:13
+#: settings/serializers/basic.py:16
msgid "User guide url"
msgstr "ユーザーガイドurl"
-#: settings/serializers/basic.py:14
+#: settings/serializers/basic.py:17
msgid "User first login update profile done redirect to it"
msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました"
-#: settings/serializers/basic.py:17
+#: settings/serializers/basic.py:20
msgid "Global organization name"
msgstr "グローバル組織名"
-#: settings/serializers/basic.py:18
+#: settings/serializers/basic.py:21
msgid "The name of global organization to display"
msgstr "表示するグローバル組織の名前"
-#: settings/serializers/basic.py:21
+#: settings/serializers/basic.py:24
msgid "Help Docs URL"
msgstr "ドキュメントリンク"
-#: settings/serializers/basic.py:22
+#: settings/serializers/basic.py:25
msgid "default: http://docs.jumpserver.org"
msgstr "デフォルト: http://docs.jumpserver.org"
-#: settings/serializers/basic.py:25
+#: settings/serializers/basic.py:28
msgid "Help Support URL"
msgstr "サポートリンク"
-#: settings/serializers/basic.py:26
+#: settings/serializers/basic.py:29
msgid "default: http://www.jumpserver.org/support/"
msgstr "デフォルト: http://www.jumpserver.org/support/"
@@ -5157,11 +5356,11 @@ msgstr ""
"ノードが表示されないようにしますが、そのノードが許可されていないという質問に"
"質問"
-#: settings/serializers/security.py:16
+#: settings/serializers/security.py:17
msgid "User password expiration (day)"
msgstr "ユーザーパスワードの有効期限（天）"
-#: settings/serializers/security.py:18
+#: settings/serializers/security.py:19
msgid ""
"If the user does not update the password during the time, the user password "
"will expire failure;The password expiration reminder mail will be automatic "
@@ -5172,11 +5371,11 @@ msgstr ""
"ドの有効期限が切れるリマインダーメールがシステムからユーザーに自動的に送信さ"
"れます。"
-#: settings/serializers/security.py:25
+#: settings/serializers/security.py:26
msgid "Number of repeated historical passwords"
msgstr "繰り返された履歴パスワードの数"
-#: settings/serializers/security.py:27
+#: settings/serializers/security.py:28
msgid ""
"Tip: When the user resets the password, it cannot be the previous n "
"historical passwords of the user"
@@ -5184,31 +5383,31 @@ msgstr ""
"ヒント: ユーザーがパスワードをリセットすると、ユーザーの前のnの履歴パスワード"
"にすることはできません"
-#: settings/serializers/security.py:33
+#: settings/serializers/security.py:34
msgid "Password minimum length"
msgstr "パスワードの最小長"
-#: settings/serializers/security.py:37
+#: settings/serializers/security.py:38
msgid "Admin user password minimum length"
msgstr "管理者ユーザーパスワードの最小長"
-#: settings/serializers/security.py:40
+#: settings/serializers/security.py:41
msgid "Must contain capital"
msgstr "資本を含める必要があります"
-#: settings/serializers/security.py:43
+#: settings/serializers/security.py:44
msgid "Must contain lowercase"
msgstr "小文字を含める必要があります。"
-#: settings/serializers/security.py:46
+#: settings/serializers/security.py:47
msgid "Must contain numeric"
msgstr "数値を含める必要があります"
-#: settings/serializers/security.py:49
+#: settings/serializers/security.py:50
msgid "Must contain special"
msgstr "特別な"
-#: settings/serializers/security.py:54
+#: settings/serializers/security.py:55
msgid ""
"If the user has failed to log in for a limited number of times, no login is "
"allowed during this time interval."
@@ -5216,35 +5415,35 @@ msgstr ""
"ユーザーが限られた回数だけログインできなかった場合、この時間間隔ではログイン"
"はできません。"
-#: settings/serializers/security.py:62
+#: settings/serializers/security.py:63
msgid "Limit the number of user login failures"
msgstr "ユーザーログインの失敗数を制限する"
-#: settings/serializers/security.py:66
+#: settings/serializers/security.py:67
msgid "Block user login interval (minute)"
msgstr "ユーザーのログイン間隔をブロックする（分）"
-#: settings/serializers/security.py:72
+#: settings/serializers/security.py:73
msgid "Limit the number of IP login failures"
msgstr "IPログイン失敗の数を制限する"
-#: settings/serializers/security.py:76
+#: settings/serializers/security.py:77
msgid "Block IP login interval (minute)"
msgstr "IPログイン間隔をブロックする（分）"
-#: settings/serializers/security.py:80
+#: settings/serializers/security.py:81
msgid "Login IP White List"
msgstr "ログインIPホワイトリスト"
-#: settings/serializers/security.py:85
+#: settings/serializers/security.py:86
msgid "Login IP Black List"
msgstr "ログインIPブラックリスト"
-#: settings/serializers/security.py:90
+#: settings/serializers/security.py:91
msgid "Only single device login"
msgstr "単一デバイスログインのみ"
-#: settings/serializers/security.py:91
+#: settings/serializers/security.py:92
msgid ""
"After the user logs in on the new device, other logged-in devices will "
"automatically log out"
@@ -5252,11 +5451,11 @@ msgstr ""
"ユーザーが新しいデバイスにログインすると、ログインしている他のデバイスは自動"
"的にログアウトします。"
-#: settings/serializers/security.py:94
+#: settings/serializers/security.py:95
msgid "Only exist user login"
msgstr "ユーザーログインのみ存在"
-#: settings/serializers/security.py:96
+#: settings/serializers/security.py:97
msgid ""
"If enabled, non-existent users will not be allowed to log in; if disabled, "
"users of other authentication methods except local authentication methods "
@@ -5267,11 +5466,11 @@ msgstr ""
"ローカル認証方法を除く他の認証方法のユーザーはログインでき、ユーザーが自動的"
"に作成されます (ユーザーが存在しない場合)。"
-#: settings/serializers/security.py:102
+#: settings/serializers/security.py:103
msgid "Only from source login"
msgstr "ソースログインからのみ"
-#: settings/serializers/security.py:104
+#: settings/serializers/security.py:105
msgid ""
"If it is enabled, the user will only authenticate to the source when logging "
"in; if it is disabled, the user will authenticate all the enabled "
@@ -5282,70 +5481,70 @@ msgstr ""
"な場合、ユーザーはログイン時に、いずれかの認証方法が成功する限り、有効なすべ"
"ての認証方法を特定の順序で認証します。 、直接ログインできます"
-#: settings/serializers/security.py:115
+#: settings/serializers/security.py:116
msgid "Not enabled"
msgstr "有効化されていません"
-#: settings/serializers/security.py:116
+#: settings/serializers/security.py:117
msgid "All users"
msgstr "すべてのユーザー"
-#: settings/serializers/security.py:117
+#: settings/serializers/security.py:118
msgid "Only admin users"
msgstr "管理者のみ"
-#: settings/serializers/security.py:119
+#: settings/serializers/security.py:120
msgid "Global MFA auth"
msgstr "グローバル有効化MFA認証"
-#: settings/serializers/security.py:123
+#: settings/serializers/security.py:124
msgid "Third-party login users perform MFA authentication"
msgstr "サードパーティのログインユーザーがMFA認証を実行"
-#: settings/serializers/security.py:124
+#: settings/serializers/security.py:125
msgid "The third-party login modes include OIDC, CAS, and SAML2"
msgstr "サードパーティのログインモードには、OIDC、CAS、SAML2"
-#: settings/serializers/security.py:127
+#: settings/serializers/security.py:128
msgid "OTP issuer name"
msgstr "OTP発行者名"
-#: settings/serializers/security.py:131
+#: settings/serializers/security.py:132
msgid "OTP valid window"
msgstr "OTP有効なウィンドウ"
-#: settings/serializers/security.py:135
+#: settings/serializers/security.py:136
msgid "MFA verify TTL"
msgstr "MFAはTTLを確認します（秒）"
-#: settings/serializers/security.py:137
+#: settings/serializers/security.py:138
msgid ""
"Unit: second, The verification MFA takes effect only when you view the "
"account password"
msgstr "検証MFAはアカウントのパスワードを表示したときにのみ有効になります。"
-#: settings/serializers/security.py:142
+#: settings/serializers/security.py:143
msgid "MFA in login page"
msgstr "ログインページのMFA"
-#: settings/serializers/security.py:143
+#: settings/serializers/security.py:144
msgid "Eu security regulations(GDPR) require MFA to be on the login page"
msgstr ""
"Euセキュリティ規制 (GDPR) では、MFAがログインページにある必要があります"
-#: settings/serializers/security.py:147
+#: settings/serializers/security.py:148
msgid "Verify code TTL (second)"
msgstr "認証コード有効時間"
-#: settings/serializers/security.py:148
+#: settings/serializers/security.py:149
msgid "Reset password and send SMS code expiration time"
msgstr "パスワードをリセットしてSMSコードの有効期限を送信します"
-#: settings/serializers/security.py:152
+#: settings/serializers/security.py:153
msgid "Enable Login dynamic code"
msgstr "ログイン動的コードの有効化"
-#: settings/serializers/security.py:153
+#: settings/serializers/security.py:154
msgid ""
"The password and additional code are sent to a third party authentication "
"system for verification"
@@ -5353,19 +5552,19 @@ msgstr ""
"パスワードと追加コードは、検証のためにサードパーティの認証システムに送信され"
"ます"
-#: settings/serializers/security.py:157
+#: settings/serializers/security.py:158
msgid "Enable Login captcha"
msgstr "ログインcaptchaの有効化"
-#: settings/serializers/security.py:158
+#: settings/serializers/security.py:159
msgid "Enable captcha to prevent robot authentication"
msgstr "Captchaを有効にしてロボット認証を防止する"
-#: settings/serializers/security.py:161
+#: settings/serializers/security.py:162
msgid "Remote Login Protection"
msgstr "リモートログイン保護"
-#: settings/serializers/security.py:163
+#: settings/serializers/security.py:164
msgid ""
"The system determines whether the login IP address belongs to a common login "
"city. If the account is logged in from a common login city, the system sends "
@@ -5375,11 +5574,11 @@ msgstr ""
"します。アカウントが共通のログイン都市からログインしている場合、システムはリ"
"モートログインリマインダーを送信します"
-#: settings/serializers/security.py:169
+#: settings/serializers/security.py:170
msgid "Unused user timeout (day)"
msgstr "未使用のユーザータイムアウト（日）"
-#: settings/serializers/security.py:170
+#: settings/serializers/security.py:171
msgid ""
"Detect infrequent users daily and disable them if they exceed the "
"predetermined time limit."
@@ -5387,57 +5586,57 @@ msgstr ""
"毎日、頻度の低いユーザーを検出し、予め決められた時間制限を超えた場合は無効に"
"します。"
-#: settings/serializers/security.py:190
+#: settings/serializers/security.py:191
msgid "Enable watermark"
msgstr "透かしの有効化"
-#: settings/serializers/security.py:191
+#: settings/serializers/security.py:192
msgid "Enabled, the web session and replay contains watermark information"
msgstr "Webセッションとリプレイには透かし情報が含まれています。"
-#: settings/serializers/security.py:195
+#: settings/serializers/security.py:196
msgid "Connection max idle time (minute)"
msgstr "接続最大アイドル時間（分）"
-#: settings/serializers/security.py:196
+#: settings/serializers/security.py:197
msgid "If idle time more than it, disconnect connection."
msgstr "この設定以上の操作がない場合、接続は切断されます"
-#: settings/serializers/security.py:200
+#: settings/serializers/security.py:201
msgid "Session max connection time (hour)"
msgstr "セッション最大接続時間（時間）"
-#: settings/serializers/security.py:201
+#: settings/serializers/security.py:202
msgid "If session connection time more than it, disconnect connection."
msgstr "セッション接続時間がこれを超えると、接続が切断されます"
-#: settings/serializers/security.py:204
+#: settings/serializers/security.py:205
msgid "Remember manual auth"
msgstr "手動入力パスワードの保存"
-#: settings/serializers/security.py:207
+#: settings/serializers/security.py:208
#: terminal/templates/terminal/_msg_session_sharing.html:10
msgid "Session share"
msgstr "セッション共有"
-#: settings/serializers/security.py:208
+#: settings/serializers/security.py:209
msgid "Enabled, Allows user active session to be shared with other users"
msgstr ""
"ユーザーのアクティブなセッションを他のユーザーと共有できるようにします。"
-#: settings/serializers/security.py:214
+#: settings/serializers/security.py:215
msgid "Insecure command alert"
msgstr "安全でないコマンドアラート"
-#: settings/serializers/security.py:217
+#: settings/serializers/security.py:218
msgid "Email recipient"
msgstr "メール受信者"
-#: settings/serializers/security.py:218
+#: settings/serializers/security.py:219
msgid "Multiple user using , split"
msgstr "複数のユーザーを使用して、分割"
-#: settings/serializers/settings.py:69
+#: settings/serializers/settings.py:70
#, python-format
msgid "[%s] %s"
msgstr "[%s] %s"
@@ -5498,17 +5697,6 @@ msgstr "Razor の有効化"
msgid "Enable SSH Client"
msgstr "SSH Clientの有効化"
-#: settings/serializers/terminal.py:52
-msgid "Default graphics resolution"
-msgstr "デフォルトのグラフィック解像度"
-
-#: settings/serializers/terminal.py:53
-msgid ""
-"Tip: Default resolution to use when connecting graphical assets in Luna pages"
-msgstr ""
-"ヒント: Luna ページでグラフィック アセットを接続するときに使用するデフォルト"
-"の解像度"
-
#: settings/tasks/ldap.py:24
msgid "Periodic import ldap user"
msgstr "LDAP ユーザーを定期的にインポートする"
@@ -5658,27 +5846,27 @@ msgstr "ヘルプ"
msgid "Docs"
msgstr "ドキュメント"
-#: templates/_header_bar.html:25
+#: templates/_header_bar.html:27
msgid "Commercial support"
msgstr "商用サポート"
-#: templates/_header_bar.html:76 users/forms/profile.py:44
+#: templates/_header_bar.html:79 users/forms/profile.py:44
msgid "Profile"
msgstr "プロフィール"
-#: templates/_header_bar.html:79
+#: templates/_header_bar.html:83
msgid "Admin page"
msgstr "ページの管理"
-#: templates/_header_bar.html:81
+#: templates/_header_bar.html:86
msgid "User page"
msgstr "ユーザーページ"
-#: templates/_header_bar.html:84
+#: templates/_header_bar.html:90
msgid "API Key"
msgstr "API Key"
-#: templates/_header_bar.html:85
+#: templates/_header_bar.html:91
msgid "Logout"
msgstr "ログアウト"
@@ -5775,6 +5963,7 @@ msgid "Home page"
msgstr "ホームページ"
#: templates/resource_download.html:18 templates/resource_download.html:33
+#: users/const.py:48
msgid "Client"
msgstr "クライアント"
@@ -5864,15 +6053,20 @@ msgstr "テスト失敗: アカウントが無効"
msgid "Have online sessions"
msgstr "オンラインセッションを持つ"
-#: terminal/api/session/session.py:251
+#: terminal/api/session/session.py:46
+#, python-format
+msgid "User %s %s session %s replay"
+msgstr "ユーザー%s %sこのセッション %s の録画です"
+
+#: terminal/api/session/session.py:292
msgid "Session does not exist: {}"
msgstr "セッションが存在しません: {}"
-#: terminal/api/session/session.py:254
+#: terminal/api/session/session.py:295
msgid "Session is finished or the protocol not supported"
msgstr "セッションが終了したか、プロトコルがサポートされていません"
-#: terminal/api/session/session.py:267
+#: terminal/api/session/session.py:308
msgid "User does not have permission"
msgstr "ユーザーに権限がありません"
@@ -5911,7 +6105,7 @@ msgstr "SFTP クライアント"
#: terminal/connect_methods.py:33
msgid "DB Guide"
-msgstr ""
+msgstr "DB 接続ウィザード"
#: terminal/connect_methods.py:34
msgid "DB Client"
@@ -5956,7 +6150,7 @@ msgstr "一致しない"
#: terminal/const.py:83
msgid "Tunnel"
-msgstr ""
+msgstr "ちかチャネル"
#: terminal/const.py:85
msgid "SFTP"
@@ -5990,51 +6184,51 @@ msgstr "一括作成非サポート"
msgid "Storage is invalid"
msgstr "ストレージが無効です"
-#: terminal/models/applet/applet.py:29
-msgid "Community"
+#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88
+msgid "Community edition"
msgstr "コミュニティ版"
-#: terminal/models/applet/applet.py:30
+#: terminal/models/applet/applet.py:31
msgid "Enterprise"
msgstr "エンタープライズ版"
-#: terminal/models/applet/applet.py:35
+#: terminal/models/applet/applet.py:36
msgid "Author"
msgstr "著者"
-#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31
+#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31
msgid "Edition"
msgstr "バージョン"
-#: terminal/models/applet/applet.py:42
+#: terminal/models/applet/applet.py:43
msgid "Can concurrent"
msgstr "同時実行可能"
-#: terminal/models/applet/applet.py:43
+#: terminal/models/applet/applet.py:44
msgid "Tags"
msgstr "ラベル"
-#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159
+#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161
msgid "Hosts"
msgstr "ホスト"
-#: terminal/models/applet/applet.py:92
+#: terminal/models/applet/applet.py:93
msgid "Applet pkg not valid, Missing file {}"
msgstr "無効なアプレット パッケージ、ファイル {} がありません"
-#: terminal/models/applet/applet.py:111
+#: terminal/models/applet/applet.py:112
msgid "Load platform.yml failed: {}"
msgstr "platform.ymlのロードに失敗しました:{}"
-#: terminal/models/applet/applet.py:114
+#: terminal/models/applet/applet.py:115
msgid "Only support custom platform"
msgstr "カスタムプラットフォームのみをサポート"
-#: terminal/models/applet/applet.py:119
+#: terminal/models/applet/applet.py:120
msgid "Missing type in platform.yml"
msgstr "platform.ymlにタイプがありません"
-#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35
+#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35
#: terminal/models/applet/host.py:137
msgid "Hosting"
msgstr "ホスト マシン"
@@ -6193,7 +6387,7 @@ msgstr "セッション再生をダウンロードできます"
msgid "Account id"
msgstr "アカウント ID"
-#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114
+#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118
msgid "Login from"
msgstr "ログイン元"
@@ -6229,61 +6423,61 @@ msgstr "セッションを終了できます"
msgid "Can validate session action perm"
msgstr "セッションアクションのパーマを検証できます"
-#: terminal/models/session/sharing.py:31
+#: terminal/models/session/sharing.py:32
msgid "Expired time (min)"
msgstr "期限切れ時間 (分)"
-#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20
+#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20
#: terminal/serializers/sharing.py:52
msgid "Action permission"
msgstr "アクションパーミッション"
-#: terminal/models/session/sharing.py:37
+#: terminal/models/session/sharing.py:38
msgid "Origin"
msgstr "ソース"
-#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96
+#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100
#: terminal/notifications.py:261
msgid "Session sharing"
msgstr "セッション共有"
-#: terminal/models/session/sharing.py:43
+#: terminal/models/session/sharing.py:44
msgid "Can add super session sharing"
msgstr "スーパーセッション共有を追加できます"
-#: terminal/models/session/sharing.py:79
+#: terminal/models/session/sharing.py:83
msgid "Link not active"
msgstr "リンクがアクティブでない"
-#: terminal/models/session/sharing.py:81
+#: terminal/models/session/sharing.py:85
msgid "Link expired"
msgstr "リンク期限切れ"
-#: terminal/models/session/sharing.py:83
+#: terminal/models/session/sharing.py:87
msgid "User not allowed to join"
msgstr "ユーザーはセッションに参加できません"
-#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71
+#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71
msgid "Joiner"
msgstr "ジョイナー"
-#: terminal/models/session/sharing.py:103
+#: terminal/models/session/sharing.py:107
msgid "Date joined"
msgstr "参加日"
-#: terminal/models/session/sharing.py:106
+#: terminal/models/session/sharing.py:110
msgid "Date left"
msgstr "日付が残っています"
-#: terminal/models/session/sharing.py:129
+#: terminal/models/session/sharing.py:133
msgid "Session join record"
msgstr "セッション参加記録"
-#: terminal/models/session/sharing.py:145
+#: terminal/models/session/sharing.py:149
msgid "Invalid verification code"
msgstr "検証コードが無効"
-#: terminal/models/session/sharing.py:152
+#: terminal/models/session/sharing.py:156
msgid "You have already joined this session"
msgstr "すでにこのセッションに参加しています"
@@ -6355,7 +6549,7 @@ msgstr ""
"URL を入力します。
例: https://172.16.10.110 または https://dev."
"jumpserver.com"
-#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170
+#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172
msgid "Ignore Certificate Verification"
msgstr "証明書の検証を無視する"
@@ -6543,30 +6737,34 @@ msgid "Endpoint suffix"
msgstr "エンドポイントサフィックス"
#: terminal/serializers/storage.py:137
+msgid "The address cannot contain the special character `#`"
+msgstr "アドレスには特殊文字「#」を含めることはできません"
+
+#: terminal/serializers/storage.py:139
msgid "The address format is incorrect"
msgstr "アドレス形式が正しくありません"
-#: terminal/serializers/storage.py:144
+#: terminal/serializers/storage.py:146
msgid "Host invalid"
msgstr "ホスト無効"
-#: terminal/serializers/storage.py:147
+#: terminal/serializers/storage.py:149
msgid "Port invalid"
msgstr "ポートが無効"
-#: terminal/serializers/storage.py:162
+#: terminal/serializers/storage.py:164
msgid "Index by date"
msgstr "日付による索引付け"
-#: terminal/serializers/storage.py:163
+#: terminal/serializers/storage.py:165
msgid "Whether to create an index by date"
msgstr "現在の日付に基づいてインデックスを動的に作成するかどうか"
-#: terminal/serializers/storage.py:166
+#: terminal/serializers/storage.py:168
msgid "Index"
msgstr "インデックス"
-#: terminal/serializers/storage.py:168
+#: terminal/serializers/storage.py:170
msgid "Doc type"
msgstr "Docタイプ"
@@ -6646,7 +6844,7 @@ msgstr "オープン"
#: tickets/const.py:18 tickets/const.py:31
msgid "Reopen"
-msgstr ""
+msgstr "再オープン"
#: tickets/const.py:19 tickets/const.py:32
msgid "Approved"
@@ -6933,7 +7131,7 @@ msgid "Ticket information"
msgstr "作業指示情報"
#: tickets/templates/tickets/approve_check_password.html:29
-#: tickets/views/approve.py:39
+#: tickets/views/approve.py:40
msgid "Ticket approval"
msgstr "作業指示の承認"
@@ -6945,26 +7143,26 @@ msgstr "承認"
msgid "Go Login"
msgstr "ログイン"
-#: tickets/views/approve.py:40
+#: tickets/views/approve.py:41
msgid ""
"This ticket does not exist, the process has ended, or this link has expired"
msgstr ""
"このワークシートが存在しないか、ワークシートが終了したか、このリンクが無効に"
"なっています"
-#: tickets/views/approve.py:69
+#: tickets/views/approve.py:70
msgid "Click the button below to approve or reject"
msgstr "下のボタンをクリックして同意または拒否。"
-#: tickets/views/approve.py:71
+#: tickets/views/approve.py:72
msgid "After successful authentication, this ticket can be approved directly"
msgstr "認証に成功した後、作業指示書は直接承認することができる。"
-#: tickets/views/approve.py:93
+#: tickets/views/approve.py:97
msgid "Illegal approval action"
msgstr "無効な承認アクション"
-#: tickets/views/approve.py:106
+#: tickets/views/approve.py:110
msgid "This user is not authorized to approve this ticket"
msgstr "このユーザーはこの作業指示を承認する権限がありません"
@@ -7000,6 +7198,30 @@ msgstr "リセットリンクが生成され、ユーザーに送信されます
msgid "Set password"
msgstr "パスワードの設定"
+#: users/const.py:23
+msgid "AUTO"
+msgstr "自動"
+
+#: users/const.py:31
+msgid "Full screen"
+msgstr "フルスクリーン"
+
+#: users/const.py:32
+msgid "Multi screen"
+msgstr "マルチスクリーンディスプレイ"
+
+#: users/const.py:33
+msgid "Drives redirect"
+msgstr "ディスクマウント"
+
+#: users/const.py:52
+msgid "Replace"
+msgstr "置換"
+
+#: users/const.py:53
+msgid "Suffix"
+msgstr "接尾辞を付ける"
+
#: users/exceptions.py:10
msgid "MFA not enabled"
msgstr "MFAが有効化されていません"
@@ -7078,83 +7300,87 @@ msgstr "ここにid_rsa.pubを貼り付けます。"
msgid "Public key should not be the same as your old one."
msgstr "公開鍵は古いものと同じであってはなりません。"
-#: users/forms/profile.py:162 users/serializers/profile.py:100
-#: users/serializers/profile.py:183 users/serializers/profile.py:210
+#: users/forms/profile.py:162 users/serializers/profile.py:76
+#: users/serializers/profile.py:159 users/serializers/profile.py:186
msgid "Not a valid ssh public key"
msgstr "有効なssh公開鍵ではありません"
-#: users/forms/profile.py:173 users/models/user.py:820
+#: users/forms/profile.py:173 users/models/user.py:831
#: xpack/plugins/cloud/serializers/account_attrs.py:203
msgid "Public key"
msgstr "公開キー"
-#: users/models/user.py:637 users/serializers/profile.py:118
+#: users/models/preference.py:38
+msgid "Preference"
+msgstr "ユーザー設定"
+
+#: users/models/user.py:648 users/serializers/profile.py:94
msgid "Force enable"
msgstr "強制有効"
-#: users/models/user.py:799 users/serializers/user.py:171
+#: users/models/user.py:810 users/serializers/user.py:172
msgid "Is service account"
msgstr "サービスアカウントです"
-#: users/models/user.py:801
+#: users/models/user.py:812
msgid "Avatar"
msgstr "アバター"
-#: users/models/user.py:804
+#: users/models/user.py:815
msgid "Wechat"
msgstr "微信"
-#: users/models/user.py:807 users/serializers/user.py:108
+#: users/models/user.py:818 users/serializers/user.py:109
msgid "Phone"
msgstr "電話"
-#: users/models/user.py:813
+#: users/models/user.py:824
msgid "OTP secret key"
msgstr "OTP 秘密"
-#: users/models/user.py:817
+#: users/models/user.py:828
#: xpack/plugins/cloud/serializers/account_attrs.py:206
msgid "Private key"
msgstr "ssh秘密鍵"
-#: users/models/user.py:823
-msgid "Secret key"
-msgstr "秘密キー"
-
-#: users/models/user.py:828 users/serializers/profile.py:149
-#: users/serializers/user.py:168
+#: users/models/user.py:836 users/serializers/profile.py:125
+#: users/serializers/user.py:169
msgid "Is first login"
msgstr "最初のログインです"
-#: users/models/user.py:842
+#: users/models/user.py:850
msgid "Date password last updated"
msgstr "最終更新日パスワード"
-#: users/models/user.py:845
+#: users/models/user.py:853
msgid "Need update password"
msgstr "更新パスワードが必要"
-#: users/models/user.py:988
+#: users/models/user.py:977
+msgid "Can not delete admin user"
+msgstr "管理者ユーザーを削除できませんでした"
+
+#: users/models/user.py:1003
msgid "Can invite user"
msgstr "ユーザーを招待できます"
-#: users/models/user.py:989
+#: users/models/user.py:1004
msgid "Can remove user"
msgstr "ユーザーを削除できます"
-#: users/models/user.py:990
+#: users/models/user.py:1005
msgid "Can match user"
msgstr "ユーザーに一致できます"
-#: users/models/user.py:999
+#: users/models/user.py:1014
msgid "Administrator"
msgstr "管理者"
-#: users/models/user.py:1002
+#: users/models/user.py:1017
msgid "Administrator is the super user of system"
msgstr "管理者はシステムのスーパーユーザーです"
-#: users/models/user.py:1027
+#: users/models/user.py:1042
msgid "User password history"
msgstr "ユーザーパスワード履歴"
@@ -7189,11 +7415,67 @@ msgstr "SSHキーのリセット"
msgid "Reset MFA"
msgstr "MFAのリセット"
+#: users/serializers/preference/koko.py:10
+msgid "File name conflict resolution"
+msgstr "ファイル名競合ソリューション"
+
+#: users/serializers/preference/lina.py:11
+msgid "New file encryption password"
+msgstr "新しいファイルの暗号化パスワード"
+
+#: users/serializers/preference/lina.py:16
+msgid "Confirm file encryption password"
+msgstr "ファイルの暗号化パスワードを確認する"
+
+#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48
+msgid "The newly set password is inconsistent"
+msgstr "新しく設定されたパスワードが一致しない"
+
+#: users/serializers/preference/luna.py:23
+msgid "Async loading of asset tree"
+msgstr "非同期ロード資産ツリー"
+
+#: users/serializers/preference/luna.py:30
+msgid "RDP resolution"
+msgstr "RDP 解像度"
+
+#: users/serializers/preference/luna.py:34
+msgid "Keyboard layout"
+msgstr "キーボードレイアウト"
+
+#: users/serializers/preference/luna.py:38
+msgid "RDP client option"
+msgstr "RDPクライアントオプション"
+
+#: users/serializers/preference/luna.py:42
+msgid "Remote application connection method"
+msgstr "リモートアプリケーション接続方式"
+
+#: users/serializers/preference/luna.py:49
+msgid "Character terminal font size"
+msgstr "文字終端フォントサイズ"
+
+#: users/serializers/preference/luna.py:52
+msgid "Backspace as Ctrl+H"
+msgstr "文字終端Backspace As Ctrl+H"
+
+#: users/serializers/preference/luna.py:55
+msgid "Right click quickly paste"
+msgstr "右クリックでクイック貼り付け"
+
+#: users/serializers/preference/luna.py:61
+msgid "Graphics"
+msgstr "図形化"
+
+#: users/serializers/preference/luna.py:62
+msgid "Command line"
+msgstr "コマンドライン"
+
#: users/serializers/profile.py:29
msgid "The old password is incorrect"
msgstr "古いパスワードが正しくありません"
-#: users/serializers/profile.py:36 users/serializers/profile.py:197
+#: users/serializers/profile.py:36 users/serializers/profile.py:173
msgid "Password does not match security rules"
msgstr "パスワードがセキュリティルールと一致しない"
@@ -7201,10 +7483,6 @@ msgstr "パスワードがセキュリティルールと一致しない"
msgid "The new password cannot be the last {} passwords"
msgstr "新しいパスワードを最後の {} 個のパスワードにすることはできません"
-#: users/serializers/profile.py:48 users/serializers/profile.py:71
-msgid "The newly set password is inconsistent"
-msgstr "新しく設定されたパスワードが一致しない"
-
#: users/serializers/user.py:42
msgid "System roles"
msgstr "システムの役割"
@@ -7213,55 +7491,55 @@ msgstr "システムの役割"
msgid "Org roles"
msgstr "組織ロール"
-#: users/serializers/user.py:89
+#: users/serializers/user.py:90
msgid "Password strategy"
msgstr "パスワード戦略"
-#: users/serializers/user.py:91
+#: users/serializers/user.py:92
msgid "MFA enabled"
msgstr "MFA有効化"
-#: users/serializers/user.py:93
+#: users/serializers/user.py:94
msgid "MFA force enabled"
msgstr "MFAフォース有効化"
-#: users/serializers/user.py:95
+#: users/serializers/user.py:96
msgid "Login blocked"
msgstr "ログインがロックされました"
-#: users/serializers/user.py:98 users/serializers/user.py:177
+#: users/serializers/user.py:99 users/serializers/user.py:178
msgid "Is OTP bound"
msgstr "仮想MFAがバインドされているか"
-#: users/serializers/user.py:100
+#: users/serializers/user.py:101
msgid "Can public key authentication"
msgstr "公開鍵認証が可能"
-#: users/serializers/user.py:172
+#: users/serializers/user.py:173
msgid "Is org admin"
msgstr "組織管理者です"
-#: users/serializers/user.py:174
+#: users/serializers/user.py:175
msgid "Avatar url"
msgstr "アバターURL"
-#: users/serializers/user.py:178
+#: users/serializers/user.py:179
msgid "MFA level"
msgstr "MFA レベル"
-#: users/serializers/user.py:284
+#: users/serializers/user.py:285
msgid "Select users"
msgstr "ユーザーの選択"
-#: users/serializers/user.py:285
+#: users/serializers/user.py:286
msgid "For security, only list several users"
msgstr "セキュリティのために、複数のユーザーのみをリストします"
-#: users/serializers/user.py:318
+#: users/serializers/user.py:319
msgid "name not unique"
msgstr "名前が一意ではない"
-#: users/signal_handlers.py:27
+#: users/signal_handlers.py:32
msgid ""
"The administrator has enabled \"Only allow existing users to log in\", \n"
" and the current user is not in the user list. Please contact the "
@@ -7270,23 +7548,23 @@ msgstr ""
"管理者は「既存のユーザーのみログインを許可」をオンにしており、現在のユーザー"
"はユーザーリストにありません。管理者に連絡してください。"
-#: users/tasks.py:24
+#: users/tasks.py:23
msgid "Check password expired"
msgstr "パスワードの有効期限が切れていることを確認する"
-#: users/tasks.py:38
+#: users/tasks.py:37
msgid "Periodic check password expired"
msgstr "定期認証パスワードの有効期限"
-#: users/tasks.py:52
+#: users/tasks.py:51
msgid "Check user expired"
msgstr "ユーザーの有効期限が切れていることを確認する"
-#: users/tasks.py:69
+#: users/tasks.py:68
msgid "Periodic check user expired"
msgstr "ユーザーの有効期限の定期的な検出"
-#: users/tasks.py:83
+#: users/tasks.py:82
msgid "Check unused users"
msgstr "未使用のユーザーを確認する"
@@ -7696,7 +7974,7 @@ msgstr "クラウドアカウント"
msgid "Test cloud account"
msgstr "クラウドアカウントのテスト"
-#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147
+#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151
msgid "Regions"
msgstr "リージョン"
@@ -7705,17 +7983,17 @@ msgid "Hostname strategy"
msgstr "ホスト名戦略"
#: xpack/plugins/cloud/models.py:100
-#: xpack/plugins/cloud/serializers/task.py:150
+#: xpack/plugins/cloud/serializers/task.py:154
msgid "IP network segment group"
msgstr "IPネットワークセグメントグループ"
#: xpack/plugins/cloud/models.py:103
-#: xpack/plugins/cloud/serializers/task.py:155
+#: xpack/plugins/cloud/serializers/task.py:159
msgid "Sync IP type"
msgstr "同期IPタイプ"
#: xpack/plugins/cloud/models.py:106
-#: xpack/plugins/cloud/serializers/task.py:173
+#: xpack/plugins/cloud/serializers/task.py:177
msgid "Always update"
msgstr "常に更新"
@@ -7808,7 +8086,7 @@ msgstr "ルール一致"
msgid "Rule value"
msgstr "ルール値"
-#: xpack/plugins/cloud/models.py:317
+#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70
msgid "Strategy rule"
msgstr "戦略ルール"
@@ -7820,7 +8098,7 @@ msgstr "アクション属性"
msgid "Action value"
msgstr "アクション値"
-#: xpack/plugins/cloud/models.py:341
+#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73
msgid "Strategy action"
msgstr "戦略アクション"
@@ -8108,7 +8386,7 @@ msgstr "テストタイムアウト"
msgid "Project"
msgstr "project"
-#: xpack/plugins/cloud/serializers/task.py:139
+#: xpack/plugins/cloud/serializers/task.py:143
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 "
@@ -8122,11 +8400,11 @@ msgstr ""
"ドレスをランダムに一致させることを意味します。
例: "
"192.168.1.0/24,10.1.1.1-10.1.1.20。"
-#: xpack/plugins/cloud/serializers/task.py:145
+#: xpack/plugins/cloud/serializers/task.py:149
msgid "History count"
msgstr "実行回数"
-#: xpack/plugins/cloud/serializers/task.py:146
+#: xpack/plugins/cloud/serializers/task.py:150
msgid "Instance count"
msgstr "インスタンス数"
@@ -8182,22 +8460,28 @@ msgstr "ライセンスのインポートに成功"
msgid "License is invalid"
msgstr "ライセンスが無効です"
-#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138
+#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140
msgid "License"
msgstr "ライセンス"
#: xpack/plugins/license/models.py:80
-msgid "Standard edition"
-msgstr "標準版"
+msgid "Basic edition"
+msgstr "エンタープライズ基本版"
#: xpack/plugins/license/models.py:82
-msgid "Enterprise edition"
-msgstr "エンタープライズ版"
+msgid "Standard edition"
+msgstr "エンタープライズ標準版"
#: xpack/plugins/license/models.py:84
-msgid "Ultimate edition"
-msgstr "究極のエディション"
+msgid "Professional edition"
+msgstr "エンタープライズプロフェッショナル版"
#: xpack/plugins/license/models.py:86
-msgid "Community edition"
-msgstr "コミュニティ版"
+msgid "Ultimate edition"
+msgstr "エンタープライズ・フラッグシップ・エディション"
+
+#~ msgid "Random"
+#~ msgstr "ランダム"
+
+#~ msgid "Enterprise edition"
+#~ msgstr "エンタープライズ基本版"
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 16bde8040..3f9d48c80 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:da4f312ed86d27fa8b6bde8da3bc70b0f32fe40811ee855f9fe81d89a68a646f
-size 126402
+oid sha256:78fa10c674b853ebde73bbdef255beeb794a7a7b4bf5483ac1464c282aab0819
+size 131200
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 5f14e8671..d6b011d9d 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-08-17 15:30+0800\n"
+"POT-Creation-Date: 2023-09-19 10:39+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler \n"
"Language-Team: JumpServer team\n"
@@ -22,12 +22,12 @@ msgid "The parameter 'action' must be [{}]"
msgstr "参数 'action' 必须是 [{}]"
#: accounts/const/account.py:6
-#: accounts/serializers/automations/change_secret.py:33
-#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
+#: accounts/serializers/automations/change_secret.py:32
+#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:35
#: authentication/confirm/password.py:9 authentication/forms.py:32
-#: authentication/templates/authentication/login.html:274
+#: authentication/templates/authentication/login.html:286
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
-#: users/forms/profile.py:22 users/serializers/user.py:104
+#: users/forms/profile.py:22 users/serializers/user.py:105
#: users/templates/users/_msg_user_created.html:13
#: users/templates/users/user_password_verify.html:18
#: xpack/plugins/cloud/serializers/account_attrs.py:28
@@ -35,7 +35,7 @@ msgid "Password"
msgstr "密码"
#: accounts/const/account.py:7
-#: accounts/serializers/automations/change_secret.py:34
+#: accounts/serializers/automations/change_secret.py:33
msgid "SSH key"
msgstr "SSH 密钥"
@@ -44,6 +44,7 @@ msgid "Access key"
msgstr "Access key"
#: accounts/const/account.py:9 assets/models/_user.py:48
+#: authentication/backends/passkey/models.py:16
#: authentication/models/sso_token.py:14 settings/serializers/feature.py:50
msgid "Token"
msgstr "Token"
@@ -69,7 +70,7 @@ msgstr "同名账号"
msgid "Anonymous account"
msgstr "匿名账号"
-#: accounts/const/account.py:25 users/models/user.py:733
+#: accounts/const/account.py:25 users/models/user.py:744
msgid "Local"
msgstr "数据库"
@@ -86,103 +87,103 @@ msgstr "模板"
msgid "Skip"
msgstr "跳过"
-#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:233
+#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:234
#: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6
msgid "Update"
msgstr "更新"
#: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:156 audits/const.py:54
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:55
#: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
-#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43
+#: ops/const.py:62 terminal/const.py:77 xpack/plugins/cloud/const.py:43
msgid "Failed"
msgstr "失败"
-#: accounts/const/automation.py:22 rbac/tree.py:50
+#: accounts/const/automation.py:24 rbac/tree.py:50
msgid "Push account"
msgstr "账号推送"
-#: accounts/const/automation.py:23
+#: accounts/const/automation.py:25
msgid "Change secret"
msgstr "更改密码"
-#: accounts/const/automation.py:24
+#: accounts/const/automation.py:26
msgid "Verify account"
msgstr "验证账号"
-#: accounts/const/automation.py:25
+#: accounts/const/automation.py:27
msgid "Gather accounts"
msgstr "收集账号"
-#: accounts/const/automation.py:26
+#: accounts/const/automation.py:28
msgid "Verify gateway account"
msgstr "验证网关账号"
-#: accounts/const/automation.py:44
-msgid "Specific password"
+#: accounts/const/automation.py:46
+msgid "Specific secret"
msgstr "指定"
-#: accounts/const/automation.py:45
-msgid "Random"
-msgstr "随机"
+#: accounts/const/automation.py:47
+msgid "Random generate"
+msgstr "随机生成"
-#: accounts/const/automation.py:49 ops/const.py:13
+#: accounts/const/automation.py:51 ops/const.py:13
msgid "Append SSH KEY"
msgstr "追加"
-#: accounts/const/automation.py:50 ops/const.py:14
+#: accounts/const/automation.py:52 ops/const.py:14
msgid "Empty and append SSH KEY"
msgstr "清空所有并添加"
-#: accounts/const/automation.py:51 ops/const.py:15
+#: accounts/const/automation.py:53 ops/const.py:15
msgid "Replace (Replace only keys pushed by JumpServer) "
msgstr "替换 (只替换由 JumpServer 推送的密钥)"
-#: accounts/const/automation.py:56
+#: accounts/const/automation.py:58
msgid "On asset create"
msgstr "资产创建时"
-#: accounts/const/automation.py:59
+#: accounts/const/automation.py:61
msgid "On perm add user"
msgstr "授权变更时添加用户"
-#: accounts/const/automation.py:61
+#: accounts/const/automation.py:63
msgid "On perm add user group"
msgstr "授权变更时添加用户组"
-#: accounts/const/automation.py:63
+#: accounts/const/automation.py:65
msgid "On perm add asset"
msgstr "授权变更时添加资产"
-#: accounts/const/automation.py:65
+#: accounts/const/automation.py:67
msgid "On perm add node"
msgstr "授权变更时添加节点"
-#: accounts/const/automation.py:67
+#: accounts/const/automation.py:69
msgid "On perm add account"
msgstr "授权变更时添加账号"
-#: accounts/const/automation.py:69
+#: accounts/const/automation.py:71
msgid "On asset join node"
msgstr "资产变更时添加到节点"
-#: accounts/const/automation.py:71
+#: accounts/const/automation.py:73
msgid "On user join group"
msgstr "用户变更时添加到用户组"
-#: accounts/const/automation.py:79
+#: accounts/const/automation.py:81
msgid "On perm change"
msgstr "授权变更时"
-#: accounts/const/automation.py:86
+#: accounts/const/automation.py:88
msgid "Inherit from group or node"
msgstr "继承自用户组或资产节点"
-#: accounts/const/automation.py:94
+#: accounts/const/automation.py:96
msgid "Create and push"
msgstr "创建并推送"
-#: accounts/const/automation.py:95
+#: accounts/const/automation.py:97
msgid "Only create"
msgstr "仅创建"
@@ -195,17 +196,35 @@ msgstr "数据库"
msgid "HCP Vault"
msgstr "HashiCorp Vault"
+#: accounts/mixins.py:35
+msgid "Export all"
+msgstr "导出所有"
+
+#: accounts/mixins.py:37
+msgid "Export only selected items"
+msgstr "仅导出选择项"
+
+#: accounts/mixins.py:42
+#, python-format
+msgid "Export filtered: %s"
+msgstr "导出搜素: %s"
+
+#: accounts/mixins.py:48
+#, python-format
+msgid "User %s view/export secret"
+msgstr "用户 %s 查看/导出 了密码"
+
#: accounts/models/account.py:48
#: accounts/models/automations/gather_account.py:16
-#: accounts/serializers/account/account.py:202
-#: accounts/serializers/account/account.py:247
+#: accounts/serializers/account/account.py:205
+#: accounts/serializers/account/account.py:250
#: accounts/serializers/account/gathered_account.py:10
-#: accounts/serializers/automations/change_secret.py:112
-#: accounts/serializers/automations/change_secret.py:132
+#: accounts/serializers/automations/change_secret.py:111
+#: accounts/serializers/automations/change_secret.py:131
#: acls/serializers/base.py:123 assets/models/asset/common.py:93
#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36
#: assets/serializers/domain.py:19 assets/serializers/label.py:27
-#: audits/models.py:53 authentication/models/connection_token.py:36
+#: audits/models.py:54 authentication/models/connection_token.py:36
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:34
#: terminal/backends/command/models.py:17 terminal/models/session/session.py:31
#: terminal/notifications.py:155 terminal/serializers/command.py:17
@@ -217,20 +236,21 @@ msgid "Asset"
msgstr "资产"
#: accounts/models/account.py:52 accounts/models/template.py:15
-#: accounts/serializers/account/account.py:209
-#: accounts/serializers/account/account.py:257
-#: accounts/serializers/account/template.py:16
+#: accounts/serializers/account/account.py:212
+#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/template.py:25
#: authentication/serializers/connect_token_secret.py:49
msgid "Su from"
msgstr "切换自"
-#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20
-#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34
+#: accounts/models/account.py:54 assets/const/protocol.py:168
+#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20
+#: terminal/models/applet/applet.py:35
msgid "Version"
msgstr "版本"
-#: accounts/models/account.py:56 accounts/serializers/account/account.py:204
-#: users/models/user.py:838
+#: accounts/models/account.py:56 accounts/serializers/account/account.py:207
+#: users/models/user.py:846
msgid "Source"
msgstr "来源"
@@ -239,10 +259,10 @@ msgid "Source ID"
msgstr "来源 ID"
#: accounts/models/account.py:60
-#: accounts/serializers/automations/change_secret.py:113
-#: accounts/serializers/automations/change_secret.py:133
+#: accounts/serializers/automations/change_secret.py:112
+#: accounts/serializers/automations/change_secret.py:132
#: acls/serializers/base.py:124 assets/serializers/asset/common.py:125
-#: assets/serializers/gateway.py:28 audits/models.py:54 ops/models/base.py:18
+#: assets/serializers/gateway.py:28 audits/models.py:55 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:39
#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33
#: terminal/templates/terminal/_msg_command_warning.html:8
@@ -285,7 +305,7 @@ msgid "Account backup plan"
msgstr "账号备份计划"
#: accounts/models/automations/backup_account.py:91
-#: assets/models/automations/base.py:115 audits/models.py:60
+#: assets/models/automations/base.py:115 audits/models.py:61
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228
#: ops/templates/ops/celery_task_log.html:75
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140
@@ -313,14 +333,14 @@ msgstr "账号备份快照"
msgid "Trigger mode"
msgstr "触发模式"
-#: accounts/models/automations/backup_account.py:105 audits/models.py:194
-#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205
+#: accounts/models/automations/backup_account.py:105 audits/models.py:195
+#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205
msgid "Reason"
msgstr "原因"
#: accounts/models/automations/backup_account.py:107
-#: accounts/serializers/automations/change_secret.py:111
-#: accounts/serializers/automations/change_secret.py:134
+#: accounts/serializers/automations/change_secret.py:110
+#: accounts/serializers/automations/change_secret.py:133
#: ops/serializers/job.py:56 terminal/serializers/session.py:46
msgid "Is success"
msgstr "是否成功"
@@ -329,109 +349,84 @@ msgstr "是否成功"
msgid "Account backup execution"
msgstr "账号备份执行"
-#: accounts/models/automations/base.py:15
+#: accounts/models/automations/base.py:18
msgid "Account automation task"
msgstr "账号自动化任务"
-#: accounts/models/automations/base.py:29
+#: accounts/models/automations/base.py:32
msgid "Automation execution"
msgstr "自动化执行"
-#: accounts/models/automations/base.py:30
+#: accounts/models/automations/base.py:33
msgid "Automation executions"
msgstr "自动化执行"
-#: accounts/models/automations/base.py:32
+#: accounts/models/automations/base.py:35
msgid "Can view change secret execution"
msgstr "查看改密执行"
-#: accounts/models/automations/base.py:33
+#: accounts/models/automations/base.py:36
msgid "Can add change secret execution"
msgstr "创建改密执行"
-#: accounts/models/automations/base.py:35
+#: accounts/models/automations/base.py:38
msgid "Can view gather accounts execution"
msgstr "查看收集账号执行"
-#: accounts/models/automations/base.py:36
+#: accounts/models/automations/base.py:39
msgid "Can add gather accounts execution"
msgstr "创建收集账号执行"
-#: accounts/models/automations/base.py:38
+#: accounts/models/automations/base.py:41
msgid "Can view push account execution"
msgstr "查看推送账号执行"
-#: accounts/models/automations/base.py:39
+#: accounts/models/automations/base.py:42
msgid "Can add push account execution"
msgstr "创建推送账号执行"
-#: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36
-#: accounts/serializers/account/account.py:429
-#: accounts/serializers/account/base.py:16
-#: accounts/serializers/automations/change_secret.py:46
-#: authentication/serializers/connect_token_secret.py:41
-#: authentication/serializers/connect_token_secret.py:50
-msgid "Secret type"
-msgstr "密文类型"
-
-#: accounts/models/automations/change_secret.py:20
-#: accounts/models/mixins/vault.py:48 accounts/serializers/account/base.py:19
-#: authentication/models/temp_token.py:10
-#: authentication/templates/authentication/_access_key_modal.html:31
-#: settings/serializers/auth/radius.py:19
-msgid "Secret"
-msgstr "密钥"
-
-#: accounts/models/automations/change_secret.py:23
-#: accounts/serializers/automations/change_secret.py:40
-msgid "Secret strategy"
-msgstr "密文策略"
-
-#: accounts/models/automations/change_secret.py:25
-msgid "Password rules"
-msgstr "密码规则"
-
-#: accounts/models/automations/change_secret.py:28
+#: accounts/models/automations/base.py:54
msgid "SSH key change strategy"
msgstr "SSH 密钥推送方式"
-#: accounts/models/automations/change_secret.py:64
+#: accounts/models/automations/change_secret.py:15
#: accounts/serializers/account/backup.py:34
-#: accounts/serializers/automations/change_secret.py:57
+#: accounts/serializers/automations/change_secret.py:56
msgid "Recipient"
msgstr "收件人"
-#: accounts/models/automations/change_secret.py:71
+#: accounts/models/automations/change_secret.py:22
msgid "Change secret automation"
msgstr "自动化改密"
-#: accounts/models/automations/change_secret.py:88
+#: accounts/models/automations/change_secret.py:39
msgid "Old secret"
msgstr "原密钥"
-#: accounts/models/automations/change_secret.py:89
+#: accounts/models/automations/change_secret.py:40
msgid "New secret"
msgstr "新密钥"
-#: accounts/models/automations/change_secret.py:90
+#: accounts/models/automations/change_secret.py:41
msgid "Date started"
msgstr "开始日期"
-#: accounts/models/automations/change_secret.py:91
+#: accounts/models/automations/change_secret.py:42
#: assets/models/automations/base.py:116 ops/models/base.py:56
#: ops/models/celery.py:64 ops/models/job.py:229
#: terminal/models/applet/host.py:141
msgid "Date finished"
msgstr "结束日期"
-#: accounts/models/automations/change_secret.py:93
-#: accounts/serializers/account/account.py:249 assets/const/automation.py:8
+#: accounts/models/automations/change_secret.py:44
+#: accounts/serializers/account/account.py:252 assets/const/automation.py:8
+#: authentication/templates/authentication/passkey.html:173
#: authentication/views/base.py:26 authentication/views/base.py:27
#: authentication/views/base.py:28 common/const/choices.py:20
msgid "Error"
msgstr "错误"
-#: accounts/models/automations/change_secret.py:97
+#: accounts/models/automations/change_secret.py:48
msgid "Change secret record"
msgstr "改密记录"
@@ -444,15 +439,15 @@ msgid "Date last login"
msgstr "最后登录日期"
#: accounts/models/automations/gather_account.py:17
-#: accounts/models/automations/push_account.py:15 accounts/models/base.py:34
+#: accounts/models/automations/push_account.py:15 accounts/models/base.py:65
#: accounts/serializers/account/virtual.py:21 acls/serializers/base.py:19
-#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:179
+#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:180
#: authentication/forms.py:25 authentication/forms.py:27
#: authentication/models/temp_token.py:9
#: authentication/templates/authentication/_msg_different_city.html:9
#: authentication/templates/authentication/_msg_oauth_bind.html:9
#: users/forms/profile.py:32 users/forms/profile.py:115
-#: users/models/user.py:785 users/templates/users/_msg_user_created.html:12
+#: users/models/user.py:796 users/templates/users/_msg_user_created.html:12
#: xpack/plugins/cloud/serializers/account_attrs.py:26
msgid "Username"
msgstr "用户名"
@@ -480,13 +475,13 @@ msgstr "触发方式"
#: accounts/models/automations/push_account.py:16 acls/models/base.py:41
#: acls/serializers/base.py:57 assets/models/cmd_filter.py:81
-#: audits/models.py:87 audits/serializers.py:83
+#: audits/models.py:88 audits/serializers.py:84
#: authentication/serializers/connect_token_secret.py:116
#: authentication/templates/authentication/_access_key_modal.html:34
msgid "Action"
msgstr "动作"
-#: accounts/models/automations/push_account.py:60
+#: accounts/models/automations/push_account.py:57
msgid "Push asset account"
msgstr "账号推送"
@@ -494,7 +489,34 @@ msgstr "账号推送"
msgid "Verify asset account"
msgstr "账号验证"
-#: accounts/models/base.py:33 accounts/serializers/account/virtual.py:20
+#: accounts/models/base.py:37 accounts/models/base.py:67
+#: accounts/serializers/account/account.py:432
+#: accounts/serializers/account/base.py:16
+#: accounts/serializers/automations/change_secret.py:45
+#: authentication/serializers/connect_token_secret.py:41
+#: authentication/serializers/connect_token_secret.py:50
+msgid "Secret type"
+msgstr "密文类型"
+
+#: accounts/models/base.py:39 accounts/models/mixins/vault.py:48
+#: accounts/serializers/account/base.py:19
+#: authentication/models/temp_token.py:10
+#: authentication/templates/authentication/_access_key_modal.html:31
+#: settings/serializers/auth/radius.py:19
+msgid "Secret"
+msgstr "密钥"
+
+#: accounts/models/base.py:42
+#: accounts/serializers/automations/change_secret.py:39
+msgid "Secret strategy"
+msgstr "密文策略"
+
+#: accounts/models/base.py:44 accounts/serializers/account/template.py:22
+#: accounts/serializers/automations/change_secret.py:44
+msgid "Password rules"
+msgstr "密码规则"
+
+#: accounts/models/base.py:64 accounts/serializers/account/virtual.py:20
#: acls/models/base.py:35 acls/models/base.py:96 acls/models/command_acl.py:21
#: acls/serializers/base.py:35 applications/models.py:9
#: assets/models/_user.py:22 assets/models/asset/common.py:91
@@ -502,46 +524,57 @@ msgstr "账号验证"
#: assets/models/domain.py:18 assets/models/group.py:17
#: assets/models/label.py:18 assets/models/platform.py:15
#: assets/models/platform.py:88 assets/serializers/asset/common.py:146
-#: assets/serializers/platform.py:110 assets/serializers/platform.py:223
+#: assets/serializers/platform.py:111 assets/serializers/platform.py:228
+#: authentication/backends/passkey/models.py:10
#: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21
#: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20
#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:32 settings/serializers/msg.py:82
-#: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12
+#: terminal/models/applet/applet.py:33 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:94
#: terminal/models/component/storage.py:26 terminal/models/component/task.py:13
#: terminal/models/component/terminal.py:84 users/forms/profile.py:33
-#: users/models/group.py:13 users/models/user.py:787
-#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273
-#: xpack/plugins/cloud/serializers/task.py:68
+#: users/models/group.py:13 users/models/preference.py:11
+#: users/models/user.py:798 xpack/plugins/cloud/models.py:32
+#: xpack/plugins/cloud/models.py:273 xpack/plugins/cloud/serializers/task.py:68
msgid "Name"
msgstr "名称"
-#: accounts/models/base.py:38
+#: accounts/models/base.py:69
msgid "Privileged"
msgstr "特权账号"
-#: accounts/models/base.py:39 assets/models/asset/common.py:156
+#: accounts/models/base.py:70 assets/models/asset/common.py:156
#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
#: assets/models/label.py:22
#: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:39
-#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
+#: terminal/models/applet/applet.py:40
+#: terminal/models/component/endpoint.py:105 users/serializers/user.py:170
msgid "Is active"
msgstr "激活"
-#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325
+#: accounts/models/template.py:17 assets/models/_user.py:53
+msgid "Auto push"
+msgstr "自动推送"
+
+#: accounts/models/template.py:20
+msgid "Platforms"
+msgstr "系统平台"
+
+#: accounts/models/template.py:22
+msgid "Push params"
+msgstr "账号推送参数"
+
+#: accounts/models/template.py:25 xpack/plugins/cloud/models.py:325
msgid "Account template"
msgstr "账号模版"
-# msgid "Account template"
-# msgstr "账号模版"
-#: accounts/models/template.py:24
+#: accounts/models/template.py:30
msgid "Can view asset account template secret"
msgstr "可以查看资产账号模版密码"
-#: accounts/models/template.py:25
+#: accounts/models/template.py:31
msgid "Can change asset account template secret"
msgstr "可以更改资产账号模版密码"
@@ -622,54 +655,55 @@ msgstr "立即推送"
msgid "Exist policy"
msgstr "账号存在策略"
-#: accounts/serializers/account/account.py:182 applications/models.py:11
+#: accounts/serializers/account/account.py:185 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:89
#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8
-#: assets/serializers/platform.py:128 assets/serializers/platform.py:224
+#: assets/serializers/platform.py:133 assets/serializers/platform.py:229
#: perms/serializers/user_permission.py:26 settings/models.py:34
-#: tickets/models/ticket/apply_application.py:13
+#: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12
msgid "Category"
msgstr "类别"
-#: accounts/serializers/account/account.py:183
+#: accounts/serializers/account/account.py:186
#: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:90
-#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112
-#: assets/serializers/platform.py:127 audits/serializers.py:49
+#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:113
+#: assets/serializers/platform.py:132 audits/serializers.py:50
+#: audits/serializers.py:170
#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137
-#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38
+#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39
#: terminal/models/component/storage.py:57
#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
-#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
-#: terminal/serializers/storage.py:238 tickets/models/comment.py:26
+#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228
+#: terminal/serializers/storage.py:240 tickets/models/comment.py:26
#: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16
#: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53
#: tickets/serializers/ticket/ticket.py:19
msgid "Type"
msgstr "类型"
-#: accounts/serializers/account/account.py:198
+#: accounts/serializers/account/account.py:201
msgid "Asset not found"
msgstr "资产不存在"
-#: accounts/serializers/account/account.py:238
+#: accounts/serializers/account/account.py:241
msgid "Has secret"
msgstr "已托管密码"
-#: accounts/serializers/account/account.py:248 ops/models/celery.py:60
+#: accounts/serializers/account/account.py:251 ops/models/celery.py:60
#: tickets/models/comment.py:13 tickets/models/ticket/general.py:45
#: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14
#: tickets/serializers/ticket/ticket.py:21
msgid "State"
msgstr "状态"
-#: accounts/serializers/account/account.py:250
+#: accounts/serializers/account/account.py:253
msgid "Changed"
msgstr "已修改"
-#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/account.py:263
#: accounts/serializers/automations/base.py:22 acls/models/base.py:97
#: assets/models/automations/base.py:19
#: assets/serializers/automations/base.py:20 ops/models/base.py:17
@@ -678,46 +712,46 @@ msgstr "已修改"
msgid "Assets"
msgstr "资产"
-#: accounts/serializers/account/account.py:315
+#: accounts/serializers/account/account.py:318
msgid "Account already exists"
msgstr "账号已存在"
-#: accounts/serializers/account/account.py:365
+#: accounts/serializers/account/account.py:368
#, python-format
msgid "Asset does not support this secret type: %s"
msgstr "资产不支持账号类型: %s"
-#: accounts/serializers/account/account.py:397
+#: accounts/serializers/account/account.py:400
msgid "Account has exist"
msgstr "账号已存在"
-#: accounts/serializers/account/account.py:430
+#: accounts/serializers/account/account.py:433
#: authentication/serializers/connect_token_secret.py:156
#: authentication/templates/authentication/_access_key_modal.html:30
#: perms/models/perm_node.py:21 users/serializers/group.py:31
msgid "ID"
msgstr "ID"
-#: accounts/serializers/account/account.py:437 acls/serializers/base.py:116
-#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49
-#: audits/models.py:85 audits/models.py:163
-#: authentication/models/connection_token.py:32
+#: accounts/serializers/account/account.py:440 acls/serializers/base.py:116
+#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:50
+#: audits/models.py:86 audits/models.py:164 audits/models.py:262
+#: audits/serializers.py:171 authentication/models/connection_token.py:32
#: authentication/models/sso_token.py:16
#: notifications/models/notification.py:12
#: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58
-#: perms/serializers/permission.py:30 rbac/builtin.py:123
+#: perms/serializers/permission.py:30 rbac/builtin.py:124
#: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17
#: terminal/backends/command/models.py:16 terminal/models/session/session.py:29
-#: terminal/models/session/sharing.py:33 terminal/notifications.py:156
+#: terminal/models/session/sharing.py:34 terminal/notifications.py:156
#: terminal/notifications.py:205 terminal/serializers/command.py:16
#: terminal/templates/terminal/_msg_command_warning.html:6
#: terminal/templates/terminal/_msg_session_sharing.html:6
-#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:981
-#: users/models/user.py:1017 users/serializers/group.py:18
+#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:996
+#: users/models/user.py:1032 users/serializers/group.py:18
msgid "User"
msgstr "用户"
-#: accounts/serializers/account/account.py:438
+#: accounts/serializers/account/account.py:441
#: authentication/templates/authentication/_access_key_modal.html:33
#: terminal/notifications.py:158 terminal/notifications.py:207
msgid "Date"
@@ -736,7 +770,7 @@ msgid "Executed amount"
msgstr "执行次数"
#: accounts/serializers/account/backup.py:35
-#: accounts/serializers/automations/change_secret.py:58
+#: accounts/serializers/automations/change_secret.py:57
msgid "Currently only mail sending is supported"
msgstr "当前只支持邮件发送"
@@ -761,27 +795,67 @@ msgstr ""
"提示: 如果认证时不需要用户名，可填写为 null, 如果是 AD 账号，格式为 "
"username@domain"
+#: accounts/serializers/account/template.py:11
+#, fuzzy
+#| msgid "Password strength"
+msgid "Password length"
+msgstr "密码强度："
+
+#: accounts/serializers/account/template.py:12
+#, fuzzy
+#| msgid "Powershell"
+msgid "Lowercase"
+msgstr "PowerShell"
+
+#: accounts/serializers/account/template.py:13
+msgid "Uppercase"
+msgstr ""
+
+#: accounts/serializers/account/template.py:14
+msgid "Digit"
+msgstr ""
+
+#: accounts/serializers/account/template.py:15
+msgid "Special symbol"
+msgstr ""
+
+#: accounts/serializers/account/template.py:36
+msgid "Secret generation strategy for account creation"
+msgstr "密码生成策略，用于账号创建时，设置密码"
+
+#: accounts/serializers/account/template.py:37
+msgid "Whether to automatically push the account to the asset"
+msgstr "是否自动推送账号到资产"
+
+#: accounts/serializers/account/template.py:40
+msgid ""
+"Associated platform, you can configure push parameters. If not associated, "
+"default parameters will be used"
+msgstr "关联平台，可配置推送参数，如果不关联，将使用默认参数"
+
#: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27
#: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
#: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142
+#: settings/models.py:37 terminal/models/applet/applet.py:45
+#: terminal/models/applet/applet.py:302 terminal/models/applet/host.py:142
#: terminal/models/component/endpoint.py:24
#: terminal/models/component/endpoint.py:104
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
-#: tickets/models/ticket/general.py:297 users/models/user.py:826
+#: tickets/models/ticket/general.py:297 users/models/user.py:834
#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109
msgid "Comment"
msgstr "备注"
-#: accounts/serializers/account/virtual.py:22
+#: accounts/serializers/account/virtual.py:24
msgid ""
"Current only support login from AD/LDAP. Secret priority: Same account in "
-"asset secret > Login secret > Manual input"
+"asset secret > Login secret > Manual input.
For security, please set "
+"config CACHE_LOGIN_PASSWORD_ENABLED to true"
msgstr ""
"当前仅支持 AD/LDAP 登录方式用户。 同名账号密码生效顺序: 资产上存在的同名账号"
-"密码 > 登录密码 > 手动输入"
+"密码 > 登录密码 > 手动输入
为了安全起见，请设置配置项 "
+"CACHE_LOGIN_PASSWORD_ENABLED=true，重启服务才能开启"
#: accounts/serializers/automations/base.py:23
#: assets/models/asset/common.py:155 assets/models/automations/base.py:18
@@ -800,31 +874,46 @@ msgstr "名称已存在"
msgid "Automation snapshot"
msgstr "自动化快照"
-#: accounts/serializers/automations/change_secret.py:43
+#: accounts/serializers/automations/change_secret.py:42
msgid "SSH Key strategy"
msgstr "SSH 密钥更改方式"
-#: accounts/serializers/automations/change_secret.py:81
+#: accounts/serializers/automations/change_secret.py:80
msgid "* Please enter the correct password length"
msgstr "* 请输入正确的密码长度"
-#: accounts/serializers/automations/change_secret.py:85
+#: accounts/serializers/automations/change_secret.py:84
msgid "* Password length range 6-30 bits"
msgstr "* 密码长度范围 6-30 位"
-#: accounts/serializers/automations/change_secret.py:115
+#: accounts/serializers/automations/change_secret.py:114
#: assets/models/automations/base.py:127
msgid "Automation task execution"
msgstr "自动化任务执行历史"
-#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53
-#: audits/models.py:59 audits/signal_handlers/activity_log.py:33
-#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40
-#: terminal/const.py:76 terminal/models/session/sharing.py:117
-#: tickets/views/approve.py:115
+#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54
+#: audits/models.py:60 audits/signal_handlers/activity_log.py:33
+#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40
+#: terminal/const.py:76 terminal/models/session/sharing.py:121
+#: tickets/views/approve.py:119
msgid "Success"
msgstr "成功"
+#: accounts/signal_handlers.py:46
+#, python-format
+msgid "Push related accounts to assets: %s, by system"
+msgstr "推送账号到资产: %s, 由系统执行"
+
+#: accounts/signal_handlers.py:55
+#, python-format
+msgid "Add account: %s"
+msgstr "添加账号: %s"
+
+#: accounts/signal_handlers.py:57
+#, python-format
+msgid "Delete account: %s"
+msgstr "删除账号: %s"
+
#: accounts/tasks/automation.py:24
msgid "Account execute automation"
msgstr "账号执行自动化"
@@ -853,19 +942,23 @@ msgstr "验证资产账号可用性"
msgid "Verify accounts connectivity"
msgstr "测试账号可连接性"
-#: accounts/utils.py:41
+#: accounts/utils.py:53
msgid "Password can not contains `{{` "
msgstr "密码不能包含 `{{` 字符"
-#: accounts/utils.py:44
+#: accounts/utils.py:55
+msgid "Password can not contains `{%` "
+msgstr "密码不能包含 `{%` 字符"
+
+#: accounts/utils.py:58
msgid "Password can not contains `'` "
msgstr "密码不能包含 `'` 字符"
-#: accounts/utils.py:46
+#: accounts/utils.py:60
msgid "Password can not contains `\"` "
msgstr "密码不能包含 `\"` 字符"
-#: accounts/utils.py:52
+#: accounts/utils.py:66
msgid "private key invalid or passphrase error"
msgstr "密钥不合法或密钥密码错误"
@@ -910,12 +1003,12 @@ msgstr "审批人"
#: acls/models/base.py:43 authentication/models/access_key.py:17
#: authentication/models/connection_token.py:53
#: authentication/templates/authentication/_access_key_modal.html:32
-#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28
+#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29
#: tickets/const.py:37
msgid "Active"
msgstr "激活中"
-#: acls/models/base.py:81 users/apps.py:9
+#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16
msgid "Users"
msgstr "用户管理"
@@ -1031,7 +1124,7 @@ msgid "None of the reviewers belong to Organization `{}`"
msgstr "所有复核人都不属于组织 `{}`"
#: acls/serializers/rules/rules.py:20
-#: xpack/plugins/cloud/serializers/task.py:133
+#: xpack/plugins/cloud/serializers/task.py:137
msgid "IP address invalid: `{}`"
msgstr "IP 地址无效: `{}`"
@@ -1104,6 +1197,10 @@ msgstr "资产管理"
msgid "{} disabled"
msgstr "{} 已禁用"
+#: assets/automations/base/manager.py:202
+msgid " - Platform {} ansible disabled"
+msgstr " - 平台 {} Ansible 已禁用, 无法执行任务"
+
#: assets/automations/ping_gateway/manager.py:33
#: authentication/models/connection_token.py:128
msgid "No account"
@@ -1128,7 +1225,7 @@ msgstr "认证失败"
msgid "Connect failed"
msgstr "连接失败"
-#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36
+#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37
#: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31
#: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104
msgid "Unknown"
@@ -1150,16 +1247,19 @@ msgstr "测试网关"
msgid "Gather facts"
msgstr "收集资产信息"
-#: assets/const/base.py:33 audits/const.py:47
+#: assets/const/base.py:33 audits/const.py:48
#: terminal/serializers/applet_host.py:32
msgid "Disabled"
msgstr "禁用"
#: assets/const/base.py:34 settings/serializers/basic.py:6
+#: users/serializers/preference/koko.py:15
+#: users/serializers/preference/lina.py:32
+#: users/serializers/preference/luna.py:60
msgid "Basic"
msgstr "基本"
-#: assets/const/base.py:35 assets/const/protocol.py:230
+#: assets/const/base.py:35 assets/const/protocol.py:245
#: assets/models/asset/web.py:13
msgid "Script"
msgstr "脚本"
@@ -1181,8 +1281,8 @@ msgid "Cloud service"
msgstr "云服务"
#: assets/const/category.py:14 assets/models/asset/gpt.py:11
-#: assets/models/asset/web.py:16 audits/const.py:34
-#: terminal/models/applet/applet.py:26
+#: assets/models/asset/web.py:16 audits/const.py:35
+#: terminal/models/applet/applet.py:27 users/const.py:47
msgid "Web"
msgstr "Web"
@@ -1202,7 +1302,7 @@ msgstr "私有云"
msgid "Kubernetes"
msgstr "Kubernetes"
-#: assets/const/device.py:7 terminal/models/applet/applet.py:25
+#: assets/const/device.py:7 terminal/models/applet/applet.py:26
#: tickets/const.py:8
msgid "General"
msgstr "一般"
@@ -1228,103 +1328,118 @@ msgid "Other"
msgstr "其它"
#: assets/const/protocol.py:48
-msgid "SFTP home"
+msgid "SFTP root"
msgstr "SFTP 根路径"
-#: assets/const/protocol.py:59
+#: assets/const/protocol.py:50
+#, python-brace-format
+msgid ""
+"SFTP root directory, Support variable:
- ${ACCOUNT} The connected "
+"account username
- ${HOME} The home directory of the connected account "
+"
- ${USER} The username of the user"
+msgstr ""
+"SFTP根目录，支持变量：
-${ACCOUNT}已连接帐户用户名
-${HOME}连接帐户的主"
+"目录
-${USER}用户的用户名"
+
+#: assets/const/protocol.py:65
msgid "Console"
msgstr "控制台"
-#: assets/const/protocol.py:60
+#: assets/const/protocol.py:66
msgid "Connect to console session"
msgstr "连接到控制台会话"
-#: assets/const/protocol.py:64
+#: assets/const/protocol.py:70
msgid "Any"
msgstr "任意"
-#: assets/const/protocol.py:66 settings/serializers/security.py:227
+#: assets/const/protocol.py:72 settings/serializers/security.py:228
msgid "Security"
msgstr "安全"
-#: assets/const/protocol.py:67
+#: assets/const/protocol.py:73
msgid "Security layer to use for the connection"
msgstr "连接 RDP 使用的安全层"
-#: assets/const/protocol.py:73
+#: assets/const/protocol.py:79
msgid "AD domain"
msgstr "AD 网域"
-#: assets/const/protocol.py:88
+#: assets/const/protocol.py:94
msgid "Username prompt"
msgstr "用户名提示"
-#: assets/const/protocol.py:89
+#: assets/const/protocol.py:95
msgid "We will send username when we see this prompt"
msgstr "当我们看到这个提示时，我们将发送用户名"
-#: assets/const/protocol.py:94
+#: assets/const/protocol.py:100
msgid "Password prompt"
msgstr "密码提示"
-#: assets/const/protocol.py:95
+#: assets/const/protocol.py:101
msgid "We will send password when we see this prompt"
msgstr "当我们看到这个提示时，我们将发送密码"
-#: assets/const/protocol.py:100
+#: assets/const/protocol.py:106
msgid "Success prompt"
msgstr "成功提示"
-#: assets/const/protocol.py:101
+#: assets/const/protocol.py:107
msgid "We will consider login success when we see this prompt"
msgstr "当我们看到这个提示时，我们将认为登录成功"
-#: assets/const/protocol.py:112 assets/models/asset/database.py:10
+#: assets/const/protocol.py:118 assets/models/asset/database.py:10
#: settings/serializers/msg.py:40
msgid "Use SSL"
msgstr "使用 SSL"
-#: assets/const/protocol.py:147
+#: assets/const/protocol.py:153
msgid "SYSDBA"
msgstr "SYSDBA"
-#: assets/const/protocol.py:148
+#: assets/const/protocol.py:154
msgid "Connect as SYSDBA"
msgstr "以 SYSDBA 角色连接"
-#: assets/const/protocol.py:177
+#: assets/const/protocol.py:169
+msgid ""
+"SQL Server version, Different versions have different connection drivers"
+msgstr "SQL Server 版本，不同版本有不同的连接驱动"
+
+#: assets/const/protocol.py:192
msgid "Auth username"
msgstr "使用用户名认证"
-#: assets/const/protocol.py:200
+#: assets/const/protocol.py:215
msgid "Safe mode"
msgstr "安全模式"
-#: assets/const/protocol.py:202
+#: assets/const/protocol.py:217
msgid ""
"When safe mode is enabled, some operations will be disabled, such as: New "
"tab, right click, visit other website, etc."
msgstr ""
"当安全模式启用时，一些操作将被禁用，例如：新建标签页、右键、访问其它网站 等"
-#: assets/const/protocol.py:207 assets/models/asset/web.py:9
+#: assets/const/protocol.py:222 assets/models/asset/web.py:9
#: assets/serializers/asset/info/spec.py:16
msgid "Autofill"
msgstr "自动代填"
-#: assets/const/protocol.py:215 assets/models/asset/web.py:10
+#: assets/const/protocol.py:230 assets/models/asset/web.py:10
msgid "Username selector"
msgstr "用户名选择器"
-#: assets/const/protocol.py:220 assets/models/asset/web.py:11
+#: assets/const/protocol.py:235 assets/models/asset/web.py:11
msgid "Password selector"
msgstr "密码选择器"
-#: assets/const/protocol.py:225 assets/models/asset/web.py:12
+#: assets/const/protocol.py:240 assets/models/asset/web.py:12
msgid "Submit selector"
msgstr "确认按钮选择器"
-#: assets/const/protocol.py:248
+#: assets/const/protocol.py:263
msgid "API mode"
msgstr "API 模式"
@@ -1352,19 +1467,19 @@ msgstr "SSH公钥"
# msgstr "备注"
#: assets/models/_user.py:28 assets/models/automations/base.py:114
#: assets/models/cmd_filter.py:41 assets/models/group.py:19
-#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227
-#: users/models/user.py:1018
+#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54
+#: ops/models/job.py:227 users/models/user.py:1033
msgid "Date created"
msgstr "创建日期"
#: assets/models/_user.py:29 assets/models/cmd_filter.py:42
-#: common/db/models.py:35 users/models/user.py:847
+#: common/db/models.py:35 users/models/user.py:855
msgid "Date updated"
msgstr "更新日期"
#: assets/models/_user.py:30 assets/models/cmd_filter.py:44
#: assets/models/cmd_filter.py:91 assets/models/group.py:18
-#: common/db/models.py:32 users/models/user.py:833
+#: common/db/models.py:32 users/models/user.py:841
#: users/serializers/group.py:29
msgid "Created by"
msgstr "创建者"
@@ -1391,15 +1506,11 @@ msgstr "用户名与用户相同"
#: assets/models/_user.py:52 authentication/models/connection_token.py:41
#: authentication/serializers/connect_token_secret.py:111
-#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19
+#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19
#: terminal/serializers/session.py:42 terminal/serializers/storage.py:70
msgid "Protocol"
msgstr "协议"
-#: assets/models/_user.py:53
-msgid "Auto push"
-msgstr "自动推送"
-
#: assets/models/_user.py:54
msgid "Sudo"
msgstr "Sudo"
@@ -1455,6 +1566,7 @@ msgid "Address"
msgstr "地址"
#: assets/models/asset/common.py:151 assets/models/platform.py:119
+#: authentication/backends/passkey/models.py:12
#: authentication/serializers/connect_token_secret.py:115
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321
msgid "Platform"
@@ -1532,9 +1644,9 @@ msgstr "自动化任务"
msgid "Asset automation task"
msgstr "资产自动化任务"
-#: assets/models/automations/base.py:113 audits/models.py:199
-#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220
-#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139
+#: assets/models/automations/base.py:113 audits/models.py:200
+#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220
+#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139
#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18
#: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283
#: tickets/serializers/super_ticket.py:13
@@ -1561,7 +1673,7 @@ msgstr "校验日期"
#: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61
#: perms/serializers/permission.py:32 users/models/group.py:25
-#: users/models/user.py:793
+#: users/models/user.py:804
msgid "User group"
msgstr "用户组"
@@ -1602,7 +1714,7 @@ msgid "Asset group"
msgstr "资产组"
#: assets/models/group.py:31 assets/models/platform.py:19
-#: assets/serializers/platform.py:113
+#: assets/serializers/platform.py:114
#: xpack/plugins/cloud/providers/nutanix.py:30
msgid "Default"
msgstr "默认"
@@ -1611,7 +1723,7 @@ msgstr "默认"
msgid "Default asset group"
msgstr "默认资产组"
-#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003
+#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018
msgid "System"
msgstr "系统"
@@ -1620,12 +1732,13 @@ msgstr "系统"
#: authentication/models/connection_token.py:29
#: authentication/serializers/connect_token_secret.py:122
#: common/serializers/common.py:86 settings/models.py:33
+#: users/models/preference.py:13
msgid "Value"
msgstr "值"
#: assets/models/label.py:40 assets/serializers/asset/common.py:123
#: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13
-#: assets/serializers/platform.py:111
+#: assets/serializers/platform.py:112
#: authentication/serializers/connect_token_secret.py:121
#: common/serializers/common.py:85 perms/serializers/user_permission.py:28
#: settings/serializers/msg.py:83
@@ -1673,13 +1786,14 @@ msgstr "必须的"
msgid "Public"
msgstr "开放的"
-#: assets/models/platform.py:21 assets/serializers/platform.py:48
-#: settings/serializers/settings.py:65
+#: assets/models/platform.py:21 assets/serializers/platform.py:49
+#: settings/serializers/settings.py:66
#: users/templates/users/reset_password.html:29
msgid "Setting"
msgstr "设置"
-#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36
+#: assets/models/platform.py:38 audits/const.py:49
+#: authentication/backends/passkey/models.py:11 settings/models.py:36
#: terminal/serializers/applet_host.py:33
msgid "Enabled"
msgstr "启用"
@@ -1688,11 +1802,11 @@ msgstr "启用"
msgid "Ansible config"
msgstr "Ansible 配置"
-#: assets/models/platform.py:41 assets/serializers/platform.py:32
+#: assets/models/platform.py:41 assets/serializers/platform.py:33
msgid "Ping enabled"
msgstr "启用资产探活"
-#: assets/models/platform.py:42 assets/serializers/platform.py:33
+#: assets/models/platform.py:42 assets/serializers/platform.py:34
msgid "Ping method"
msgstr "资产探活方式"
@@ -1701,12 +1815,12 @@ msgid "Ping params"
msgstr "资产探活参数"
#: assets/models/platform.py:45 assets/models/platform.py:69
-#: assets/serializers/platform.py:34
+#: assets/serializers/platform.py:35
msgid "Gather facts enabled"
msgstr "启用收集资产信息"
#: assets/models/platform.py:47 assets/models/platform.py:71
-#: assets/serializers/platform.py:35
+#: assets/serializers/platform.py:36
msgid "Gather facts method"
msgstr "收集信息方式"
@@ -1714,11 +1828,11 @@ msgstr "收集信息方式"
msgid "Gather facts params"
msgstr "收集信息参数"
-#: assets/models/platform.py:51 assets/serializers/platform.py:38
+#: assets/models/platform.py:51 assets/serializers/platform.py:39
msgid "Change secret enabled"
msgstr "启用改密"
-#: assets/models/platform.py:53 assets/serializers/platform.py:39
+#: assets/models/platform.py:53 assets/serializers/platform.py:40
msgid "Change secret method"
msgstr "改密方式"
@@ -1726,11 +1840,11 @@ msgstr "改密方式"
msgid "Change secret params"
msgstr "改密参数"
-#: assets/models/platform.py:57 assets/serializers/platform.py:40
+#: assets/models/platform.py:57 assets/serializers/platform.py:41
msgid "Push account enabled"
msgstr "启用账号推送"
-#: assets/models/platform.py:59 assets/serializers/platform.py:41
+#: assets/models/platform.py:59 assets/serializers/platform.py:42
msgid "Push account method"
msgstr "账号推送方式"
@@ -1738,11 +1852,11 @@ msgstr "账号推送方式"
msgid "Push account params"
msgstr "账号推送参数"
-#: assets/models/platform.py:63 assets/serializers/platform.py:36
+#: assets/models/platform.py:63 assets/serializers/platform.py:37
msgid "Verify account enabled"
msgstr "开启账号验证"
-#: assets/models/platform.py:65 assets/serializers/platform.py:37
+#: assets/models/platform.py:65 assets/serializers/platform.py:38
msgid "Verify account method"
msgstr "账号验证方式"
@@ -1758,23 +1872,23 @@ msgstr "元数据"
msgid "Internal"
msgstr "内置"
-#: assets/models/platform.py:96 assets/serializers/platform.py:126
+#: assets/models/platform.py:96 assets/serializers/platform.py:131
msgid "Charset"
msgstr "编码"
-#: assets/models/platform.py:98 assets/serializers/platform.py:154
+#: assets/models/platform.py:98 assets/serializers/platform.py:159
msgid "Domain enabled"
msgstr "启用网域"
-#: assets/models/platform.py:100 assets/serializers/platform.py:153
+#: assets/models/platform.py:100 assets/serializers/platform.py:158
msgid "Su enabled"
msgstr "启用账号切换"
-#: assets/models/platform.py:101 assets/serializers/platform.py:132
+#: assets/models/platform.py:101 assets/serializers/platform.py:137
msgid "Su method"
msgstr "账号切换方式"
-#: assets/models/platform.py:102 assets/serializers/platform.py:135
+#: assets/models/platform.py:102 assets/serializers/platform.py:140
msgid "Custom fields"
msgstr "自定义属性"
@@ -1789,7 +1903,7 @@ msgid ""
"type"
msgstr "资产中批量更新平台，不符合平台类型跳过的资产"
-#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129
+#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134
#: authentication/serializers/connect_token_secret.py:29
#: authentication/serializers/connect_token_secret.py:72
#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324
@@ -1922,59 +2036,59 @@ msgstr "值"
msgid "Can't contains: /"
msgstr "不能包含: /"
-#: assets/serializers/platform.py:42
+#: assets/serializers/platform.py:43
msgid "Gather accounts enabled"
msgstr "启用账号收集"
-#: assets/serializers/platform.py:43
+#: assets/serializers/platform.py:44
msgid "Gather accounts method"
msgstr "收集账号方式"
-#: assets/serializers/platform.py:49
+#: assets/serializers/platform.py:50
msgid "Port from addr"
msgstr "端口来自地址"
-#: assets/serializers/platform.py:61
+#: assets/serializers/platform.py:62
msgid ""
"This protocol is primary, and it must be set when adding assets. "
"Additionally, there can only be one primary protocol."
msgstr "该协议是主要的，添加资产时必须设置。并且只能有一个主要协议"
-#: assets/serializers/platform.py:66
+#: assets/serializers/platform.py:67
msgid "This protocol is required, and it must be set when adding assets."
msgstr "该协议是必填的，添加资产时必须设置"
-#: assets/serializers/platform.py:69
+#: assets/serializers/platform.py:70
msgid ""
"This protocol is default, when adding assets, it will be displayed by "
"default."
msgstr "该协议是默认的，添加资产时，将默认显示"
-#: assets/serializers/platform.py:72
+#: assets/serializers/platform.py:73
msgid "This protocol is public, asset will show this protocol to user"
msgstr "该协议是公开的，资产将向用户显示该协议并可以连接使用"
-#: assets/serializers/platform.py:114
+#: assets/serializers/platform.py:115
msgid "Help text"
msgstr "帮助"
-#: assets/serializers/platform.py:115
+#: assets/serializers/platform.py:116
msgid "Choices"
msgstr "选择"
-#: assets/serializers/platform.py:130
+#: assets/serializers/platform.py:135
msgid "Automation"
msgstr "自动化"
-#: assets/serializers/platform.py:155
+#: assets/serializers/platform.py:160
msgid "Default Domain"
msgstr "默认网域"
-#: assets/serializers/platform.py:176
+#: assets/serializers/platform.py:181
msgid "type is required"
msgstr "类型 该字段是必填项。"
-#: assets/serializers/platform.py:199
+#: assets/serializers/platform.py:204
msgid "Protocols is required"
msgstr "协议是必填的"
@@ -2066,7 +2180,7 @@ msgstr "删除目录"
#: audits/const.py:14 audits/const.py:25
#: authentication/templates/authentication/_access_key_modal.html:65
-#: perms/const.py:17 rbac/tree.py:234
+#: perms/const.py:17 rbac/tree.py:235
msgid "Delete"
msgstr "删除"
@@ -2082,7 +2196,8 @@ msgstr "重命名"
msgid "Symlink"
msgstr "建立软链接"
-#: audits/const.py:18 perms/const.py:14
+#: audits/const.py:18 audits/const.py:28 perms/const.py:14
+#: terminal/api/session/session.py:141
msgid "Download"
msgstr "下载"
@@ -2090,7 +2205,7 @@ msgstr "下载"
msgid "Rename dir"
msgstr "映射目录"
-#: audits/const.py:23 rbac/tree.py:232
+#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252
#: terminal/templates/terminal/_msg_command_warning.html:18
#: terminal/templates/terminal/_msg_session_sharing.html:10
msgid "View"
@@ -2098,48 +2213,48 @@ msgstr "查看"
#: audits/const.py:26
#: authentication/templates/authentication/_access_key_modal.html:22
-#: rbac/tree.py:231
+#: rbac/tree.py:232
msgid "Create"
msgstr "创建"
-#: audits/const.py:28 perms/const.py:12
+#: audits/const.py:29 perms/const.py:12
msgid "Connect"
msgstr "连接"
-#: audits/const.py:29 authentication/templates/authentication/login.html:240
-#: authentication/templates/authentication/login.html:313
-#: templates/_header_bar.html:89
+#: audits/const.py:30 authentication/templates/authentication/login.html:252
+#: authentication/templates/authentication/login.html:325
+#: templates/_header_bar.html:95
msgid "Login"
msgstr "登录"
-#: audits/const.py:30 ops/const.py:9
+#: audits/const.py:31 ops/const.py:9
msgid "Change password"
msgstr "改密"
-#: audits/const.py:35 settings/serializers/terminal.py:6
+#: audits/const.py:36 settings/serializers/terminal.py:6
#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164
#: terminal/serializers/session.py:49 terminal/serializers/session.py:63
msgid "Terminal"
msgstr "终端"
-#: audits/const.py:40 audits/models.py:127
+#: audits/const.py:41 audits/models.py:128
msgid "Operate log"
msgstr "操作日志"
-#: audits/const.py:41
+#: audits/const.py:42
msgid "Session log"
msgstr "会话日志"
-#: audits/const.py:42
+#: audits/const.py:43
msgid "Login log"
msgstr "登录日志"
-#: audits/const.py:43 terminal/models/applet/host.py:143
+#: audits/const.py:44 terminal/models/applet/host.py:143
#: terminal/models/component/task.py:22
msgid "Task"
msgstr "任务"
-#: audits/const.py:49
+#: audits/const.py:50
msgid "-"
msgstr "-"
@@ -2151,120 +2266,141 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: audits/models.py:42
+#: audits/models.py:43
msgid "Job audit log"
msgstr "作业审计日志"
-#: audits/models.py:51 audits/models.py:95 audits/models.py:166
-#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109
+#: audits/models.py:52 audits/models.py:96 audits/models.py:167
+#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113
msgid "Remote addr"
msgstr "远端地址"
-#: audits/models.py:56 audits/serializers.py:34
+#: audits/models.py:57 audits/serializers.py:35
msgid "Operate"
msgstr "操作"
-#: audits/models.py:58
+#: audits/models.py:59
msgid "Filename"
msgstr "文件名"
-#: audits/models.py:61 common/serializers/common.py:98
+#: audits/models.py:62 common/serializers/common.py:98
msgid "File"
msgstr "文件"
-#: audits/models.py:62 terminal/backends/command/models.py:21
-#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19
-#: terminal/models/session/sharing.py:91
+#: audits/models.py:63 terminal/backends/command/models.py:21
+#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20
+#: terminal/models/session/sharing.py:95
#: terminal/templates/terminal/_msg_command_alert.html:10
#: terminal/templates/terminal/_msg_command_warning.html:17
#: tickets/models/ticket/command_confirm.py:15
msgid "Session"
msgstr "会话"
-#: audits/models.py:65
+#: audits/models.py:66
msgid "File transfer log"
msgstr "文件管理"
-#: audits/models.py:89 audits/serializers.py:85
+#: audits/models.py:90 audits/serializers.py:86
msgid "Resource Type"
msgstr "资源类型"
-#: audits/models.py:90 audits/models.py:93 audits/models.py:139
-#: audits/serializers.py:84
+#: audits/models.py:91 audits/models.py:94 audits/models.py:140
+#: audits/serializers.py:85
msgid "Resource"
msgstr "资源"
-#: audits/models.py:96 audits/models.py:142 audits/models.py:168
+#: audits/models.py:97 audits/models.py:143 audits/models.py:169
#: terminal/serializers/command.py:75
msgid "Datetime"
msgstr "日期"
-#: audits/models.py:135
+#: audits/models.py:136
msgid "Activity type"
msgstr "活动类型"
-#: audits/models.py:145
+#: audits/models.py:146
msgid "Detail"
msgstr "详情"
-#: audits/models.py:148
+#: audits/models.py:149
msgid "Detail ID"
msgstr "详情 ID"
-#: audits/models.py:152
+#: audits/models.py:153
msgid "Activity log"
msgstr "活动日志"
-#: audits/models.py:164
+#: audits/models.py:165
msgid "Change by"
msgstr "修改者"
-#: audits/models.py:174
+#: audits/models.py:175
msgid "Password change log"
msgstr "改密日志"
-#: audits/models.py:181
+#: audits/models.py:182 audits/models.py:257
msgid "Login type"
msgstr "登录方式"
-#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10
+#: audits/models.py:184 audits/models.py:253
+#: tickets/models/ticket/login_confirm.py:10
msgid "Login IP"
msgstr "登录 IP"
-#: audits/models.py:185
+#: audits/models.py:186 audits/models.py:255
#: authentication/templates/authentication/_msg_different_city.html:11
#: tickets/models/ticket/login_confirm.py:11
msgid "Login city"
msgstr "登录城市"
-#: audits/models.py:188 audits/serializers.py:64
+#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65
msgid "User agent"
msgstr "用户代理"
-#: audits/models.py:191 audits/serializers.py:48
+#: audits/models.py:192 audits/serializers.py:49
#: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms/profile.py:65 users/models/user.py:810
-#: users/serializers/profile.py:126
+#: users/forms/profile.py:65 users/models/user.py:821
+#: users/serializers/profile.py:102
msgid "MFA"
msgstr "MFA"
-#: audits/models.py:201
+#: audits/models.py:202
msgid "Date login"
msgstr "登录日期"
-#: audits/models.py:203 audits/serializers.py:66
+#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67
+#: audits/serializers.py:183
msgid "Authentication backend"
msgstr "认证方式"
-#: audits/models.py:247
+#: audits/models.py:248
msgid "User login log"
msgstr "用户登录日志"
-#: audits/serializers.py:65
+#: audits/models.py:254
+msgid "Session key"
+msgstr "会话标识"
+
+#: audits/models.py:260 authentication/models/connection_token.py:47
+#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74
+#: tickets/models/ticket/apply_application.py:31
+#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839
+msgid "Date expired"
+msgstr "失效日期"
+
+#: audits/models.py:278
+msgid "User session"
+msgstr "用户会话"
+
+#: audits/models.py:280
+msgid "Offline ussr session"
+msgstr "下限用户会话"
+
+#: audits/serializers.py:66
msgid "Reason display"
msgstr "原因描述"
-#: audits/serializers.py:133
+#: audits/serializers.py:134
#, python-format
msgid "User %s %s this resource"
msgstr "用户 %s %s 了当前资源"
@@ -2284,46 +2420,51 @@ msgstr "用户 %s 登录系统 %s"
msgid "User %s perform a task for this resource: %s"
msgstr "用户 %s 在当前资源， 执行了任务 (%s)"
-#: audits/signal_handlers/login_log.py:27
+#: audits/signal_handlers/login_log.py:34
msgid "SSH Key"
msgstr "SSH 密钥"
-#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13
+#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13
msgid "SSO"
msgstr "SSO"
-#: audits/signal_handlers/login_log.py:30
+#: audits/signal_handlers/login_log.py:37
msgid "Auth Token"
msgstr "认证令牌"
-#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73
-#: authentication/views/login.py:75 authentication/views/wecom.py:159
+#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73
+#: authentication/views/login.py:77 authentication/views/wecom.py:159
#: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10
-#: users/models/user.py:740 users/models/user.py:848
+#: users/models/user.py:751 users/models/user.py:856
msgid "WeCom"
msgstr "企业微信"
-#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122
-#: authentication/views/login.py:87 notifications/backends/__init__.py:14
+#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122
+#: authentication/views/login.py:89 notifications/backends/__init__.py:14
#: settings/serializers/auth/feishu.py:10
-#: settings/serializers/auth/feishu.py:13 users/models/user.py:742
-#: users/models/user.py:850
+#: settings/serializers/auth/feishu.py:13 users/models/user.py:753
+#: users/models/user.py:858
msgid "FeiShu"
msgstr "飞书"
-#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159
-#: authentication/views/login.py:81 notifications/backends/__init__.py:12
-#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741
-#: users/models/user.py:849
+#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159
+#: authentication/views/login.py:83 notifications/backends/__init__.py:12
+#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752
+#: users/models/user.py:857
msgid "DingTalk"
msgstr "钉钉"
-#: audits/signal_handlers/login_log.py:34
+#: audits/signal_handlers/login_log.py:41
#: authentication/models/temp_token.py:16
msgid "Temporary token"
msgstr "临时密码"
-#: audits/tasks.py:101
+#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95
+#: settings/serializers/auth/passkey.py:8
+msgid "Passkey"
+msgstr ""
+
+#: audits/tasks.py:101 users/signal_handlers.py:166
msgid "Clean audits session task log"
msgstr "清理审计会话任务日志"
@@ -2335,35 +2476,35 @@ msgstr "上传 FTP 文件到外部存储"
msgid "This action require verify your MFA"
msgstr "该操作需要验证您的 MFA, 请先开启并配置"
-#: authentication/api/connection_token.py:258
+#: authentication/api/connection_token.py:260
msgid "Reusable connection token is not allowed, global setting not enabled"
msgstr "不允许使用可重复使用的连接令牌，未启用全局设置"
-#: authentication/api/connection_token.py:338
+#: authentication/api/connection_token.py:351
msgid "Anonymous account is not supported for this asset"
msgstr "匿名账号不支持当前资产"
-#: authentication/api/connection_token.py:357
+#: authentication/api/connection_token.py:370
msgid "Account not found"
msgstr "账号未找到"
-#: authentication/api/connection_token.py:360
+#: authentication/api/connection_token.py:373
msgid "Permission expired"
msgstr "授权已过期"
-#: authentication/api/connection_token.py:374
+#: authentication/api/connection_token.py:387
msgid "ACL action is reject: {}({})"
msgstr "ACL 动作是拒绝: {}({})"
-#: authentication/api/connection_token.py:378
+#: authentication/api/connection_token.py:391
msgid "ACL action is review"
msgstr "ACL 动作是复核"
-#: authentication/api/mfa.py:57
+#: authentication/api/mfa.py:59
msgid "Current user not support mfa type: {}"
msgstr "当前用户不支持 MFA 类型: {}"
-#: authentication/api/password.py:32 terminal/api/session/session.py:259
+#: authentication/api/password.py:32 terminal/api/session/session.py:300
#: users/views/profile/reset.py:44
msgid "User does not exist: {}"
msgstr "用户不存在: {}"
@@ -2379,7 +2520,7 @@ msgid ""
msgstr "用户来自 {} 请去相应系统修改密码"
#: authentication/api/password.py:64
-#: authentication/templates/authentication/login.html:305
+#: authentication/templates/authentication/login.html:317
#: users/templates/users/forgot_password.html:27
#: users/templates/users/forgot_password.html:28
#: users/templates/users/forgot_password_previewing.html:13
@@ -2447,6 +2588,26 @@ msgstr "无效的令牌头。符号字符串不应包含无效字符。"
msgid "Invalid token or cache refreshed."
msgstr "刷新的令牌或缓存无效。"
+#: authentication/backends/passkey/api.py:52
+msgid "Auth failed"
+msgstr "认证失败"
+
+#: authentication/backends/passkey/fido.py:148
+msgid "This key is not registered"
+msgstr "此密钥未注册"
+
+#: authentication/backends/passkey/models.py:13
+msgid "Added on"
+msgstr "附加"
+
+#: authentication/backends/passkey/models.py:14
+msgid "Date last used"
+msgstr "最后使用日期"
+
+#: authentication/backends/passkey/models.py:15
+msgid "Credential ID"
+msgstr "凭证 ID"
+
#: authentication/confirm/password.py:16
msgid "Authentication failed password incorrect"
msgstr "认证失败 (用户名或密码不正确)"
@@ -2756,13 +2917,6 @@ msgstr "资产名称"
msgid "Reusable"
msgstr "可以重复使用"
-#: authentication/models/connection_token.py:47
-#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74
-#: tickets/models/ticket/apply_application.py:31
-#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831
-msgid "Date expired"
-msgstr "失效日期"
-
#: authentication/models/connection_token.py:51
#: perms/models/asset_permission.py:77
msgid "From ticket"
@@ -2862,7 +3016,7 @@ msgstr "动作"
#: authentication/serializers/connection_token.py:42
#: perms/serializers/permission.py:38 perms/serializers/permission.py:57
-#: users/serializers/user.py:96 users/serializers/user.py:173
+#: users/serializers/user.py:97 users/serializers/user.py:174
msgid "Is expired"
msgstr "已过期"
@@ -2870,7 +3024,7 @@ msgstr "已过期"
#: authentication/serializers/password_mfa.py:24
#: notifications/backends/__init__.py:10 settings/serializers/msg.py:22
#: settings/serializers/msg.py:57 users/forms/profile.py:102
-#: users/forms/profile.py:109 users/models/user.py:789
+#: users/forms/profile.py:109 users/models/user.py:800
#: users/templates/users/forgot_password.html:117
#: users/views/profile/reset.py:73
msgid "Email"
@@ -2882,8 +3036,8 @@ msgid "The {} cannot be empty"
msgstr "{} 不能为空"
#: authentication/serializers/token.py:79 perms/serializers/permission.py:37
-#: perms/serializers/permission.py:58 users/serializers/user.py:97
-#: users/serializers/user.py:170
+#: perms/serializers/permission.py:58 users/serializers/user.py:98
+#: users/serializers/user.py:171
msgid "Is valid"
msgstr "是否有效"
@@ -2908,13 +3062,13 @@ msgid "Show"
msgstr "显示"
#: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:635 users/serializers/profile.py:116
+#: users/models/user.py:646 users/serializers/profile.py:92
#: users/templates/users/user_verify_mfa.html:36
msgid "Disable"
msgstr "禁用"
#: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:636 users/serializers/profile.py:117
+#: users/models/user.py:647 users/serializers/profile.py:93
#: users/templates/users/mfa_setting.html:26
#: users/templates/users/mfa_setting.html:68
msgid "Enable"
@@ -2959,7 +3113,7 @@ msgstr "代码错误"
#: authentication/templates/authentication/_msg_reset_password_code.html:9
#: authentication/templates/authentication/_msg_rest_password_success.html:2
#: authentication/templates/authentication/_msg_rest_public_key_success.html:2
-#: jumpserver/conf.py:444
+#: jumpserver/conf.py:447
#: perms/templates/perms/_msg_item_permissions_expire.html:3
#: perms/templates/perms/_msg_permed_items_expire.html:3
#: tickets/templates/tickets/approve_check_password.html:33
@@ -3013,7 +3167,7 @@ msgid "request new one"
msgstr "重新申请"
#: authentication/templates/authentication/_msg_reset_password_code.html:12
-#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93
+#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97
#: terminal/templates/terminal/_msg_session_sharing.html:12
#: users/forms/profile.py:107 users/templates/users/forgot_password.html:66
msgid "Verify code"
@@ -3063,7 +3217,17 @@ msgstr "如果这次公钥更新不是由你发起的，那么你的账号可能
msgid "Cancel"
msgstr "取消"
-#: authentication/templates/authentication/login.html:320
+#: authentication/templates/authentication/login.html:237
+msgid ""
+"Configuration file has problems and cannot be logged in. Please contact the "
+"administrator or view latest docs"
+msgstr "配置文件有问题，无法登录，请联系管理员或查看最新文档"
+
+#: authentication/templates/authentication/login.html:238
+msgid "If you are administrator, you can update the config resolve it, set"
+msgstr "如果你是管理员，可以更新配置文件解决，设置配置项"
+
+#: authentication/templates/authentication/login.html:332
msgid "More login options"
msgstr "其他方式登录"
@@ -3099,6 +3263,16 @@ msgstr "返回"
msgid "Copy success"
msgstr "复制成功"
+#: authentication/templates/authentication/passkey.html:162
+msgid ""
+"This page is not served over HTTPS. Please use HTTPS to ensure security of "
+"your credentials."
+msgstr "本页面未使用 HTTPS 协议，请使用 HTTPS 协议以确保您的凭据安全。"
+
+#: authentication/templates/authentication/passkey.html:173
+msgid "Do you want to retry ?"
+msgstr "是否重试 ？"
+
#: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24
#: xpack/plugins/cloud/const.py:29
msgid "LAN"
@@ -3175,23 +3349,23 @@ msgstr "绑定 飞书 成功"
msgid "Failed to get user from FeiShu"
msgstr "从飞书获取用户失败"
-#: authentication/views/login.py:183
+#: authentication/views/login.py:210
msgid "Redirecting"
msgstr "跳转中"
-#: authentication/views/login.py:184
+#: authentication/views/login.py:211
msgid "Redirecting to {} authentication"
msgstr "正在跳转到 {} 认证"
-#: authentication/views/login.py:207
+#: authentication/views/login.py:234
msgid "Login timeout, please try again."
msgstr "登录超时，请重新登录"
-#: authentication/views/login.py:250
+#: authentication/views/login.py:277
msgid "User email already exists ({})"
msgstr "用户邮箱已存在 ({})"
-#: authentication/views/login.py:328
+#: authentication/views/login.py:361
msgid ""
"Wait for {} confirm, You also can copy link to her/him
\n"
" Don't close this page"
@@ -3199,15 +3373,15 @@ msgstr ""
"等待 {} 确认, 你也可以复制链接发给他/她
\n"
" 不要关闭本页面"
-#: authentication/views/login.py:333
+#: authentication/views/login.py:366
msgid "No ticket found"
msgstr "没有发现工单"
-#: authentication/views/login.py:369
+#: authentication/views/login.py:402
msgid "Logout success"
msgstr "退出登录成功"
-#: authentication/views/login.py:370
+#: authentication/views/login.py:403
msgid "Logout success, return login page"
msgstr "退出登录成功，返回到登录页面"
@@ -3260,7 +3434,7 @@ msgstr "准备"
msgid "Pending"
msgstr "待定的"
-#: common/const/choices.py:17 ops/const.py:58
+#: common/const/choices.py:17 ops/const.py:59
msgid "Running"
msgstr "运行中"
@@ -3344,7 +3518,7 @@ msgstr "忽略的"
msgid "discard time"
msgstr "忽略时间"
-#: common/db/models.py:33 users/models/user.py:834
+#: common/db/models.py:33 users/models/user.py:842
msgid "Updated by"
msgstr "最后更新者"
@@ -3526,29 +3700,11 @@ msgstr "不能包含特殊字符"
msgid "The mobile phone number format is incorrect"
msgstr "手机号格式不正确"
-#: common/views/mixins.py:74
-msgid "Export all"
-msgstr "导出所有"
-
-#: common/views/mixins.py:76
-msgid "Export only selected items"
-msgstr "仅导出选择项"
-
-#: common/views/mixins.py:81
-#, python-format
-msgid "Export filtered: %s"
-msgstr "导出搜素: %s"
-
-#: common/views/mixins.py:90
-#, python-format
-msgid "User %s view/export secret"
-msgstr "用户 %s 查看/导出 了密码"
-
-#: jumpserver/conf.py:443
+#: jumpserver/conf.py:446
msgid "Create account successfully"
msgstr "创建账号成功"
-#: jumpserver/conf.py:445
+#: jumpserver/conf.py:448
msgid "Your account has been created successfully"
msgstr "你的账号已创建成功"
@@ -3615,23 +3771,23 @@ msgstr "发布站内消息"
msgid "No account available"
msgstr "无可用账号"
-#: ops/ansible/inventory.py:260
+#: ops/ansible/inventory.py:263
msgid "Ansible disabled"
msgstr "Ansible 已禁用"
-#: ops/ansible/inventory.py:276
+#: ops/ansible/inventory.py:279
msgid "Skip hosts below:"
msgstr "跳过以下主机: "
-#: ops/api/celery.py:62 ops/api/celery.py:77
+#: ops/api/celery.py:64 ops/api/celery.py:79
msgid "Waiting task start"
msgstr "等待任务开始"
-#: ops/api/celery.py:138
+#: ops/api/celery.py:162
msgid "Task {} not found"
msgstr "任务 {} 不存在"
-#: ops/api/celery.py:143
+#: ops/api/celery.py:167
msgid "Task {} args or kwargs error"
msgstr "任务 {} 执行参数错误"
@@ -3715,7 +3871,11 @@ msgstr "PostgreSQL"
msgid "SQLServer"
msgstr "SQLServer"
-#: ops/const.py:60
+#: ops/const.py:55
+msgid "Raw"
+msgstr ""
+
+#: ops/const.py:61
msgid "Timeout"
msgstr "超时"
@@ -3763,7 +3923,7 @@ msgstr "参数"
#: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53
#: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30
-#: terminal/models/session/sharing.py:24
+#: terminal/models/session/sharing.py:25
msgid "Creator"
msgstr "创建者"
@@ -3804,7 +3964,7 @@ msgstr "可以查看任务监控"
msgid "Kwargs"
msgstr "其它参数"
-#: ops/models/celery.py:61 terminal/models/session/sharing.py:124
+#: ops/models/celery.py:61 terminal/models/session/sharing.py:128
#: tickets/const.py:25
msgid "Finished"
msgstr "结束"
@@ -3991,7 +4151,7 @@ msgstr "LDAP 同步设置组织为当前组织，请切换其他组织后再进
msgid "The organization have resource ({}) cannot be deleted"
msgstr "组织存在资源 ({}) 不能被删除"
-#: orgs/apps.py:7 rbac/tree.py:122
+#: orgs/apps.py:7 rbac/tree.py:123
msgid "App organizations"
msgstr "组织管理"
@@ -4020,7 +4180,7 @@ msgstr "默认组织"
msgid "SYSTEM"
msgstr "系统组织"
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40
+#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41
msgid "Builtin"
msgstr "内置的"
@@ -4034,7 +4194,7 @@ msgstr "可以查看所有加入的组织"
#: orgs/models.py:233
msgid "Can not delete virtual org"
-msgstr ""
+msgstr "无法删除虚拟组织"
#: orgs/tasks.py:9
msgid "Refresh organization cache"
@@ -4156,27 +4316,27 @@ msgstr "{} 至少有一个系统角色"
msgid "RBAC"
msgstr "RBAC"
-#: rbac/builtin.py:114
+#: rbac/builtin.py:115
msgid "SystemAdmin"
msgstr "系统管理员"
-#: rbac/builtin.py:117
+#: rbac/builtin.py:118
msgid "SystemAuditor"
msgstr "系统审计员"
-#: rbac/builtin.py:120
+#: rbac/builtin.py:121
msgid "SystemComponent"
msgstr "系统组件"
-#: rbac/builtin.py:126
+#: rbac/builtin.py:127
msgid "OrgAdmin"
msgstr "组织管理员"
-#: rbac/builtin.py:129
+#: rbac/builtin.py:130
msgid "OrgAuditor"
msgstr "组织审计员"
-#: rbac/builtin.py:132
+#: rbac/builtin.py:133
msgid "OrgUser"
msgstr "组织用户"
@@ -4214,7 +4374,7 @@ msgid "Scope"
msgstr "范围"
#: rbac/models/role.py:46 rbac/models/rolebinding.py:52
-#: users/models/user.py:797
+#: users/models/user.py:808
msgid "Role"
msgstr "角色"
@@ -4248,7 +4408,7 @@ msgstr "组织角色绑定"
msgid "System role binding"
msgstr "系统角色绑定"
-#: rbac/serializers/permission.py:25 users/serializers/profile.py:132
+#: rbac/serializers/permission.py:25 users/serializers/profile.py:108
msgid "Perms"
msgstr "权限"
@@ -4256,7 +4416,7 @@ msgstr "权限"
msgid "Users amount"
msgstr "用户数量"
-#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33
+#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34
msgid "Display name"
msgstr "显示名称"
@@ -4316,26 +4476,26 @@ msgstr "任务中心"
msgid "My assets"
msgstr "我的资产"
-#: rbac/tree.py:56 terminal/models/applet/applet.py:51
-#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29
+#: rbac/tree.py:56 terminal/models/applet/applet.py:52
+#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29
#: terminal/serializers/applet.py:15
msgid "Applet"
msgstr "远程应用"
-#: rbac/tree.py:123
+#: rbac/tree.py:124
msgid "Ticket comment"
msgstr "工单评论"
-#: rbac/tree.py:124 settings/serializers/feature.py:58
+#: rbac/tree.py:125 settings/serializers/feature.py:58
#: tickets/models/ticket/general.py:307
msgid "Ticket"
msgstr "工单管理"
-#: rbac/tree.py:125
+#: rbac/tree.py:126
msgid "Common setting"
msgstr "一般设置"
-#: rbac/tree.py:126
+#: rbac/tree.py:127
msgid "View permission tree"
msgstr "查看授权树"
@@ -4380,7 +4540,7 @@ msgstr "测试手机号 该字段是必填项。"
msgid "Settings"
msgstr "系统设置"
-#: settings/models.py:35
+#: settings/models.py:35 users/models/preference.py:14
msgid "Encrypted"
msgstr "加密的"
@@ -4468,11 +4628,15 @@ msgstr "企业微信 认证"
msgid "SSO Auth"
msgstr "SSO 令牌认证"
-#: settings/serializers/auth/base.py:24
+#: settings/serializers/auth/base.py:22
+msgid "Passkey Auth"
+msgstr "Passkey 认证"
+
+#: settings/serializers/auth/base.py:25
msgid "Forgot password url"
msgstr "忘记密码 URL"
-#: settings/serializers/auth/base.py:30
+#: settings/serializers/auth/base.py:28
msgid "Enable login redirect msg"
msgstr "启用登录跳转提示"
@@ -4709,6 +4873,30 @@ msgstr "使用状态"
msgid "Use nonce"
msgstr "临时使用"
+#: settings/serializers/auth/passkey.py:11
+msgid "Enable passkey Auth"
+msgstr "启用 Passkey 认证"
+
+#: settings/serializers/auth/passkey.py:12
+msgid "Only SSL domain can use passkey auth"
+msgstr "只有 SSL 域名可以使用 Passkey(通行密钥)认证"
+
+#: settings/serializers/auth/passkey.py:15
+msgid "FIDO server ID"
+msgstr "Passkey 服务域名"
+
+#: settings/serializers/auth/passkey.py:17
+msgid ""
+"The hostname can using passkey auth, If not set, will use request host and "
+"the request host in DOMAINS, If multiple domains, use comma to separate"
+msgstr ""
+"可以使用 Passkey 认证的域名，如果不设置，将使用请求主机(主机名在可信域 "
+"DOMAINS中), 如果有多个域名，使用逗号分隔, 不需要端口号"
+
+#: settings/serializers/auth/passkey.py:22
+msgid "FIDO server name"
+msgstr "Passkey 服务名称"
+
#: settings/serializers/auth/radius.py:13
msgid "Radius"
msgstr "Radius"
@@ -4853,41 +5041,43 @@ msgstr "启用企业微信认证"
msgid "Site url"
msgstr "当前站点 URL"
-#: settings/serializers/basic.py:10
+#: settings/serializers/basic.py:11
msgid ""
-"Email links or other system callbacks are used to access it, eg: http://dev."
-"jumpserver.org:8080"
+"External URL, email links or other system callbacks are used to access it, "
+"eg: http://dev.jumpserver.org:8080"
msgstr ""
+"外部可访问的 URL, 用于邮件链接或其它系统回调, 例如: http://dev.jumpserver."
+"org:8080"
-#: settings/serializers/basic.py:13
+#: settings/serializers/basic.py:16
msgid "User guide url"
msgstr "用户向导URL"
-#: settings/serializers/basic.py:14
+#: settings/serializers/basic.py:17
msgid "User first login update profile done redirect to it"
msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档"
-#: settings/serializers/basic.py:17
+#: settings/serializers/basic.py:20
msgid "Global organization name"
msgstr "全局组织名"
-#: settings/serializers/basic.py:18
+#: settings/serializers/basic.py:21
msgid "The name of global organization to display"
msgstr "全局组织的显示名称，默认为 全局组织"
-#: settings/serializers/basic.py:21
+#: settings/serializers/basic.py:24
msgid "Help Docs URL"
msgstr "文档链接"
-#: settings/serializers/basic.py:22
+#: settings/serializers/basic.py:25
msgid "default: http://docs.jumpserver.org"
msgstr "默认: http://dev.jumpserver.org:8080"
-#: settings/serializers/basic.py:25
+#: settings/serializers/basic.py:28
msgid "Help Support URL"
msgstr "支持链接"
-#: settings/serializers/basic.py:26
+#: settings/serializers/basic.py:29
msgid "default: http://www.jumpserver.org/support/"
msgstr "默认: http://www.jumpserver.org/support/"
@@ -5103,11 +5293,11 @@ msgstr ""
"放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问"
"题"
-#: settings/serializers/security.py:16
+#: settings/serializers/security.py:17
msgid "User password expiration (day)"
msgstr "用户密码过期时间 (天)"
-#: settings/serializers/security.py:18
+#: settings/serializers/security.py:19
msgid ""
"If the user does not update the password during the time, the user password "
"will expire failure;The password expiration reminder mail will be automatic "
@@ -5116,85 +5306,85 @@ msgstr ""
"如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期提醒邮件将在密码过"
"期前5天内由系统 (每天)自动发送给用户"
-#: settings/serializers/security.py:25
+#: settings/serializers/security.py:26
msgid "Number of repeated historical passwords"
msgstr "不能设置近几次密码"
-#: settings/serializers/security.py:27
+#: settings/serializers/security.py:28
msgid ""
"Tip: When the user resets the password, it cannot be the previous n "
"historical passwords of the user"
msgstr "提示：用户重置密码时，不能为该用户前几次使用过的密码"
-#: settings/serializers/security.py:33
+#: settings/serializers/security.py:34
msgid "Password minimum length"
msgstr "密码最小长度"
-#: settings/serializers/security.py:37
+#: settings/serializers/security.py:38
msgid "Admin user password minimum length"
msgstr "管理员密码最小长度"
-#: settings/serializers/security.py:40
+#: settings/serializers/security.py:41
msgid "Must contain capital"
msgstr "必须包含大写字符"
-#: settings/serializers/security.py:43
+#: settings/serializers/security.py:44
msgid "Must contain lowercase"
msgstr "必须包含小写字符"
-#: settings/serializers/security.py:46
+#: settings/serializers/security.py:47
msgid "Must contain numeric"
msgstr "必须包含数字"
-#: settings/serializers/security.py:49
+#: settings/serializers/security.py:50
msgid "Must contain special"
msgstr "必须包含特殊字符"
-#: settings/serializers/security.py:54
+#: settings/serializers/security.py:55
msgid ""
"If the user has failed to log in for a limited number of times, no login is "
"allowed during this time interval."
msgstr "当用户登录失败次数达到限制后，那么在此间隔内禁止登录"
-#: settings/serializers/security.py:62
+#: settings/serializers/security.py:63
msgid "Limit the number of user login failures"
msgstr "限制用户登录失败次数"
-#: settings/serializers/security.py:66
+#: settings/serializers/security.py:67
msgid "Block user login interval (minute)"
msgstr "禁止用户登录间隔 (分)"
-#: settings/serializers/security.py:72
+#: settings/serializers/security.py:73
msgid "Limit the number of IP login failures"
msgstr "限制 IP 登录失败次数"
-#: settings/serializers/security.py:76
+#: settings/serializers/security.py:77
msgid "Block IP login interval (minute)"
msgstr "禁止 IP 登录间隔 (分)"
-#: settings/serializers/security.py:80
+#: settings/serializers/security.py:81
msgid "Login IP White List"
msgstr "IP 登录白名单"
-#: settings/serializers/security.py:85
+#: settings/serializers/security.py:86
msgid "Login IP Black List"
msgstr "IP 登录黑名单"
-#: settings/serializers/security.py:90
+#: settings/serializers/security.py:91
msgid "Only single device login"
msgstr "仅一台设备登录"
-#: settings/serializers/security.py:91
+#: settings/serializers/security.py:92
msgid ""
"After the user logs in on the new device, other logged-in devices will "
"automatically log out"
msgstr "用户在新设备登录后，其他已登录的设备会自动退出"
-#: settings/serializers/security.py:94
+#: settings/serializers/security.py:95
msgid "Only exist user login"
msgstr "仅已存在用户登录"
-#: settings/serializers/security.py:96
+#: settings/serializers/security.py:97
msgid ""
"If enabled, non-existent users will not be allowed to log in; if disabled, "
"users of other authentication methods except local authentication methods "
@@ -5204,11 +5394,11 @@ msgstr ""
"如果开启，不存在的用户将不被允许登录；如果关闭，除本地认证方式外，其他认证方"
"式的用户都允许登录并自动创建用户 (如果用户不存在)"
-#: settings/serializers/security.py:102
+#: settings/serializers/security.py:103
msgid "Only from source login"
msgstr "仅从用户来源登录"
-#: settings/serializers/security.py:104
+#: settings/serializers/security.py:105
msgid ""
"If it is enabled, the user will only authenticate to the source when logging "
"in; if it is disabled, the user will authenticate all the enabled "
@@ -5218,69 +5408,69 @@ msgstr ""
"如果开启，用户登录时仅会向来源端进行认证；如果关闭，用户登录时会按照一定的顺"
"序对所有已开启的认证方式进行顺序认证，只要有一个认证成功就可以直接登录"
-#: settings/serializers/security.py:115
+#: settings/serializers/security.py:116
msgid "Not enabled"
msgstr "未启用"
-#: settings/serializers/security.py:116
+#: settings/serializers/security.py:117
msgid "All users"
msgstr "所有用户"
-#: settings/serializers/security.py:117
+#: settings/serializers/security.py:118
msgid "Only admin users"
msgstr "仅管理员"
-#: settings/serializers/security.py:119
+#: settings/serializers/security.py:120
msgid "Global MFA auth"
msgstr "全局启用 MFA 认证"
-#: settings/serializers/security.py:123
+#: settings/serializers/security.py:124
msgid "Third-party login users perform MFA authentication"
msgstr "第三方认证开启 MFA"
-#: settings/serializers/security.py:124
+#: settings/serializers/security.py:125
msgid "The third-party login modes include OIDC, CAS, and SAML2"
msgstr "第三方登录方式包括: OIDC、CAS、SAML2"
-#: settings/serializers/security.py:127
+#: settings/serializers/security.py:128
msgid "OTP issuer name"
msgstr "OTP 扫描后的名称"
-#: settings/serializers/security.py:131
+#: settings/serializers/security.py:132
msgid "OTP valid window"
msgstr "OTP 延迟有效次数"
-#: settings/serializers/security.py:135
+#: settings/serializers/security.py:136
msgid "MFA verify TTL"
msgstr "MFA 校验有效期"
-#: settings/serializers/security.py:137
+#: settings/serializers/security.py:138
msgid ""
"Unit: second, The verification MFA takes effect only when you view the "
"account password"
msgstr "单位：秒，目前仅在查看账号密码校验 MFA 时生效"
-#: settings/serializers/security.py:142
+#: settings/serializers/security.py:143
msgid "MFA in login page"
msgstr "MFA 在登录页面输入"
-#: settings/serializers/security.py:143
+#: settings/serializers/security.py:144
msgid "Eu security regulations(GDPR) require MFA to be on the login page"
msgstr "欧盟数据安全法规(GDPR) 要求 MFA 在登录页面，来确保系统登录安全"
-#: settings/serializers/security.py:147
+#: settings/serializers/security.py:148
msgid "Verify code TTL (second)"
msgstr "验证码有效时间 (分)"
-#: settings/serializers/security.py:148
+#: settings/serializers/security.py:149
msgid "Reset password and send SMS code expiration time"
msgstr "重置密码的验证码及发送短信的验证码过期时间"
-#: settings/serializers/security.py:152
+#: settings/serializers/security.py:153
msgid "Enable Login dynamic code"
msgstr "启用登录附加码"
-#: settings/serializers/security.py:153
+#: settings/serializers/security.py:154
msgid ""
"The password and additional code are sent to a third party authentication "
"system for verification"
@@ -5288,19 +5478,19 @@ msgstr ""
"密码和附加码一并发送给第三方认证系统进行校验, 如：有的第三方认证系统，需要 密"
"码+6位数字 完成认证"
-#: settings/serializers/security.py:157
+#: settings/serializers/security.py:158
msgid "Enable Login captcha"
msgstr "启用登录验证码"
-#: settings/serializers/security.py:158
+#: settings/serializers/security.py:159
msgid "Enable captcha to prevent robot authentication"
msgstr "开启验证码，防止机器人登录"
-#: settings/serializers/security.py:161
+#: settings/serializers/security.py:162
msgid "Remote Login Protection"
msgstr "异地登录通知"
-#: settings/serializers/security.py:163
+#: settings/serializers/security.py:164
msgid ""
"The system determines whether the login IP address belongs to a common login "
"city. If the account is logged in from a common login city, the system sends "
@@ -5309,66 +5499,66 @@ msgstr ""
"根据登录 IP 是否所属常用登录城市进行判断，若账号在非常用城市登录，会发送异地"
"登录提醒"
-#: settings/serializers/security.py:169
+#: settings/serializers/security.py:170
msgid "Unused user timeout (day)"
msgstr "不活跃用户自动禁用 (天)"
-#: settings/serializers/security.py:170
+#: settings/serializers/security.py:171
msgid ""
"Detect infrequent users daily and disable them if they exceed the "
"predetermined time limit."
msgstr "每天检测一次，超过预设时间的用户自动禁用"
-#: settings/serializers/security.py:190
+#: settings/serializers/security.py:191
msgid "Enable watermark"
msgstr "开启水印"
-#: settings/serializers/security.py:191
+#: settings/serializers/security.py:192
msgid "Enabled, the web session and replay contains watermark information"
msgstr "启用后，Web 会话和录像将包含水印信息"
-#: settings/serializers/security.py:195
+#: settings/serializers/security.py:196
msgid "Connection max idle time (minute)"
msgstr "连接最大空闲时间 (分)"
-#: settings/serializers/security.py:196
+#: settings/serializers/security.py:197
msgid "If idle time more than it, disconnect connection."
msgstr "提示：如果超过该配置没有操作，连接会被断开"
-#: settings/serializers/security.py:200
+#: settings/serializers/security.py:201
msgid "Session max connection time (hour)"
msgstr "会话连接最大时间 (时)"
-#: settings/serializers/security.py:201
+#: settings/serializers/security.py:202
msgid "If session connection time more than it, disconnect connection."
msgstr "提示：如果会话连接超过该配置，连接会被断开"
-#: settings/serializers/security.py:204
+#: settings/serializers/security.py:205
msgid "Remember manual auth"
msgstr "保存手动输入密码"
-#: settings/serializers/security.py:207
+#: settings/serializers/security.py:208
#: terminal/templates/terminal/_msg_session_sharing.html:10
msgid "Session share"
msgstr "会话分享"
-#: settings/serializers/security.py:208
+#: settings/serializers/security.py:209
msgid "Enabled, Allows user active session to be shared with other users"
msgstr "开启后允许用户分享已连接的资产会话给他人，协同工作"
-#: settings/serializers/security.py:214
+#: settings/serializers/security.py:215
msgid "Insecure command alert"
msgstr "危险命令告警"
-#: settings/serializers/security.py:217
+#: settings/serializers/security.py:218
msgid "Email recipient"
msgstr "邮件收件人"
-#: settings/serializers/security.py:218
+#: settings/serializers/security.py:219
msgid "Multiple user using , split"
msgstr "多个用户，使用 , 分割"
-#: settings/serializers/settings.py:69
+#: settings/serializers/settings.py:70
#, python-format
msgid "[%s] %s"
msgstr "[%s] %s"
@@ -5427,15 +5617,6 @@ msgstr "启用 Razor 服务"
msgid "Enable SSH Client"
msgstr "启用 SSH Client"
-#: settings/serializers/terminal.py:52
-msgid "Default graphics resolution"
-msgstr "默认图形化分辨率"
-
-#: settings/serializers/terminal.py:53
-msgid ""
-"Tip: Default resolution to use when connecting graphical assets in Luna pages"
-msgstr "提示：在Luna 页面中连接图形化资产时默认使用的分辨率"
-
#: settings/tasks/ldap.py:24
msgid "Periodic import ldap user"
msgstr "周期导入 LDAP 用户"
@@ -5581,27 +5762,27 @@ msgstr "帮助"
msgid "Docs"
msgstr "文档"
-#: templates/_header_bar.html:25
+#: templates/_header_bar.html:27
msgid "Commercial support"
msgstr "商业支持"
-#: templates/_header_bar.html:76 users/forms/profile.py:44
+#: templates/_header_bar.html:79 users/forms/profile.py:44
msgid "Profile"
msgstr "个人信息"
-#: templates/_header_bar.html:79
+#: templates/_header_bar.html:83
msgid "Admin page"
msgstr "管理页面"
-#: templates/_header_bar.html:81
+#: templates/_header_bar.html:86
msgid "User page"
msgstr "用户页面"
-#: templates/_header_bar.html:84
+#: templates/_header_bar.html:90
msgid "API Key"
msgstr "API Key"
-#: templates/_header_bar.html:85
+#: templates/_header_bar.html:91
msgid "Logout"
msgstr "注销登录"
@@ -5697,6 +5878,7 @@ msgid "Home page"
msgstr "首页"
#: templates/resource_download.html:18 templates/resource_download.html:33
+#: users/const.py:48
msgid "Client"
msgstr "客户端"
@@ -5781,15 +5963,20 @@ msgstr "测试失败: 账号无效"
msgid "Have online sessions"
msgstr "有在线会话"
-#: terminal/api/session/session.py:251
+#: terminal/api/session/session.py:46
+#, python-format
+msgid "User %s %s session %s replay"
+msgstr "用户 %s %s 了会话 %s 的录像"
+
+#: terminal/api/session/session.py:292
msgid "Session does not exist: {}"
msgstr "会话不存在: {}"
-#: terminal/api/session/session.py:254
+#: terminal/api/session/session.py:295
msgid "Session is finished or the protocol not supported"
msgstr "会话已经完成或协议不支持"
-#: terminal/api/session/session.py:267
+#: terminal/api/session/session.py:308
msgid "User does not have permission"
msgstr "用户没有权限"
@@ -5907,51 +6094,51 @@ msgstr "不支持批量创建"
msgid "Storage is invalid"
msgstr "存储无效"
-#: terminal/models/applet/applet.py:29
-msgid "Community"
+#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88
+msgid "Community edition"
msgstr "社区版"
-#: terminal/models/applet/applet.py:30
+#: terminal/models/applet/applet.py:31
msgid "Enterprise"
msgstr "企业版"
-#: terminal/models/applet/applet.py:35
+#: terminal/models/applet/applet.py:36
msgid "Author"
msgstr "作者"
-#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31
+#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31
msgid "Edition"
msgstr "版本"
-#: terminal/models/applet/applet.py:42
+#: terminal/models/applet/applet.py:43
msgid "Can concurrent"
msgstr "可以并发"
-#: terminal/models/applet/applet.py:43
+#: terminal/models/applet/applet.py:44
msgid "Tags"
msgstr "标签"
-#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159
+#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161
msgid "Hosts"
msgstr "主机"
-#: terminal/models/applet/applet.py:92
+#: terminal/models/applet/applet.py:93
msgid "Applet pkg not valid, Missing file {}"
msgstr "Applet pkg 无效，缺少文件 {}"
-#: terminal/models/applet/applet.py:111
+#: terminal/models/applet/applet.py:112
msgid "Load platform.yml failed: {}"
msgstr "加载 platform.yml 失败: {}"
-#: terminal/models/applet/applet.py:114
+#: terminal/models/applet/applet.py:115
msgid "Only support custom platform"
msgstr "只支持自定义平台"
-#: terminal/models/applet/applet.py:119
+#: terminal/models/applet/applet.py:120
msgid "Missing type in platform.yml"
msgstr "在 platform.yml 中缺少类型"
-#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35
+#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35
#: terminal/models/applet/host.py:137
msgid "Hosting"
msgstr "宿主机"
@@ -6110,7 +6297,7 @@ msgstr "可以下载会话录像"
msgid "Account id"
msgstr "账号 ID"
-#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114
+#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118
msgid "Login from"
msgstr "登录来源"
@@ -6146,61 +6333,61 @@ msgstr "可以终断会话"
msgid "Can validate session action perm"
msgstr "可以验证会话动作权限"
-#: terminal/models/session/sharing.py:31
+#: terminal/models/session/sharing.py:32
msgid "Expired time (min)"
msgstr "过期时间 (分)"
-#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20
+#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20
#: terminal/serializers/sharing.py:52
msgid "Action permission"
msgstr "操作权限"
-#: terminal/models/session/sharing.py:37
+#: terminal/models/session/sharing.py:38
msgid "Origin"
msgstr "来源"
-#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96
+#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100
#: terminal/notifications.py:261
msgid "Session sharing"
msgstr "会话分享"
-#: terminal/models/session/sharing.py:43
+#: terminal/models/session/sharing.py:44
msgid "Can add super session sharing"
msgstr "可以创建超级会话分享"
-#: terminal/models/session/sharing.py:79
+#: terminal/models/session/sharing.py:83
msgid "Link not active"
msgstr "链接失效"
-#: terminal/models/session/sharing.py:81
+#: terminal/models/session/sharing.py:85
msgid "Link expired"
msgstr "链接过期"
-#: terminal/models/session/sharing.py:83
+#: terminal/models/session/sharing.py:87
msgid "User not allowed to join"
msgstr "该用户无权加入会话"
-#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71
+#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71
msgid "Joiner"
msgstr "加入者"
-#: terminal/models/session/sharing.py:103
+#: terminal/models/session/sharing.py:107
msgid "Date joined"
msgstr "加入日期"
-#: terminal/models/session/sharing.py:106
+#: terminal/models/session/sharing.py:110
msgid "Date left"
msgstr "结束日期"
-#: terminal/models/session/sharing.py:129
+#: terminal/models/session/sharing.py:133
msgid "Session join record"
msgstr "会话加入记录"
-#: terminal/models/session/sharing.py:145
+#: terminal/models/session/sharing.py:149
msgid "Invalid verification code"
msgstr "验证码不正确"
-#: terminal/models/session/sharing.py:152
+#: terminal/models/session/sharing.py:156
msgid "You have already joined this session"
msgstr "您已经加入过此会话"
@@ -6270,7 +6457,7 @@ msgstr ""
"建议填写内网地址，否则填写当前站点 URL
例如：https://172.16.10.110 or "
"https://dev.jumpserver.com"
-#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170
+#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172
msgid "Ignore Certificate Verification"
msgstr "忽略证书认证"
@@ -6454,30 +6641,34 @@ msgid "Endpoint suffix"
msgstr "端点后缀"
#: terminal/serializers/storage.py:137
+msgid "The address cannot contain the special character `#`"
+msgstr "地址中不能包含特殊字符 `#`"
+
+#: terminal/serializers/storage.py:139
msgid "The address format is incorrect"
msgstr "地址格式不正确"
-#: terminal/serializers/storage.py:144
+#: terminal/serializers/storage.py:146
msgid "Host invalid"
msgstr "主机无效"
-#: terminal/serializers/storage.py:147
+#: terminal/serializers/storage.py:149
msgid "Port invalid"
msgstr "端口无效"
-#: terminal/serializers/storage.py:162
+#: terminal/serializers/storage.py:164
msgid "Index by date"
msgstr "按日期建索引"
-#: terminal/serializers/storage.py:163
+#: terminal/serializers/storage.py:165
msgid "Whether to create an index by date"
msgstr "是否根据日期动态建立索引"
-#: terminal/serializers/storage.py:166
+#: terminal/serializers/storage.py:168
msgid "Index"
msgstr "索引"
-#: terminal/serializers/storage.py:168
+#: terminal/serializers/storage.py:170
msgid "Doc type"
msgstr "文档类型"
@@ -6840,7 +7031,7 @@ msgid "Ticket information"
msgstr "工单信息"
#: tickets/templates/tickets/approve_check_password.html:29
-#: tickets/views/approve.py:39
+#: tickets/views/approve.py:40
msgid "Ticket approval"
msgstr "工单审批"
@@ -6852,24 +7043,24 @@ msgstr "同意"
msgid "Go Login"
msgstr "去登录"
-#: tickets/views/approve.py:40
+#: tickets/views/approve.py:41
msgid ""
"This ticket does not exist, the process has ended, or this link has expired"
msgstr "工单不存在，或者工单流程已经结束，或者此链接已经过期"
-#: tickets/views/approve.py:69
+#: tickets/views/approve.py:70
msgid "Click the button below to approve or reject"
msgstr "点击下方按钮同意或者拒绝"
-#: tickets/views/approve.py:71
+#: tickets/views/approve.py:72
msgid "After successful authentication, this ticket can be approved directly"
msgstr "认证成功后，工单可直接审批"
-#: tickets/views/approve.py:93
+#: tickets/views/approve.py:97
msgid "Illegal approval action"
msgstr "无效的审批动作"
-#: tickets/views/approve.py:106
+#: tickets/views/approve.py:110
msgid "This user is not authorized to approve this ticket"
msgstr "此用户无权审批此工单"
@@ -6905,6 +7096,30 @@ msgstr "生成重置密码链接，通过邮件发送给用户"
msgid "Set password"
msgstr "设置密码"
+#: users/const.py:23
+msgid "AUTO"
+msgstr "自动"
+
+#: users/const.py:31
+msgid "Full screen"
+msgstr "全屏"
+
+#: users/const.py:32
+msgid "Multi screen"
+msgstr "多屏显示"
+
+#: users/const.py:33
+msgid "Drives redirect"
+msgstr "磁盘挂载"
+
+#: users/const.py:52
+msgid "Replace"
+msgstr "替换"
+
+#: users/const.py:53
+msgid "Suffix"
+msgstr "加后缀"
+
#: users/exceptions.py:10
msgid "MFA not enabled"
msgstr "MFA 多因子认证没有开启"
@@ -6983,83 +7198,87 @@ msgstr "复制你的公钥到这里"
msgid "Public key should not be the same as your old one."
msgstr "不能和原来的密钥相同"
-#: users/forms/profile.py:162 users/serializers/profile.py:100
-#: users/serializers/profile.py:183 users/serializers/profile.py:210
+#: users/forms/profile.py:162 users/serializers/profile.py:76
+#: users/serializers/profile.py:159 users/serializers/profile.py:186
msgid "Not a valid ssh public key"
msgstr "SSH密钥不合法"
-#: users/forms/profile.py:173 users/models/user.py:820
+#: users/forms/profile.py:173 users/models/user.py:831
#: xpack/plugins/cloud/serializers/account_attrs.py:203
msgid "Public key"
msgstr "SSH公钥"
-#: users/models/user.py:637 users/serializers/profile.py:118
+#: users/models/preference.py:38
+msgid "Preference"
+msgstr "用户设置"
+
+#: users/models/user.py:648 users/serializers/profile.py:94
msgid "Force enable"
msgstr "强制启用"
-#: users/models/user.py:799 users/serializers/user.py:171
+#: users/models/user.py:810 users/serializers/user.py:172
msgid "Is service account"
msgstr "服务账号"
-#: users/models/user.py:801
+#: users/models/user.py:812
msgid "Avatar"
msgstr "头像"
-#: users/models/user.py:804
+#: users/models/user.py:815
msgid "Wechat"
msgstr "微信"
-#: users/models/user.py:807 users/serializers/user.py:108
+#: users/models/user.py:818 users/serializers/user.py:109
msgid "Phone"
msgstr "手机"
-#: users/models/user.py:813
+#: users/models/user.py:824
msgid "OTP secret key"
msgstr "OTP 密钥"
-#: users/models/user.py:817
+#: users/models/user.py:828
#: xpack/plugins/cloud/serializers/account_attrs.py:206
msgid "Private key"
msgstr "ssh私钥"
-#: users/models/user.py:823
-msgid "Secret key"
-msgstr "Secret key"
-
-#: users/models/user.py:828 users/serializers/profile.py:149
-#: users/serializers/user.py:168
+#: users/models/user.py:836 users/serializers/profile.py:125
+#: users/serializers/user.py:169
msgid "Is first login"
msgstr "首次登录"
-#: users/models/user.py:842
+#: users/models/user.py:850
msgid "Date password last updated"
msgstr "最后更新密码日期"
-#: users/models/user.py:845
+#: users/models/user.py:853
msgid "Need update password"
msgstr "需要更新密码"
-#: users/models/user.py:988
+#: users/models/user.py:977
+msgid "Can not delete admin user"
+msgstr "无法删除管理员用户"
+
+#: users/models/user.py:1003
msgid "Can invite user"
msgstr "可以邀请用户"
-#: users/models/user.py:989
+#: users/models/user.py:1004
msgid "Can remove user"
msgstr "可以移除用户"
-#: users/models/user.py:990
+#: users/models/user.py:1005
msgid "Can match user"
msgstr "可以匹配用户"
-#: users/models/user.py:999
+#: users/models/user.py:1014
msgid "Administrator"
msgstr "管理员"
-#: users/models/user.py:1002
+#: users/models/user.py:1017
msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员"
-#: users/models/user.py:1027
+#: users/models/user.py:1042
msgid "User password history"
msgstr "用户密码历史"
@@ -7094,11 +7313,67 @@ msgstr "重置 SSH 密钥"
msgid "Reset MFA"
msgstr "重置 MFA"
+#: users/serializers/preference/koko.py:10
+msgid "File name conflict resolution"
+msgstr "文件名冲突解决方案"
+
+#: users/serializers/preference/lina.py:11
+msgid "New file encryption password"
+msgstr "文件加密密码"
+
+#: users/serializers/preference/lina.py:16
+msgid "Confirm file encryption password"
+msgstr "确认文件加密密码"
+
+#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48
+msgid "The newly set password is inconsistent"
+msgstr "两次密码不一致"
+
+#: users/serializers/preference/luna.py:23
+msgid "Async loading of asset tree"
+msgstr "异步加载资产树"
+
+#: users/serializers/preference/luna.py:30
+msgid "RDP resolution"
+msgstr "RDP 分辨率"
+
+#: users/serializers/preference/luna.py:34
+msgid "Keyboard layout"
+msgstr "键盘布局"
+
+#: users/serializers/preference/luna.py:38
+msgid "RDP client option"
+msgstr "RDP 客户端选项"
+
+#: users/serializers/preference/luna.py:42
+msgid "Remote application connection method"
+msgstr "远程应用连接方式"
+
+#: users/serializers/preference/luna.py:49
+msgid "Character terminal font size"
+msgstr "字符终端字体大小"
+
+#: users/serializers/preference/luna.py:52
+msgid "Backspace as Ctrl+H"
+msgstr "字符终端Backspace As Ctrl+H"
+
+#: users/serializers/preference/luna.py:55
+msgid "Right click quickly paste"
+msgstr "右键快速粘贴"
+
+#: users/serializers/preference/luna.py:61
+msgid "Graphics"
+msgstr "图形化"
+
+#: users/serializers/preference/luna.py:62
+msgid "Command line"
+msgstr "命令行"
+
#: users/serializers/profile.py:29
msgid "The old password is incorrect"
msgstr "旧密码错误"
-#: users/serializers/profile.py:36 users/serializers/profile.py:197
+#: users/serializers/profile.py:36 users/serializers/profile.py:173
msgid "Password does not match security rules"
msgstr "密码不满足安全规则"
@@ -7106,10 +7381,6 @@ msgstr "密码不满足安全规则"
msgid "The new password cannot be the last {} passwords"
msgstr "新密码不能是最近 {} 次的密码"
-#: users/serializers/profile.py:48 users/serializers/profile.py:71
-msgid "The newly set password is inconsistent"
-msgstr "两次密码不一致"
-
#: users/serializers/user.py:42
msgid "System roles"
msgstr "系统角色"
@@ -7118,55 +7389,55 @@ msgstr "系统角色"
msgid "Org roles"
msgstr "组织角色"
-#: users/serializers/user.py:89
+#: users/serializers/user.py:90
msgid "Password strategy"
msgstr "密码策略"
-#: users/serializers/user.py:91
+#: users/serializers/user.py:92
msgid "MFA enabled"
msgstr "MFA 已启用"
-#: users/serializers/user.py:93
+#: users/serializers/user.py:94
msgid "MFA force enabled"
msgstr "强制 MFA"
-#: users/serializers/user.py:95
+#: users/serializers/user.py:96
msgid "Login blocked"
msgstr "登录被锁定"
-#: users/serializers/user.py:98 users/serializers/user.py:177
+#: users/serializers/user.py:99 users/serializers/user.py:178
msgid "Is OTP bound"
msgstr "是否绑定了虚拟 MFA"
-#: users/serializers/user.py:100
+#: users/serializers/user.py:101
msgid "Can public key authentication"
msgstr "可以使用公钥认证"
-#: users/serializers/user.py:172
+#: users/serializers/user.py:173
msgid "Is org admin"
msgstr "组织管理员"
-#: users/serializers/user.py:174
+#: users/serializers/user.py:175
msgid "Avatar url"
msgstr "头像路径"
-#: users/serializers/user.py:178
+#: users/serializers/user.py:179
msgid "MFA level"
msgstr "MFA 级别"
-#: users/serializers/user.py:284
+#: users/serializers/user.py:285
msgid "Select users"
msgstr "选择用户"
-#: users/serializers/user.py:285
+#: users/serializers/user.py:286
msgid "For security, only list several users"
msgstr "为了安全，仅列出几个用户"
-#: users/serializers/user.py:318
+#: users/serializers/user.py:319
msgid "name not unique"
msgstr "名称重复"
-#: users/signal_handlers.py:27
+#: users/signal_handlers.py:32
msgid ""
"The administrator has enabled \"Only allow existing users to log in\", \n"
" and the current user is not in the user list. Please contact the "
@@ -7174,23 +7445,23 @@ msgid ""
msgstr ""
"管理员已开启'仅允许已存在用户登录'，当前用户不在用户列表中，请联系管理员。"
-#: users/tasks.py:24
+#: users/tasks.py:23
msgid "Check password expired"
msgstr "校验密码已过期"
-#: users/tasks.py:38
+#: users/tasks.py:37
msgid "Periodic check password expired"
msgstr "周期校验密码过期"
-#: users/tasks.py:52
+#: users/tasks.py:51
msgid "Check user expired"
msgstr "校验用户已过期"
-#: users/tasks.py:69
+#: users/tasks.py:68
msgid "Periodic check user expired"
msgstr "周期检测用户过期"
-#: users/tasks.py:83
+#: users/tasks.py:82
msgid "Check unused users"
msgstr "校验用户已过期"
@@ -7588,7 +7859,7 @@ msgstr "云账号"
msgid "Test cloud account"
msgstr "测试云账号"
-#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147
+#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151
msgid "Regions"
msgstr "地域"
@@ -7597,17 +7868,17 @@ msgid "Hostname strategy"
msgstr "主机名策略"
#: xpack/plugins/cloud/models.py:100
-#: xpack/plugins/cloud/serializers/task.py:150
+#: xpack/plugins/cloud/serializers/task.py:154
msgid "IP network segment group"
msgstr "IP网段组"
#: xpack/plugins/cloud/models.py:103
-#: xpack/plugins/cloud/serializers/task.py:155
+#: xpack/plugins/cloud/serializers/task.py:159
msgid "Sync IP type"
msgstr "同步IP类型"
#: xpack/plugins/cloud/models.py:106
-#: xpack/plugins/cloud/serializers/task.py:173
+#: xpack/plugins/cloud/serializers/task.py:177
msgid "Always update"
msgstr "总是更新"
@@ -7700,9 +7971,9 @@ msgstr "规则匹配"
msgid "Rule value"
msgstr "规则值"
-#: xpack/plugins/cloud/models.py:317
+#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70
msgid "Strategy rule"
-msgstr "策略规则"
+msgstr "条件"
#: xpack/plugins/cloud/models.py:332
msgid "Action attr"
@@ -7712,9 +7983,9 @@ msgstr "动作属性"
msgid "Action value"
msgstr "动作值"
-#: xpack/plugins/cloud/models.py:341
+#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73
msgid "Strategy action"
-msgstr "策略动作"
+msgstr "动作"
#: xpack/plugins/cloud/providers/aws_international.py:18
msgid "China (Beijing)"
@@ -7999,7 +8270,7 @@ msgstr "测试超时时间"
msgid "Project"
msgstr "project"
-#: xpack/plugins/cloud/serializers/task.py:139
+#: xpack/plugins/cloud/serializers/task.py:143
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 "
@@ -8011,11 +8282,11 @@ msgstr ""
"到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 "
"IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。"
-#: xpack/plugins/cloud/serializers/task.py:145
+#: xpack/plugins/cloud/serializers/task.py:149
msgid "History count"
msgstr "执行次数"
-#: xpack/plugins/cloud/serializers/task.py:146
+#: xpack/plugins/cloud/serializers/task.py:150
msgid "Instance count"
msgstr "实例个数"
@@ -8071,22 +8342,25 @@ msgstr "许可证导入成功"
msgid "License is invalid"
msgstr "无效的许可证"
-#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138
+#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140
msgid "License"
msgstr "许可证"
#: xpack/plugins/license/models.py:80
-msgid "Standard edition"
-msgstr "标准版"
+msgid "Basic edition"
+msgstr "企业基础版"
#: xpack/plugins/license/models.py:82
-msgid "Enterprise edition"
-msgstr "企业版"
+msgid "Standard edition"
+msgstr "企业标准版"
#: xpack/plugins/license/models.py:84
-msgid "Ultimate edition"
-msgstr "旗舰版"
+msgid "Professional edition"
+msgstr "企业专业版"
#: xpack/plugins/license/models.py:86
-msgid "Community edition"
-msgstr "社区版"
+msgid "Ultimate edition"
+msgstr "企业旗舰版"
+
+#~ msgid "Random"
+#~ msgstr "随机"
diff --git a/apps/notifications/api/notifications.py b/apps/notifications/api/notifications.py
index 827cb9d19..9f641ee70 100644
--- a/apps/notifications/api/notifications.py
+++ b/apps/notifications/api/notifications.py
@@ -96,6 +96,8 @@ def get_all_test_messages(request):
import textwrap
from ..notifications import Message
from django.shortcuts import HttpResponse
+ if not request.user.is_superuser:
+ return HttpResponse('没有权限', status=401)
msgs_cls = Message.get_all_sub_messages()
html_data = 'HTML 格式
'
diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py
index a650b158e..b07876224 100644
--- a/apps/ops/ansible/inventory.py
+++ b/apps/ops/ansible/inventory.py
@@ -163,13 +163,16 @@ class JMSInventory:
protocol = self.get_primary_protocol(ansible_config, protocols)
+ tp, category = asset.type, asset.category
+ name = asset.name.replace(' ', '_').replace('[', '_').replace(']', '_')
+ secret_info = {k: v for k, v in asset.secret_info.items() if v}
host = {
- 'name': '{}'.format(asset.name.replace(' ', '_')),
+ 'name': name,
'jms_asset': {
'id': str(asset.id), 'name': asset.name, 'address': asset.address,
- 'type': asset.type, 'category': asset.category,
+ 'type': tp, 'category': category,
'protocol': protocol.name, 'port': protocol.port,
- 'spec_info': asset.spec_info, 'secret_info': asset.secret_info,
+ 'spec_info': asset.spec_info, 'secret_info': secret_info,
'protocols': [{'name': p.name, 'port': p.port} for p in protocols],
},
'jms_account': {
@@ -179,7 +182,7 @@ class JMSInventory:
} if account else None
}
- if host['jms_account'] and asset.platform.type == 'oracle':
+ if host['jms_account'] and tp == 'oracle':
host['jms_account']['mode'] = 'sysdba' if account.privileged else None
ansible_config = self.fill_ansible_config(ansible_config, protocol)
@@ -281,7 +284,6 @@ class JMSInventory:
data = {'all': {'hosts': {}}}
for host in hosts:
name = host.pop('name')
- name = name.replace('[', '_').replace(']', '_')
data['all']['hosts'][name] = host
if not self.exclude_localhost:
data['all']['hosts'].update({
diff --git a/apps/ops/api/celery.py b/apps/ops/api/celery.py
index 67f4d4dda..a7baaf6e4 100644
--- a/apps/ops/api/celery.py
+++ b/apps/ops/api/celery.py
@@ -9,10 +9,12 @@ from django.utils.translation import gettext as _
from django_celery_beat.models import PeriodicTask
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.exceptions import JMSException
from common.permissions import IsValidUser
+from common.drf.filters import BaseFilterSet
from ops.celery import app
from ..ansible.utils import get_ansible_task_log_path
from ..celery.utils import get_celery_task_log_path
@@ -102,13 +104,35 @@ class CelerySummaryAPIView(generics.RetrieveAPIView):
pass
+class CeleryTaskFilterSet(BaseFilterSet):
+ id = drf_filters.CharFilter(field_name='id', lookup_expr='exact')
+ name = drf_filters.CharFilter(method='filter_name')
+
+ @staticmethod
+ def filter_name(queryset, name, value):
+ _ids = []
+ for task in queryset:
+ comment = task.meta.get('comment')
+ if not comment:
+ continue
+ if value not in comment:
+ continue
+ _ids.append(task.id)
+ queryset = queryset.filter(id__in=_ids)
+ return queryset
+
+ class Meta:
+ model = CeleryTask
+ fields = ['id', 'name']
+
+
class CeleryTaskViewSet(
CommonApiMixin, mixins.RetrieveModelMixin,
mixins.ListModelMixin, mixins.DestroyModelMixin,
viewsets.GenericViewSet
):
- filterset_fields = ('id', 'name')
- search_fields = filterset_fields
+ search_fields = ('id', 'name')
+ filterset_class = CeleryTaskFilterSet
serializer_class = CeleryTaskSerializer
def get_queryset(self):
diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py
index 6fac1bc95..f2bf92cae 100644
--- a/apps/ops/api/job.py
+++ b/apps/ops/api/job.py
@@ -1,4 +1,5 @@
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
@@ -25,9 +26,9 @@ from perms.models import PermNode
from perms.utils import UserPermAssetUtil
-def set_task_to_serializer_data(serializer, task):
+def set_task_to_serializer_data(serializer, task_id):
data = getattr(serializer, "_data", {})
- data["task_id"] = task.id
+ data["task_id"] = task_id
setattr(serializer, "_data", data)
@@ -85,8 +86,10 @@ class JobViewSet(OrgBulkModelViewSet):
execution = job.create_execution()
execution.creator = self.request.user
execution.save()
- task = run_ops_job_execution.delay(str(execution.id))
- set_task_to_serializer_data(serializer, task)
+
+ set_task_to_serializer_data(serializer, execution.id)
+ transaction.on_commit(
+ lambda: run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id)))
class JobExecutionViewSet(OrgBulkModelViewSet):
@@ -96,7 +99,10 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
search_fields = ('material',)
filterset_fields = ['status', 'job_id']
- @atomic
+ @staticmethod
+ def start_deploy(instance, serializer):
+ task = run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id))
+
def perform_create(self, serializer):
instance = serializer.save()
instance.job_version = instance.job.version
@@ -104,8 +110,10 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
instance.job_type = Types[instance.job.type].value
instance.creator = self.request.user
instance.save()
- task = run_ops_job_execution.delay(str(instance.id))
- set_task_to_serializer_data(serializer, task)
+
+ 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)))
def get_queryset(self):
queryset = super().get_queryset()
diff --git a/apps/ops/api/playbook.py b/apps/ops/api/playbook.py
index 72e62cb82..2bf52132c 100644
--- a/apps/ops/api/playbook.py
+++ b/apps/ops/api/playbook.py
@@ -3,6 +3,7 @@ import shutil
import zipfile
from django.conf import settings
+from django.core.exceptions import SuspiciousFileOperation
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext_lazy as _
from rest_framework import status
@@ -18,6 +19,7 @@ __all__ = ["PlaybookViewSet", "PlaybookFileBrowserAPIView"]
from rest_framework.views import APIView
from rest_framework.response import Response
+from django.utils._os import safe_join
def unzip_playbook(src, dist):
@@ -37,7 +39,7 @@ class PlaybookViewSet(OrgBulkModelViewSet):
raise JMSException(code='playbook_has_job', detail={"msg": _("Currently playbook is being used in a job")})
instance_id = instance.id
super().perform_destroy(instance)
- dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance_id.__str__())
+ dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance_id.__str__())
shutil.rmtree(dest_path)
def get_queryset(self):
@@ -48,8 +50,8 @@ class PlaybookViewSet(OrgBulkModelViewSet):
def perform_create(self, serializer):
instance = serializer.save()
if 'multipart/form-data' in self.request.headers['Content-Type']:
- src_path = os.path.join(settings.MEDIA_ROOT, instance.path.name)
- dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__())
+ src_path = safe_join(settings.MEDIA_ROOT, instance.path.name)
+ dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__())
try:
unzip_playbook(src_path, dest_path)
except RuntimeError as e:
@@ -60,9 +62,9 @@ class PlaybookViewSet(OrgBulkModelViewSet):
else:
if instance.create_method == 'blank':
- dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__())
+ dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__())
os.makedirs(dest_path)
- with open(os.path.join(dest_path, 'main.yml'), 'w') as f:
+ with open(safe_join(dest_path, 'main.yml'), 'w') as f:
f.write('## write your playbook here')
@@ -83,13 +85,15 @@ class PlaybookFileBrowserAPIView(APIView):
work_path = playbook.work_dir
file_key = request.query_params.get('key', '')
if file_key:
- file_path = os.path.join(work_path, file_key)
- with open(file_path, 'r') as f:
- try:
+ try:
+ file_path = safe_join(work_path, file_key)
+ with open(file_path, 'r') as f:
content = f.read()
- except UnicodeDecodeError:
- content = _('Unsupported file content')
- return Response({'content': content})
+ except UnicodeDecodeError:
+ content = _('Unsupported file content')
+ except SuspiciousFileOperation:
+ raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")})
+ return Response({'content': content})
else:
expand_key = request.query_params.get('expand', '')
nodes = self.generate_tree(playbook, work_path, expand_key)
@@ -105,7 +109,8 @@ class PlaybookFileBrowserAPIView(APIView):
parent_key = ''
if os.path.dirname(parent_key) == 'root':
parent_key = os.path.basename(parent_key)
- full_path = os.path.join(work_path, parent_key)
+
+ full_path = safe_join(work_path, parent_key)
is_directory = request.data.get('is_directory', False)
content = request.data.get('content', '')
@@ -117,27 +122,30 @@ class PlaybookFileBrowserAPIView(APIView):
p = 'new_file.yml'
else:
p = 'new_dir'
- np = os.path.join(full_path, p)
+ np = safe_join(full_path, p)
n = 0
while os.path.exists(np):
n += 1
- np = os.path.join(full_path, '{}({})'.format(p, n))
+ np = safe_join(full_path, '{}({})'.format(p, n))
return np
- if is_directory:
- new_file_path = find_new_name(name)
- os.makedirs(new_file_path)
- else:
- new_file_path = find_new_name(name, True)
- with open(new_file_path, 'w') as f:
- f.write(content)
+ try:
+ if is_directory:
+ new_file_path = find_new_name(name)
+ os.makedirs(new_file_path)
+ else:
+ new_file_path = find_new_name(name, True)
+ with open(new_file_path, 'w') as f:
+ f.write(content)
+ except SuspiciousFileOperation:
+ raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")})
relative_path = os.path.relpath(os.path.dirname(new_file_path), work_path)
new_node = {
"name": os.path.basename(new_file_path),
"title": os.path.basename(new_file_path),
- "id": os.path.join(relative_path, os.path.basename(new_file_path))
- if not os.path.join(relative_path, os.path.basename(new_file_path)).startswith('.')
+ "id": safe_join(relative_path, os.path.basename(new_file_path))
+ if not safe_join(relative_path, os.path.basename(new_file_path)).startswith('.')
else os.path.basename(new_file_path),
"isParent": is_directory,
"pId": relative_path if not relative_path.startswith('.') else 'root',
@@ -156,7 +164,7 @@ class PlaybookFileBrowserAPIView(APIView):
new_name = request.data.get('new_name', '')
if file_key in self.protected_files and new_name:
- return Response({'msg': '{} can not be rename'.format(file_key)}, status=status.HTTP_400_BAD_REQUEST)
+ raise JMSException(code='this_file_can_not_be_rename', detail={"msg": _("This file can not be rename")})
if os.path.dirname(file_key) == 'root':
file_key = os.path.basename(file_key)
@@ -166,16 +174,20 @@ class PlaybookFileBrowserAPIView(APIView):
if not file_key or file_key == 'root':
return Response(status=status.HTTP_400_BAD_REQUEST)
- file_path = os.path.join(work_path, file_key)
+ file_path = safe_join(work_path, file_key)
# rename
if new_name:
- new_file_path = os.path.join(os.path.dirname(file_path), new_name)
- if new_file_path == file_path:
- return Response(status=status.HTTP_200_OK)
- if os.path.exists(new_file_path):
- return Response({'msg': '{} already exists'.format(new_name)}, status=status.HTTP_400_BAD_REQUEST)
- os.rename(file_path, new_file_path)
+ try:
+ new_file_path = safe_join(os.path.dirname(file_path), new_name)
+ if new_file_path == file_path:
+ return Response(status=status.HTTP_200_OK)
+ if os.path.exists(new_file_path):
+ raise JMSException(code='file_already exists', detail={"msg": _("File already exists")})
+ os.rename(file_path, new_file_path)
+ except SuspiciousFileOperation:
+ raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")})
+
# edit content
else:
if not is_directory:
@@ -189,10 +201,11 @@ class PlaybookFileBrowserAPIView(APIView):
work_path = playbook.work_dir
file_key = request.query_params.get('key', '')
if not file_key:
- return Response({'msg': 'key is required'}, status=status.HTTP_400_BAD_REQUEST)
+ raise JMSException(code='file_key_is_required', detail={"msg": _("File key is required")})
+
if file_key in self.protected_files:
- return Response({'msg': ' {} can not be delete'.format(file_key)}, status=status.HTTP_400_BAD_REQUEST)
- file_path = os.path.join(work_path, file_key)
+ raise JMSException(code='This file can not be delete', detail={"msg": _("This file can not be delete")})
+ file_path = safe_join(work_path, file_key)
if os.path.isdir(file_path):
shutil.rmtree(file_path)
else:
@@ -216,11 +229,12 @@ class PlaybookFileBrowserAPIView(APIView):
relative_path = os.path.relpath(path, root_path)
for d in dirs:
+ dir_id = os.path.relpath(safe_join(path, d), root_path)
+
node = {
"name": d,
"title": d,
- "id": os.path.join(relative_path, d) if not os.path.join(relative_path, d).startswith(
- '.') else d,
+ "id": dir_id,
"isParent": True,
"open": True,
"pId": relative_path if not relative_path.startswith('.') else 'root',
@@ -230,12 +244,12 @@ class PlaybookFileBrowserAPIView(APIView):
node['open'] = True
nodes.append(node)
for f in files:
+ file_id = os.path.relpath(safe_join(path, f), root_path)
node = {
"name": f,
"title": f,
"iconSkin": 'file',
- "id": os.path.join(relative_path, f) if not os.path.join(relative_path, f).startswith(
- '.') else f,
+ "id": file_id,
"isParent": False,
"open": False,
"pId": relative_path if not relative_path.startswith('.') else 'root',
diff --git a/apps/ops/const.py b/apps/ops/const.py
index 01889a4b2..7fa636a0f 100644
--- a/apps/ops/const.py
+++ b/apps/ops/const.py
@@ -45,13 +45,26 @@ class RunasPolicies(models.TextChoices):
skip = 'skip', _('Skip')
-class Modules(models.TextChoices):
+class JobModules(models.TextChoices):
shell = 'shell', _('Shell')
winshell = 'win_shell', _('Powershell')
python = 'python', _('Python')
mysql = 'mysql', _('MySQL')
postgresql = 'postgresql', _('PostgreSQL')
sqlserver = 'sqlserver', _('SQLServer')
+ raw = 'raw', _('Raw')
+
+
+class AdHocModules(models.TextChoices):
+ shell = 'shell', _('Shell')
+ winshell = 'win_shell', _('Powershell')
+ python = 'python', _('Python')
+ mysql = 'mysql', _('MySQL')
+ mariadb = 'mariadb', _('MariaDB')
+ postgresql = 'postgresql', _('PostgreSQL')
+ sqlserver = 'sqlserver', _('SQLServer')
+ oracle = 'oracle', _('Oracle')
+ raw = 'raw', _('Raw')
class JobStatus(models.TextChoices):
diff --git a/apps/ops/migrations/0026_auto_20230810_1039.py b/apps/ops/migrations/0026_auto_20230810_1039.py
index f9bd966a8..99ffdf7d5 100644
--- a/apps/ops/migrations/0026_auto_20230810_1039.py
+++ b/apps/ops/migrations/0026_auto_20230810_1039.py
@@ -14,17 +14,17 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='adhoc',
name='module',
- field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, verbose_name='Module'),
+ field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, verbose_name='Module'),
),
migrations.AlterField(
model_name='historicaljob',
name='module',
- field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'),
+ field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, null=True, verbose_name='Module'),
),
migrations.AlterField(
model_name='job',
name='module',
- field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'),
+ field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, null=True, verbose_name='Module'),
),
migrations.AlterField(
model_name='jobexecution',
@@ -36,4 +36,12 @@ class Migration(migrations.Migration):
name='summary',
field=models.JSONField(default=dict, encoder=common.db.encoder.ModelJSONFieldEncoder, verbose_name='Summary'),
),
+ migrations.AlterField(
+ model_name='adhoc',
+ name='module',
+ field=models.CharField(
+ choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'),
+ ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'),
+ ('oracle', 'Oracle'), ('raw', 'Raw')], default='shell', max_length=128, verbose_name='Module'),
+ ),
]
diff --git a/apps/ops/mixin.py b/apps/ops/mixin.py
index 05d1e297d..549e422ee 100644
--- a/apps/ops/mixin.py
+++ b/apps/ops/mixin.py
@@ -48,7 +48,8 @@ class PeriodTaskModelMixin(models.Model):
def set_period_schedule(self):
name, task, args, kwargs = self.get_register_task()
- if not self.is_periodic:
+ is_active = self.is_active if hasattr(self, 'is_active') else True
+ if not self.is_periodic or not is_active:
disable_celery_periodic_task(name)
return
diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py
index 18b1e5cba..f55b6f3d0 100644
--- a/apps/ops/models/adhoc.py
+++ b/apps/ops/models/adhoc.py
@@ -8,7 +8,7 @@ from common.utils import get_logger
__all__ = ["AdHoc"]
-from ops.const import Modules
+from ops.const import AdHocModules
from orgs.mixins.models import JMSOrgBaseModel
@@ -19,7 +19,7 @@ class AdHoc(JMSOrgBaseModel):
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
name = models.CharField(max_length=128, verbose_name=_('Name'))
pattern = models.CharField(max_length=1024, verbose_name=_("Pattern"), default='all')
- module = models.CharField(max_length=128, choices=Modules.choices, default=Modules.shell,
+ module = models.CharField(max_length=128, choices=AdHocModules.choices, default=AdHocModules.shell,
verbose_name=_('Module'))
args = models.CharField(max_length=8192, default='', verbose_name=_('Args'))
creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py
index f27e6b309..6dcbcc467 100644
--- a/apps/ops/models/job.py
+++ b/apps/ops/models/job.py
@@ -23,7 +23,7 @@ from common.db.encoder import ModelJSONFieldEncoder
from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException
from ops.mixin import PeriodTaskModelMixin
from ops.variables import *
-from ops.const import Types, Modules, RunasPolicies, JobStatus
+from ops.const import Types, RunasPolicies, JobStatus, JobModules
from orgs.mixins.models import JMSOrgBaseModel
from perms.models import AssetPermission
from perms.utils import UserPermAssetUtil
@@ -64,7 +64,7 @@ class JMSPermedInventory(JMSInventory):
'mysql': ['mysql'],
'postgresql': ['postgresql'],
'sqlserver': ['sqlserver'],
- 'ssh': ['shell', 'python', 'win_shell'],
+ 'ssh': ['shell', 'python', 'win_shell', 'raw'],
}
if self.module not in protocol_supported_modules_mapping.get(protocol.name, []):
@@ -127,7 +127,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
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=Modules.choices, default=Modules.shell, verbose_name=_('Module'),
+ module = models.CharField(max_length=128, choices=JobModules.choices, default=JobModules.shell, 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)'))
diff --git a/apps/ops/tasks.py b/apps/ops/tasks.py
index 045c8f1b9..01250c2bc 100644
--- a/apps/ops/tasks.py
+++ b/apps/ops/tasks.py
@@ -35,7 +35,12 @@ def job_task_activity_callback(self, job_id, *args, **kwargs):
activity_callback=job_task_activity_callback
)
def run_ops_job(job_id):
- job = get_object_or_none(Job, id=job_id)
+ with tmp_to_root_org():
+ job = get_object_or_none(Job, id=job_id)
+ if not job:
+ logger.error("Did not get the execution: {}".format(job_id))
+ return
+
with tmp_to_org(job.org):
execution = job.create_execution()
execution.creator = job.creator
diff --git a/apps/ops/views.py b/apps/ops/views.py
index ccff2aa21..b35fdb764 100644
--- a/apps/ops/views.py
+++ b/apps/ops/views.py
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
#
-from django.views.generic import TemplateView
from django.conf import settings
+from django.http import HttpResponse
+from django.views.generic import TemplateView
from common.views.mixins import PermissionsMixin
from rbac.permissions import RBACPermission
@@ -16,6 +17,11 @@ class CeleryTaskLogView(PermissionsMixin, TemplateView):
'GET': 'ops.view_celerytaskexecution'
}
+ def get(self, request, *args, **kwargs):
+ if not request.user.is_authenticated:
+ return HttpResponse(status=401)
+ return super().get(request, *args, **kwargs)
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context.update({
diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py
index ceed23907..583bd2e7c 100644
--- a/apps/orgs/utils.py
+++ b/apps/orgs/utils.py
@@ -87,7 +87,8 @@ def tmp_to_root_org():
@contextmanager
def tmp_to_org(org):
ori_org = get_current_org()
- set_current_org(org)
+ if org:
+ set_current_org(org)
yield
if ori_org is not None:
set_current_org(ori_org)
diff --git a/apps/perms/utils/account.py b/apps/perms/utils/account.py
index 303e3ad22..d66338a2c 100644
--- a/apps/perms/utils/account.py
+++ b/apps/perms/utils/account.py
@@ -41,7 +41,6 @@ class PermAccountUtil(AssetPermissionUtil):
alias_date_expired_mapper[alias].append(perm.date_expired)
asset_accounts = asset.accounts.all().active()
- # username_accounts_mapper = {account.username: account for account in asset_accounts}
username_accounts_mapper = defaultdict(list)
for account in asset_accounts:
username_accounts_mapper[account.username].append(account)
diff --git a/apps/rbac/builtin.py b/apps/rbac/builtin.py
index a16944d47..8498f7776 100644
--- a/apps/rbac/builtin.py
+++ b/apps/rbac/builtin.py
@@ -29,6 +29,7 @@ system_user_perms = (
('authentication', 'connectiontoken', 'add,view,reuse,expire', 'connectiontoken'),
('authentication', 'temptoken', 'add,change,view', 'temptoken'),
('authentication', 'accesskey', '*', '*'),
+ ('authentication', 'passkey', '*', '*'),
('tickets', 'ticket', 'view', 'ticket'),
)
system_user_perms += (user_perms + _view_all_joined_org_perms)
diff --git a/apps/rbac/const.py b/apps/rbac/const.py
index 20f469611..fac97b5db 100644
--- a/apps/rbac/const.py
+++ b/apps/rbac/const.py
@@ -92,6 +92,7 @@ exclude_permissions = (
('audits', 'activitylog', 'add,delete,change', 'activitylog'),
('audits', 'passwordchangelog', 'add,change,delete', 'passwordchangelog'),
('audits', 'userloginlog', 'add,change,delete,change', 'userloginlog'),
+ ('audits', 'usersession', 'add,delete,change', 'usersession'),
('audits', 'ftplog', 'delete', 'ftplog'),
('tickets', 'ticketassignee', '*', 'ticketassignee'),
('tickets', 'ticketflow', 'add,delete', 'ticketflow'),
@@ -147,6 +148,7 @@ only_system_permissions = (
('authentication', 'accesskey', '*', '*'),
('authentication', 'superconnectiontoken', '*', '*'),
('authentication', 'temptoken', '*', '*'),
+ ('authentication', 'passkey', '*', '*'),
('tickets', '*', '*', '*'),
('orgs', 'organization', 'view', 'rootorg'),
('terminal', 'applet', '*', '*'),
diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py
index 5bbedbbf0..d608a869f 100644
--- a/apps/rbac/tree.py
+++ b/apps/rbac/tree.py
@@ -112,6 +112,7 @@ special_pid_mapper = {
"settings.view_setting": "view_setting",
"rbac.view_console": "view_console",
"rbac.view_audit": "view_audit",
+ 'audits.usersession': 'view_audit',
"rbac.view_workbench": "view_workbench",
"rbac.view_webterminal": "view_workbench",
"rbac.view_filemanager": "view_workbench",
diff --git a/apps/settings/api/__init__.py b/apps/settings/api/__init__.py
index 13f4a2b18..510925590 100644
--- a/apps/settings/api/__init__.py
+++ b/apps/settings/api/__init__.py
@@ -3,6 +3,7 @@ from .email import *
from .feishu import *
from .ldap import *
from .public import *
+from .security import *
from .settings import *
from .sms import *
from .vault import *
diff --git a/apps/settings/api/security.py b/apps/settings/api/security.py
new file mode 100644
index 000000000..85de822f9
--- /dev/null
+++ b/apps/settings/api/security.py
@@ -0,0 +1,58 @@
+from uuid import uuid4
+
+from django.conf import settings
+from django.core.cache import cache
+from rest_framework.generics import ListAPIView, CreateAPIView
+from rest_framework.views import Response
+
+from users.utils import LoginIpBlockUtil
+from ..serializers import SecurityBlockIPSerializer
+
+
+class BlockIPSecurityAPI(ListAPIView):
+ serializer_class = SecurityBlockIPSerializer
+ rbac_perms = {
+ 'GET': 'settings.change_security',
+ 'unlock': 'settings.change_security',
+ }
+
+ @staticmethod
+ def get_ips():
+ ips = []
+ prefix = LoginIpBlockUtil.BLOCK_KEY_TMPL.replace('{}', '')
+ keys = cache.keys(f'{prefix}*')
+ for key in keys:
+ ips.append(key.replace(prefix, ''))
+
+ white_list = settings.SECURITY_LOGIN_IP_WHITE_LIST
+ ips = list(set(ips) - set(white_list))
+ ips = [ip for ip in ips if ip != '*']
+ return ips
+
+ def get_page_offset_and_limit(self):
+ get_params = self.request.GET
+ offset = get_params.get('offset', 0)
+ limit = get_params.get('limit', 15)
+ return int(offset), int(limit)
+
+ def list(self, request, *args, **kwargs):
+ ips = self.get_ips()
+ offset, limit = self.get_page_offset_and_limit()
+ slice_ips = ips[offset:offset + limit]
+ data = [{'id': str(uuid4()), 'ip': ip} for ip in slice_ips]
+ ser = self.get_serializer(data, many=True)
+ data = {'count': len(ips), 'results': ser.data}
+ return Response(data=data, status=200)
+
+
+class UnlockIPSecurityAPI(CreateAPIView):
+ serializer_class = SecurityBlockIPSerializer
+ rbac_perms = {
+ 'POST': 'settings.change_security',
+ }
+
+ def create(self, request, *args, **kwargs):
+ ips = request.data.get('ips')
+ for ip in ips:
+ LoginIpBlockUtil(ip).clean_block_if_need()
+ return Response(status=200)
diff --git a/apps/settings/api/settings.py b/apps/settings/api/settings.py
index bb55dc453..4a8f6cc3d 100644
--- a/apps/settings/api/settings.py
+++ b/apps/settings/api/settings.py
@@ -46,6 +46,7 @@ class SettingsApi(generics.RetrieveUpdateAPIView):
'cas': serializers.CASSettingSerializer,
'saml2': serializers.SAML2SettingSerializer,
'oauth2': serializers.OAuth2SettingSerializer,
+ 'passkey': serializers.PasskeySettingSerializer,
'clean': serializers.CleaningSerializer,
'other': serializers.OtherSettingSerializer,
'sms': serializers.SMSSettingSerializer,
diff --git a/apps/settings/migrations/0009_alter_cas_username_attribute.py b/apps/settings/migrations/0009_alter_cas_username_attribute.py
new file mode 100644
index 000000000..7e5ba7428
--- /dev/null
+++ b/apps/settings/migrations/0009_alter_cas_username_attribute.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.19 on 2023-06-30 10:37
+import json
+
+from django.db import migrations
+
+
+def migrate_cas_setting(apps, schema_editor):
+ setting_model = apps.get_model('settings', 'Setting')
+ obj = setting_model.objects.filter(name='CAS_RENAME_ATTRIBUTES').first()
+ if obj:
+ try:
+ value = json.loads(obj.value)
+ except Exception:
+ print("Invalid CAS_RENAME_ATTRIBUTES setting, skip")
+ return
+
+ if value.pop('uid', None):
+ setting_model.objects.filter(name='CAS_USERNAME_ATTRIBUTE').update(value='"cas:user"')
+ value['cas:user'] = 'username'
+ obj.value = json.dumps(value)
+ obj.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('settings', '0008_alter_setting_options'),
+ ]
+
+ operations = [
+ migrations.RunPython(migrate_cas_setting),
+ ]
diff --git a/apps/settings/serializers/auth/__init__.py b/apps/settings/serializers/auth/__init__.py
index 1f9f360f9..aeca390ac 100644
--- a/apps/settings/serializers/auth/__init__.py
+++ b/apps/settings/serializers/auth/__init__.py
@@ -1,12 +1,13 @@
+from .base import *
from .cas import *
-from .ldap import *
-from .oidc import *
-from .radius import *
from .dingtalk import *
from .feishu import *
-from .wecom import *
-from .sso import *
-from .base import *
-from .sms import *
-from .saml2 import *
+from .ldap import *
from .oauth2 import *
+from .oidc import *
+from .passkey import *
+from .radius import *
+from .saml2 import *
+from .sms import *
+from .sso import *
+from .wecom import *
diff --git a/apps/settings/serializers/auth/base.py b/apps/settings/serializers/auth/base.py
index 16cf535b4..57034e730 100644
--- a/apps/settings/serializers/auth/base.py
+++ b/apps/settings/serializers/auth/base.py
@@ -19,13 +19,11 @@ class AuthSettingSerializer(serializers.Serializer):
AUTH_FEISHU = serializers.BooleanField(default=False, label=_('FeiShu Auth'))
AUTH_WECOM = 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(
required=False, allow_blank=True, max_length=1024,
label=_("Forgot password url")
)
- # HEALTH_CHECK_TOKEN = serializers.CharField(
- # required=False, max_length=1024, label=_("Health check token")
- # )
LOGIN_REDIRECT_MSG_ENABLED = serializers.BooleanField(
required=False, label=_("Enable login redirect msg")
)
diff --git a/apps/settings/serializers/auth/passkey.py b/apps/settings/serializers/auth/passkey.py
new file mode 100644
index 000000000..6d65da26b
--- /dev/null
+++ b/apps/settings/serializers/auth/passkey.py
@@ -0,0 +1,22 @@
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+
+__all__ = ['PasskeySettingSerializer']
+
+
+class PasskeySettingSerializer(serializers.Serializer):
+ PREFIX_TITLE = _('Passkey')
+
+ AUTH_PASSKEY = serializers.BooleanField(
+ default=False, label=_('Enable passkey Auth'),
+ help_text=_('Only SSL domain can use passkey auth')
+ )
+ FIDO_SERVER_ID = serializers.CharField(
+ max_length=255, label=_('FIDO server ID'), required=False, allow_blank=True,
+ help_text=_(
+ 'The hostname can using passkey auth, If not set, '
+ 'will use request host and the request host in DOMAINS, '
+ 'If multiple domains, use comma to separate'
+ )
+ )
+ FIDO_SERVER_NAME = serializers.CharField(max_length=255, label=_('FIDO server name'))
diff --git a/apps/settings/serializers/basic.py b/apps/settings/serializers/basic.py
index baa5edb68..ad1c2f8e3 100644
--- a/apps/settings/serializers/basic.py
+++ b/apps/settings/serializers/basic.py
@@ -7,7 +7,10 @@ class BasicSettingSerializer(serializers.Serializer):
SITE_URL = serializers.URLField(
required=True, label=_("Site url"),
- help_text=_('Email links or other system callbacks are used to access it, eg: http://dev.jumpserver.org:8080')
+ help_text=_(
+ 'External URL, email links or other system callbacks are used to access it, '
+ 'eg: http://dev.jumpserver.org:8080'
+ )
)
USER_GUIDE_URL = serializers.URLField(
required=False, allow_blank=True, allow_null=True, label=_("User guide url"),
diff --git a/apps/settings/serializers/public.py b/apps/settings/serializers/public.py
index 02f900d5f..1b5c78609 100644
--- a/apps/settings/serializers/public.py
+++ b/apps/settings/serializers/public.py
@@ -35,6 +35,7 @@ class PrivateSettingSerializer(PublicSettingSerializer):
HELP_DOCUMENT_URL = serializers.CharField()
HELP_SUPPORT_URL = serializers.CharField()
+ AUTH_PASSKEY = serializers.BooleanField()
AUTH_WECOM = serializers.BooleanField()
AUTH_DINGTALK = serializers.BooleanField()
AUTH_FEISHU = serializers.BooleanField()
@@ -45,8 +46,6 @@ class PrivateSettingSerializer(PublicSettingSerializer):
TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField()
TERMINAL_OMNIDB_ENABLED = serializers.BooleanField()
- TERMINAL_GRAPHICAL_RESOLUTION = serializers.CharField()
-
ANNOUNCEMENT_ENABLED = serializers.BooleanField()
ANNOUNCEMENT = serializers.DictField()
diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py
index a5c27f1a1..7c9bf676a 100644
--- a/apps/settings/serializers/security.py
+++ b/apps/settings/serializers/security.py
@@ -7,6 +7,7 @@ __all__ = [
'SecurityPasswordRuleSerializer', 'SecuritySessionSerializer',
'SecurityAuthSerializer', 'SecuritySettingSerializer',
'SecurityLoginLimitSerializer', 'SecurityBasicSerializer',
+ 'SecurityBlockIPSerializer'
]
@@ -225,3 +226,8 @@ class SecuritySettingSerializer(
SecurityLoginLimitSerializer,
):
PREFIX_TITLE = _('Security')
+
+
+class SecurityBlockIPSerializer(serializers.Serializer):
+ id = serializers.UUIDField(required=False)
+ ip = serializers.CharField(max_length=1024, required=False, allow_blank=True)
diff --git a/apps/settings/serializers/settings.py b/apps/settings/serializers/settings.py
index 2d38ed74a..743f7cc60 100644
--- a/apps/settings/serializers/settings.py
+++ b/apps/settings/serializers/settings.py
@@ -9,7 +9,7 @@ from .auth import (
CASSettingSerializer, RadiusSettingSerializer, FeiShuSettingSerializer,
WeComSettingSerializer, DingTalkSettingSerializer, AlibabaSMSSettingSerializer,
TencentSMSSettingSerializer, CMPP2SMSSettingSerializer, AuthSettingSerializer,
- SAML2SettingSerializer, OAuth2SettingSerializer,
+ SAML2SettingSerializer, OAuth2SettingSerializer, PasskeySettingSerializer,
CustomSMSSettingSerializer,
)
from .basic import BasicSettingSerializer
@@ -47,6 +47,7 @@ class SettingsSerializer(
TencentSMSSettingSerializer,
CMPP2SMSSettingSerializer,
CustomSMSSettingSerializer,
+ PasskeySettingSerializer
):
CACHE_KEY = 'SETTING_FIELDS_MAPPING'
diff --git a/apps/settings/serializers/terminal.py b/apps/settings/serializers/terminal.py
index 17782a2e0..42e03eeb7 100644
--- a/apps/settings/serializers/terminal.py
+++ b/apps/settings/serializers/terminal.py
@@ -39,16 +39,3 @@ class TerminalSettingSerializer(serializers.Serializer):
TERMINAL_MAGNUS_ENABLED = serializers.BooleanField(label=_("Enable database proxy"))
TERMINAL_RAZOR_ENABLED = serializers.BooleanField(label=_("Enable Razor"))
TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField(label=_("Enable SSH Client"))
-
- RESOLUTION_CHOICES = (
- ('Auto', 'Auto'),
- ('1024x768', '1024x768'),
- ('1366x768', '1366x768'),
- ('1600x900', '1600x900'),
- ('1920x1080', '1920x1080')
- )
- TERMINAL_GRAPHICAL_RESOLUTION = serializers.ChoiceField(
- default='Auto', choices=RESOLUTION_CHOICES, required=False,
- label=_('Default graphics resolution'),
- help_text=_('Tip: Default resolution to use when connecting graphical assets in Luna pages')
- )
diff --git a/apps/settings/tools/__init__.py b/apps/settings/tools/__init__.py
index 09154d4b2..993b7bca2 100644
--- a/apps/settings/tools/__init__.py
+++ b/apps/settings/tools/__init__.py
@@ -4,3 +4,4 @@ from .ping import *
from .telnet import *
from .nmap import *
from .tcpdump import *
+from .traceroute import *
diff --git a/apps/settings/tools/ping.py b/apps/settings/tools/ping.py
index 556bb9e5b..4af375a4f 100644
--- a/apps/settings/tools/ping.py
+++ b/apps/settings/tools/ping.py
@@ -8,6 +8,7 @@ import struct
import time
from common.utils import lookup_domain
+from settings.utils import generate_ips
# From /usr/include/linux/icmp.h; your milage may vary.
ICMP_ECHO_REQUEST = 8 # Seems to be the same on Solaris.
@@ -128,7 +129,7 @@ def ping(dest_addr, timeout, psize, flag=0):
return delay
-async def verbose_ping(dest_ip, timeout=2, count=5, psize=64, display=None):
+async def verbose_ping(dest_ips, timeout=2, count=5, psize=64, display=None):
"""
Send `count' ping with `psize' size to `dest_addr' with
the given `timeout' and display the result.
@@ -136,34 +137,38 @@ async def verbose_ping(dest_ip, timeout=2, count=5, psize=64, display=None):
if not display:
return
- ip, err = lookup_domain(dest_ip)
- if not ip:
- await display(err)
- return
+ result = {}
+ ips = generate_ips(dest_ips)
+ await display(f'Total valid address: {len(ips)}\r\n')
+ for dest_ip in ips:
+ await display(f'PING {dest_ip}: 56 data bytes')
+ # 切换异步协程
+ await asyncio.sleep(0.01)
+ error_count = 0
+ for i in range(count):
+ try:
+ delay = ping(dest_ip, timeout, psize)
+ except socket.gaierror as e:
+ await display("Failed (socket error: '%s')" % str(e))
+ error_count += 1
+ break
- await display("PING %s (%s): 56 data bytes" % (dest_ip, ip))
- await asyncio.sleep(0.1)
- error_count = 0
- for i in range(count):
- try:
- delay = ping(dest_ip, timeout, psize)
- except socket.gaierror as e:
- await display("Failed (socket error: '%s')" % str(e))
- error_count += 1
- break
+ if delay is None:
+ await display("Request timeout for icmp_seq %i" % i)
+ error_count += 1
+ else:
+ delay *= 1000
+ await display("64 bytes from %s: time=%.3f ms" % (dest_ip, delay))
+ await asyncio.sleep(1)
+ # 只要有包通过，就认为address是通的
+ result[dest_ip] = 'failed' if error_count == count else 'ok'
+ await display(f'{count} packets transmitted, '
+ f'{count - error_count} packets received, '
+ f'{(error_count / count) * 100}% packet loss\r\n')
- if delay is None:
- await display("Request timeout for icmp_seq %i" % i)
- error_count += 1
- else:
- delay *= 1000
- await display("64 bytes from %s: icmp_seq=0 ttl=115 time=%.3f ms" % (ip, delay))
- await asyncio.sleep(1)
-
- await display(f'--- {dest_ip} ping statistics ---')
- await display(f'{count} packets transmitted, '
- f'{count - error_count} packets received, '
- f'{(error_count / count) * 100}% packet loss')
+ await display(f'----- Ping statistics -----')
+ for k, v in result.items():
+ await display(f'{k}: {v}')
if __name__ == "__main__":
diff --git a/apps/settings/tools/telnet.py b/apps/settings/tools/telnet.py
index b54a393d8..796118383 100644
--- a/apps/settings/tools/telnet.py
+++ b/apps/settings/tools/telnet.py
@@ -1,57 +1,53 @@
# -*- coding: utf-8 -*-
#
import asyncio
+import socket
+import telnetlib
-from common.utils import lookup_domain
+from settings.utils import generate_ips
PROMPT_REGEX = r'[\<|\[](.*)[\>|\]]'
async def telnet(dest_addr, port_number=23, timeout=10):
+ loop = asyncio.get_running_loop()
try:
- reader, writer = await asyncio.wait_for(
- asyncio.open_connection(dest_addr, port_number), timeout
- )
+ connection = await loop.run_in_executor(None, telnetlib.Telnet, dest_addr, port_number, timeout)
except asyncio.TimeoutError:
return False, 'Timeout'
- except (ConnectionRefusedError, OSError) as e:
+ except (ConnectionRefusedError, socket.timeout, socket.gaierror) as e:
return False, str(e)
- try:
- # 发送命令
- writer.write(b"command\r\n")
- await writer.drain()
- # 读取响应
- response = await reader.readuntil()
- except asyncio.TimeoutError:
- writer.close()
- await writer.wait_closed()
- return False, 'Timeout'
- writer.close()
- await writer.wait_closed()
- return True, response.decode('utf-8', 'ignore')
+ expected_regexes = [bytes(PROMPT_REGEX, encoding='ascii')]
+ __, __, output = connection.expect(expected_regexes, timeout=3)
+ return True, output.decode('utf-8', 'ignore')
-async def verbose_telnet(dest_ip, dest_port=23, timeout=10, display=None):
+async def verbose_telnet(dest_ips, dest_port=23, timeout=10, display=None):
if not display:
return
- ip, err = lookup_domain(dest_ip)
- if not ip:
- await display(err)
- return
+ result = {}
+ ips = generate_ips(dest_ips)
+ await display(f'Total valid address: {len(ips)}\r\n')
+ for dest_ip in ips:
+ await display(f'Trying ({dest_ip}:{dest_port})')
+ try:
+ is_connective, resp = await telnet(dest_ip, dest_port, timeout)
+ if is_connective:
+ result[dest_ip] = 'ok'
+ msg = f'Connected to {dest_ip} {dest_port} {resp}.\r\n' \
+ f'Connection closed by foreign host.'
+ else:
+ result[dest_ip] = 'failed'
+ msg = f'Unable to connect to remote host\r\n' \
+ f'Reason: {resp}'
+ except Exception as e:
+ msg = 'Error: %s' % e
+ await display(f'{msg}\r\n')
- await display(f'Trying {dest_ip} ({ip}:{dest_port})')
- try:
- is_connective, resp = await telnet(dest_ip, dest_port, timeout)
- if is_connective:
- msg = f'Connected to {dest_ip} {dest_port} {resp}.\r\n' \
- f'Connection closed by foreign host.'
- else:
- msg = f'Unable to connect to remote host\r\n' \
- f'Reason: {resp}'
- except Exception as e:
- msg = 'Error: %s' % e
- await display(msg)
+ await display(f'----- Telnet statistics -----')
+ for k, v in result.items():
+ await display(f'{k}: {v}')
if __name__ == "__main__":
diff --git a/apps/settings/tools/traceroute.py b/apps/settings/tools/traceroute.py
new file mode 100644
index 000000000..726f3a07d
--- /dev/null
+++ b/apps/settings/tools/traceroute.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+#
+import asyncio
+import socket
+import struct
+import time
+
+from settings.utils import generate_ips
+
+
+def calculate_checksum(data):
+ # 计算 ICMP 校验和
+ checksum = 0
+ if len(data) % 2 == 1:
+ data += b'\x00'
+ for i in range(0, len(data), 2):
+ w = (data[i] << 8) + data[i+1]
+ checksum += w
+ checksum = (checksum >> 16) + (checksum & 0xffff)
+ checksum = ~checksum & 0xffff
+ return checksum
+
+
+async def once_traceroute(target, display, max_hops=30, timeout=3):
+ loop = asyncio.get_event_loop()
+ icmp = socket.getprotobyname('icmp')
+ sock_fd = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp)
+ for ttl in range(1, max_hops+1):
+ # 设置 TTL
+ sock_fd.setsockopt(socket.IPPROTO_IP, socket.IP_TTL, ttl)
+ # 设置超时时间
+ sock_fd.settimeout(timeout)
+ # 发送 ICMP Echo 请求数据包
+ packet = struct.pack('!BBHHH', 8, 0, 0, 12345, ttl)
+ checksum = calculate_checksum(packet)
+ packet = struct.pack('!BBHHH', 8, 0, checksum, 12345, ttl)
+ start_time = time.time()
+ sock_fd.sendto(packet, (target, 0))
+ await asyncio.sleep(0.01)
+ try:
+ # 接收 ICMP Echo Reply 数据包
+ recv_packet, addr = await loop.sock_recvfrom(sock_fd, 1024)
+ end_time = time.time()
+ # 解析目标地址
+ dest_ip = addr[0]
+ # 获取跃点信息
+ hop_info = f'{ttl} {dest_ip} ({dest_ip})'
+ # 获取延迟时间信息
+ delay_info = f'{(end_time - start_time) * 1000:.3f} ms'
+ # 打印跃点信息和延迟时间
+ await display(f'{hop_info:<4} {delay_info}')
+ if dest_ip == target:
+ return
+ except socket.timeout:
+ # 发生超时，跳出循环
+ await display(f'{ttl} *')
+ sock_fd.close()
+
+
+async def verbose_traceroute(dest_ips, timeout=10, display=None):
+ if not display:
+ return
+
+ ips = generate_ips(dest_ips)
+ await display(f'Total valid address: {len(ips)}\r\n')
+ for dest_ip in ips:
+ await display(f'traceroute to {dest_ip}, 30 hops max, 60 byte packets')
+ msg = ''
+ try:
+ await once_traceroute(dest_ip, display)
+ except Exception as e:
+ msg = f'Error: {e}'
+ await display(msg)
diff --git a/apps/settings/urls/api_urls.py b/apps/settings/urls/api_urls.py
index ba074d4ee..97055bc83 100644
--- a/apps/settings/urls/api_urls.py
+++ b/apps/settings/urls/api_urls.py
@@ -20,6 +20,8 @@ urlpatterns = [
path('sms/backend/', api.SMSBackendAPI.as_view(), name='sms-backend'),
path('vault/testing/', api.VaultTestingAPI.as_view(), name='vault-testing'),
path('vault/sync/', api.VaultSyncDataAPI.as_view(), name='vault-sync'),
+ path('security/block-ip/', api.BlockIPSecurityAPI.as_view(), name='block-ip'),
+ path('security/unlock-ip/', api.UnlockIPSecurityAPI.as_view(), name='unlock-ip'),
path('setting/', api.SettingsApi.as_view(), name='settings-setting'),
path('logo/', api.SettingsLogoApi.as_view(), name='settings-logo'),
diff --git a/apps/settings/utils/common.py b/apps/settings/utils/common.py
index e549f9b8c..826b19cd8 100644
--- a/apps/settings/utils/common.py
+++ b/apps/settings/utils/common.py
@@ -3,6 +3,8 @@ from jumpserver.context_processor import default_interface
from django.conf import settings
from IPy import IP
+from common.utils import lookup_domain
+
def get_interface_setting_or_default():
if not settings.XPACK_ENABLED:
@@ -15,21 +17,25 @@ def get_login_title():
return get_interface_setting_or_default()['login_title']
-def generate_ips(ip_string):
+def generate_ips(address_string):
+ def transform(_ip):
+ real_ip, err_msg = lookup_domain(_ip)
+ return _ip if err_msg else real_ip
# 支持的格式
# 192.168.1.1,192.168.1.2
# 192.168.1.1-12 | 192.168.1.1-192.168.1.12 | 192.168.1.0/30 | 192.168.1.1
ips = []
- ip_list = ip_string.split(',')
- if len(ip_list) > 1:
+ ip_list = address_string.split(',')
+ if len(ip_list) >= 1:
for ip in ip_list:
try:
- ips.append(str(IP(ip)))
+ ips.append(str(IP(transform(ip))))
except ValueError:
pass
- return ips
+ if ips:
+ return ips
- ip_list = ip_string.split('-')
+ ip_list = address_string.split('-')
try:
if len(ip_list) == 2:
start_ip, end_ip = ip_list
@@ -54,6 +60,7 @@ def is_valid_port(port):
valid = False
return valid
+
def generate_ports(ports):
port_list = []
if isinstance(ports, int):
diff --git a/apps/settings/ws.py b/apps/settings/ws.py
index b15d61ea7..a8ae2c398 100644
--- a/apps/settings/ws.py
+++ b/apps/settings/ws.py
@@ -6,7 +6,10 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer
from common.db.utils import close_old_connections
from common.utils import get_logger
-from .tools import verbose_ping, verbose_telnet, verbose_nmap, verbose_tcpdump
+from .tools import (
+ verbose_ping, verbose_telnet, verbose_nmap,
+ verbose_tcpdump, verbose_traceroute
+)
logger = get_logger(__name__)
@@ -22,19 +25,19 @@ class ToolsWebsocket(AsyncJsonWebsocketConsumer):
await self.close()
async def send_msg(self, msg=''):
- await self.send_json({'msg': msg + '\r\n'})
+ await self.send_json({'msg': f'{msg}\r\n'})
- async def imitate_ping(self, dest_ip, timeout=3, count=5, psize=64):
+ async def imitate_ping(self, dest_ips, timeout=3, count=5, psize=64):
params = {
- 'dest_ip': dest_ip, 'timeout': timeout,
+ 'dest_ips': dest_ips, 'timeout': timeout,
'count': count, 'psize': psize
}
logger.info(f'Receive request ping: {params}')
await verbose_ping(display=self.send_msg, **params)
- async def imitate_telnet(self, dest_ip, dest_port=23, timeout=10):
+ async def imitate_telnet(self, dest_ips, dest_port=23, timeout=10):
params = {
- 'dest_ip': dest_ip, 'dest_port': dest_port, 'timeout': timeout,
+ 'dest_ips': dest_ips, 'dest_port': dest_port, 'timeout': timeout,
}
logger.info(f'Receive request telnet: {params}')
await verbose_telnet(display=self.send_msg, **params)
@@ -57,6 +60,10 @@ class ToolsWebsocket(AsyncJsonWebsocketConsumer):
logger.info(f'Receive request tcpdump: {params}')
await verbose_tcpdump(display=self.send_msg, **params)
+ async def imitate_traceroute(self,dest_ips):
+ params = {'dest_ips': dest_ips}
+ await verbose_traceroute(display=self.send_msg, **params)
+
async def receive(self, text_data=None, bytes_data=None, **kwargs):
data = json.loads(text_data)
tool_type = data.pop('tool_type', 'Ping')
diff --git a/apps/static/img/login_passkey.png b/apps/static/img/login_passkey.png
new file mode 100644
index 000000000..23d2b7d89
Binary files /dev/null and b/apps/static/img/login_passkey.png differ
diff --git a/apps/static/js/plugins/qrcode/qrcode.js b/apps/static/js/plugins/qrcode/qrcode.js
new file mode 100644
index 000000000..3b1186491
--- /dev/null
+++ b/apps/static/js/plugins/qrcode/qrcode.js
@@ -0,0 +1,618 @@
+/**
+ * @fileoverview
+ * - Using the 'QRCode for Javascript library'
+ * - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
+ * - this library has no dependencies.
+ *
+ * @author davidshimjs
+ * @see http://www.d-project.com/
+ * @see http://jeromeetienne.github.com/jquery-qrcode/
+ */
+var QRCode;
+
+(function () {
+ //---------------------------------------------------------------------
+ // QRCode for JavaScript
+ //
+ // Copyright (c) 2009 Kazuhiko Arase
+ //
+ // URL: http://www.d-project.com/
+ //
+ // Licensed under the MIT license:
+ // http://www.opensource.org/licenses/mit-license.php
+ //
+ // The word "QR Code" is registered trademark of
+ // DENSO WAVE INCORPORATED
+ // http://www.denso-wave.com/qrcode/faqpatent-e.html
+ //
+ //---------------------------------------------------------------------
+ function QR8bitByte(data) {
+ this.mode = QRMode.MODE_8BIT_BYTE;
+ this.data = data;
+ this.parsedData = [];
+
+ // Added to support UTF-8 Characters
+ for (var i = 0, l = this.data.length; i < l; i++) {
+ var byteArray = [];
+ var code = this.data.charCodeAt(i);
+
+ if (code > 0x10000) {
+ byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+ byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+ byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[3] = 0x80 | (code & 0x3F);
+ } else if (code > 0x800) {
+ byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+ byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[2] = 0x80 | (code & 0x3F);
+ } else if (code > 0x80) {
+ byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+ byteArray[1] = 0x80 | (code & 0x3F);
+ } else {
+ byteArray[0] = code;
+ }
+
+ this.parsedData.push(byteArray);
+ }
+
+ this.parsedData = Array.prototype.concat.apply([], this.parsedData);
+
+ if (this.parsedData.length != this.data.length) {
+ this.parsedData.unshift(191);
+ this.parsedData.unshift(187);
+ this.parsedData.unshift(239);
+ }
+ }
+
+ QR8bitByte.prototype = {
+ getLength: function (buffer) {
+ return this.parsedData.length;
+ },
+ write: function (buffer) {
+ for (var i = 0, l = this.parsedData.length; i < l; i++) {
+ buffer.put(this.parsedData[i], 8);
+ }
+ }
+ };
+
+ function QRCodeModel(typeNumber, errorCorrectLevel) {
+ this.typeNumber = typeNumber;
+ this.errorCorrectLevel = errorCorrectLevel;
+ this.modules = null;
+ this.moduleCount = 0;
+ this.dataCache = null;
+ this.dataList = [];
+ }
+
+ QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
+ return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);}
+ if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
+ this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
+ return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
+ for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
+ for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
+ this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);}
+ var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
+ this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
+ row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. ("
+ +buffer.getLengthInBits()
+ +">"
+ +totalDataCount*8
+ +")");}
+ if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
+ while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
+ while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD1,8);}
+ return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}}
+ var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
+ return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
+ return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
+ return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}}
+ for(var row=0;row=256){n-=255;}
+ return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
+ if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
+ this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
+
+ function _isSupportCanvas() {
+ return typeof CanvasRenderingContext2D != "undefined";
+ }
+
+ // android 2.x doesn't support Data-URI spec
+ function _getAndroid() {
+ var android = false;
+ var sAgent = navigator.userAgent;
+
+ if (/android/i.test(sAgent)) { // android
+ android = true;
+ var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
+
+ if (aMat && aMat[1]) {
+ android = parseFloat(aMat[1]);
+ }
+ }
+
+ return android;
+ }
+
+ var svgDrawer = (function() {
+
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+
+ this.clear();
+
+ function makeSVG(tag, attrs) {
+ var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
+ for (var k in attrs)
+ if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
+ return el;
+ }
+
+ var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
+ svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
+ _el.appendChild(svg);
+
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ if (oQRCode.isDark(row, col)) {
+ var child = makeSVG("use", {"x": String(col), "y": String(row)});
+ child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
+ svg.appendChild(child);
+ }
+ }
+ }
+ };
+ Drawing.prototype.clear = function () {
+ while (this._el.hasChildNodes())
+ this._el.removeChild(this._el.lastChild);
+ };
+ return Drawing;
+ })();
+
+ var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
+
+ // Drawing in DOM by using Table tag
+ var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+ var aHTML = [''];
+
+ for (var row = 0; row < nCount; row++) {
+ aHTML.push('');
+
+ for (var col = 0; col < nCount; col++) {
+ aHTML.push(' ');
+ }
+
+ aHTML.push('
');
+ _el.innerHTML = aHTML.join('');
+
+ // Fix the margin values as real size.
+ var elTable = _el.childNodes[0];
+ var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
+ var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
+
+ if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
+ elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._el.innerHTML = '';
+ };
+
+ return Drawing;
+ })() : (function () { // Drawing in Canvas
+ function _onMakeImage() {
+ this._elImage.src = this._elCanvas.toDataURL("image/png");
+ this._elImage.style.display = "block";
+ this._elCanvas.style.display = "none";
+ }
+
+ // Android 2.1 bug workaround
+ // http://code.google.com/p/android/issues/detail?id=5141
+ if (this._android && this._android <= 2.1) {
+ var factor = 1 / window.devicePixelRatio;
+ var drawImage = CanvasRenderingContext2D.prototype.drawImage;
+ CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
+ if (("nodeName" in image) && /img/i.test(image.nodeName)) {
+ for (var i = arguments.length - 1; i >= 1; i--) {
+ arguments[i] = arguments[i] * factor;
+ }
+ } else if (typeof dw == "undefined") {
+ arguments[1] *= factor;
+ arguments[2] *= factor;
+ arguments[3] *= factor;
+ arguments[4] *= factor;
+ }
+
+ drawImage.apply(this, arguments);
+ };
+ }
+
+ /**
+ * Check whether the user's browser supports Data URI or not
+ *
+ * @private
+ * @param {Function} fSuccess Occurs if it supports Data URI
+ * @param {Function} fFail Occurs if it doesn't support Data URI
+ */
+ function _safeSetDataURI(fSuccess, fFail) {
+ var self = this;
+ self._fFail = fFail;
+ self._fSuccess = fSuccess;
+
+ // Check it just once
+ if (self._bSupportDataURI === null) {
+ var el = document.createElement("img");
+ var fOnError = function() {
+ self._bSupportDataURI = false;
+
+ if (self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+ var fOnSuccess = function() {
+ self._bSupportDataURI = true;
+
+ if (self._fSuccess) {
+ self._fSuccess.call(self);
+ }
+ };
+
+ el.onabort = fOnError;
+ el.onerror = fOnError;
+ el.onload = fOnSuccess;
+ el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
+ return;
+ } else if (self._bSupportDataURI === true && self._fSuccess) {
+ self._fSuccess.call(self);
+ } else if (self._bSupportDataURI === false && self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+
+ /**
+ * Drawing QRCode by using canvas
+ *
+ * @constructor
+ * @param {HTMLElement} el
+ * @param {Object} htOption QRCode Options
+ */
+ var Drawing = function (el, htOption) {
+ this._bIsPainted = false;
+ this._android = _getAndroid();
+
+ this._htOption = htOption;
+ this._elCanvas = document.createElement("canvas");
+ this._elCanvas.width = htOption.width;
+ this._elCanvas.height = htOption.height;
+ el.appendChild(this._elCanvas);
+ this._el = el;
+ this._oContext = this._elCanvas.getContext("2d");
+ this._bIsPainted = false;
+ this._elImage = document.createElement("img");
+ this._elImage.alt = "Scan me!";
+ this._elImage.style.display = "none";
+ this._el.appendChild(this._elImage);
+ this._bSupportDataURI = null;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _elImage = this._elImage;
+ var _oContext = this._oContext;
+ var _htOption = this._htOption;
+
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = _htOption.width / nCount;
+ var nHeight = _htOption.height / nCount;
+ var nRoundedWidth = Math.round(nWidth);
+ var nRoundedHeight = Math.round(nHeight);
+
+ _elImage.style.display = "none";
+ this.clear();
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ var bIsDark = oQRCode.isDark(row, col);
+ var nLeft = col * nWidth;
+ var nTop = row * nHeight;
+ _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.lineWidth = 1;
+ _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.fillRect(nLeft, nTop, nWidth, nHeight);
+
+ // 안티 앨리어싱 방지 처리
+ _oContext.strokeRect(
+ Math.floor(nLeft) + 0.5,
+ Math.floor(nTop) + 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+
+ _oContext.strokeRect(
+ Math.ceil(nLeft) - 0.5,
+ Math.ceil(nTop) - 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+ }
+ }
+
+ this._bIsPainted = true;
+ };
+
+ /**
+ * Make the image from Canvas if the browser supports Data URI.
+ */
+ Drawing.prototype.makeImage = function () {
+ if (this._bIsPainted) {
+ _safeSetDataURI.call(this, _onMakeImage);
+ }
+ };
+
+ /**
+ * Return whether the QRCode is painted or not
+ *
+ * @return {Boolean}
+ */
+ Drawing.prototype.isPainted = function () {
+ return this._bIsPainted;
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
+ this._bIsPainted = false;
+ };
+
+ /**
+ * @private
+ * @param {Number} nNumber
+ */
+ Drawing.prototype.round = function (nNumber) {
+ if (!nNumber) {
+ return nNumber;
+ }
+
+ return Math.floor(nNumber * 1000) / 1000;
+ };
+
+ return Drawing;
+ })();
+
+ /**
+ * Get the type by string length
+ *
+ * @private
+ * @param {String} sText
+ * @param {Number} nCorrectLevel
+ * @return {Number} type
+ */
+ function _getTypeNumber(sText, nCorrectLevel) {
+ var nType = 1;
+ var length = _getUTF8Length(sText);
+
+ for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+ var nLimit = 0;
+
+ switch (nCorrectLevel) {
+ case QRErrorCorrectLevel.L :
+ nLimit = QRCodeLimitLength[i][0];
+ break;
+ case QRErrorCorrectLevel.M :
+ nLimit = QRCodeLimitLength[i][1];
+ break;
+ case QRErrorCorrectLevel.Q :
+ nLimit = QRCodeLimitLength[i][2];
+ break;
+ case QRErrorCorrectLevel.H :
+ nLimit = QRCodeLimitLength[i][3];
+ break;
+ }
+
+ if (length <= nLimit) {
+ break;
+ } else {
+ nType++;
+ }
+ }
+
+ if (nType > QRCodeLimitLength.length) {
+ throw new Error("Too long data");
+ }
+
+ return nType;
+ }
+
+ function _getUTF8Length(sText) {
+ var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+ return replacedText.length + (replacedText.length != sText ? 3 : 0);
+ }
+
+ /**
+ * @class QRCode
+ * @constructor
+ * @example
+ * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
+ *
+ * @example
+ * var oQRCode = new QRCode("test", {
+ * text : "http://naver.com",
+ * width : 128,
+ * height : 128
+ * });
+ *
+ * oQRCode.clear(); // Clear the QRCode.
+ * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
+ *
+ * @param {HTMLElement|String} el target element or 'id' attribute of element.
+ * @param {Object|String} vOption
+ * @param {String} vOption.text QRCode link data
+ * @param {Number} [vOption.width=256]
+ * @param {Number} [vOption.height=256]
+ * @param {String} [vOption.colorDark="#000000"]
+ * @param {String} [vOption.colorLight="#ffffff"]
+ * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
+ */
+ QRCode = function (el, vOption) {
+ this._htOption = {
+ width : 256,
+ height : 256,
+ typeNumber : 4,
+ colorDark : "#000000",
+ colorLight : "#ffffff",
+ correctLevel : QRErrorCorrectLevel.H
+ };
+
+ if (typeof vOption === 'string') {
+ vOption = {
+ text : vOption
+ };
+ }
+
+ // Overwrites options
+ if (vOption) {
+ for (var i in vOption) {
+ this._htOption[i] = vOption[i];
+ }
+ }
+
+ if (typeof el == "string") {
+ el = document.getElementById(el);
+ }
+
+ if (this._htOption.useSVG) {
+ Drawing = svgDrawer;
+ }
+
+ this._android = _getAndroid();
+ this._el = el;
+ this._oQRCode = null;
+ this._oDrawing = new Drawing(this._el, this._htOption);
+
+ if (this._htOption.text) {
+ this.makeCode(this._htOption.text);
+ }
+ };
+
+ /**
+ * Make the QRCode
+ *
+ * @param {String} sText link data
+ */
+ QRCode.prototype.makeCode = function (sText) {
+ this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
+ this._oQRCode.addData(sText);
+ this._oQRCode.make();
+ this._el.title = sText;
+ this._oDrawing.draw(this._oQRCode);
+ this.makeImage();
+ };
+
+ /**
+ * Make the Image from Canvas element
+ * - It occurs automatically
+ * - Android below 3 doesn't support Data-URI spec.
+ *
+ * @private
+ */
+ QRCode.prototype.makeImage = function () {
+ if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
+ this._oDrawing.makeImage();
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ QRCode.prototype.clear = function () {
+ this._oDrawing.clear();
+ };
+
+ /**
+ * @name QRCode.CorrectLevel
+ */
+ QRCode.CorrectLevel = QRErrorCorrectLevel;
+})();
+
+if (typeof module != "undefined") {
+ module.exports = QRCode;
+}
diff --git a/apps/static/js/plugins/qrcode/qrcode.min.js b/apps/static/js/plugins/qrcode/qrcode.min.js
deleted file mode 100755
index 993e88f39..000000000
--- a/apps/static/js/plugins/qrcode/qrcode.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push(' ")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}();
\ No newline at end of file
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 62ddb52c4..72fb77201 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -14,13 +14,15 @@
-
-
+
{% trans 'Docs' %}
-
-
+
{% trans 'Commercial support' %}
@@ -32,11 +34,11 @@
-
- {% ifequal request.COOKIES.django_language 'en' %}
+ {% if request.COOKIES.django_language == 'en' %}
English
{% else %}
中文
- {% endifequal %}
+ {% endif %}
@@ -64,7 +66,7 @@
-
{% if request.user.is_authenticated %}
-
+
{{ request.user.name }}
@@ -72,20 +74,24 @@
-
- - {% trans 'Profile' %}
- {% if request.user.can_admin_or_audit_current_org %}
- {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
- - {% trans 'Admin page' %}
- {% else %}
- - {% trans 'User page' %}
+
+ - {% trans 'Profile' %}
+ {% if request.user.can_admin_or_audit_current_org %}
+ {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
+ - {% trans 'Admin page' %}
+ {% else %}
+ - {% trans 'User page' %}
+ {% endif %}
{% endif %}
- {% endif %}
- - {% trans 'API Key' %}
+ - {% trans 'API Key' %}
- {% trans 'Logout' %}
{% else %}
-
+
{% trans 'Login' %}
{% endif %}
@@ -99,12 +105,12 @@
{% if app %}
- -
+
-
{{ app }}
{% endif %}
{% if action %}
- -
+
-
{{ action }}
{% endif %}
@@ -116,20 +122,19 @@
diff --git a/apps/templates/_without_nav_base.html b/apps/templates/_without_nav_base.html
index 6e1c34484..a9ed54abd 100644
--- a/apps/templates/_without_nav_base.html
+++ b/apps/templates/_without_nav_base.html
@@ -11,7 +11,7 @@
-
+
diff --git a/apps/templates/flash_message_standalone.html b/apps/templates/flash_message_standalone.html
index ad81c1141..fd3308f00 100644
--- a/apps/templates/flash_message_standalone.html
+++ b/apps/templates/flash_message_standalone.html
@@ -12,7 +12,7 @@
-
+
{% if error %}
{{ error }}
{% else %}
@@ -44,6 +44,7 @@
{% block custom_foot_js %}
-
+
{% if form.auto_login %}
{% bootstrap_field form.auto_login form_group_class='auto_login_box' %}
{% endif %}
-
+
{% trans 'Forgot password' %}?
diff --git a/apps/authentication/templates/authentication/passkey.html b/apps/authentication/templates/authentication/passkey.html
new file mode 100644
index 000000000..6db7141e3
--- /dev/null
+++ b/apps/authentication/templates/authentication/passkey.html
@@ -0,0 +1,191 @@
+{% load static %}
+{% load i18n %}
+
+
+
+
+ Login passkey
+
+
+
+
+
+
+
diff --git a/apps/authentication/urls/api_urls.py b/apps/authentication/urls/api_urls.py
index 99805a4e8..6d40f68e8 100644
--- a/apps/authentication/urls/api_urls.py
+++ b/apps/authentication/urls/api_urls.py
@@ -4,6 +4,7 @@ from django.urls import path
from rest_framework.routers import DefaultRouter
from .. import api
+from ..backends.passkey.urls import urlpatterns as passkey_urlpatterns
app_name = 'authentication'
router = DefaultRouter()
@@ -13,17 +14,19 @@ router.register('temp-tokens', api.TempTokenViewSet, 'temp-token')
router.register('connection-token', api.ConnectionTokenViewSet, 'connection-token')
router.register('super-connection-token', api.SuperConnectionTokenViewSet, 'super-connection-token')
-
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('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('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'),
+ 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'),
path('auth/', api.TokenCreateApi.as_view(), name='user-auth'),
path('confirm/', api.ConfirmApi.as_view(), name='user-confirm'),
@@ -38,4 +41,4 @@ urlpatterns = [
path('login-confirm-ticket/status/', api.TicketStatusApi.as_view(), name='login-confirm-ticket-status'),
]
-urlpatterns += router.urls
+urlpatterns += router.urls + passkey_urlpatterns
diff --git a/apps/authentication/urls/view_urls.py b/apps/authentication/urls/view_urls.py
index bad1ded62..ea08eddd0 100644
--- a/apps/authentication/urls/view_urls.py
+++ b/apps/authentication/urls/view_urls.py
@@ -1,11 +1,11 @@
# coding:utf-8
#
-from django.urls import path, include
from django.db.transaction import non_atomic_requests
+from django.urls import path, include
-from .. import views
from users import views as users_view
+from .. import views
app_name = 'authentication'
@@ -18,7 +18,8 @@ urlpatterns = [
path('logout/', views.UserLogoutView.as_view(), name='logout'),
# 原来在users中的
- path('password/forget/previewing/', users_view.UserForgotPasswordPreviewingView.as_view(), name='forgot-previewing'),
+ path('password/forget/previewing/', users_view.UserForgotPasswordPreviewingView.as_view(),
+ name='forgot-previewing'),
path('password/forgot/', users_view.UserForgotPasswordView.as_view(), name='forgot-password'),
path('password/reset/', users_view.UserResetPasswordView.as_view(), name='reset-password'),
path('password/verify/', users_view.UserVerifyPasswordView.as_view(), name='user-verify-password'),
@@ -26,7 +27,8 @@ 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(), name='wecom-qr-bind-callback'),
+ 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'),
path('wecom/oauth/login/callback/', views.WeComOAuthLoginCallbackView.as_view(), name='wecom-oauth-login-callback'),
@@ -34,10 +36,12 @@ urlpatterns = [
path('dingtalk/bind/start/', views.DingTalkEnableStartView.as_view(), name='dingtalk-bind-start'),
path('dingtalk/qr/bind/', views.DingTalkQRBindView.as_view(), name='dingtalk-qr-bind'),
path('dingtalk/qr/login/', views.DingTalkQRLoginView.as_view(), name='dingtalk-qr-login'),
- path('dingtalk/qr/bind//callback/', views.DingTalkQRBindCallbackView.as_view(), name='dingtalk-qr-bind-callback'),
+ path('dingtalk/qr/bind//callback/', views.DingTalkQRBindCallbackView.as_view(),
+ name='dingtalk-qr-bind-callback'),
path('dingtalk/qr/login/callback/', views.DingTalkQRLoginCallbackView.as_view(), name='dingtalk-qr-login-callback'),
path('dingtalk/oauth/login/', views.DingTalkOAuthLoginView.as_view(), name='dingtalk-oauth-login'),
- path('dingtalk/oauth/login/callback/', views.DingTalkOAuthLoginCallbackView.as_view(), name='dingtalk-oauth-login-callback'),
+ path('dingtalk/oauth/login/callback/', views.DingTalkOAuthLoginCallbackView.as_view(),
+ name='dingtalk-oauth-login-callback'),
path('feishu/bind/start/', views.FeiShuEnableStartView.as_view(), name='feishu-bind-start'),
path('feishu/qr/bind/', views.FeiShuQRBindView.as_view(), name='feishu-qr-bind'),
diff --git a/apps/authentication/views/base.py b/apps/authentication/views/base.py
index 7969502c0..c118680f0 100644
--- a/apps/authentication/views/base.py
+++ b/apps/authentication/views/base.py
@@ -12,6 +12,7 @@ from authentication.mixins import AuthMixin
from common.utils import get_logger
from common.utils.django import reverse, get_object_or_none
from users.models import User
+from users.signal_handlers import check_only_allow_exist_user_auth
from .mixins import FlashMessageMixin
logger = get_logger(__file__)
@@ -49,6 +50,11 @@ class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
user, create = User.objects.get_or_create(
username=user_attr['username'], defaults=user_attr
)
+
+ if not check_only_allow_exist_user_auth(create):
+ user.delete()
+ return user, (self.msg_client_err, self.request.error_message)
+
setattr(user, f'{self.user_type}_id', user_id)
if create:
setattr(user, 'source', self.user_type)
diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py
index 459abb3cf..a222aa4d8 100644
--- a/apps/authentication/views/login.py
+++ b/apps/authentication/views/login.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
import datetime
import os
from typing import Callable
+from urllib.parse import urlparse
from django.conf import settings
from django.contrib.auth import BACKEND_SESSION_KEY
@@ -40,6 +41,7 @@ __all__ = [
class UserLoginContextMixin:
get_user_mfa_context: Callable
request: HttpRequest
+ error_origin: str
def get_support_auth_methods(self):
auth_methods = [
@@ -88,6 +90,12 @@ class UserLoginContextMixin:
'enabled': settings.AUTH_FEISHU,
'url': reverse('authentication:feishu-qr-login'),
'logo': static('img/login_feishu_logo.png')
+ },
+ {
+ 'name': _("Passkey"),
+ 'enabled': settings.AUTH_PASSKEY,
+ 'url': reverse('api-auth:passkey-login'),
+ 'logo': static('img/login_passkey.png')
}
]
return [method for method in auth_methods if method['enabled']]
@@ -134,8 +142,27 @@ class UserLoginContextMixin:
count += 1
return count
+ def set_csrf_error_if_need(self, context):
+ if not self.request.GET.get('csrf_failure'):
+ return context
+
+ http_origin = self.request.META.get('HTTP_ORIGIN')
+ http_referer = self.request.META.get('HTTP_REFERER')
+ http_origin = http_origin or http_referer
+
+ if not http_origin:
+ return context
+
+ try:
+ origin = urlparse(http_origin)
+ context['error_origin'] = str(origin.netloc)
+ except ValueError:
+ pass
+ return context
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ self.set_csrf_error_if_need(context)
context.update({
'demo_mode': os.environ.get("DEMO_MODE"),
'auth_methods': self.get_support_auth_methods(),
@@ -283,6 +310,12 @@ class UserLoginGuardView(mixins.AuthMixin, RedirectView):
age = self.request.session.get_expiry_age()
self.request.session.set_expiry(age)
+ def get(self, request, *args, **kwargs):
+ response = super().get(request, *args, **kwargs)
+ if request.user.is_authenticated:
+ response.set_cookie('jms_username', request.user.username)
+ return response
+
def get_redirect_url(self, *args, **kwargs):
try:
user = self.get_user_from_session()
diff --git a/apps/authentication/views/mixins.py b/apps/authentication/views/mixins.py
index d56206dcd..c78872603 100644
--- a/apps/authentication/views/mixins.py
+++ b/apps/authentication/views/mixins.py
@@ -16,12 +16,19 @@ class METAMixin:
class FlashMessageMixin:
@staticmethod
- def get_response(redirect_url, title, msg, m_type='message'):
- message_data = {'title': title, 'interval': 5, 'redirect_url': redirect_url, m_type: msg}
+ def get_response(redirect_url='', title='', msg='', m_type='message', interval=5):
+ message_data = {
+ 'title': title, 'interval': interval,
+ 'redirect_url': redirect_url,
+ }
+ if m_type == 'error':
+ message_data['error'] = msg
+ else:
+ message_data['message'] = msg
return FlashMessageUtil.gen_and_redirect_to(message_data)
- def get_success_response(self, redirect_url, title, msg):
- return self.get_response(redirect_url, title, msg)
+ def get_success_response(self, redirect_url, title, msg, **kwargs):
+ return self.get_response(redirect_url, title, msg, m_type='success', **kwargs)
- def get_failed_response(self, redirect_url, title, msg):
- return self.get_response(redirect_url, title, msg, 'error')
+ def get_failed_response(self, redirect_url, title, msg, interval=10):
+ return self.get_response(redirect_url, title, msg, 'error', interval)
diff --git a/apps/common/api/__init__.py b/apps/common/api/__init__.py
index 7f2c4dbc9..15797eb69 100644
--- a/apps/common/api/__init__.py
+++ b/apps/common/api/__init__.py
@@ -1,6 +1,5 @@
from .action import *
from .common import *
-from .filter import *
from .generic import *
from .mixin import *
from .patch import *
diff --git a/apps/common/api/filter.py b/apps/common/api/filter.py
deleted file mode 100644
index 56c3e6483..000000000
--- a/apps/common/api/filter.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import logging
-from itertools import chain
-
-from django.db import models
-from rest_framework.settings import api_settings
-
-from common.drf.filters import IDSpmFilter, CustomFilter, IDInFilter
-
-__all__ = ['ExtraFilterFieldsMixin', 'OrderingFielderFieldsMixin']
-
-logger = logging.getLogger('jumpserver.common')
-
-
-class ExtraFilterFieldsMixin:
- """
- 额外的 api filter
- """
- default_added_filters = [CustomFilter, IDSpmFilter, IDInFilter]
- filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
- extra_filter_fields = []
- extra_filter_backends = []
-
- def get_filter_backends(self):
- if self.filter_backends != self.__class__.filter_backends:
- return self.filter_backends
- backends = list(chain(
- self.filter_backends,
- self.default_added_filters,
- self.extra_filter_backends
- ))
- return backends
-
- def filter_queryset(self, queryset):
- for backend in self.get_filter_backends():
- queryset = backend().filter_queryset(self.request, queryset, self)
- return queryset
-
-
-class OrderingFielderFieldsMixin:
- """
- 额外的 api ordering
- """
- ordering_fields = None
- extra_ordering_fields = []
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.ordering_fields = self._get_ordering_fields()
-
- def _get_ordering_fields(self):
- if isinstance(self.__class__.ordering_fields, (list, tuple)):
- return self.__class__.ordering_fields
-
- try:
- valid_fields = self.get_valid_ordering_fields()
- except Exception as e:
- logger.debug('get_valid_ordering_fields error: %s' % e)
- # 这里千万不要这么用，会让 logging 重复，至于为什么，我也不知道
- # logging.debug('get_valid_ordering_fields error: %s' % e)
- valid_fields = []
-
- fields = list(chain(
- valid_fields,
- self.extra_ordering_fields
- ))
- return fields
-
- def get_valid_ordering_fields(self):
- if getattr(self, 'model', None):
- model = self.model
- elif getattr(self, 'queryset', None):
- model = self.queryset.model
- else:
- queryset = self.get_queryset()
- model = queryset.model
-
- if not model:
- return []
-
- excludes_fields = (
- models.UUIDField, models.Model, models.ForeignKey,
- models.FileField, models.JSONField, models.ManyToManyField,
- models.DurationField,
- )
- valid_fields = []
- for field in model._meta.fields:
- if isinstance(field, excludes_fields):
- continue
- valid_fields.append(field.name)
- return valid_fields
diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py
index cb8d6ec3e..4795673d7 100644
--- a/apps/common/api/mixin.py
+++ b/apps/common/api/mixin.py
@@ -1,19 +1,29 @@
# -*- coding: utf-8 -*-
#
from collections import defaultdict
+from itertools import chain
from typing import Callable
+from django.db import models
from django.db.models.signals import m2m_changed
from rest_framework.response import Response
+from rest_framework.settings import api_settings
+from common.drf.filters import (
+ IDSpmFilterBackend, CustomFilterBackend, IDInFilterBackend,
+ IDNotFilterBackend, NotOrRelFilterBackend
+)
+from common.utils import get_logger
from .action import RenderToJsonMixin
-from .filter import ExtraFilterFieldsMixin, OrderingFielderFieldsMixin
from .serializer import SerializerMixin
__all__ = [
'CommonApiMixin', 'PaginatedResponseMixin', 'RelationMixin',
+ 'ExtraFilterFieldsMixin',
]
+logger = get_logger(__name__)
+
class PaginatedResponseMixin:
@@ -95,6 +105,100 @@ class QuerySetMixin:
return queryset
-class CommonApiMixin(SerializerMixin, ExtraFilterFieldsMixin, OrderingFielderFieldsMixin,
- QuerySetMixin, RenderToJsonMixin, PaginatedResponseMixin):
+class ExtraFilterFieldsMixin:
+ """
+ 额外的 api filter
+ """
+ default_added_filters = (
+ CustomFilterBackend, IDSpmFilterBackend, IDInFilterBackend,
+ IDNotFilterBackend,
+ )
+ filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
+ extra_filter_fields = []
+ extra_filter_backends = []
+
+ def set_compatible_fields(self):
+ """
+ 兼容老的 filter_fields
+ """
+ if not hasattr(self, 'filter_fields') and hasattr(self, 'filterset_fields'):
+ self.filter_fields = self.filterset_fields
+
+ def get_filter_backends(self):
+ self.set_compatible_fields()
+ if self.filter_backends != self.__class__.filter_backends:
+ return self.filter_backends
+ backends = list(chain(
+ self.filter_backends,
+ self.default_added_filters,
+ self.extra_filter_backends,
+ ))
+ # 这个要放在最后
+ backends.append(NotOrRelFilterBackend)
+ return backends
+
+ def filter_queryset(self, queryset):
+ for backend in self.get_filter_backends():
+ queryset = backend().filter_queryset(self.request, queryset, self)
+ return queryset
+
+
+class OrderingFielderFieldsMixin:
+ """
+ 额外的 api ordering
+ """
+ ordering_fields = None
+ extra_ordering_fields = []
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.ordering_fields = self._get_ordering_fields()
+
+ def _get_ordering_fields(self):
+ if isinstance(self.__class__.ordering_fields, (list, tuple)):
+ return self.__class__.ordering_fields
+
+ try:
+ valid_fields = self.get_valid_ordering_fields()
+ except Exception as e:
+ logger.debug('get_valid_ordering_fields error: %s, pass' % e)
+ # 这里千万不要这么用，会让 logging 重复，至于为什么，我也不知道
+ # logging.debug('get_valid_ordering_fields error: %s' % e)
+ valid_fields = []
+
+ fields = list(chain(
+ valid_fields,
+ self.extra_ordering_fields
+ ))
+ return fields
+
+ def get_valid_ordering_fields(self):
+ if getattr(self, 'model', None):
+ model = self.model
+ elif getattr(self, 'queryset', None):
+ model = self.queryset.model
+ else:
+ queryset = self.get_queryset()
+ model = queryset.model
+
+ if not model:
+ return []
+
+ excludes_fields = (
+ models.UUIDField, models.Model, models.ForeignKey,
+ models.FileField, models.JSONField, models.ManyToManyField,
+ models.DurationField,
+ )
+ valid_fields = []
+ for field in model._meta.fields:
+ if isinstance(field, excludes_fields):
+ continue
+ valid_fields.append(field.name)
+ return valid_fields
+
+
+class CommonApiMixin(
+ SerializerMixin, ExtraFilterFieldsMixin, OrderingFielderFieldsMixin,
+ QuerySetMixin, RenderToJsonMixin, PaginatedResponseMixin
+):
pass
diff --git a/apps/common/api/patch.py b/apps/common/api/patch.py
index f79957546..71dd8a18f 100644
--- a/apps/common/api/patch.py
+++ b/apps/common/api/patch.py
@@ -88,6 +88,7 @@ class AsyncApiMixin(InterceptMixin):
if not self.is_need_async():
return handler(*args, **kwargs)
resp = self.do_async(handler, *args, **kwargs)
+ self.async_callback(*args, **kwargs)
return resp
def is_need_refresh(self):
@@ -98,6 +99,9 @@ class AsyncApiMixin(InterceptMixin):
def is_need_async(self):
return False
+ def async_callback(self, *args, **kwargs):
+ pass
+
def do_async(self, handler, *args, **kwargs):
data = self.get_cache_data()
if not data:
diff --git a/apps/common/drf/filters.py b/apps/common/drf/filters.py
index c44874fd5..bd9d3e6a1 100644
--- a/apps/common/drf/filters.py
+++ b/apps/common/drf/filters.py
@@ -13,17 +13,17 @@ from rest_framework.fields import DateTimeField
from rest_framework.serializers import ValidationError
from common import const
+from common.db.fields import RelatedManager
logger = logging.getLogger('jumpserver.common')
__all__ = [
- "DatetimeRangeFilter", "IDSpmFilter",
- 'IDInFilter', "CustomFilter",
- "BaseFilterSet"
+ "DatetimeRangeFilterBackend", "IDSpmFilterBackend",
+ 'IDInFilterBackend', "CustomFilterBackend",
+ "BaseFilterSet", 'IDNotFilterBackend',
+ 'NotOrRelFilterBackend',
]
-from common.db.fields import RelatedManager
-
class BaseFilterSet(drf_filters.FilterSet):
def do_nothing(self, queryset, name, value):
@@ -35,7 +35,7 @@ class BaseFilterSet(drf_filters.FilterSet):
return default
-class DatetimeRangeFilter(filters.BaseFilterBackend):
+class DatetimeRangeFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
ret = []
fields = self._get_date_range_filter_fields(view)
@@ -102,7 +102,7 @@ class DatetimeRangeFilter(filters.BaseFilterBackend):
return queryset
-class IDSpmFilter(filters.BaseFilterBackend):
+class IDSpmFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
return [
coreapi.Field(
@@ -130,7 +130,7 @@ class IDSpmFilter(filters.BaseFilterBackend):
return queryset
-class IDInFilter(filters.BaseFilterBackend):
+class IDInFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
return [
coreapi.Field(
@@ -149,7 +149,26 @@ class IDInFilter(filters.BaseFilterBackend):
return queryset
-class CustomFilter(filters.BaseFilterBackend):
+class IDNotFilterBackend(filters.BaseFilterBackend):
+ def get_schema_fields(self, view):
+ return [
+ coreapi.Field(
+ name='id!', location='query', required=False,
+ type='string', example='/api/v1/users/users?id!=1,2,3',
+ description='Exclude by id set'
+ )
+ ]
+
+ def filter_queryset(self, request, queryset, view):
+ ids = request.query_params.get('id!')
+ if not ids:
+ return queryset
+ id_list = [i.strip() for i in ids.split(',')]
+ queryset = queryset.exclude(id__in=id_list)
+ return queryset
+
+
+class CustomFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
fields = []
@@ -218,3 +237,25 @@ class AttrRulesFilterBackend(filters.BaseFilterBackend):
logger.debug('attr_rules: %s', attr_rules)
q = RelatedManager.get_to_filter_q(attr_rules, queryset.model)
return queryset.filter(q).distinct()
+
+
+class NotOrRelFilterBackend(filters.BaseFilterBackend):
+ def get_schema_fields(self, view):
+ return [
+ coreapi.Field(
+ name='_rel', location='query', required=False,
+ type='string', example='/api/v1/users/users?name=abc&username=def&_rel=union',
+ description='Filter by rel, or not, default is and'
+ )
+ ]
+
+ def filter_queryset(self, request, queryset, view):
+ _rel = request.query_params.get('_rel')
+ if not _rel or _rel not in ('or', 'not'):
+ return queryset
+ if _rel == 'not':
+ queryset.query.where.negated = True
+ elif _rel == 'or':
+ queryset.query.where.connector = 'OR'
+ queryset._result_cache = None
+ return queryset
diff --git a/apps/common/drf/renders/__init__.py b/apps/common/drf/renders/__init__.py
index bbefe8783..5e0120651 100644
--- a/apps/common/drf/renders/__init__.py
+++ b/apps/common/drf/renders/__init__.py
@@ -8,7 +8,8 @@ class PassthroughRenderer(renderers.BaseRenderer):
"""
Return data as-is. View should supply a Response.
"""
- media_type = ''
+ media_type = 'application/octet-stream'
format = ''
+
def render(self, data, accepted_media_type=None, renderer_context=None):
return data
diff --git a/apps/common/management/commands/check_api.py b/apps/common/management/commands/check_api.py
new file mode 100644
index 000000000..5dff77a9d
--- /dev/null
+++ b/apps/common/management/commands/check_api.py
@@ -0,0 +1,126 @@
+import re
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+from django.test import Client
+from django.urls import URLPattern, URLResolver
+
+from jumpserver.urls import api_v1
+
+path_uuid_pattern = re.compile(r'<\w+:\w+>', re.IGNORECASE)
+uuid_pattern = re.compile(r'\(\(\?P<.*>[^)]+\)/\)\?', re.IGNORECASE)
+uuid2_pattern = re.compile(r'\(\?P<.*>\[\/\.\]\+\)', re.IGNORECASE)
+uuid3_pattern = re.compile(r'\(\?P<.*>\[/\.]\+\)')
+
+
+def list_urls(patterns, path=None):
+ """ recursive """
+ if not path:
+ path = []
+ result = []
+ for pattern in patterns:
+ if isinstance(pattern, URLPattern):
+ result.append(''.join(path) + str(pattern.pattern))
+ elif isinstance(pattern, URLResolver):
+ result += list_urls(pattern.url_patterns, path + [str(pattern.pattern)])
+ return result
+
+
+def parse_to_url(url):
+ uid = '00000000-0000-0000-0000-000000000000'
+
+ url = url.replace('^', '')
+ url = url.replace('?$', '')
+ url = url.replace('(?P[a-z0-9]+)', '')
+ url = url.replace('((?P[/.]{36})/)?', uid + '/')
+ url = url.replace('(?P[/.]+)', uid)
+ url = url.replace('\.', '')
+ url = url.replace('//', '/')
+ url = url.strip('$')
+ url = re.sub(path_uuid_pattern, uid, url)
+ url = re.sub(uuid2_pattern, uid, url)
+ url = re.sub(uuid_pattern, uid + '/', url)
+ url = re.sub(uuid3_pattern, uid, url)
+ url = url.replace('(00000000-0000-0000-0000-000000000000/)?', uid + '/')
+ return url
+
+
+def get_api_urls():
+ urls = []
+ api_urls = list_urls(api_v1)
+ for ourl in api_urls:
+ url = parse_to_url(ourl)
+ if 'render-to-json' in url:
+ continue
+ url = '/api/v1/' + url
+ urls.append((url, ourl))
+ return set(urls)
+
+
+known_unauth_urls = [
+ "/api/v1/authentication/passkeys/auth/",
+ "/api/v1/prometheus/metrics/",
+ "/api/v1/authentication/auth/",
+ "/api/v1/settings/logo/",
+ "/api/v1/settings/public/open/",
+ "/api/v1/authentication/passkeys/login/",
+ "/api/v1/authentication/tokens/",
+ "/api/v1/authentication/mfa/challenge/",
+ "/api/v1/authentication/password/reset-code/",
+ "/api/v1/authentication/login-confirm-ticket/status/",
+ "/api/v1/authentication/mfa/select/",
+ "/api/v1/authentication/mfa/send-code/",
+ "/api/v1/authentication/sso/login/"
+]
+
+known_error_urls = [
+ '/api/v1/terminal/terminals/00000000-0000-0000-0000-000000000000/sessions/00000000-0000-0000-0000-000000000000/replay/download/',
+ '/api/v1/terminal/sessions/00000000-0000-0000-0000-000000000000/replay/download/',
+]
+
+errors = {}
+
+
+class Command(BaseCommand):
+ help = 'Check api if unauthorized'
+
+ def handle(self, *args, **options):
+ settings.LOG_LEVEL = 'ERROR'
+ urls = get_api_urls()
+ client = Client()
+ unauth_urls = []
+ error_urls = []
+ unformat_urls = []
+
+ for url, ourl in urls:
+ if '(' in url or '<' in url:
+ unformat_urls.append([url, ourl])
+ continue
+
+ try:
+ response = client.get(url, follow=True)
+ if response.status_code != 401:
+ errors[url] = str(response.status_code) + ' ' + str(ourl)
+ unauth_urls.append(url)
+ except Exception as e:
+ errors[url] = str(e)
+ error_urls.append(url)
+
+ unauth_urls = set(unauth_urls) - set(known_unauth_urls)
+ print("\nUnauthorized urls:")
+ if not unauth_urls:
+ print(" Empty, very good!")
+ for url in unauth_urls:
+ print('"{}", {}'.format(url, errors.get(url, '')))
+
+ print("\nError urls:")
+ if not error_urls:
+ print(" Empty, very good!")
+ for url in set(error_urls):
+ print(url, ': ' + errors.get(url))
+
+ print("\nUnformat urls:")
+ if not unformat_urls:
+ print(" Empty, very good!")
+ for url in unformat_urls:
+ print(url)
diff --git a/apps/common/permissions.py b/apps/common/permissions.py
index d28157085..5c58de68e 100644
--- a/apps/common/permissions.py
+++ b/apps/common/permissions.py
@@ -12,7 +12,7 @@ from common.utils import get_object_or_none
from orgs.utils import tmp_to_root_org
-class IsValidUser(permissions.IsAuthenticated, permissions.BasePermission):
+class IsValidUser(permissions.IsAuthenticated):
"""Allows access to valid user, is active and not expired"""
def has_permission(self, request, view):
diff --git a/apps/common/utils/random.py b/apps/common/utils/random.py
index f75e7001b..267de8d22 100644
--- a/apps/common/utils/random.py
+++ b/apps/common/utils/random.py
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
#
-import struct
import random
import socket
import string
-
+import struct
string_punctuation = '!#$%&()*+,-.:;<=>?@[]^_~'
@@ -18,35 +17,32 @@ def random_ip():
return socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
-def random_string(length: int, lower=True, upper=True, digit=True, special_char=False):
- args_names = ['lower', 'upper', 'digit', 'special_char']
- args_values = [lower, upper, digit, special_char]
- args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits, string_punctuation]
+def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation):
+ random.seed()
+ args_names = ['lower', 'upper', 'digit']
+ args_values = [lower, upper, digit]
+ args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits]
args_string_map = dict(zip(args_names, args_string))
kwargs = dict(zip(args_names, args_values))
kwargs_keys = list(kwargs.keys())
kwargs_values = list(kwargs.values())
args_true_count = len([i for i in kwargs_values if i])
+
assert any(kwargs_values), f'Parameters {kwargs_keys} must have at least one `True`'
assert length >= args_true_count, f'Expected length >= {args_true_count}, bug got {length}'
- can_startswith_special_char = args_true_count == 1 and special_char
-
chars = ''.join([args_string_map[k] for k, v in kwargs.items() if v])
+ password = list(random.choice(chars) for i in range(length))
- while True:
- password = list(random.choice(chars) for i in range(length))
- for k, v in kwargs.items():
- if v and not (set(password) & set(args_string_map[k])):
- # 没有包含指定的字符, retry
- break
- else:
- if not can_startswith_special_char and password[0] in args_string_map['special_char']:
- # 首位不能为特殊字符, retry
- continue
- else:
- # 满足要求终止 while 循环
- break
+ if special_char:
+ special_num = length // 16 + 1
+ special_index = []
+ for i in range(special_num):
+ index = random.randint(1, length - 1)
+ if index not in special_index:
+ special_index.append(index)
+ for i in special_index:
+ password[i] = random.choice(symbols)
password = ''.join(password)
return password
diff --git a/apps/common/utils/verify_code.py b/apps/common/utils/verify_code.py
index acd547296..b21e43b26 100644
--- a/apps/common/utils/verify_code.py
+++ b/apps/common/utils/verify_code.py
@@ -90,4 +90,4 @@ class SendAndVerifyCodeUtil(object):
self.__send_with_email()
cache.set(self.key, self.code, self.timeout)
- logger.info(f'Send verify code to {self.target}: {code}')
+ logger.debug(f'Send verify code to {self.target}')
diff --git a/apps/common/views/mixins.py b/apps/common/views/mixins.py
index 207888593..6f59ac21a 100644
--- a/apps/common/views/mixins.py
+++ b/apps/common/views/mixins.py
@@ -1,18 +1,17 @@
# -*- coding: utf-8 -*-
#
-from django.utils import translation
-from django.utils.translation import gettext_noop
from django.contrib.auth.mixins import UserPassesTestMixin
from django.http.response import JsonResponse
+from django.db.models import Model
+from django.utils import translation
from rest_framework import permissions
from rest_framework.request import Request
-from common.exceptions import UserConfirmRequired
-from common.utils import i18n_fmt
-from orgs.utils import current_org
+from audits.const import ActivityChoices
from audits.handler import create_or_update_operate_log
-from audits.const import ActionChoices, ActivityChoices
from audits.models import ActivityLog
+from common.exceptions import UserConfirmRequired
+from orgs.utils import current_org
__all__ = [
"PermissionsMixin",
@@ -49,66 +48,20 @@ class PermissionsMixin(UserPassesTestMixin):
class RecordViewLogMixin:
- ACTION = ActionChoices.view
+ model: Model
- @staticmethod
- def _filter_params(params):
- new_params = {}
- need_pop_params = ('format', 'order')
- for key, value in params.items():
- if key in need_pop_params:
- continue
- if isinstance(value, list):
- value = list(filter(None, value))
- if value:
- new_params[key] = value
- return new_params
-
- def get_resource_display(self, request):
- query_params = dict(request.query_params)
- params = self._filter_params(query_params)
-
- spm_filter = params.pop("spm", None)
-
- if not params and not spm_filter:
- display_message = gettext_noop("Export all")
- elif spm_filter:
- display_message = gettext_noop("Export only selected items")
- else:
- query = ",".join(
- ["%s=%s" % (key, value) for key, value in params.items()]
- )
- display_message = i18n_fmt(gettext_noop("Export filtered: %s"), query)
- return display_message
-
- def record_logs(self, ids, **kwargs):
- resource_type = self.model._meta.verbose_name
- create_or_update_operate_log(
- self.ACTION, resource_type, force=True, **kwargs
- )
- detail = i18n_fmt(
- gettext_noop('User %s view/export secret'), self.request.user
- )
- activities = [
- ActivityLog(
- resource_id=getattr(resource_id, 'pk', resource_id),
- type=ActivityChoices.operate_log, detail=detail, org_id=current_org.id,
- )
- for resource_id in ids
- ]
- ActivityLog.objects.bulk_create(activities)
-
- def list(self, request, *args, **kwargs):
- response = super().list(request, *args, **kwargs)
+ def record_logs(self, ids, action, detail, model=None, **kwargs):
with translation.override('en'):
- resource_display = self.get_resource_display(request)
- ids = [q.id for q in self.get_queryset()]
- self.record_logs(ids, resource_display=resource_display)
- return response
-
- def retrieve(self, request, *args, **kwargs):
- response = super().retrieve(request, *args, **kwargs)
- with translation.override('en'):
- resource = self.get_object()
- self.record_logs([resource.id], resource=resource)
- return response
+ model = model or self.model
+ resource_type = model._meta.verbose_name
+ create_or_update_operate_log(
+ action, resource_type, force=True, **kwargs
+ )
+ activities = [
+ ActivityLog(
+ resource_id=resource_id, type=ActivityChoices.operate_log,
+ detail=detail, org_id=current_org.id,
+ )
+ for resource_id in ids
+ ]
+ ActivityLog.objects.bulk_create(activities)
diff --git a/apps/common/views/msg.py b/apps/common/views/msg.py
index 4b0987da7..bb3cf0f98 100644
--- a/apps/common/views/msg.py
+++ b/apps/common/views/msg.py
@@ -1,7 +1,7 @@
#
+from django.http import HttpResponse
from django.utils.decorators import method_decorator
from django.views.decorators.cache import never_cache
-from django.http import HttpResponse
from django.views.generic.base import TemplateView
from common.utils import bulk_get, FlashMessageUtil
diff --git a/apps/jumpserver/api.py b/apps/jumpserver/api.py
index 3b72841f9..164620057 100644
--- a/apps/jumpserver/api.py
+++ b/apps/jumpserver/api.py
@@ -1,7 +1,9 @@
import time
+from collections import defaultdict
from django.core.cache import cache
-from django.db.models import Count, Max, F
+from django.db.models import Count, Max, F, CharField
+from django.db.models.functions import Cast
from django.http.response import JsonResponse, HttpResponse
from django.utils import timezone
from django.utils.timesince import timesince
@@ -12,6 +14,7 @@ from rest_framework.views import APIView
from assets.const import AllTypes
from assets.models import Asset
+from audits.api import OperateLogViewSet
from audits.const import LoginStatusChoices
from audits.models import UserLoginLog, PasswordChangeLog, OperateLog, FTPLog, JobLog
from common.utils import lazyproperty
@@ -52,87 +55,82 @@ class DateTimeMixin:
@lazyproperty
def date_start_end(self):
- return self.days_to_datetime.date(), local_now().date()
+ return self.days_to_datetime.date(), local_now().date() + timezone.timedelta(days=1)
@lazyproperty
def dates_list(self):
- now = local_now()
- dates = [(now - timezone.timedelta(days=i)).date() for i in range(self.days)]
- dates.reverse()
- return dates
+ return [
+ (local_now() - timezone.timedelta(days=i)).date()
+ for i in range(self.days - 1, -1, -1)
+ ]
def get_dates_metrics_date(self):
- dates_metrics_date = [d.strftime('%m-%d') for d in self.dates_list] or ['0']
- return dates_metrics_date
+ return [d.strftime('%m-%d') for d in self.dates_list] or ['0']
- @lazyproperty
- def users(self):
- return self.org.get_members()
-
- @lazyproperty
- def sessions_queryset(self):
- t = self.days_to_datetime
- sessions_queryset = Session.objects.filter(date_start__gte=t)
- return sessions_queryset
+ def get_logs_queryset_filter(self, qs, query_field, is_timestamp=False):
+ dt = self.days_to_datetime
+ t = dt.timestamp() if is_timestamp else dt
+ query = {f'{query_field}__gte': t}
+ return qs.filter(**query)
def get_logs_queryset(self, queryset, query_params):
query = {}
+ users = self.org.get_members()
if not self.org.is_root():
if query_params == 'username':
query = {
- f'{query_params}__in': self.users.values_list('username', flat=True)
+ f'{query_params}__in': users.values_list('username', flat=True)
}
else:
query = {
- f'{query_params}__in': [str(user) for user in self.users]
+ f'{query_params}__in': [str(user) for user in users]
}
queryset = queryset.filter(**query)
return queryset
+ @lazyproperty
+ def sessions_queryset(self):
+ return self.get_logs_queryset_filter(Session.objects, 'date_start')
+
@lazyproperty
def login_logs_queryset(self):
- t = self.days_to_datetime
- queryset = UserLoginLog.objects.filter(datetime__gte=t)
- queryset = self.get_logs_queryset(queryset, 'username')
+ qs = UserLoginLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'datetime')
+ queryset = self.get_logs_queryset(qs, 'username')
return queryset
@lazyproperty
def password_change_logs_queryset(self):
- t = self.days_to_datetime
- queryset = PasswordChangeLog.objects.filter(datetime__gte=t)
- queryset = self.get_logs_queryset(queryset, 'user')
+ qs = PasswordChangeLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'datetime')
+ queryset = self.get_logs_queryset(qs, 'user')
return queryset
@lazyproperty
def operate_logs_queryset(self):
- from audits.api import OperateLogViewSet
- t = self.days_to_datetime
- queryset = OperateLogViewSet().get_queryset().filter(datetime__gte=t)
- return queryset
+ qs = OperateLogViewSet().get_queryset()
+ return self.get_logs_queryset_filter(qs, 'datetime')
@lazyproperty
def ftp_logs_queryset(self):
- t = self.days_to_datetime
- queryset = FTPLog.objects.filter(date_start__gte=t)
- queryset = self.get_logs_queryset(queryset, 'user')
- return queryset
+ qs = FTPLog.objects.all()
+ qs = self.get_logs_queryset_filter(qs, 'date_start')
+ return self.get_logs_queryset(qs, 'user')
@lazyproperty
def command_queryset(self):
- t = self.days_to_datetime
- t = t.timestamp()
- queryset = Command.objects.filter(timestamp__gte=t)
- return queryset
+ qs = Command.objects.all()
+ return self.get_logs_queryset_filter(qs, 'timestamp', is_timestamp=True)
@lazyproperty
def job_logs_queryset(self):
- t = self.days_to_datetime
- queryset = JobLog.objects.filter(date_created__gte=t)
- return queryset
+ qs = JobLog.objects.all()
+ return self.get_logs_queryset_filter(qs, 'date_start')
class DatesLoginMetricMixin:
dates_list: list
+ date_start_end: tuple
command_queryset: Command.objects
sessions_queryset: Session.objects
ftp_logs_queryset: OperateLog.objects
@@ -141,41 +139,6 @@ class DatesLoginMetricMixin:
operate_logs_queryset: OperateLog.objects
password_change_logs_queryset: PasswordChangeLog.objects
- def get_dates_metrics_total_count_login(self):
- queryset = UserLoginLog.objects \
- .filter(datetime__range=(self.date_start_end)) \
- .values('datetime__date').annotate(id__count=Count(id)) \
- .order_by('datetime__date')
- map_date_logincount = {i['datetime__date']: i['id__count'] for i in queryset}
- return [map_date_logincount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_active_users(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count('user_id', distinct=True)) \
- .order_by('date_start__date')
- map_date_usercount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_usercount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_active_assets(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count('asset_id', distinct=True)) \
- .order_by('date_start__date')
- map_date_assetcount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_assetcount.get(d, 0) for d in self.dates_list]
-
- def get_dates_metrics_total_count_sessions(self):
- queryset = Session.objects \
- .filter(date_start__range=(self.date_start_end)) \
- .values('date_start__date') \
- .annotate(id__count=Count(id)) \
- .order_by('date_start__date')
- map_date_usercount = {i['date_start__date']: i['id__count'] for i in queryset}
- return [map_date_usercount.get(d, 0) for d in self.dates_list]
-
@lazyproperty
def get_type_to_assets(self):
result = Asset.objects.annotate(type=F('platform__type')). \
@@ -187,30 +150,53 @@ class DatesLoginMetricMixin:
i['label'] = all_types_dict.get(tp, tp)
return result
+ def filter_date_start_end(self, queryset, field_name):
+ query = {f'{field_name}__range': self.date_start_end}
+ return queryset.filter(**query)
+
+ def get_date_metrics(self, queryset, field_name, count_field):
+ queryset = self.filter_date_start_end(queryset, field_name)
+ queryset = queryset.values_list(field_name, count_field)
+
+ date_group_map = defaultdict(set)
+ for datetime, count_field in queryset:
+ date_str = str(datetime.date())
+ date_group_map[date_str].add(count_field)
+
+ return [
+ len(date_group_map.get(str(d), set()))
+ for d in self.dates_list
+ ]
+
+ def get_dates_metrics_total_count_login(self):
+ return self.get_date_metrics(UserLoginLog.objects, 'datetime', 'id')
+
+ def get_dates_metrics_total_count_active_users(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'user_id')
+
+ def get_dates_metrics_total_count_active_assets(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'asset_id')
+
+ def get_dates_metrics_total_count_sessions(self):
+ return self.get_date_metrics(Session.objects, 'date_start', 'id')
+
def get_dates_login_times_assets(self):
assets = self.sessions_queryset.values("asset") \
.annotate(total=Count("asset")) \
- .annotate(last=Max("date_start")).order_by("-total")
- assets = assets[:10]
- for asset in assets:
- asset['last'] = str(asset['last'])
- return list(assets)
+ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
+ .order_by("-total")
+ return list(assets[:10])
def get_dates_login_times_users(self):
users = self.sessions_queryset.values("user_id") \
.annotate(total=Count("user_id")) \
.annotate(user=Max('user')) \
- .annotate(last=Max("date_start")).order_by("-total")
- users = users[:10]
- for user in users:
- user['last'] = str(user['last'])
- return list(users)
+ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
+ .order_by("-total")
+ return list(users[:10])
def get_dates_login_record_sessions(self):
sessions = self.sessions_queryset.order_by('-date_start')
- sessions = sessions[:10]
- for session in sessions:
- session.avatar_url = User.get_avatar_url("")
sessions = [
{
'user': session.user,
@@ -219,7 +205,7 @@ class DatesLoginMetricMixin:
'date_start': str(session.date_start),
'timesince': timesince(session.date_start)
}
- for session in sessions
+ for session in sessions[:10]
]
return sessions
@@ -253,12 +239,13 @@ class DatesLoginMetricMixin:
@lazyproperty
def job_logs_running_amount(self):
- return self.job_logs_queryset.filter(status__in=[JobStatus.running]).count()
+ return self.job_logs_queryset.filter(status=JobStatus.running).count()
@lazyproperty
def job_logs_failed_amount(self):
return self.job_logs_queryset.filter(
- status__in=[JobStatus.failed, JobStatus.timeout]).count()
+ status__in=[JobStatus.failed, JobStatus.timeout]
+ ).count()
@lazyproperty
def job_logs_amount(self):
@@ -268,6 +255,10 @@ class DatesLoginMetricMixin:
def sessions_amount(self):
return self.sessions_queryset.count()
+ @lazyproperty
+ def online_sessions_amount(self):
+ return self.sessions_queryset.filter(is_finished=False).count()
+
@lazyproperty
def ftp_logs_amount(self):
return self.ftp_logs_queryset.count()
@@ -275,9 +266,9 @@ class DatesLoginMetricMixin:
class IndexApi(DateTimeMixin, DatesLoginMetricMixin, APIView):
http_method_names = ['get']
-
- def check_permissions(self, request):
- return request.user.has_perm('rbac.view_audit | rbac.view_console')
+ rbac_perms = {
+ 'GET': ['rbac.view_audit | rbac.view_console'],
+ }
def get(self, request, *args, **kwargs):
data = {}
@@ -365,7 +356,7 @@ class IndexApi(DateTimeMixin, DatesLoginMetricMixin, APIView):
if _all or query_params.get('total_count') or query_params.get('total_count_history_sessions'):
data.update({
- 'total_count_history_sessions': self.sessions_amount - caches.total_count_online_sessions,
+ 'total_count_history_sessions': self.sessions_amount - self.online_sessions_amount,
})
if _all or query_params.get('total_count') or query_params.get('total_count_ftp_logs'):
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 60d665a04..b24ef5746 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -333,9 +333,9 @@ class Config(dict):
'CAS_ROOT_PROXIED_AS': 'https://example.com',
'CAS_LOGOUT_COMPLETELY': True,
'CAS_VERSION': 3,
- 'CAS_USERNAME_ATTRIBUTE': 'uid',
+ 'CAS_USERNAME_ATTRIBUTE': 'cas:user',
'CAS_APPLY_ATTRIBUTES_TO_USER': False,
- 'CAS_RENAME_ATTRIBUTES': {'uid': 'username'},
+ 'CAS_RENAME_ATTRIBUTES': {'cas:user': 'username'},
'CAS_CREATE_USER': True,
'AUTH_SSO': False,
@@ -382,6 +382,9 @@ class Config(dict):
'AUTH_OAUTH2_USER_ATTR_MAP': {
'name': 'name', 'username': 'username', 'email': 'email'
},
+ 'AUTH_PASSKEY': False,
+ 'FIDO_SERVER_ID': '',
+ 'FIDO_SERVER_NAME': 'JumpServer',
# 企业微信
'AUTH_WECOM': False,
@@ -457,9 +460,6 @@ class Config(dict):
'TERMINAL_SESSION_KEEP_DURATION': 200,
'TERMINAL_HOST_KEY': '',
'TERMINAL_COMMAND_STORAGE': {},
- # Luna 页面
- # 默认图形化分辨率
- 'TERMINAL_GRAPHICAL_RESOLUTION': 'Auto',
# 未来废弃(目前迁移会用)
'TERMINAL_RDP_ADDR': '',
# 保留(Luna还在用)
@@ -578,7 +578,9 @@ class Config(dict):
'FTP_FILE_MAX_STORE': 100,
# API 请求次数限制
- 'MAX_LIMIT_PER_PAGE': 100
+ 'MAX_LIMIT_PER_PAGE': 100,
+
+ 'LIMIT_SUPER_PRIV': False,
}
old_config_map = {
diff --git a/apps/jumpserver/rewriting/storage/permissions.py b/apps/jumpserver/rewriting/storage/permissions.py
index 51b1c9c40..7af0adece 100644
--- a/apps/jumpserver/rewriting/storage/permissions.py
+++ b/apps/jumpserver/rewriting/storage/permissions.py
@@ -16,6 +16,8 @@ def allow_access(private_file):
path_base = path_list[1] if len(path_list) > 1 else None
path_perm = path_perms_map.get(path_base, None)
+ if ".." in request_path:
+ return False
if not path_perm:
return False
if path_perm == '*' or request.user.has_perms([path_perm]):
diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py
index 1654ae63c..63a96fe1d 100644
--- a/apps/jumpserver/settings/auth.py
+++ b/apps/jumpserver/settings/auth.py
@@ -171,6 +171,10 @@ AUTH_OAUTH2_AUTHENTICATION_REDIRECT_URI = '/'
AUTH_OAUTH2_AUTHENTICATION_FAILURE_REDIRECT_URI = '/'
AUTH_OAUTH2_LOGOUT_URL_NAME = "authentication:oauth2:logout"
+AUTH_PASSKEY = CONFIG.AUTH_PASSKEY
+FIDO_SERVER_ID = CONFIG.FIDO_SERVER_ID
+FIDO_SERVER_NAME = CONFIG.FIDO_SERVER_NAME
+KEY_ATTACHMENT = 2 # 0 any, 1 platform, 2 cross-platform 3 none
# 临时 token
AUTH_TEMP_TOKEN = CONFIG.AUTH_TEMP_TOKEN
@@ -202,7 +206,7 @@ AUTH_BACKEND_SAML2 = 'authentication.backends.saml2.SAML2Backend'
AUTH_BACKEND_OAUTH2 = 'authentication.backends.oauth2.OAuth2Backend'
AUTH_BACKEND_TEMP_TOKEN = 'authentication.backends.token.TempTokenAuthBackend'
AUTH_BACKEND_CUSTOM = 'authentication.backends.custom.CustomAuthBackend'
-
+AUTH_BACKEND_PASSKEY = 'authentication.backends.passkey.PasskeyAuthBackend'
AUTHENTICATION_BACKENDS = [
# 只做权限校验
RBAC_BACKEND,
@@ -215,6 +219,7 @@ AUTHENTICATION_BACKENDS = [
AUTH_BACKEND_WECOM, AUTH_BACKEND_DINGTALK, AUTH_BACKEND_FEISHU,
# Token模式
AUTH_BACKEND_AUTH_TOKEN, AUTH_BACKEND_SSO, AUTH_BACKEND_TEMP_TOKEN,
+ AUTH_BACKEND_PASSKEY
]
@@ -254,8 +259,10 @@ if MFA_CUSTOM and MFA_CUSTOM_FILE_MD5 == get_file_md5(MFA_CUSTOM_FILE_PATH):
# 自定义多因子认证模块
MFA_BACKENDS.append(MFA_BACKEND_CUSTOM)
-AUTHENTICATION_BACKENDS_THIRD_PARTY = [AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_CAS, AUTH_BACKEND_SAML2,
- AUTH_BACKEND_OAUTH2]
+AUTHENTICATION_BACKENDS_THIRD_PARTY = [
+ AUTH_BACKEND_OIDC_CODE, AUTH_BACKEND_CAS,
+ AUTH_BACKEND_SAML2, AUTH_BACKEND_OAUTH2
+]
ONLY_ALLOW_EXIST_USER_AUTH = CONFIG.ONLY_ALLOW_EXIST_USER_AUTH
ONLY_ALLOW_AUTH_FROM_SOURCE = CONFIG.ONLY_ALLOW_AUTH_FROM_SOURCE
diff --git a/apps/jumpserver/settings/base.py b/apps/jumpserver/settings/base.py
index 5bd7fb84e..4cf1c3c77 100644
--- a/apps/jumpserver/settings/base.py
+++ b/apps/jumpserver/settings/base.py
@@ -88,11 +88,12 @@ if DEBUG:
DEBUG_HOST_PORTS = ['{}:{}'.format(host, port) for host in DEBUG_HOSTS for port in DEBUG_PORT]
ALLOWED_DOMAINS.extend(DEBUG_HOST_PORTS)
-ALLOWED_HOSTS = list(set(['.' + host.split(':')[0] for host in ALLOWED_DOMAINS]))
print("ALLOWED_HOSTS: ", )
-for host in ALLOWED_HOSTS:
+for host in ALLOWED_DOMAINS:
print(' - ' + host.lstrip('.'))
+ALLOWED_HOSTS = ['*']
+
# https://docs.djangoproject.com/en/4.1/ref/settings/#std-setting-CSRF_TRUSTED_ORIGINS
CSRF_TRUSTED_ORIGINS = []
for host_port in ALLOWED_DOMAINS:
@@ -106,6 +107,7 @@ for host_port in ALLOWED_DOMAINS:
continue
CSRF_TRUSTED_ORIGINS.append('{}://*.{}'.format(schema, origin))
+CSRF_FAILURE_VIEW = 'jumpserver.views.other.csrf_failure'
# print("CSRF_TRUSTED_ORIGINS: ")
# for origin in CSRF_TRUSTED_ORIGINS:
# print(' - ' + origin)
diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index 9688f2c82..18d0bccca 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -91,8 +91,6 @@ TERMINAL_HOST_KEY = CONFIG.TERMINAL_HOST_KEY
TERMINAL_HEADER_TITLE = CONFIG.TERMINAL_HEADER_TITLE
# TERMINAL_TELNET_REGEX = CONFIG.TERMINAL_TELNET_REGEX
-# 默认图形化分辨率
-TERMINAL_GRAPHICAL_RESOLUTION = CONFIG.TERMINAL_GRAPHICAL_RESOLUTION
# Asset user auth external backend, default AuthBook backend
BACKEND_ASSET_USER_AUTH_VAULT = False
@@ -205,3 +203,4 @@ MAX_LIMIT_PER_PAGE = CONFIG.MAX_LIMIT_PER_PAGE
# Magnus DB Port
MAGNUS_ORACLE_PORTS = CONFIG.MAGNUS_ORACLE_PORTS
+LIMIT_SUPER_PRIV = CONFIG.LIMIT_SUPER_PRIV
diff --git a/apps/jumpserver/views/other.py b/apps/jumpserver/views/other.py
index 038a6fb06..6a05acaa5 100644
--- a/apps/jumpserver/views/other.py
+++ b/apps/jumpserver/views/other.py
@@ -88,3 +88,9 @@ class KokoView(View):
class ResourceDownload(TemplateView):
template_name = 'resource_download.html'
+
+
+def csrf_failure(request, reason=""):
+ from django.shortcuts import reverse
+ login_url = reverse('authentication:login') + '?csrf_failure=1&admin=1'
+ return redirect(login_url)
diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo
index 2e46fa34c..e12251412 100644
--- a/apps/locale/ja/LC_MESSAGES/django.mo
+++ b/apps/locale/ja/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:810d46e14e09a2309a8d898bc391f33082bfc5c164dec246bd95cea8436e33ee
-size 154540
+oid sha256:2ffdd50c364a510b4f5cfe7922a5f1a604e8bc7b03aa43ece1dff0250ccde6d6
+size 160575
diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po
index e541c9c8c..aa30a95b7 100644
--- a/apps/locale/ja/LC_MESSAGES/django.po
+++ b/apps/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-17 15:30+0800\n"
+"POT-Creation-Date: 2023-09-19 15:41+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -23,12 +23,12 @@ msgid "The parameter 'action' must be [{}]"
msgstr "パラメータ 'action' は [{}] でなければなりません。"
#: accounts/const/account.py:6
-#: accounts/serializers/automations/change_secret.py:33
-#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
+#: accounts/serializers/automations/change_secret.py:32
+#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:35
#: authentication/confirm/password.py:9 authentication/forms.py:32
-#: authentication/templates/authentication/login.html:274
+#: authentication/templates/authentication/login.html:286
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
-#: users/forms/profile.py:22 users/serializers/user.py:104
+#: users/forms/profile.py:22 users/serializers/user.py:105
#: users/templates/users/_msg_user_created.html:13
#: users/templates/users/user_password_verify.html:18
#: xpack/plugins/cloud/serializers/account_attrs.py:28
@@ -36,7 +36,7 @@ msgid "Password"
msgstr "パスワード"
#: accounts/const/account.py:7
-#: accounts/serializers/automations/change_secret.py:34
+#: accounts/serializers/automations/change_secret.py:33
msgid "SSH key"
msgstr "SSH キー"
@@ -45,6 +45,7 @@ msgid "Access key"
msgstr "アクセスキー"
#: accounts/const/account.py:9 assets/models/_user.py:48
+#: authentication/backends/passkey/models.py:16
#: authentication/models/sso_token.py:14 settings/serializers/feature.py:50
msgid "Token"
msgstr "トークン"
@@ -70,7 +71,7 @@ msgstr "動的コード"
msgid "Anonymous account"
msgstr "匿名ユーザー"
-#: accounts/const/account.py:25 users/models/user.py:733
+#: accounts/const/account.py:25 users/models/user.py:744
msgid "Local"
msgstr "ローカル"
@@ -87,103 +88,103 @@ msgstr "テンプレート"
msgid "Skip"
msgstr "スキップ"
-#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:233
+#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:234
#: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6
msgid "Update"
msgstr "更新"
#: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:156 audits/const.py:54
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:55
#: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
-#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43
+#: ops/const.py:62 terminal/const.py:77 xpack/plugins/cloud/const.py:43
msgid "Failed"
msgstr "失敗しました"
-#: accounts/const/automation.py:22 rbac/tree.py:50
+#: accounts/const/automation.py:24 rbac/tree.py:50
msgid "Push account"
msgstr "アカウントプッシュ"
-#: accounts/const/automation.py:23
+#: accounts/const/automation.py:25
msgid "Change secret"
msgstr "パスワードを変更する"
-#: accounts/const/automation.py:24
+#: accounts/const/automation.py:26
msgid "Verify account"
msgstr "アカウントを確認"
-#: accounts/const/automation.py:25
+#: accounts/const/automation.py:27
msgid "Gather accounts"
msgstr "アカウントのコレクション"
-#: accounts/const/automation.py:26
+#: accounts/const/automation.py:28
msgid "Verify gateway account"
msgstr "ゲートウェイ アカウントを確認する"
-#: accounts/const/automation.py:44
-msgid "Specific password"
+#: accounts/const/automation.py:46
+msgid "Specific secret"
msgstr "特定"
-#: accounts/const/automation.py:45
-msgid "Random"
-msgstr "ランダム"
+#: accounts/const/automation.py:47
+msgid "Random generate"
+msgstr "ランダム生成"
-#: accounts/const/automation.py:49 ops/const.py:13
+#: accounts/const/automation.py:51 ops/const.py:13
msgid "Append SSH KEY"
msgstr "追加"
-#: accounts/const/automation.py:50 ops/const.py:14
+#: accounts/const/automation.py:52 ops/const.py:14
msgid "Empty and append SSH KEY"
msgstr "すべてクリアして追加"
-#: accounts/const/automation.py:51 ops/const.py:15
+#: accounts/const/automation.py:53 ops/const.py:15
msgid "Replace (Replace only keys pushed by JumpServer) "
msgstr "置換（JumpServer によってプッシュされたキーのみを置換）"
-#: accounts/const/automation.py:56
+#: accounts/const/automation.py:58
msgid "On asset create"
msgstr "アセットが作成されたとき"
-#: accounts/const/automation.py:59
+#: accounts/const/automation.py:61
msgid "On perm add user"
msgstr "承認が変更されたときにユーザーを追加する"
-#: accounts/const/automation.py:61
+#: accounts/const/automation.py:63
msgid "On perm add user group"
msgstr "権限変更時にユーザーグループを追加"
-#: accounts/const/automation.py:63
+#: accounts/const/automation.py:65
msgid "On perm add asset"
msgstr "変更の承認時にアセットを追加する"
-#: accounts/const/automation.py:65
+#: accounts/const/automation.py:67
msgid "On perm add node"
msgstr "承認変更時のノードの追加"
-#: accounts/const/automation.py:67
+#: accounts/const/automation.py:69
msgid "On perm add account"
msgstr "承認が変更されたときにアカウントを追加する"
-#: accounts/const/automation.py:69
+#: accounts/const/automation.py:71
msgid "On asset join node"
msgstr "アセットの変更時にノードに追加"
-#: accounts/const/automation.py:71
+#: accounts/const/automation.py:73
msgid "On user join group"
msgstr "ユーザー変更時にユーザーグループに追加"
-#: accounts/const/automation.py:79
+#: accounts/const/automation.py:81
msgid "On perm change"
msgstr "権限が変更されたとき"
-#: accounts/const/automation.py:86
+#: accounts/const/automation.py:88
msgid "Inherit from group or node"
msgstr "ユーザーグループまたはアセットノードから継承"
-#: accounts/const/automation.py:94
+#: accounts/const/automation.py:96
msgid "Create and push"
msgstr "作成してプッシュ"
-#: accounts/const/automation.py:95
+#: accounts/const/automation.py:97
msgid "Only create"
msgstr "作成のみ"
@@ -196,17 +197,35 @@ msgstr "データベース"
msgid "HCP Vault"
msgstr "HashiCorp Vault"
+#: accounts/mixins.py:35
+msgid "Export all"
+msgstr "すべてエクスポート"
+
+#: accounts/mixins.py:37
+msgid "Export only selected items"
+msgstr "選択項目のみエクスポート"
+
+#: accounts/mixins.py:42
+#, python-format
+msgid "Export filtered: %s"
+msgstr "検索のエクスポート: %s"
+
+#: accounts/mixins.py:48
+#, python-format
+msgid "User %s view/export secret"
+msgstr "ユーザー %s がパスワードを閲覧/導き出しました"
+
#: accounts/models/account.py:48
#: accounts/models/automations/gather_account.py:16
-#: accounts/serializers/account/account.py:202
-#: accounts/serializers/account/account.py:247
+#: accounts/serializers/account/account.py:205
+#: accounts/serializers/account/account.py:250
#: accounts/serializers/account/gathered_account.py:10
-#: accounts/serializers/automations/change_secret.py:112
-#: accounts/serializers/automations/change_secret.py:132
+#: accounts/serializers/automations/change_secret.py:111
+#: accounts/serializers/automations/change_secret.py:131
#: acls/serializers/base.py:123 assets/models/asset/common.py:93
#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36
#: assets/serializers/domain.py:19 assets/serializers/label.py:27
-#: audits/models.py:53 authentication/models/connection_token.py:36
+#: audits/models.py:54 authentication/models/connection_token.py:36
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:34
#: terminal/backends/command/models.py:17 terminal/models/session/session.py:31
#: terminal/notifications.py:155 terminal/serializers/command.py:17
@@ -218,20 +237,21 @@ msgid "Asset"
msgstr "資産"
#: accounts/models/account.py:52 accounts/models/template.py:15
-#: accounts/serializers/account/account.py:209
-#: accounts/serializers/account/account.py:257
-#: accounts/serializers/account/template.py:16
+#: accounts/serializers/account/account.py:212
+#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/template.py:25
#: authentication/serializers/connect_token_secret.py:49
msgid "Su from"
msgstr "から切り替え"
-#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20
-#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34
+#: accounts/models/account.py:54 assets/const/protocol.py:168
+#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20
+#: terminal/models/applet/applet.py:35
msgid "Version"
msgstr "バージョン"
-#: accounts/models/account.py:56 accounts/serializers/account/account.py:204
-#: users/models/user.py:838
+#: accounts/models/account.py:56 accounts/serializers/account/account.py:207
+#: users/models/user.py:846
msgid "Source"
msgstr "ソース"
@@ -240,10 +260,10 @@ msgid "Source ID"
msgstr "ソース ID"
#: accounts/models/account.py:60
-#: accounts/serializers/automations/change_secret.py:113
-#: accounts/serializers/automations/change_secret.py:133
+#: accounts/serializers/automations/change_secret.py:112
+#: accounts/serializers/automations/change_secret.py:132
#: acls/serializers/base.py:124 assets/serializers/asset/common.py:125
-#: assets/serializers/gateway.py:28 audits/models.py:54 ops/models/base.py:18
+#: assets/serializers/gateway.py:28 audits/models.py:55 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:39
#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33
#: terminal/templates/terminal/_msg_command_warning.html:8
@@ -286,7 +306,7 @@ msgid "Account backup plan"
msgstr "アカウントバックアップ計画"
#: accounts/models/automations/backup_account.py:91
-#: assets/models/automations/base.py:115 audits/models.py:60
+#: assets/models/automations/base.py:115 audits/models.py:61
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228
#: ops/templates/ops/celery_task_log.html:75
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140
@@ -314,14 +334,14 @@ msgstr "アカウントのバックアップスナップショット"
msgid "Trigger mode"
msgstr "トリガーモード"
-#: accounts/models/automations/backup_account.py:105 audits/models.py:194
-#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205
+#: accounts/models/automations/backup_account.py:105 audits/models.py:195
+#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205
msgid "Reason"
msgstr "理由"
#: accounts/models/automations/backup_account.py:107
-#: accounts/serializers/automations/change_secret.py:111
-#: accounts/serializers/automations/change_secret.py:134
+#: accounts/serializers/automations/change_secret.py:110
+#: accounts/serializers/automations/change_secret.py:133
#: ops/serializers/job.py:56 terminal/serializers/session.py:46
msgid "Is success"
msgstr "成功は"
@@ -330,109 +350,84 @@ msgstr "成功は"
msgid "Account backup execution"
msgstr "アカウントバックアップの実行"
-#: accounts/models/automations/base.py:15
+#: accounts/models/automations/base.py:18
msgid "Account automation task"
msgstr "アカウント自動化タスク"
-#: accounts/models/automations/base.py:29
+#: accounts/models/automations/base.py:32
msgid "Automation execution"
msgstr "自動実行"
-#: accounts/models/automations/base.py:30
+#: accounts/models/automations/base.py:33
msgid "Automation executions"
msgstr "自動実行"
-#: accounts/models/automations/base.py:32
+#: accounts/models/automations/base.py:35
msgid "Can view change secret execution"
msgstr "改密実行の表示"
-#: accounts/models/automations/base.py:33
+#: accounts/models/automations/base.py:36
msgid "Can add change secret execution"
msgstr "改密実行の作成"
-#: accounts/models/automations/base.py:35
+#: accounts/models/automations/base.py:38
msgid "Can view gather accounts execution"
msgstr "コレクションアカウントの実行を表示"
-#: accounts/models/automations/base.py:36
+#: accounts/models/automations/base.py:39
msgid "Can add gather accounts execution"
msgstr "回収口座作成の実行"
-#: accounts/models/automations/base.py:38
+#: accounts/models/automations/base.py:41
msgid "Can view push account execution"
msgstr "プッシュ アカウントの実行を表示する"
-#: accounts/models/automations/base.py:39
+#: accounts/models/automations/base.py:42
msgid "Can add push account execution"
msgstr "プッシュ アカウントの作成の実行"
-#: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36
-#: accounts/serializers/account/account.py:429
-#: accounts/serializers/account/base.py:16
-#: accounts/serializers/automations/change_secret.py:46
-#: authentication/serializers/connect_token_secret.py:41
-#: authentication/serializers/connect_token_secret.py:50
-msgid "Secret type"
-msgstr "鍵の種類"
-
-#: accounts/models/automations/change_secret.py:20
-#: accounts/models/mixins/vault.py:48 accounts/serializers/account/base.py:19
-#: authentication/models/temp_token.py:10
-#: authentication/templates/authentication/_access_key_modal.html:31
-#: settings/serializers/auth/radius.py:19
-msgid "Secret"
-msgstr "ひみつ"
-
-#: accounts/models/automations/change_secret.py:23
-#: accounts/serializers/automations/change_secret.py:40
-msgid "Secret strategy"
-msgstr "鍵ポリシー"
-
-#: accounts/models/automations/change_secret.py:25
-msgid "Password rules"
-msgstr "パスワードルール"
-
-#: accounts/models/automations/change_secret.py:28
+#: accounts/models/automations/base.py:54
msgid "SSH key change strategy"
msgstr "SSHキープッシュ方式"
-#: accounts/models/automations/change_secret.py:64
+#: accounts/models/automations/change_secret.py:15
#: accounts/serializers/account/backup.py:34
-#: accounts/serializers/automations/change_secret.py:57
+#: accounts/serializers/automations/change_secret.py:56
msgid "Recipient"
msgstr "受信者"
-#: accounts/models/automations/change_secret.py:71
+#: accounts/models/automations/change_secret.py:22
msgid "Change secret automation"
msgstr "自動暗号化"
-#: accounts/models/automations/change_secret.py:88
+#: accounts/models/automations/change_secret.py:39
msgid "Old secret"
msgstr "オリジナルキー"
-#: accounts/models/automations/change_secret.py:89
+#: accounts/models/automations/change_secret.py:40
msgid "New secret"
msgstr "新しい鍵"
-#: accounts/models/automations/change_secret.py:90
+#: accounts/models/automations/change_secret.py:41
msgid "Date started"
msgstr "開始日"
-#: accounts/models/automations/change_secret.py:91
+#: accounts/models/automations/change_secret.py:42
#: assets/models/automations/base.py:116 ops/models/base.py:56
#: ops/models/celery.py:64 ops/models/job.py:229
#: terminal/models/applet/host.py:141
msgid "Date finished"
msgstr "終了日"
-#: accounts/models/automations/change_secret.py:93
-#: accounts/serializers/account/account.py:249 assets/const/automation.py:8
+#: accounts/models/automations/change_secret.py:44
+#: accounts/serializers/account/account.py:252 assets/const/automation.py:8
+#: authentication/templates/authentication/passkey.html:173
#: authentication/views/base.py:26 authentication/views/base.py:27
#: authentication/views/base.py:28 common/const/choices.py:20
msgid "Error"
msgstr "間違い"
-#: accounts/models/automations/change_secret.py:97
+#: accounts/models/automations/change_secret.py:48
msgid "Change secret record"
msgstr "パスワード レコードの変更"
@@ -445,15 +440,15 @@ msgid "Date last login"
msgstr "最終ログイン日"
#: accounts/models/automations/gather_account.py:17
-#: accounts/models/automations/push_account.py:15 accounts/models/base.py:34
+#: accounts/models/automations/push_account.py:15 accounts/models/base.py:65
#: accounts/serializers/account/virtual.py:21 acls/serializers/base.py:19
-#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:179
+#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:180
#: authentication/forms.py:25 authentication/forms.py:27
#: authentication/models/temp_token.py:9
#: authentication/templates/authentication/_msg_different_city.html:9
#: authentication/templates/authentication/_msg_oauth_bind.html:9
#: users/forms/profile.py:32 users/forms/profile.py:115
-#: users/models/user.py:785 users/templates/users/_msg_user_created.html:12
+#: users/models/user.py:796 users/templates/users/_msg_user_created.html:12
#: xpack/plugins/cloud/serializers/account_attrs.py:26
msgid "Username"
msgstr "ユーザー名"
@@ -481,13 +476,13 @@ msgstr "トリガー方式"
#: accounts/models/automations/push_account.py:16 acls/models/base.py:41
#: acls/serializers/base.py:57 assets/models/cmd_filter.py:81
-#: audits/models.py:87 audits/serializers.py:83
+#: audits/models.py:88 audits/serializers.py:84
#: authentication/serializers/connect_token_secret.py:116
#: authentication/templates/authentication/_access_key_modal.html:34
msgid "Action"
msgstr "アクション"
-#: accounts/models/automations/push_account.py:60
+#: accounts/models/automations/push_account.py:57
msgid "Push asset account"
msgstr "アカウントプッシュ"
@@ -495,7 +490,34 @@ msgstr "アカウントプッシュ"
msgid "Verify asset account"
msgstr "アカウントの確認"
-#: accounts/models/base.py:33 accounts/serializers/account/virtual.py:20
+#: accounts/models/base.py:37 accounts/models/base.py:67
+#: accounts/serializers/account/account.py:432
+#: accounts/serializers/account/base.py:16
+#: accounts/serializers/automations/change_secret.py:45
+#: authentication/serializers/connect_token_secret.py:41
+#: authentication/serializers/connect_token_secret.py:50
+msgid "Secret type"
+msgstr "鍵の種類"
+
+#: accounts/models/base.py:39 accounts/models/mixins/vault.py:48
+#: accounts/serializers/account/base.py:19
+#: authentication/models/temp_token.py:10
+#: authentication/templates/authentication/_access_key_modal.html:31
+#: settings/serializers/auth/radius.py:19
+msgid "Secret"
+msgstr "ひみつ"
+
+#: accounts/models/base.py:42
+#: accounts/serializers/automations/change_secret.py:39
+msgid "Secret strategy"
+msgstr "鍵ポリシー"
+
+#: accounts/models/base.py:44 accounts/serializers/account/template.py:22
+#: accounts/serializers/automations/change_secret.py:44
+msgid "Password rules"
+msgstr "パスワードルール"
+
+#: accounts/models/base.py:64 accounts/serializers/account/virtual.py:20
#: acls/models/base.py:35 acls/models/base.py:96 acls/models/command_acl.py:21
#: acls/serializers/base.py:35 applications/models.py:9
#: assets/models/_user.py:22 assets/models/asset/common.py:91
@@ -503,44 +525,57 @@ msgstr "アカウントの確認"
#: assets/models/domain.py:18 assets/models/group.py:17
#: assets/models/label.py:18 assets/models/platform.py:15
#: assets/models/platform.py:88 assets/serializers/asset/common.py:146
-#: assets/serializers/platform.py:110 assets/serializers/platform.py:223
+#: assets/serializers/platform.py:111 assets/serializers/platform.py:228
+#: authentication/backends/passkey/models.py:10
#: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21
#: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20
#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:32 settings/serializers/msg.py:82
-#: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12
+#: terminal/models/applet/applet.py:33 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:94
#: terminal/models/component/storage.py:26 terminal/models/component/task.py:13
#: terminal/models/component/terminal.py:84 users/forms/profile.py:33
-#: users/models/group.py:13 users/models/user.py:787
-#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273
-#: xpack/plugins/cloud/serializers/task.py:68
+#: users/models/group.py:13 users/models/preference.py:11
+#: users/models/user.py:798 xpack/plugins/cloud/models.py:32
+#: xpack/plugins/cloud/models.py:273 xpack/plugins/cloud/serializers/task.py:68
msgid "Name"
msgstr "名前"
-#: accounts/models/base.py:38
+#: accounts/models/base.py:69
msgid "Privileged"
msgstr "特権アカウント"
-#: accounts/models/base.py:39 assets/models/asset/common.py:156
+#: accounts/models/base.py:70 assets/models/asset/common.py:156
#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
#: assets/models/label.py:22
#: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:39
-#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
+#: terminal/models/applet/applet.py:40
+#: terminal/models/component/endpoint.py:105 users/serializers/user.py:170
msgid "Is active"
msgstr "アクティブです。"
-#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325
+#: accounts/models/template.py:17 assets/models/_user.py:53
+msgid "Auto push"
+msgstr "オートプッシュ"
+
+#: accounts/models/template.py:20
+msgid "Platforms"
+msgstr "プラットフォーム"
+
+#: accounts/models/template.py:22
+msgid "Push params"
+msgstr "パラメータをプッシュする"
+
+#: accounts/models/template.py:25 xpack/plugins/cloud/models.py:325
msgid "Account template"
msgstr "アカウント テンプレート"
-#: accounts/models/template.py:24
+#: accounts/models/template.py:30
msgid "Can view asset account template secret"
msgstr "アセット アカウント テンプレートのパスワードを表示できます"
-#: accounts/models/template.py:25
+#: accounts/models/template.py:31
msgid "Can change asset account template secret"
msgstr "アセット アカウント テンプレートのパスワードを変更できます"
@@ -622,54 +657,55 @@ msgstr "今すぐプッシュ"
msgid "Exist policy"
msgstr "アカウントの存在ポリシー"
-#: accounts/serializers/account/account.py:182 applications/models.py:11
+#: accounts/serializers/account/account.py:185 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:89
#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8
-#: assets/serializers/platform.py:128 assets/serializers/platform.py:224
+#: assets/serializers/platform.py:133 assets/serializers/platform.py:229
#: perms/serializers/user_permission.py:26 settings/models.py:34
-#: tickets/models/ticket/apply_application.py:13
+#: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12
msgid "Category"
msgstr "カテゴリ"
-#: accounts/serializers/account/account.py:183
+#: accounts/serializers/account/account.py:186
#: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:90
-#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112
-#: assets/serializers/platform.py:127 audits/serializers.py:49
+#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:113
+#: assets/serializers/platform.py:132 audits/serializers.py:50
+#: audits/serializers.py:170
#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137
-#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38
+#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39
#: terminal/models/component/storage.py:57
#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
-#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
-#: terminal/serializers/storage.py:238 tickets/models/comment.py:26
+#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228
+#: terminal/serializers/storage.py:240 tickets/models/comment.py:26
#: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16
#: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53
#: tickets/serializers/ticket/ticket.py:19
msgid "Type"
msgstr "タイプ"
-#: accounts/serializers/account/account.py:198
+#: accounts/serializers/account/account.py:201
msgid "Asset not found"
msgstr "資産が存在しません"
-#: accounts/serializers/account/account.py:238
+#: accounts/serializers/account/account.py:241
msgid "Has secret"
msgstr "エスクローされたパスワード"
-#: accounts/serializers/account/account.py:248 ops/models/celery.py:60
+#: accounts/serializers/account/account.py:251 ops/models/celery.py:60
#: tickets/models/comment.py:13 tickets/models/ticket/general.py:45
#: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14
#: tickets/serializers/ticket/ticket.py:21
msgid "State"
msgstr "状態"
-#: accounts/serializers/account/account.py:250
+#: accounts/serializers/account/account.py:253
msgid "Changed"
msgstr "編集済み"
-#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/account.py:263
#: accounts/serializers/automations/base.py:22 acls/models/base.py:97
#: assets/models/automations/base.py:19
#: assets/serializers/automations/base.py:20 ops/models/base.py:17
@@ -678,46 +714,46 @@ msgstr "編集済み"
msgid "Assets"
msgstr "資産"
-#: accounts/serializers/account/account.py:315
+#: accounts/serializers/account/account.py:318
msgid "Account already exists"
msgstr "アカウントはすでに存在しています"
-#: accounts/serializers/account/account.py:365
+#: accounts/serializers/account/account.py:368
#, python-format
msgid "Asset does not support this secret type: %s"
msgstr "アセットはアカウント タイプをサポートしていません: %s"
-#: accounts/serializers/account/account.py:397
+#: accounts/serializers/account/account.py:400
msgid "Account has exist"
msgstr "アカウントはすでに存在しています"
-#: accounts/serializers/account/account.py:430
+#: accounts/serializers/account/account.py:433
#: authentication/serializers/connect_token_secret.py:156
#: authentication/templates/authentication/_access_key_modal.html:30
#: perms/models/perm_node.py:21 users/serializers/group.py:31
msgid "ID"
msgstr "ID"
-#: accounts/serializers/account/account.py:437 acls/serializers/base.py:116
-#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49
-#: audits/models.py:85 audits/models.py:163
-#: authentication/models/connection_token.py:32
+#: accounts/serializers/account/account.py:440 acls/serializers/base.py:116
+#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:50
+#: audits/models.py:86 audits/models.py:164 audits/models.py:262
+#: audits/serializers.py:171 authentication/models/connection_token.py:32
#: authentication/models/sso_token.py:16
#: notifications/models/notification.py:12
#: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58
-#: perms/serializers/permission.py:30 rbac/builtin.py:123
+#: perms/serializers/permission.py:30 rbac/builtin.py:124
#: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17
#: terminal/backends/command/models.py:16 terminal/models/session/session.py:29
-#: terminal/models/session/sharing.py:33 terminal/notifications.py:156
+#: terminal/models/session/sharing.py:34 terminal/notifications.py:156
#: terminal/notifications.py:205 terminal/serializers/command.py:16
#: terminal/templates/terminal/_msg_command_warning.html:6
#: terminal/templates/terminal/_msg_session_sharing.html:6
-#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:981
-#: users/models/user.py:1017 users/serializers/group.py:18
+#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:996
+#: users/models/user.py:1032 users/serializers/group.py:18
msgid "User"
msgstr "ユーザー"
-#: accounts/serializers/account/account.py:438
+#: accounts/serializers/account/account.py:441
#: authentication/templates/authentication/_access_key_modal.html:33
#: terminal/notifications.py:158 terminal/notifications.py:207
msgid "Date"
@@ -736,7 +772,7 @@ msgid "Executed amount"
msgstr "実行回数"
#: accounts/serializers/account/backup.py:35
-#: accounts/serializers/automations/change_secret.py:58
+#: accounts/serializers/automations/change_secret.py:57
msgid "Currently only mail sending is supported"
msgstr "現在、メール送信のみがサポートされています"
@@ -761,27 +797,68 @@ msgstr ""
"ヒント: 認証にユーザー名が必要ない場合は、`null`を入力します。ADアカウントの"
"場合は、`username@domain`のようになります。"
+#: accounts/serializers/account/template.py:11
+#, fuzzy
+#| msgid "Password strength"
+msgid "Password length"
+msgstr "パスワードの強さ"
+
+#: accounts/serializers/account/template.py:12
+#, fuzzy
+#| msgid "Powershell"
+msgid "Lowercase"
+msgstr "PowerShell"
+
+#: accounts/serializers/account/template.py:13
+msgid "Uppercase"
+msgstr ""
+
+#: accounts/serializers/account/template.py:14
+msgid "Digit"
+msgstr ""
+
+#: accounts/serializers/account/template.py:15
+msgid "Special symbol"
+msgstr ""
+
+#: accounts/serializers/account/template.py:36
+msgid "Secret generation strategy for account creation"
+msgstr "账号创建时，密文生成策略"
+
+#: accounts/serializers/account/template.py:37
+msgid "Whether to automatically push the account to the asset"
+msgstr "是否自动推送账号到资产"
+
+#: accounts/serializers/account/template.py:40
+msgid ""
+"Associated platform, you can configure push parameters. If not associated, "
+"default parameters will be used"
+msgstr "关联平台，可以配置推送参数，如果不关联，则使用默认参数"
+
#: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27
#: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
#: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142
+#: settings/models.py:37 terminal/models/applet/applet.py:45
+#: terminal/models/applet/applet.py:302 terminal/models/applet/host.py:142
#: terminal/models/component/endpoint.py:24
#: terminal/models/component/endpoint.py:104
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
-#: tickets/models/ticket/general.py:297 users/models/user.py:826
+#: tickets/models/ticket/general.py:297 users/models/user.py:834
#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109
msgid "Comment"
msgstr "コメント"
-#: accounts/serializers/account/virtual.py:22
+#: accounts/serializers/account/virtual.py:24
msgid ""
"Current only support login from AD/LDAP. Secret priority: Same account in "
-"asset secret > Login secret > Manual input"
+"asset secret > Login secret > Manual input.
For security, please set " +"config CACHE_LOGIN_PASSWORD_ENABLED to true" msgstr "" "現在、AD/LDAPからのログインのみをサポートしています。シークレットの優先順位: " -"資産シークレット内の同じアカウント > ログインシークレット > 手動入力" +"資産シークレット内の同じアカウント > ログインシークレット > 手動入力.
" +"セキュリティのために、「config CACHE_LOGIN_PASSWORD_ENABLED」をtrueに設定して" +"ください。 " #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -800,31 +877,46 @@ msgstr "名前は既に存在します。" msgid "Automation snapshot" msgstr "自動スナップショット" -#: accounts/serializers/automations/change_secret.py:43 +#: accounts/serializers/automations/change_secret.py:42 msgid "SSH Key strategy" msgstr "SSHキー戦略" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:80 msgid "* Please enter the correct password length" msgstr "* 正しいパスワードの長さを入力してください" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:84 msgid "* Password length range 6-30 bits" msgstr "* パスワードの長さの範囲6-30ビット" -#: accounts/serializers/automations/change_secret.py:115 +#: accounts/serializers/automations/change_secret.py:114 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自動タスク実行履歴" -#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 -#: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 -#: tickets/views/approve.py:115 +#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54 +#: audits/models.py:60 audits/signal_handlers/activity_log.py:33 +#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 +#: tickets/views/approve.py:119 msgid "Success" msgstr "成功" +#: accounts/signal_handlers.py:46 +#, python-format +msgid "Push related accounts to assets: %s, by system" +msgstr "関連するアカウントをアセットにプッシュ: %s, by system" + +#: accounts/signal_handlers.py:55 +#, python-format +msgid "Add account: %s" +msgstr "アカウントを追加: %s" + +#: accounts/signal_handlers.py:57 +#, python-format +msgid "Delete account: %s" +msgstr "アカウントを削除: %s" + #: accounts/tasks/automation.py:24 msgid "Account execute automation" msgstr "アカウント実行の自動化" @@ -853,19 +945,23 @@ msgstr "アセット アカウントの可用性を確認する" msgid "Verify accounts connectivity" msgstr "アカウント接続のテスト" -#: accounts/utils.py:41 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "パスワードには '{{' を含まない" -#: accounts/utils.py:44 +#: accounts/utils.py:55 +msgid "Password can not contains `{%` " +msgstr "パスワードには '{%' を含まない" + +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "パスワードには `'` を含まない" -#: accounts/utils.py:46 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "パスワードには `\"` を含まない" -#: accounts/utils.py:52 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "秘密鍵が無効またはpassphraseエラー" @@ -910,12 +1006,12 @@ msgstr "レビュー担当者" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "アクティブ" -#: acls/models/base.py:81 users/apps.py:9 +#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16 msgid "Users" msgstr "ユーザー" @@ -1032,7 +1128,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:137 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1107,6 +1203,10 @@ msgstr "アプリ資産" msgid "{} disabled" msgstr "{} 無効" +#: assets/automations/base/manager.py:202 +msgid " - Platform {} ansible disabled" +msgstr " - プラットフォーム {} ansible 無効" + #: assets/automations/ping_gateway/manager.py:33 #: authentication/models/connection_token.py:128 msgid "No account" @@ -1131,7 +1231,7 @@ msgstr "認証に失敗しました" msgid "Connect failed" msgstr "接続に失敗しました" -#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36 +#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104 msgid "Unknown" @@ -1153,16 +1253,19 @@ msgstr "テストゲートウェイ" msgid "Gather facts" msgstr "資産情報の収集" -#: assets/const/base.py:33 audits/const.py:47 +#: assets/const/base.py:33 audits/const.py:48 #: terminal/serializers/applet_host.py:32 msgid "Disabled" msgstr "無効" #: assets/const/base.py:34 settings/serializers/basic.py:6 +#: users/serializers/preference/koko.py:15 +#: users/serializers/preference/lina.py:32 +#: users/serializers/preference/luna.py:60 msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:245 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1184,8 +1287,8 @@ msgid "Cloud service" msgstr "クラウド サービス" #: assets/const/category.py:14 assets/models/asset/gpt.py:11 -#: assets/models/asset/web.py:16 audits/const.py:34 -#: terminal/models/applet/applet.py:26 +#: assets/models/asset/web.py:16 audits/const.py:35 +#: terminal/models/applet/applet.py:27 users/const.py:47 msgid "Web" msgstr "Web" @@ -1205,7 +1308,7 @@ msgstr "私有雲" msgid "Kubernetes" msgstr "Kubernetes" -#: assets/const/device.py:7 terminal/models/applet/applet.py:25 +#: assets/const/device.py:7 terminal/models/applet/applet.py:26 #: tickets/const.py:8 msgid "General" msgstr "一般" @@ -1224,86 +1327,102 @@ msgstr "ファイアウォール" #: assets/const/gpt.py:7 msgid "ChatGPT" -msgstr "" +msgstr "ChatGPT" #: assets/const/host.py:12 rbac/tree.py:28 msgid "Other" msgstr "その他" #: assets/const/protocol.py:48 -msgid "SFTP home" -msgstr "SFTP ルート パス" +msgid "SFTP root" +msgstr "SFTPルート" -#: assets/const/protocol.py:59 +#: assets/const/protocol.py:50 +#, python-brace-format +msgid "" +"SFTP root directory, Support variable:
- ${ACCOUNT} The connected " +"account username
- ${HOME} The home directory of the connected account " +"
- ${USER} The username of the user" +msgstr "" +"SFTPルートディレクトリ、サポート変数：
-${ACCOUNT}接続されたアカウントの" +"ユーザー名
-${HOME}接続されたアカウントのホームディレクトリ
-${USER}" +"ユーザーのユーザー名" + +#: assets/const/protocol.py:65 msgid "Console" msgstr "Console" -#: assets/const/protocol.py:60 +#: assets/const/protocol.py:66 msgid "Connect to console session" msgstr "コンソールセッションに接続" -#: assets/const/protocol.py:64 +#: assets/const/protocol.py:70 msgid "Any" msgstr "任意" -#: assets/const/protocol.py:66 settings/serializers/security.py:227 +#: assets/const/protocol.py:72 settings/serializers/security.py:228 msgid "Security" msgstr "セキュリティ" -#: assets/const/protocol.py:67 +#: assets/const/protocol.py:73 msgid "Security layer to use for the connection" msgstr "接続に使用するセキュリティ レイヤー" -#: assets/const/protocol.py:73 +#: assets/const/protocol.py:79 msgid "AD domain" msgstr "AD ドメイン" -#: assets/const/protocol.py:88 +#: assets/const/protocol.py:94 msgid "Username prompt" msgstr "ユーザー名プロンプト" -#: assets/const/protocol.py:89 +#: assets/const/protocol.py:95 msgid "We will send username when we see this prompt" msgstr "このプロンプトが表示されたらユーザー名を送信します" -#: assets/const/protocol.py:94 +#: assets/const/protocol.py:100 msgid "Password prompt" msgstr "パスワードプロンプト" -#: assets/const/protocol.py:95 +#: assets/const/protocol.py:101 msgid "We will send password when we see this prompt" msgstr "このプロンプトが表示されたらパスワードを送信します" -#: assets/const/protocol.py:100 +#: assets/const/protocol.py:106 msgid "Success prompt" msgstr "成功プロンプト" -#: assets/const/protocol.py:101 +#: assets/const/protocol.py:107 msgid "We will consider login success when we see this prompt" msgstr "このプロンプトが表示されたらログイン成功とみなします" -#: assets/const/protocol.py:112 assets/models/asset/database.py:10 +#: assets/const/protocol.py:118 assets/models/asset/database.py:10 #: settings/serializers/msg.py:40 msgid "Use SSL" msgstr "SSLの使用" -#: assets/const/protocol.py:147 +#: assets/const/protocol.py:153 msgid "SYSDBA" msgstr "SYSDBA" -#: assets/const/protocol.py:148 +#: assets/const/protocol.py:154 msgid "Connect as SYSDBA" msgstr "SYSDBA として接続" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:169 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server のバージョン。バージョンによって接続ドライバが異なります" + +#: assets/const/protocol.py:192 msgid "Auth username" msgstr "ユーザー名で認証する" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:215 msgid "Safe mode" msgstr "安全モード" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:217 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." @@ -1311,24 +1430,24 @@ msgstr "" "安全モードが有効になっている場合、新しいタブ、右クリック、他のウェブサイトへ" "のアクセスなど、一部の操作が無効になります" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:222 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自動充填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:230 assets/models/asset/web.py:10 msgid "Username selector" msgstr "ユーザー名ピッカー" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:235 assets/models/asset/web.py:11 msgid "Password selector" msgstr "パスワードセレクター" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:240 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "ボタンセレクターを確認する" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:263 msgid "API mode" msgstr "APIモード" @@ -1354,19 +1473,19 @@ msgstr "SSHパブリックキー" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 -#: users/models/user.py:1018 +#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54 +#: ops/models/job.py:227 users/models/user.py:1033 msgid "Date created" msgstr "作成された日付" #: assets/models/_user.py:29 assets/models/cmd_filter.py:42 -#: common/db/models.py:35 users/models/user.py:847 +#: common/db/models.py:35 users/models/user.py:855 msgid "Date updated" msgstr "更新日" #: assets/models/_user.py:30 assets/models/cmd_filter.py:44 #: assets/models/cmd_filter.py:91 assets/models/group.py:18 -#: common/db/models.py:32 users/models/user.py:833 +#: common/db/models.py:32 users/models/user.py:841 #: users/serializers/group.py:29 msgid "Created by" msgstr "によって作成された" @@ -1393,15 +1512,11 @@ msgstr "ユーザーと同じユーザー名" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "プロトコル" -#: assets/models/_user.py:53 -msgid "Auto push" -msgstr "オートプッシュ" - #: assets/models/_user.py:54 msgid "Sudo" msgstr "すど" @@ -1457,6 +1572,7 @@ msgid "Address" msgstr "アドレス" #: assets/models/asset/common.py:151 assets/models/platform.py:119 +#: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" @@ -1534,9 +1650,9 @@ msgstr "自動化されたタスク" msgid "Asset automation task" msgstr "アセットの自動化タスク" -#: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 +#: assets/models/automations/base.py:113 audits/models.py:200 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1563,7 +1679,7 @@ msgstr "確認済みの日付" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61 #: perms/serializers/permission.py:32 users/models/group.py:25 -#: users/models/user.py:793 +#: users/models/user.py:804 msgid "User group" msgstr "ユーザーグループ" @@ -1604,7 +1720,7 @@ msgid "Asset group" msgstr "資産グループ" #: assets/models/group.py:31 assets/models/platform.py:19 -#: assets/serializers/platform.py:113 +#: assets/serializers/platform.py:114 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1613,7 +1729,7 @@ msgstr "デフォルト" msgid "Default asset group" msgstr "デフォルトアセットグループ" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018 msgid "System" msgstr "システム" @@ -1622,12 +1738,13 @@ msgstr "システム" #: authentication/models/connection_token.py:29 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:33 +#: users/models/preference.py:13 msgid "Value" msgstr "値" #: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:111 +#: assets/serializers/platform.py:112 #: authentication/serializers/connect_token_secret.py:121 #: common/serializers/common.py:85 perms/serializers/user_permission.py:28 #: settings/serializers/msg.py:83 @@ -1675,13 +1792,14 @@ msgstr "必要" msgid "Public" msgstr "開ける" -#: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:65 +#: assets/models/platform.py:21 assets/serializers/platform.py:49 +#: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "設定" -#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36 +#: assets/models/platform.py:38 audits/const.py:49 +#: authentication/backends/passkey/models.py:11 settings/models.py:36 #: terminal/serializers/applet_host.py:33 msgid "Enabled" msgstr "有効化" @@ -1690,11 +1808,11 @@ msgstr "有効化" msgid "Ansible config" msgstr "Ansible 構成" -#: assets/models/platform.py:41 assets/serializers/platform.py:32 +#: assets/models/platform.py:41 assets/serializers/platform.py:33 msgid "Ping enabled" msgstr "アセット ディスカバリを有効にする" -#: assets/models/platform.py:42 assets/serializers/platform.py:33 +#: assets/models/platform.py:42 assets/serializers/platform.py:34 msgid "Ping method" msgstr "資産検出方法" @@ -1703,12 +1821,12 @@ msgid "Ping params" msgstr "資産検出パラメータ" #: assets/models/platform.py:45 assets/models/platform.py:69 -#: assets/serializers/platform.py:34 +#: assets/serializers/platform.py:35 msgid "Gather facts enabled" msgstr "資産情報の収集を有効にする" #: assets/models/platform.py:47 assets/models/platform.py:71 -#: assets/serializers/platform.py:35 +#: assets/serializers/platform.py:36 msgid "Gather facts method" msgstr "情報収集の方法" @@ -1716,11 +1834,11 @@ msgstr "情報収集の方法" msgid "Gather facts params" msgstr "情報収集パラメータ" -#: assets/models/platform.py:51 assets/serializers/platform.py:38 +#: assets/models/platform.py:51 assets/serializers/platform.py:39 msgid "Change secret enabled" msgstr "パスワードの変更が有効" -#: assets/models/platform.py:53 assets/serializers/platform.py:39 +#: assets/models/platform.py:53 assets/serializers/platform.py:40 msgid "Change secret method" msgstr "パスワード変更モード" @@ -1728,11 +1846,11 @@ msgstr "パスワード変更モード" msgid "Change secret params" msgstr "パスワード変更パラメータ" -#: assets/models/platform.py:57 assets/serializers/platform.py:40 +#: assets/models/platform.py:57 assets/serializers/platform.py:41 msgid "Push account enabled" msgstr "アカウントのプッシュを有効にする" -#: assets/models/platform.py:59 assets/serializers/platform.py:41 +#: assets/models/platform.py:59 assets/serializers/platform.py:42 msgid "Push account method" msgstr "アカウントプッシュ方式" @@ -1740,11 +1858,11 @@ msgstr "アカウントプッシュ方式" msgid "Push account params" msgstr "アカウントプッシュパラメータ" -#: assets/models/platform.py:63 assets/serializers/platform.py:36 +#: assets/models/platform.py:63 assets/serializers/platform.py:37 msgid "Verify account enabled" msgstr "アカウントの確認をオンにする" -#: assets/models/platform.py:65 assets/serializers/platform.py:37 +#: assets/models/platform.py:65 assets/serializers/platform.py:38 msgid "Verify account method" msgstr "アカウント認証方法" @@ -1760,23 +1878,23 @@ msgstr "メタ" msgid "Internal" msgstr "ビルトイン" -#: assets/models/platform.py:96 assets/serializers/platform.py:126 +#: assets/models/platform.py:96 assets/serializers/platform.py:131 msgid "Charset" msgstr "シャーセット" -#: assets/models/platform.py:98 assets/serializers/platform.py:154 +#: assets/models/platform.py:98 assets/serializers/platform.py:159 msgid "Domain enabled" msgstr "ドメインを有効にする" -#: assets/models/platform.py:100 assets/serializers/platform.py:153 +#: assets/models/platform.py:100 assets/serializers/platform.py:158 msgid "Su enabled" msgstr "アカウントの切り替えを有効にする" -#: assets/models/platform.py:101 assets/serializers/platform.py:132 +#: assets/models/platform.py:101 assets/serializers/platform.py:137 msgid "Su method" msgstr "アカウントの切り替え方法" -#: assets/models/platform.py:102 assets/serializers/platform.py:135 +#: assets/models/platform.py:102 assets/serializers/platform.py:140 msgid "Custom fields" msgstr "カスタムフィールド" @@ -1793,7 +1911,7 @@ msgstr "" "プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ" "ラットフォーム" -#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 @@ -1926,19 +2044,19 @@ msgstr "値" msgid "Can't contains: /" msgstr "含まれない:/" -#: assets/serializers/platform.py:42 +#: assets/serializers/platform.py:43 msgid "Gather accounts enabled" msgstr "アカウント収集を有効にする" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:44 msgid "Gather accounts method" msgstr "アカウントの収集方法" -#: assets/serializers/platform.py:49 +#: assets/serializers/platform.py:50 msgid "Port from addr" msgstr "アドレスからのポート" -#: assets/serializers/platform.py:61 +#: assets/serializers/platform.py:62 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." @@ -1946,11 +2064,11 @@ msgstr "" "このプロトコルはプライマリであり、資産を追加するときに設定する必要がありま" "す。また、プライマリプロトコルは1つしかありません" -#: assets/serializers/platform.py:66 +#: assets/serializers/platform.py:67 msgid "This protocol is required, and it must be set when adding assets." msgstr "このプロトコルは必須であり、資産を追加するときに設定する必要があります" -#: assets/serializers/platform.py:69 +#: assets/serializers/platform.py:70 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." @@ -1958,32 +2076,32 @@ msgstr "" "このプロトコルはデフォルトです。資産を追加するときに、デフォルトで表示されま" "す" -#: assets/serializers/platform.py:72 +#: assets/serializers/platform.py:73 msgid "This protocol is public, asset will show this protocol to user" msgstr "" "このプロトコルは公開されており、資産はこのプロトコルをユーザーに表示します" -#: assets/serializers/platform.py:114 +#: assets/serializers/platform.py:115 msgid "Help text" msgstr "ヘルプ" -#: assets/serializers/platform.py:115 +#: assets/serializers/platform.py:116 msgid "Choices" msgstr "せんたく" -#: assets/serializers/platform.py:130 +#: assets/serializers/platform.py:135 msgid "Automation" msgstr "オートメーション" -#: assets/serializers/platform.py:155 +#: assets/serializers/platform.py:160 msgid "Default Domain" msgstr "デフォルト ドメイン" -#: assets/serializers/platform.py:176 +#: assets/serializers/platform.py:181 msgid "type is required" msgstr "タイプ このフィールドは必須です." -#: assets/serializers/platform.py:199 +#: assets/serializers/platform.py:204 msgid "Protocols is required" msgstr "同意が必要です" @@ -2077,7 +2195,7 @@ msgstr "Rmdir" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 -#: perms/const.py:17 rbac/tree.py:234 +#: perms/const.py:17 rbac/tree.py:235 msgid "Delete" msgstr "削除" @@ -2093,7 +2211,8 @@ msgstr "名前の変更" msgid "Symlink" msgstr "Symlink" -#: audits/const.py:18 perms/const.py:14 +#: audits/const.py:18 audits/const.py:28 perms/const.py:14 +#: terminal/api/session/session.py:141 msgid "Download" msgstr "ダウンロード" @@ -2101,7 +2220,7 @@ msgstr "ダウンロード" msgid "Rename dir" msgstr "マップディレクトリ" -#: audits/const.py:23 rbac/tree.py:232 +#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "View" @@ -2109,48 +2228,48 @@ msgstr "表示" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 -#: rbac/tree.py:231 +#: rbac/tree.py:232 msgid "Create" msgstr "作成" -#: audits/const.py:28 perms/const.py:12 +#: audits/const.py:29 perms/const.py:12 msgid "Connect" msgstr "接続" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 -#: templates/_header_bar.html:89 +#: audits/const.py:30 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 +#: templates/_header_bar.html:95 msgid "Login" msgstr "ログイン" -#: audits/const.py:30 ops/const.py:9 +#: audits/const.py:31 ops/const.py:9 msgid "Change password" msgstr "パスワードを変更する" -#: audits/const.py:35 settings/serializers/terminal.py:6 +#: audits/const.py:36 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "ターミナル" -#: audits/const.py:40 audits/models.py:127 +#: audits/const.py:41 audits/models.py:128 msgid "Operate log" msgstr "ログの操作" -#: audits/const.py:41 +#: audits/const.py:42 msgid "Session log" msgstr "セッションログ" -#: audits/const.py:42 +#: audits/const.py:43 msgid "Login log" msgstr "ログインログ" -#: audits/const.py:43 terminal/models/applet/host.py:143 +#: audits/const.py:44 terminal/models/applet/host.py:143 #: terminal/models/component/task.py:22 msgid "Task" msgstr "タスク" -#: audits/const.py:49 +#: audits/const.py:50 msgid "-" msgstr "-" @@ -2162,120 +2281,141 @@ msgstr "是" msgid "No" msgstr "否" -#: audits/models.py:42 +#: audits/models.py:43 msgid "Job audit log" msgstr "ジョブ監査ログ" -#: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: audits/models.py:52 audits/models.py:96 audits/models.py:167 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "リモートaddr" -#: audits/models.py:56 audits/serializers.py:34 +#: audits/models.py:57 audits/serializers.py:35 msgid "Operate" msgstr "操作" -#: audits/models.py:58 +#: audits/models.py:59 msgid "Filename" msgstr "ファイル名" -#: audits/models.py:61 common/serializers/common.py:98 +#: audits/models.py:62 common/serializers/common.py:98 msgid "File" msgstr "書類" -#: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: audits/models.py:63 terminal/backends/command/models.py:21 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 msgid "Session" msgstr "セッション" -#: audits/models.py:65 +#: audits/models.py:66 msgid "File transfer log" msgstr "ファイル転送ログ" -#: audits/models.py:89 audits/serializers.py:85 +#: audits/models.py:90 audits/serializers.py:86 msgid "Resource Type" msgstr "リソースタイプ" -#: audits/models.py:90 audits/models.py:93 audits/models.py:139 -#: audits/serializers.py:84 +#: audits/models.py:91 audits/models.py:94 audits/models.py:140 +#: audits/serializers.py:85 msgid "Resource" msgstr "リソース" -#: audits/models.py:96 audits/models.py:142 audits/models.py:168 +#: audits/models.py:97 audits/models.py:143 audits/models.py:169 #: terminal/serializers/command.py:75 msgid "Datetime" msgstr "時間" -#: audits/models.py:135 +#: audits/models.py:136 msgid "Activity type" msgstr "活動の種類" -#: audits/models.py:145 +#: audits/models.py:146 msgid "Detail" msgstr "詳細" -#: audits/models.py:148 +#: audits/models.py:149 msgid "Detail ID" msgstr "詳細 ID" -#: audits/models.py:152 +#: audits/models.py:153 msgid "Activity log" msgstr "活動記録" -#: audits/models.py:164 +#: audits/models.py:165 msgid "Change by" msgstr "による変更" -#: audits/models.py:174 +#: audits/models.py:175 msgid "Password change log" msgstr "パスワード変更ログ" -#: audits/models.py:181 +#: audits/models.py:182 audits/models.py:257 msgid "Login type" msgstr "ログインタイプ" -#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10 +#: audits/models.py:184 audits/models.py:253 +#: tickets/models/ticket/login_confirm.py:10 msgid "Login IP" msgstr "ログインIP" -#: audits/models.py:185 +#: audits/models.py:186 audits/models.py:255 #: authentication/templates/authentication/_msg_different_city.html:11 #: tickets/models/ticket/login_confirm.py:11 msgid "Login city" msgstr "ログイン都市" -#: audits/models.py:188 audits/serializers.py:64 +#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65 msgid "User agent" msgstr "ユーザーエージェント" -#: audits/models.py:191 audits/serializers.py:48 +#: audits/models.py:192 audits/serializers.py:49 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:65 users/models/user.py:810 -#: users/serializers/profile.py:126 +#: users/forms/profile.py:65 users/models/user.py:821 +#: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" -#: audits/models.py:201 +#: audits/models.py:202 msgid "Date login" msgstr "日付ログイン" -#: audits/models.py:203 audits/serializers.py:66 +#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67 +#: audits/serializers.py:183 msgid "Authentication backend" msgstr "認証バックエンド" -#: audits/models.py:247 +#: audits/models.py:248 msgid "User login log" msgstr "ユーザーログインログ" -#: audits/serializers.py:65 +#: audits/models.py:254 +msgid "Session key" +msgstr "セッションID" + +#: audits/models.py:260 authentication/models/connection_token.py:47 +#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 +#: tickets/models/ticket/apply_application.py:31 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839 +msgid "Date expired" +msgstr "期限切れの日付" + +#: audits/models.py:278 +msgid "User session" +msgstr "ユーザーセッション" + +#: audits/models.py:280 +msgid "Offline ussr session" +msgstr "ユーザー・セッションの下限" + +#: audits/serializers.py:66 msgid "Reason display" msgstr "理由表示" -#: audits/serializers.py:133 +#: audits/serializers.py:134 #, python-format msgid "User %s %s this resource" msgstr "ユーザー %s %s が現在のリソースをサブスクライブしました。" @@ -2295,46 +2435,51 @@ msgstr "ユーザー %s はシステム %s にログインしています" msgid "User %s perform a task for this resource: %s" msgstr "ユーザー %s が現在のリソースでタスク (%s) を実行しました" -#: audits/signal_handlers/login_log.py:27 +#: audits/signal_handlers/login_log.py:34 msgid "SSH Key" msgstr "SSHキー" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 +#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" -#: audits/signal_handlers/login_log.py:30 +#: audits/signal_handlers/login_log.py:37 msgid "Auth Token" msgstr "認証トークン" -#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 -#: users/models/user.py:740 users/models/user.py:848 +#: users/models/user.py:751 users/models/user.py:856 msgid "WeCom" msgstr "企業微信" -#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:13 users/models/user.py:742 -#: users/models/user.py:850 +#: settings/serializers/auth/feishu.py:13 users/models/user.py:753 +#: users/models/user.py:858 msgid "FeiShu" msgstr "本を飛ばす" -#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 -#: users/models/user.py:849 +#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752 +#: users/models/user.py:857 msgid "DingTalk" msgstr "DingTalk" -#: audits/signal_handlers/login_log.py:34 +#: audits/signal_handlers/login_log.py:41 #: authentication/models/temp_token.py:16 msgid "Temporary token" msgstr "仮パスワード" -#: audits/tasks.py:101 +#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95 +#: settings/serializers/auth/passkey.py:8 +msgid "Passkey" +msgstr "" + +#: audits/tasks.py:101 users/signal_handlers.py:166 msgid "Clean audits session task log" msgstr "監査セッション タスク ログのクリーンアップ" @@ -2346,37 +2491,37 @@ msgstr "外部ストレージへのFTPファイルのアップロード" msgid "This action require verify your MFA" msgstr "この操作には、MFAを検証する必要があります" -#: authentication/api/connection_token.py:258 +#: authentication/api/connection_token.py:260 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "" "再使用可能な接続トークンの使用は許可されていません。グローバル設定は有効に" "なっていません" -#: authentication/api/connection_token.py:338 +#: authentication/api/connection_token.py:351 msgid "Anonymous account is not supported for this asset" msgstr "匿名アカウントはこのプロパティではサポートされていません" -#: authentication/api/connection_token.py:357 +#: authentication/api/connection_token.py:370 msgid "Account not found" msgstr "アカウントが見つかりません" -#: authentication/api/connection_token.py:360 +#: authentication/api/connection_token.py:373 msgid "Permission expired" msgstr "承認の有効期限が切れています" -#: authentication/api/connection_token.py:374 +#: authentication/api/connection_token.py:387 msgid "ACL action is reject: {}({})" msgstr "ACL アクションは拒否です: {}({})" -#: authentication/api/connection_token.py:378 +#: authentication/api/connection_token.py:391 msgid "ACL action is review" msgstr "ACL アクションはレビューです" -#: authentication/api/mfa.py:57 +#: authentication/api/mfa.py:59 msgid "Current user not support mfa type: {}" msgstr "現在のユーザーはmfaタイプをサポートしていません: {}" -#: authentication/api/password.py:32 terminal/api/session/session.py:259 +#: authentication/api/password.py:32 terminal/api/session/session.py:300 #: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "ユーザーが存在しない: {}" @@ -2394,7 +2539,7 @@ msgstr "" "さい。" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -2464,6 +2609,26 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "無効なトークンまたはキャッシュの更新。" +#: authentication/backends/passkey/api.py:52 +msgid "Auth failed" +msgstr "認証に失敗しました" + +#: authentication/backends/passkey/fido.py:148 +msgid "This key is not registered" +msgstr "このキーは登録されていません" + +#: authentication/backends/passkey/models.py:13 +msgid "Added on" +msgstr "に追加" + +#: authentication/backends/passkey/models.py:14 +msgid "Date last used" +msgstr "最後に使用した日付" + +#: authentication/backends/passkey/models.py:15 +msgid "Credential ID" +msgstr "資格情報ID" + #: authentication/confirm/password.py:16 msgid "Authentication failed password incorrect" msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません)" @@ -2783,13 +2948,6 @@ msgstr "アセット名" msgid "Reusable" msgstr "再利用可能" -#: authentication/models/connection_token.py:47 -#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 -#: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831 -msgid "Date expired" -msgstr "期限切れの日付" - #: authentication/models/connection_token.py:51 #: perms/models/asset_permission.py:77 msgid "From ticket" @@ -2889,7 +3047,7 @@ msgstr "アクション" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:38 perms/serializers/permission.py:57 -#: users/serializers/user.py:96 users/serializers/user.py:173 +#: users/serializers/user.py:97 users/serializers/user.py:174 msgid "Is expired" msgstr "期限切れです" @@ -2897,7 +3055,7 @@ msgstr "期限切れです" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:57 users/forms/profile.py:102 -#: users/forms/profile.py:109 users/models/user.py:789 +#: users/forms/profile.py:109 users/models/user.py:800 #: users/templates/users/forgot_password.html:117 #: users/views/profile/reset.py:73 msgid "Email" @@ -2909,8 +3067,8 @@ msgid "The {} cannot be empty" msgstr "{} 空にしてはならない" #: authentication/serializers/token.py:79 perms/serializers/permission.py:37 -#: perms/serializers/permission.py:58 users/serializers/user.py:97 -#: users/serializers/user.py:170 +#: perms/serializers/permission.py:58 users/serializers/user.py:98 +#: users/serializers/user.py:171 msgid "Is valid" msgstr "有効です" @@ -2935,13 +3093,13 @@ msgid "Show" msgstr "表示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:635 users/serializers/profile.py:116 +#: users/models/user.py:646 users/serializers/profile.py:92 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "無効化" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:636 users/serializers/profile.py:117 +#: users/models/user.py:647 users/serializers/profile.py:93 #: users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" @@ -2986,7 +3144,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:444 +#: jumpserver/conf.py:447 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3044,7 +3202,7 @@ msgid "request new one" msgstr "新しいものを要求する" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3098,7 +3256,19 @@ msgstr "" msgid "Cancel" msgstr "キャンセル" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:237 +msgid "" +"Configuration file has problems and cannot be logged in. Please contact the " +"administrator or view latest docs" +msgstr "" +"設定ファイルに問題があり、ログインできません。管理者に連絡するか、最新のド" +"キュメントを参照してください。" + +#: authentication/templates/authentication/login.html:238 +msgid "If you are administrator, you can update the config resolve it, set" +msgstr "管理者の場合は、configを更新して解決することができます。" + +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "その他のログインオプション" @@ -3134,6 +3304,18 @@ msgstr "返品" msgid "Copy success" msgstr "コピー成功" +#: authentication/templates/authentication/passkey.html:162 +msgid "" +"This page is not served over HTTPS. Please use HTTPS to ensure security of " +"your credentials." +msgstr "" +"このページはHTTPSで提供されていません。HTTPSを使用して、資格情報のセキュリ" +"ティを確保してください。" + +#: authentication/templates/authentication/passkey.html:173 +msgid "Do you want to retry ?" +msgstr "再試行しますか？" + #: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24 #: xpack/plugins/cloud/const.py:29 msgid "LAN" @@ -3210,23 +3392,23 @@ msgstr "本を飛ばすのバインドに成功" msgid "Failed to get user from FeiShu" msgstr "本を飛ばすからユーザーを取得できませんでした" -#: authentication/views/login.py:183 +#: authentication/views/login.py:210 msgid "Redirecting" msgstr "リダイレクト" -#: authentication/views/login.py:184 +#: authentication/views/login.py:211 msgid "Redirecting to {} authentication" msgstr "{} 認証へのリダイレクト" -#: authentication/views/login.py:207 +#: authentication/views/login.py:234 msgid "Login timeout, please try again." msgstr "ログインタイムアウト、もう一度お試しください" -#: authentication/views/login.py:250 +#: authentication/views/login.py:277 msgid "User email already exists ({})" msgstr "ユーザー メールボックスは既に存在します ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:361 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3234,15 +3416,15 @@ msgstr "" "{} 確認を待ちます。彼女/彼へのリンクをコピーすることもできます
\n" " このページを閉じないでください" -#: authentication/views/login.py:333 +#: authentication/views/login.py:366 msgid "No ticket found" msgstr "チケットが見つかりません" -#: authentication/views/login.py:369 +#: authentication/views/login.py:402 msgid "Logout success" msgstr "ログアウト成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:403 msgid "Logout success, return login page" msgstr "ログアウト成功、ログインページを返す" @@ -3295,7 +3477,7 @@ msgstr "の準備を" msgid "Pending" msgstr "未定" -#: common/const/choices.py:17 ops/const.py:58 +#: common/const/choices.py:17 ops/const.py:59 msgid "Running" msgstr "ランニング" @@ -3379,7 +3561,7 @@ msgstr "は破棄されます" msgid "discard time" msgstr "時間を捨てる" -#: common/db/models.py:33 users/models/user.py:834 +#: common/db/models.py:33 users/models/user.py:842 msgid "Updated by" msgstr "によって更新" @@ -3510,7 +3692,7 @@ msgstr "{} 秒待ってから送信してください" #: common/serializers/common.py:90 msgid "Children" -msgstr "" +msgstr "ノード" #: common/serializers/fields.py:105 #, python-brace-format @@ -3563,29 +3745,11 @@ msgstr "特殊文字を含むべきではない" msgid "The mobile phone number format is incorrect" msgstr "携帯電話番号の形式が正しくありません" -#: common/views/mixins.py:74 -msgid "Export all" -msgstr "すべてエクスポート" - -#: common/views/mixins.py:76 -msgid "Export only selected items" -msgstr "選択項目のみエクスポート" - -#: common/views/mixins.py:81 -#, python-format -msgid "Export filtered: %s" -msgstr "検索のエクスポート: %s" - -#: common/views/mixins.py:90 -#, python-format -msgid "User %s view/export secret" -msgstr "ユーザー %s がパスワードを閲覧/導き出しました" - -#: jumpserver/conf.py:443 +#: jumpserver/conf.py:446 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:445 +#: jumpserver/conf.py:448 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -3657,23 +3821,23 @@ msgstr "投稿サイトニュース" msgid "No account available" msgstr "利用可能なアカウントがありません" -#: ops/ansible/inventory.py:260 +#: ops/ansible/inventory.py:263 msgid "Ansible disabled" msgstr "Ansible 無効" -#: ops/ansible/inventory.py:276 +#: ops/ansible/inventory.py:279 msgid "Skip hosts below:" msgstr "次のホストをスキップします: " -#: ops/api/celery.py:62 ops/api/celery.py:77 +#: ops/api/celery.py:64 ops/api/celery.py:79 msgid "Waiting task start" msgstr "タスク開始待ち" -#: ops/api/celery.py:138 +#: ops/api/celery.py:162 msgid "Task {} not found" msgstr "タスクは存在しません" -#: ops/api/celery.py:143 +#: ops/api/celery.py:167 msgid "Task {} args or kwargs error" msgstr "タスク実行パラメータエラー" @@ -3757,7 +3921,11 @@ msgstr "PostgreSQL" msgid "SQLServer" msgstr "SQLServer" -#: ops/const.py:60 +#: ops/const.py:55 +msgid "Raw" +msgstr "" + +#: ops/const.py:61 msgid "Timeout" msgstr "タイムアウト" @@ -3805,7 +3973,7 @@ msgstr "アルグ" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "作成者" @@ -3846,7 +4014,7 @@ msgstr "タスクモニターを表示できます" msgid "Kwargs" msgstr "クワーグ" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "終了" @@ -4034,7 +4202,7 @@ msgstr "" msgid "The organization have resource ({}) cannot be deleted" msgstr "組織のリソース ({}) は削除できません" -#: orgs/apps.py:7 rbac/tree.py:122 +#: orgs/apps.py:7 rbac/tree.py:123 msgid "App organizations" msgstr "アプリ組織" @@ -4063,7 +4231,7 @@ msgstr "デフォルト組織" msgid "SYSTEM" msgstr "システム組織" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41 msgid "Builtin" msgstr "ビルトイン" @@ -4077,7 +4245,7 @@ msgstr "参加しているすべての組織を表示できます" #: orgs/models.py:233 msgid "Can not delete virtual org" -msgstr "" +msgstr "仮想組織を削除できませんでした" #: orgs/tasks.py:9 msgid "Refresh organization cache" @@ -4199,27 +4367,27 @@ msgstr "{} 少なくとも1つのシステムロール" msgid "RBAC" msgstr "RBAC" -#: rbac/builtin.py:114 +#: rbac/builtin.py:115 msgid "SystemAdmin" msgstr "システム管理者" -#: rbac/builtin.py:117 +#: rbac/builtin.py:118 msgid "SystemAuditor" msgstr "システム監査人" -#: rbac/builtin.py:120 +#: rbac/builtin.py:121 msgid "SystemComponent" msgstr "システムコンポーネント" -#: rbac/builtin.py:126 +#: rbac/builtin.py:127 msgid "OrgAdmin" msgstr "組織管理者" -#: rbac/builtin.py:129 +#: rbac/builtin.py:130 msgid "OrgAuditor" msgstr "監査員を組織する" -#: rbac/builtin.py:132 +#: rbac/builtin.py:133 msgid "OrgUser" msgstr "組織ユーザー" @@ -4257,7 +4425,7 @@ msgid "Scope" msgstr "スコープ" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:797 +#: users/models/user.py:808 msgid "Role" msgstr "ロール" @@ -4292,7 +4460,7 @@ msgstr "組織の役割バインディング" msgid "System role binding" msgstr "システムロールバインディング" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:132 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 msgid "Perms" msgstr "パーマ" @@ -4300,7 +4468,7 @@ msgstr "パーマ" msgid "Users amount" msgstr "ユーザー数" -#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33 +#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34 msgid "Display name" msgstr "表示名" @@ -4360,26 +4528,26 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:52 +#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "リモートアプリケーション" -#: rbac/tree.py:123 +#: rbac/tree.py:124 msgid "Ticket comment" msgstr "チケットコメント" -#: rbac/tree.py:124 settings/serializers/feature.py:58 +#: rbac/tree.py:125 settings/serializers/feature.py:58 #: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "チケット" -#: rbac/tree.py:125 +#: rbac/tree.py:126 msgid "Common setting" msgstr "共通設定" -#: rbac/tree.py:126 +#: rbac/tree.py:127 msgid "View permission tree" msgstr "権限ツリーの表示" @@ -4424,7 +4592,7 @@ msgstr "携帯番号をテストこのフィールドは必須です" msgid "Settings" msgstr "設定" -#: settings/models.py:35 +#: settings/models.py:35 users/models/preference.py:14 msgid "Encrypted" msgstr "暗号化された" @@ -4512,11 +4680,15 @@ msgstr "企業微信 認証" msgid "SSO Auth" msgstr "SSO Token 認証" -#: settings/serializers/auth/base.py:24 +#: settings/serializers/auth/base.py:22 +msgid "Passkey Auth" +msgstr "Passkey 認証" + +#: settings/serializers/auth/base.py:25 msgid "Forgot password url" msgstr "パスワードのURLを忘れた" -#: settings/serializers/auth/base.py:30 +#: settings/serializers/auth/base.py:28 msgid "Enable login redirect msg" msgstr "ログインリダイレクトの有効化msg" @@ -4753,6 +4925,31 @@ msgstr "使用状態" msgid "Use nonce" msgstr "Nonceを使用" +#: settings/serializers/auth/passkey.py:11 +msgid "Enable passkey Auth" +msgstr "パスキー認証を有効にする" + +#: settings/serializers/auth/passkey.py:12 +msgid "Only SSL domain can use passkey auth" +msgstr "SSLドメインのみがパスキー認証を使用できます" + +#: settings/serializers/auth/passkey.py:15 +msgid "FIDO server ID" +msgstr "FIDOサーバーID" + +#: settings/serializers/auth/passkey.py:17 +msgid "" +"The hostname can using passkey auth, If not set, will use request host and " +"the request host in DOMAINS, If multiple domains, use comma to separate" +msgstr "" +"パスキー認証を使用できるホスト名、設定されていない場合は、リクエストホストと" +"DOMAINSのリクエストホストを使用します。複数のドメインの場合は、カンマで区切り" +"ます" + +#: settings/serializers/auth/passkey.py:22 +msgid "FIDO server name" +msgstr "FIDOサーバー名" + #: settings/serializers/auth/radius.py:13 msgid "Radius" msgstr "Radius" @@ -4899,41 +5096,43 @@ msgstr "企業微信認証の有効化" msgid "Site url" msgstr "サイトURL" -#: settings/serializers/basic.py:10 +#: settings/serializers/basic.py:11 msgid "" -"Email links or other system callbacks are used to access it, eg: http://dev." -"jumpserver.org:8080" +"External URL, email links or other system callbacks are used to access it, " +"eg: http://dev.jumpserver.org:8080" msgstr "" +"外部URL、メールリンクまたは他のシステムコールバックにアクセスするには、" +"http://dev.jumpserver.org:8080などを使用します" -#: settings/serializers/basic.py:13 +#: settings/serializers/basic.py:16 msgid "User guide url" msgstr "ユーザーガイドurl" -#: settings/serializers/basic.py:14 +#: settings/serializers/basic.py:17 msgid "User first login update profile done redirect to it" msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました" -#: settings/serializers/basic.py:17 +#: settings/serializers/basic.py:20 msgid "Global organization name" msgstr "グローバル組織名" -#: settings/serializers/basic.py:18 +#: settings/serializers/basic.py:21 msgid "The name of global organization to display" msgstr "表示するグローバル組織の名前" -#: settings/serializers/basic.py:21 +#: settings/serializers/basic.py:24 msgid "Help Docs URL" msgstr "ドキュメントリンク" -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:25 msgid "default: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org" -#: settings/serializers/basic.py:25 +#: settings/serializers/basic.py:28 msgid "Help Support URL" msgstr "サポートリンク" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:29 msgid "default: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/" @@ -5157,11 +5356,11 @@ msgstr "" "ノードが表示されないようにしますが、そのノードが許可されていないという質問に" "質問" -#: settings/serializers/security.py:16 +#: settings/serializers/security.py:17 msgid "User password expiration (day)" msgstr "ユーザーパスワードの有効期限（天）" -#: settings/serializers/security.py:18 +#: settings/serializers/security.py:19 msgid "" "If the user does not update the password during the time, the user password " "will expire failure;The password expiration reminder mail will be automatic " @@ -5172,11 +5371,11 @@ msgstr "" "ドの有効期限が切れるリマインダーメールがシステムからユーザーに自動的に送信さ" "れます。" -#: settings/serializers/security.py:25 +#: settings/serializers/security.py:26 msgid "Number of repeated historical passwords" msgstr "繰り返された履歴パスワードの数" -#: settings/serializers/security.py:27 +#: settings/serializers/security.py:28 msgid "" "Tip: When the user resets the password, it cannot be the previous n " "historical passwords of the user" @@ -5184,31 +5383,31 @@ msgstr "" "ヒント: ユーザーがパスワードをリセットすると、ユーザーの前のnの履歴パスワード" "にすることはできません" -#: settings/serializers/security.py:33 +#: settings/serializers/security.py:34 msgid "Password minimum length" msgstr "パスワードの最小長" -#: settings/serializers/security.py:37 +#: settings/serializers/security.py:38 msgid "Admin user password minimum length" msgstr "管理者ユーザーパスワードの最小長" -#: settings/serializers/security.py:40 +#: settings/serializers/security.py:41 msgid "Must contain capital" msgstr "資本を含める必要があります" -#: settings/serializers/security.py:43 +#: settings/serializers/security.py:44 msgid "Must contain lowercase" msgstr "小文字を含める必要があります。" -#: settings/serializers/security.py:46 +#: settings/serializers/security.py:47 msgid "Must contain numeric" msgstr "数値を含める必要があります" -#: settings/serializers/security.py:49 +#: settings/serializers/security.py:50 msgid "Must contain special" msgstr "特別な" -#: settings/serializers/security.py:54 +#: settings/serializers/security.py:55 msgid "" "If the user has failed to log in for a limited number of times, no login is " "allowed during this time interval." @@ -5216,35 +5415,35 @@ msgstr "" "ユーザーが限られた回数だけログインできなかった場合、この時間間隔ではログイン" "はできません。" -#: settings/serializers/security.py:62 +#: settings/serializers/security.py:63 msgid "Limit the number of user login failures" msgstr "ユーザーログインの失敗数を制限する" -#: settings/serializers/security.py:66 +#: settings/serializers/security.py:67 msgid "Block user login interval (minute)" msgstr "ユーザーのログイン間隔をブロックする（分）" -#: settings/serializers/security.py:72 +#: settings/serializers/security.py:73 msgid "Limit the number of IP login failures" msgstr "IPログイン失敗の数を制限する" -#: settings/serializers/security.py:76 +#: settings/serializers/security.py:77 msgid "Block IP login interval (minute)" msgstr "IPログイン間隔をブロックする（分）" -#: settings/serializers/security.py:80 +#: settings/serializers/security.py:81 msgid "Login IP White List" msgstr "ログインIPホワイトリスト" -#: settings/serializers/security.py:85 +#: settings/serializers/security.py:86 msgid "Login IP Black List" msgstr "ログインIPブラックリスト" -#: settings/serializers/security.py:90 +#: settings/serializers/security.py:91 msgid "Only single device login" msgstr "単一デバイスログインのみ" -#: settings/serializers/security.py:91 +#: settings/serializers/security.py:92 msgid "" "After the user logs in on the new device, other logged-in devices will " "automatically log out" @@ -5252,11 +5451,11 @@ msgstr "" "ユーザーが新しいデバイスにログインすると、ログインしている他のデバイスは自動" "的にログアウトします。" -#: settings/serializers/security.py:94 +#: settings/serializers/security.py:95 msgid "Only exist user login" msgstr "ユーザーログインのみ存在" -#: settings/serializers/security.py:96 +#: settings/serializers/security.py:97 msgid "" "If enabled, non-existent users will not be allowed to log in; if disabled, " "users of other authentication methods except local authentication methods " @@ -5267,11 +5466,11 @@ msgstr "" "ローカル認証方法を除く他の認証方法のユーザーはログインでき、ユーザーが自動的" "に作成されます (ユーザーが存在しない場合)。" -#: settings/serializers/security.py:102 +#: settings/serializers/security.py:103 msgid "Only from source login" msgstr "ソースログインからのみ" -#: settings/serializers/security.py:104 +#: settings/serializers/security.py:105 msgid "" "If it is enabled, the user will only authenticate to the source when logging " "in; if it is disabled, the user will authenticate all the enabled " @@ -5282,70 +5481,70 @@ msgstr "" "な場合、ユーザーはログイン時に、いずれかの認証方法が成功する限り、有効なすべ" "ての認証方法を特定の順序で認証します。 、直接ログインできます" -#: settings/serializers/security.py:115 +#: settings/serializers/security.py:116 msgid "Not enabled" msgstr "有効化されていません" -#: settings/serializers/security.py:116 +#: settings/serializers/security.py:117 msgid "All users" msgstr "すべてのユーザー" -#: settings/serializers/security.py:117 +#: settings/serializers/security.py:118 msgid "Only admin users" msgstr "管理者のみ" -#: settings/serializers/security.py:119 +#: settings/serializers/security.py:120 msgid "Global MFA auth" msgstr "グローバル有効化MFA認証" -#: settings/serializers/security.py:123 +#: settings/serializers/security.py:124 msgid "Third-party login users perform MFA authentication" msgstr "サードパーティのログインユーザーがMFA認証を実行" -#: settings/serializers/security.py:124 +#: settings/serializers/security.py:125 msgid "The third-party login modes include OIDC, CAS, and SAML2" msgstr "サードパーティのログインモードには、OIDC、CAS、SAML2" -#: settings/serializers/security.py:127 +#: settings/serializers/security.py:128 msgid "OTP issuer name" msgstr "OTP発行者名" -#: settings/serializers/security.py:131 +#: settings/serializers/security.py:132 msgid "OTP valid window" msgstr "OTP有効なウィンドウ" -#: settings/serializers/security.py:135 +#: settings/serializers/security.py:136 msgid "MFA verify TTL" msgstr "MFAはTTLを確認します（秒）" -#: settings/serializers/security.py:137 +#: settings/serializers/security.py:138 msgid "" "Unit: second, The verification MFA takes effect only when you view the " "account password" msgstr "検証MFAはアカウントのパスワードを表示したときにのみ有効になります。" -#: settings/serializers/security.py:142 +#: settings/serializers/security.py:143 msgid "MFA in login page" msgstr "ログインページのMFA" -#: settings/serializers/security.py:143 +#: settings/serializers/security.py:144 msgid "Eu security regulations(GDPR) require MFA to be on the login page" msgstr "" "Euセキュリティ規制 (GDPR) では、MFAがログインページにある必要があります" -#: settings/serializers/security.py:147 +#: settings/serializers/security.py:148 msgid "Verify code TTL (second)" msgstr "認証コード有効時間" -#: settings/serializers/security.py:148 +#: settings/serializers/security.py:149 msgid "Reset password and send SMS code expiration time" msgstr "パスワードをリセットしてSMSコードの有効期限を送信します" -#: settings/serializers/security.py:152 +#: settings/serializers/security.py:153 msgid "Enable Login dynamic code" msgstr "ログイン動的コードの有効化" -#: settings/serializers/security.py:153 +#: settings/serializers/security.py:154 msgid "" "The password and additional code are sent to a third party authentication " "system for verification" @@ -5353,19 +5552,19 @@ msgstr "" "パスワードと追加コードは、検証のためにサードパーティの認証システムに送信され" "ます" -#: settings/serializers/security.py:157 +#: settings/serializers/security.py:158 msgid "Enable Login captcha" msgstr "ログインcaptchaの有効化" -#: settings/serializers/security.py:158 +#: settings/serializers/security.py:159 msgid "Enable captcha to prevent robot authentication" msgstr "Captchaを有効にしてロボット認証を防止する" -#: settings/serializers/security.py:161 +#: settings/serializers/security.py:162 msgid "Remote Login Protection" msgstr "リモートログイン保護" -#: settings/serializers/security.py:163 +#: settings/serializers/security.py:164 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5375,11 +5574,11 @@ msgstr "" "します。アカウントが共通のログイン都市からログインしている場合、システムはリ" "モートログインリマインダーを送信します" -#: settings/serializers/security.py:169 +#: settings/serializers/security.py:170 msgid "Unused user timeout (day)" msgstr "未使用のユーザータイムアウト（日）" -#: settings/serializers/security.py:170 +#: settings/serializers/security.py:171 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." @@ -5387,57 +5586,57 @@ msgstr "" "毎日、頻度の低いユーザーを検出し、予め決められた時間制限を超えた場合は無効に" "します。" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:191 msgid "Enable watermark" msgstr "透かしの有効化" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:192 msgid "Enabled, the web session and replay contains watermark information" msgstr "Webセッションとリプレイには透かし情報が含まれています。" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:196 msgid "Connection max idle time (minute)" msgstr "接続最大アイドル時間（分）" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:197 msgid "If idle time more than it, disconnect connection." msgstr "この設定以上の操作がない場合、接続は切断されます" -#: settings/serializers/security.py:200 +#: settings/serializers/security.py:201 msgid "Session max connection time (hour)" msgstr "セッション最大接続時間（時間）" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:202 msgid "If session connection time more than it, disconnect connection." msgstr "セッション接続時間がこれを超えると、接続が切断されます" -#: settings/serializers/security.py:204 +#: settings/serializers/security.py:205 msgid "Remember manual auth" msgstr "手動入力パスワードの保存" -#: settings/serializers/security.py:207 +#: settings/serializers/security.py:208 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "Session share" msgstr "セッション共有" -#: settings/serializers/security.py:208 +#: settings/serializers/security.py:209 msgid "Enabled, Allows user active session to be shared with other users" msgstr "" "ユーザーのアクティブなセッションを他のユーザーと共有できるようにします。" -#: settings/serializers/security.py:214 +#: settings/serializers/security.py:215 msgid "Insecure command alert" msgstr "安全でないコマンドアラート" -#: settings/serializers/security.py:217 +#: settings/serializers/security.py:218 msgid "Email recipient" msgstr "メール受信者" -#: settings/serializers/security.py:218 +#: settings/serializers/security.py:219 msgid "Multiple user using , split" msgstr "複数のユーザーを使用して、分割" -#: settings/serializers/settings.py:69 +#: settings/serializers/settings.py:70 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5498,17 +5697,6 @@ msgstr "Razor の有効化" msgid "Enable SSH Client" msgstr "SSH Clientの有効化" -#: settings/serializers/terminal.py:52 -msgid "Default graphics resolution" -msgstr "デフォルトのグラフィック解像度" - -#: settings/serializers/terminal.py:53 -msgid "" -"Tip: Default resolution to use when connecting graphical assets in Luna pages" -msgstr "" -"ヒント: Luna ページでグラフィック アセットを接続するときに使用するデフォルト" -"の解像度" - #: settings/tasks/ldap.py:24 msgid "Periodic import ldap user" msgstr "LDAP ユーザーを定期的にインポートする" @@ -5658,27 +5846,27 @@ msgstr "ヘルプ" msgid "Docs" msgstr "ドキュメント" -#: templates/_header_bar.html:25 +#: templates/_header_bar.html:27 msgid "Commercial support" msgstr "商用サポート" -#: templates/_header_bar.html:76 users/forms/profile.py:44 +#: templates/_header_bar.html:79 users/forms/profile.py:44 msgid "Profile" msgstr "プロフィール" -#: templates/_header_bar.html:79 +#: templates/_header_bar.html:83 msgid "Admin page" msgstr "ページの管理" -#: templates/_header_bar.html:81 +#: templates/_header_bar.html:86 msgid "User page" msgstr "ユーザーページ" -#: templates/_header_bar.html:84 +#: templates/_header_bar.html:90 msgid "API Key" msgstr "API Key" -#: templates/_header_bar.html:85 +#: templates/_header_bar.html:91 msgid "Logout" msgstr "ログアウト" @@ -5775,6 +5963,7 @@ msgid "Home page" msgstr "ホームページ" #: templates/resource_download.html:18 templates/resource_download.html:33 +#: users/const.py:48 msgid "Client" msgstr "クライアント" @@ -5864,15 +6053,20 @@ msgstr "テスト失敗: アカウントが無効" msgid "Have online sessions" msgstr "オンラインセッションを持つ" -#: terminal/api/session/session.py:251 +#: terminal/api/session/session.py:46 +#, python-format +msgid "User %s %s session %s replay" +msgstr "ユーザー%s %sこのセッション %s の録画です" + +#: terminal/api/session/session.py:292 msgid "Session does not exist: {}" msgstr "セッションが存在しません: {}" -#: terminal/api/session/session.py:254 +#: terminal/api/session/session.py:295 msgid "Session is finished or the protocol not supported" msgstr "セッションが終了したか、プロトコルがサポートされていません" -#: terminal/api/session/session.py:267 +#: terminal/api/session/session.py:308 msgid "User does not have permission" msgstr "ユーザーに権限がありません" @@ -5911,7 +6105,7 @@ msgstr "SFTP クライアント" #: terminal/connect_methods.py:33 msgid "DB Guide" -msgstr "" +msgstr "DB 接続ウィザード" #: terminal/connect_methods.py:34 msgid "DB Client" @@ -5956,7 +6150,7 @@ msgstr "一致しない" #: terminal/const.py:83 msgid "Tunnel" -msgstr "" +msgstr "ちかチャネル" #: terminal/const.py:85 msgid "SFTP" @@ -5990,51 +6184,51 @@ msgstr "一括作成非サポート" msgid "Storage is invalid" msgstr "ストレージが無効です" -#: terminal/models/applet/applet.py:29 -msgid "Community" +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +msgid "Community edition" msgstr "コミュニティ版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:31 msgid "Enterprise" msgstr "エンタープライズ版" -#: terminal/models/applet/applet.py:35 +#: terminal/models/applet/applet.py:36 msgid "Author" msgstr "著者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31 +#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31 msgid "Edition" msgstr "バージョン" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Can concurrent" msgstr "同時実行可能" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:44 msgid "Tags" msgstr "ラベル" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "ホスト" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:93 msgid "Applet pkg not valid, Missing file {}" msgstr "無効なアプレット パッケージ、ファイル {} がありません" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:112 msgid "Load platform.yml failed: {}" msgstr "platform.ymlのロードに失敗しました:{}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:115 msgid "Only support custom platform" msgstr "カスタムプラットフォームのみをサポート" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:120 msgid "Missing type in platform.yml" msgstr "platform.ymlにタイプがありません" -#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:137 msgid "Hosting" msgstr "ホスト マシン" @@ -6193,7 +6387,7 @@ msgstr "セッション再生をダウンロードできます" msgid "Account id" msgstr "アカウント ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "ログイン元" @@ -6229,61 +6423,61 @@ msgstr "セッションを終了できます" msgid "Can validate session action perm" msgstr "セッションアクションのパーマを検証できます" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "期限切れ時間 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "アクションパーミッション" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "ソース" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "セッション共有" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "スーパーセッション共有を追加できます" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "リンクがアクティブでない" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "リンク期限切れ" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "ユーザーはセッションに参加できません" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "ジョイナー" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "参加日" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "日付が残っています" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "セッション参加記録" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "検証コードが無効" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "すでにこのセッションに参加しています" @@ -6355,7 +6549,7 @@ msgstr "" "URL を入力します。
例: https://172.16.10.110 または https://dev." "jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "証明書の検証を無視する" @@ -6543,30 +6737,34 @@ msgid "Endpoint suffix" msgstr "エンドポイントサフィックス" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "アドレスには特殊文字「#」を含めることはできません" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "アドレス形式が正しくありません" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "ホスト無効" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "ポートが無効" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "日付による索引付け" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "現在の日付に基づいてインデックスを動的に作成するかどうか" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "インデックス" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "Docタイプ" @@ -6646,7 +6844,7 @@ msgstr "オープン" #: tickets/const.py:18 tickets/const.py:31 msgid "Reopen" -msgstr "" +msgstr "再オープン" #: tickets/const.py:19 tickets/const.py:32 msgid "Approved" @@ -6933,7 +7131,7 @@ msgid "Ticket information" msgstr "作業指示情報" #: tickets/templates/tickets/approve_check_password.html:29 -#: tickets/views/approve.py:39 +#: tickets/views/approve.py:40 msgid "Ticket approval" msgstr "作業指示の承認" @@ -6945,26 +7143,26 @@ msgstr "承認" msgid "Go Login" msgstr "ログイン" -#: tickets/views/approve.py:40 +#: tickets/views/approve.py:41 msgid "" "This ticket does not exist, the process has ended, or this link has expired" msgstr "" "このワークシートが存在しないか、ワークシートが終了したか、このリンクが無効に" "なっています" -#: tickets/views/approve.py:69 +#: tickets/views/approve.py:70 msgid "Click the button below to approve or reject" msgstr "下のボタンをクリックして同意または拒否。" -#: tickets/views/approve.py:71 +#: tickets/views/approve.py:72 msgid "After successful authentication, this ticket can be approved directly" msgstr "認証に成功した後、作業指示書は直接承認することができる。" -#: tickets/views/approve.py:93 +#: tickets/views/approve.py:97 msgid "Illegal approval action" msgstr "無効な承認アクション" -#: tickets/views/approve.py:106 +#: tickets/views/approve.py:110 msgid "This user is not authorized to approve this ticket" msgstr "このユーザーはこの作業指示を承認する権限がありません" @@ -7000,6 +7198,30 @@ msgstr "リセットリンクが生成され、ユーザーに送信されます msgid "Set password" msgstr "パスワードの設定" +#: users/const.py:23 +msgid "AUTO" +msgstr "自動" + +#: users/const.py:31 +msgid "Full screen" +msgstr "フルスクリーン" + +#: users/const.py:32 +msgid "Multi screen" +msgstr "マルチスクリーンディスプレイ" + +#: users/const.py:33 +msgid "Drives redirect" +msgstr "ディスクマウント" + +#: users/const.py:52 +msgid "Replace" +msgstr "置換" + +#: users/const.py:53 +msgid "Suffix" +msgstr "接尾辞を付ける" + #: users/exceptions.py:10 msgid "MFA not enabled" msgstr "MFAが有効化されていません" @@ -7078,83 +7300,87 @@ msgstr "ここにid_rsa.pubを貼り付けます。" msgid "Public key should not be the same as your old one." msgstr "公開鍵は古いものと同じであってはなりません。" -#: users/forms/profile.py:162 users/serializers/profile.py:100 -#: users/serializers/profile.py:183 users/serializers/profile.py:210 +#: users/forms/profile.py:162 users/serializers/profile.py:76 +#: users/serializers/profile.py:159 users/serializers/profile.py:186 msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" -#: users/forms/profile.py:173 users/models/user.py:820 +#: users/forms/profile.py:173 users/models/user.py:831 #: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "公開キー" -#: users/models/user.py:637 users/serializers/profile.py:118 +#: users/models/preference.py:38 +msgid "Preference" +msgstr "ユーザー設定" + +#: users/models/user.py:648 users/serializers/profile.py:94 msgid "Force enable" msgstr "強制有効" -#: users/models/user.py:799 users/serializers/user.py:171 +#: users/models/user.py:810 users/serializers/user.py:172 msgid "Is service account" msgstr "サービスアカウントです" -#: users/models/user.py:801 +#: users/models/user.py:812 msgid "Avatar" msgstr "アバター" -#: users/models/user.py:804 +#: users/models/user.py:815 msgid "Wechat" msgstr "微信" -#: users/models/user.py:807 users/serializers/user.py:108 +#: users/models/user.py:818 users/serializers/user.py:109 msgid "Phone" msgstr "電話" -#: users/models/user.py:813 +#: users/models/user.py:824 msgid "OTP secret key" msgstr "OTP 秘密" -#: users/models/user.py:817 +#: users/models/user.py:828 #: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh秘密鍵" -#: users/models/user.py:823 -msgid "Secret key" -msgstr "秘密キー" - -#: users/models/user.py:828 users/serializers/profile.py:149 -#: users/serializers/user.py:168 +#: users/models/user.py:836 users/serializers/profile.py:125 +#: users/serializers/user.py:169 msgid "Is first login" msgstr "最初のログインです" -#: users/models/user.py:842 +#: users/models/user.py:850 msgid "Date password last updated" msgstr "最終更新日パスワード" -#: users/models/user.py:845 +#: users/models/user.py:853 msgid "Need update password" msgstr "更新パスワードが必要" -#: users/models/user.py:988 +#: users/models/user.py:977 +msgid "Can not delete admin user" +msgstr "管理者ユーザーを削除できませんでした" + +#: users/models/user.py:1003 msgid "Can invite user" msgstr "ユーザーを招待できます" -#: users/models/user.py:989 +#: users/models/user.py:1004 msgid "Can remove user" msgstr "ユーザーを削除できます" -#: users/models/user.py:990 +#: users/models/user.py:1005 msgid "Can match user" msgstr "ユーザーに一致できます" -#: users/models/user.py:999 +#: users/models/user.py:1014 msgid "Administrator" msgstr "管理者" -#: users/models/user.py:1002 +#: users/models/user.py:1017 msgid "Administrator is the super user of system" msgstr "管理者はシステムのスーパーユーザーです" -#: users/models/user.py:1027 +#: users/models/user.py:1042 msgid "User password history" msgstr "ユーザーパスワード履歴" @@ -7189,11 +7415,67 @@ msgstr "SSHキーのリセット" msgid "Reset MFA" msgstr "MFAのリセット" +#: users/serializers/preference/koko.py:10 +msgid "File name conflict resolution" +msgstr "ファイル名競合ソリューション" + +#: users/serializers/preference/lina.py:11 +msgid "New file encryption password" +msgstr "新しいファイルの暗号化パスワード" + +#: users/serializers/preference/lina.py:16 +msgid "Confirm file encryption password" +msgstr "ファイルの暗号化パスワードを確認する" + +#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48 +msgid "The newly set password is inconsistent" +msgstr "新しく設定されたパスワードが一致しない" + +#: users/serializers/preference/luna.py:23 +msgid "Async loading of asset tree" +msgstr "非同期ロード資産ツリー" + +#: users/serializers/preference/luna.py:30 +msgid "RDP resolution" +msgstr "RDP 解像度" + +#: users/serializers/preference/luna.py:34 +msgid "Keyboard layout" +msgstr "キーボードレイアウト" + +#: users/serializers/preference/luna.py:38 +msgid "RDP client option" +msgstr "RDPクライアントオプション" + +#: users/serializers/preference/luna.py:42 +msgid "Remote application connection method" +msgstr "リモートアプリケーション接続方式" + +#: users/serializers/preference/luna.py:49 +msgid "Character terminal font size" +msgstr "文字終端フォントサイズ" + +#: users/serializers/preference/luna.py:52 +msgid "Backspace as Ctrl+H" +msgstr "文字終端Backspace As Ctrl+H" + +#: users/serializers/preference/luna.py:55 +msgid "Right click quickly paste" +msgstr "右クリックでクイック貼り付け" + +#: users/serializers/preference/luna.py:61 +msgid "Graphics" +msgstr "図形化" + +#: users/serializers/preference/luna.py:62 +msgid "Command line" +msgstr "コマンドライン" + #: users/serializers/profile.py:29 msgid "The old password is incorrect" msgstr "古いパスワードが正しくありません" -#: users/serializers/profile.py:36 users/serializers/profile.py:197 +#: users/serializers/profile.py:36 users/serializers/profile.py:173 msgid "Password does not match security rules" msgstr "パスワードがセキュリティルールと一致しない" @@ -7201,10 +7483,6 @@ msgstr "パスワードがセキュリティルールと一致しない" msgid "The new password cannot be the last {} passwords" msgstr "新しいパスワードを最後の {} 個のパスワードにすることはできません" -#: users/serializers/profile.py:48 users/serializers/profile.py:71 -msgid "The newly set password is inconsistent" -msgstr "新しく設定されたパスワードが一致しない" - #: users/serializers/user.py:42 msgid "System roles" msgstr "システムの役割" @@ -7213,55 +7491,55 @@ msgstr "システムの役割" msgid "Org roles" msgstr "組織ロール" -#: users/serializers/user.py:89 +#: users/serializers/user.py:90 msgid "Password strategy" msgstr "パスワード戦略" -#: users/serializers/user.py:91 +#: users/serializers/user.py:92 msgid "MFA enabled" msgstr "MFA有効化" -#: users/serializers/user.py:93 +#: users/serializers/user.py:94 msgid "MFA force enabled" msgstr "MFAフォース有効化" -#: users/serializers/user.py:95 +#: users/serializers/user.py:96 msgid "Login blocked" msgstr "ログインがロックされました" -#: users/serializers/user.py:98 users/serializers/user.py:177 +#: users/serializers/user.py:99 users/serializers/user.py:178 msgid "Is OTP bound" msgstr "仮想MFAがバインドされているか" -#: users/serializers/user.py:100 +#: users/serializers/user.py:101 msgid "Can public key authentication" msgstr "公開鍵認証が可能" -#: users/serializers/user.py:172 +#: users/serializers/user.py:173 msgid "Is org admin" msgstr "組織管理者です" -#: users/serializers/user.py:174 +#: users/serializers/user.py:175 msgid "Avatar url" msgstr "アバターURL" -#: users/serializers/user.py:178 +#: users/serializers/user.py:179 msgid "MFA level" msgstr "MFA レベル" -#: users/serializers/user.py:284 +#: users/serializers/user.py:285 msgid "Select users" msgstr "ユーザーの選択" -#: users/serializers/user.py:285 +#: users/serializers/user.py:286 msgid "For security, only list several users" msgstr "セキュリティのために、複数のユーザーのみをリストします" -#: users/serializers/user.py:318 +#: users/serializers/user.py:319 msgid "name not unique" msgstr "名前が一意ではない" -#: users/signal_handlers.py:27 +#: users/signal_handlers.py:32 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -7270,23 +7548,23 @@ msgstr "" "管理者は「既存のユーザーのみログインを許可」をオンにしており、現在のユーザー" "はユーザーリストにありません。管理者に連絡してください。" -#: users/tasks.py:24 +#: users/tasks.py:23 msgid "Check password expired" msgstr "パスワードの有効期限が切れていることを確認する" -#: users/tasks.py:38 +#: users/tasks.py:37 msgid "Periodic check password expired" msgstr "定期認証パスワードの有効期限" -#: users/tasks.py:52 +#: users/tasks.py:51 msgid "Check user expired" msgstr "ユーザーの有効期限が切れていることを確認する" -#: users/tasks.py:69 +#: users/tasks.py:68 msgid "Periodic check user expired" msgstr "ユーザーの有効期限の定期的な検出" -#: users/tasks.py:83 +#: users/tasks.py:82 msgid "Check unused users" msgstr "未使用のユーザーを確認する" @@ -7696,7 +7974,7 @@ msgstr "クラウドアカウント" msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 msgid "Regions" msgstr "リージョン" @@ -7705,17 +7983,17 @@ msgid "Hostname strategy" msgstr "ホスト名戦略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同期IPタイプ" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/serializers/task.py:177 msgid "Always update" msgstr "常に更新" @@ -7808,7 +8086,7 @@ msgstr "ルール一致" msgid "Rule value" msgstr "ルール値" -#: xpack/plugins/cloud/models.py:317 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 msgid "Strategy rule" msgstr "戦略ルール" @@ -7820,7 +8098,7 @@ msgstr "アクション属性" msgid "Action value" msgstr "アクション値" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 msgid "Strategy action" msgstr "戦略アクション" @@ -8108,7 +8386,7 @@ msgstr "テストタイムアウト" msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:143 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 " @@ -8122,11 +8400,11 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "Instance count" msgstr "インスタンス数" @@ -8182,22 +8460,28 @@ msgstr "ライセンスのインポートに成功" msgid "License is invalid" msgstr "ライセンスが無効です" -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138 +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140 msgid "License" msgstr "ライセンス" #: xpack/plugins/license/models.py:80 -msgid "Standard edition" -msgstr "標準版" +msgid "Basic edition" +msgstr "エンタープライズ基本版" #: xpack/plugins/license/models.py:82 -msgid "Enterprise edition" -msgstr "エンタープライズ版" +msgid "Standard edition" +msgstr "エンタープライズ標準版" #: xpack/plugins/license/models.py:84 -msgid "Ultimate edition" -msgstr "究極のエディション" +msgid "Professional edition" +msgstr "エンタープライズプロフェッショナル版" #: xpack/plugins/license/models.py:86 -msgid "Community edition" -msgstr "コミュニティ版" +msgid "Ultimate edition" +msgstr "エンタープライズ・フラッグシップ・エディション" + +#~ msgid "Random" +#~ msgstr "ランダム" + +#~ msgid "Enterprise edition" +#~ msgstr "エンタープライズ基本版" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 16bde8040..3f9d48c80 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:da4f312ed86d27fa8b6bde8da3bc70b0f32fe40811ee855f9fe81d89a68a646f -size 126402 +oid sha256:78fa10c674b853ebde73bbdef255beeb794a7a7b4bf5483ac1464c282aab0819 +size 131200 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 5f14e8671..d6b011d9d 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-08-17 15:30+0800\n" +"POT-Creation-Date: 2023-09-19 10:39+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler\n"
"Language-Team: JumpServer team\n"
@@ -22,12 +22,12 @@ msgid "The parameter 'action' must be [{}]"
msgstr "参数 'action' 必须是 [{}]"
#: accounts/const/account.py:6
-#: accounts/serializers/automations/change_secret.py:33
-#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
+#: accounts/serializers/automations/change_secret.py:32
+#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:35
#: authentication/confirm/password.py:9 authentication/forms.py:32
-#: authentication/templates/authentication/login.html:274
+#: authentication/templates/authentication/login.html:286
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
-#: users/forms/profile.py:22 users/serializers/user.py:104
+#: users/forms/profile.py:22 users/serializers/user.py:105
#: users/templates/users/_msg_user_created.html:13
#: users/templates/users/user_password_verify.html:18
#: xpack/plugins/cloud/serializers/account_attrs.py:28
@@ -35,7 +35,7 @@ msgid "Password"
msgstr "密码"
#: accounts/const/account.py:7
-#: accounts/serializers/automations/change_secret.py:34
+#: accounts/serializers/automations/change_secret.py:33
msgid "SSH key"
msgstr "SSH 密钥"
@@ -44,6 +44,7 @@ msgid "Access key"
msgstr "Access key"
#: accounts/const/account.py:9 assets/models/_user.py:48
+#: authentication/backends/passkey/models.py:16
#: authentication/models/sso_token.py:14 settings/serializers/feature.py:50
msgid "Token"
msgstr "Token"
@@ -69,7 +70,7 @@ msgstr "同名账号"
msgid "Anonymous account"
msgstr "匿名账号"
-#: accounts/const/account.py:25 users/models/user.py:733
+#: accounts/const/account.py:25 users/models/user.py:744
msgid "Local"
msgstr "数据库"
@@ -86,103 +87,103 @@ msgstr "模板"
msgid "Skip"
msgstr "跳过"
-#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:233
+#: accounts/const/account.py:32 audits/const.py:24 rbac/tree.py:234
#: templates/_csv_import_export.html:18 templates/_csv_update_modal.html:6
msgid "Update"
msgstr "更新"
#: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:156 audits/const.py:54
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:55
#: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
-#: ops/const.py:61 terminal/const.py:77 xpack/plugins/cloud/const.py:43
+#: ops/const.py:62 terminal/const.py:77 xpack/plugins/cloud/const.py:43
msgid "Failed"
msgstr "失败"
-#: accounts/const/automation.py:22 rbac/tree.py:50
+#: accounts/const/automation.py:24 rbac/tree.py:50
msgid "Push account"
msgstr "账号推送"
-#: accounts/const/automation.py:23
+#: accounts/const/automation.py:25
msgid "Change secret"
msgstr "更改密码"
-#: accounts/const/automation.py:24
+#: accounts/const/automation.py:26
msgid "Verify account"
msgstr "验证账号"
-#: accounts/const/automation.py:25
+#: accounts/const/automation.py:27
msgid "Gather accounts"
msgstr "收集账号"
-#: accounts/const/automation.py:26
+#: accounts/const/automation.py:28
msgid "Verify gateway account"
msgstr "验证网关账号"
-#: accounts/const/automation.py:44
-msgid "Specific password"
+#: accounts/const/automation.py:46
+msgid "Specific secret"
msgstr "指定"
-#: accounts/const/automation.py:45
-msgid "Random"
-msgstr "随机"
+#: accounts/const/automation.py:47
+msgid "Random generate"
+msgstr "随机生成"
-#: accounts/const/automation.py:49 ops/const.py:13
+#: accounts/const/automation.py:51 ops/const.py:13
msgid "Append SSH KEY"
msgstr "追加"
-#: accounts/const/automation.py:50 ops/const.py:14
+#: accounts/const/automation.py:52 ops/const.py:14
msgid "Empty and append SSH KEY"
msgstr "清空所有并添加"
-#: accounts/const/automation.py:51 ops/const.py:15
+#: accounts/const/automation.py:53 ops/const.py:15
msgid "Replace (Replace only keys pushed by JumpServer) "
msgstr "替换 (只替换由 JumpServer 推送的密钥)"
-#: accounts/const/automation.py:56
+#: accounts/const/automation.py:58
msgid "On asset create"
msgstr "资产创建时"
-#: accounts/const/automation.py:59
+#: accounts/const/automation.py:61
msgid "On perm add user"
msgstr "授权变更时添加用户"
-#: accounts/const/automation.py:61
+#: accounts/const/automation.py:63
msgid "On perm add user group"
msgstr "授权变更时添加用户组"
-#: accounts/const/automation.py:63
+#: accounts/const/automation.py:65
msgid "On perm add asset"
msgstr "授权变更时添加资产"
-#: accounts/const/automation.py:65
+#: accounts/const/automation.py:67
msgid "On perm add node"
msgstr "授权变更时添加节点"
-#: accounts/const/automation.py:67
+#: accounts/const/automation.py:69
msgid "On perm add account"
msgstr "授权变更时添加账号"
-#: accounts/const/automation.py:69
+#: accounts/const/automation.py:71
msgid "On asset join node"
msgstr "资产变更时添加到节点"
-#: accounts/const/automation.py:71
+#: accounts/const/automation.py:73
msgid "On user join group"
msgstr "用户变更时添加到用户组"
-#: accounts/const/automation.py:79
+#: accounts/const/automation.py:81
msgid "On perm change"
msgstr "授权变更时"
-#: accounts/const/automation.py:86
+#: accounts/const/automation.py:88
msgid "Inherit from group or node"
msgstr "继承自用户组或资产节点"
-#: accounts/const/automation.py:94
+#: accounts/const/automation.py:96
msgid "Create and push"
msgstr "创建并推送"
-#: accounts/const/automation.py:95
+#: accounts/const/automation.py:97
msgid "Only create"
msgstr "仅创建"
@@ -195,17 +196,35 @@ msgstr "数据库"
msgid "HCP Vault"
msgstr "HashiCorp Vault"
+#: accounts/mixins.py:35
+msgid "Export all"
+msgstr "导出所有"
+
+#: accounts/mixins.py:37
+msgid "Export only selected items"
+msgstr "仅导出选择项"
+
+#: accounts/mixins.py:42
+#, python-format
+msgid "Export filtered: %s"
+msgstr "导出搜素: %s"
+
+#: accounts/mixins.py:48
+#, python-format
+msgid "User %s view/export secret"
+msgstr "用户 %s 查看/导出 了密码"
+
#: accounts/models/account.py:48
#: accounts/models/automations/gather_account.py:16
-#: accounts/serializers/account/account.py:202
-#: accounts/serializers/account/account.py:247
+#: accounts/serializers/account/account.py:205
+#: accounts/serializers/account/account.py:250
#: accounts/serializers/account/gathered_account.py:10
-#: accounts/serializers/automations/change_secret.py:112
-#: accounts/serializers/automations/change_secret.py:132
+#: accounts/serializers/automations/change_secret.py:111
+#: accounts/serializers/automations/change_secret.py:131
#: acls/serializers/base.py:123 assets/models/asset/common.py:93
#: assets/models/asset/common.py:334 assets/models/cmd_filter.py:36
#: assets/serializers/domain.py:19 assets/serializers/label.py:27
-#: audits/models.py:53 authentication/models/connection_token.py:36
+#: audits/models.py:54 authentication/models/connection_token.py:36
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:34
#: terminal/backends/command/models.py:17 terminal/models/session/session.py:31
#: terminal/notifications.py:155 terminal/serializers/command.py:17
@@ -217,20 +236,21 @@ msgid "Asset"
msgstr "资产"
#: accounts/models/account.py:52 accounts/models/template.py:15
-#: accounts/serializers/account/account.py:209
-#: accounts/serializers/account/account.py:257
-#: accounts/serializers/account/template.py:16
+#: accounts/serializers/account/account.py:212
+#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/template.py:25
#: authentication/serializers/connect_token_secret.py:49
msgid "Su from"
msgstr "切换自"
-#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20
-#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34
+#: accounts/models/account.py:54 assets/const/protocol.py:168
+#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20
+#: terminal/models/applet/applet.py:35
msgid "Version"
msgstr "版本"
-#: accounts/models/account.py:56 accounts/serializers/account/account.py:204
-#: users/models/user.py:838
+#: accounts/models/account.py:56 accounts/serializers/account/account.py:207
+#: users/models/user.py:846
msgid "Source"
msgstr "来源"
@@ -239,10 +259,10 @@ msgid "Source ID"
msgstr "来源 ID"
#: accounts/models/account.py:60
-#: accounts/serializers/automations/change_secret.py:113
-#: accounts/serializers/automations/change_secret.py:133
+#: accounts/serializers/automations/change_secret.py:112
+#: accounts/serializers/automations/change_secret.py:132
#: acls/serializers/base.py:124 assets/serializers/asset/common.py:125
-#: assets/serializers/gateway.py:28 audits/models.py:54 ops/models/base.py:18
+#: assets/serializers/gateway.py:28 audits/models.py:55 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:39
#: terminal/backends/command/models.py:18 terminal/models/session/session.py:33
#: terminal/templates/terminal/_msg_command_warning.html:8
@@ -285,7 +305,7 @@ msgid "Account backup plan"
msgstr "账号备份计划"
#: accounts/models/automations/backup_account.py:91
-#: assets/models/automations/base.py:115 audits/models.py:60
+#: assets/models/automations/base.py:115 audits/models.py:61
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:228
#: ops/templates/ops/celery_task_log.html:75
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:140
@@ -313,14 +333,14 @@ msgstr "账号备份快照"
msgid "Trigger mode"
msgstr "触发模式"
-#: accounts/models/automations/backup_account.py:105 audits/models.py:194
-#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205
+#: accounts/models/automations/backup_account.py:105 audits/models.py:195
+#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205
msgid "Reason"
msgstr "原因"
#: accounts/models/automations/backup_account.py:107
-#: accounts/serializers/automations/change_secret.py:111
-#: accounts/serializers/automations/change_secret.py:134
+#: accounts/serializers/automations/change_secret.py:110
+#: accounts/serializers/automations/change_secret.py:133
#: ops/serializers/job.py:56 terminal/serializers/session.py:46
msgid "Is success"
msgstr "是否成功"
@@ -329,109 +349,84 @@ msgstr "是否成功"
msgid "Account backup execution"
msgstr "账号备份执行"
-#: accounts/models/automations/base.py:15
+#: accounts/models/automations/base.py:18
msgid "Account automation task"
msgstr "账号自动化任务"
-#: accounts/models/automations/base.py:29
+#: accounts/models/automations/base.py:32
msgid "Automation execution"
msgstr "自动化执行"
-#: accounts/models/automations/base.py:30
+#: accounts/models/automations/base.py:33
msgid "Automation executions"
msgstr "自动化执行"
-#: accounts/models/automations/base.py:32
+#: accounts/models/automations/base.py:35
msgid "Can view change secret execution"
msgstr "查看改密执行"
-#: accounts/models/automations/base.py:33
+#: accounts/models/automations/base.py:36
msgid "Can add change secret execution"
msgstr "创建改密执行"
-#: accounts/models/automations/base.py:35
+#: accounts/models/automations/base.py:38
msgid "Can view gather accounts execution"
msgstr "查看收集账号执行"
-#: accounts/models/automations/base.py:36
+#: accounts/models/automations/base.py:39
msgid "Can add gather accounts execution"
msgstr "创建收集账号执行"
-#: accounts/models/automations/base.py:38
+#: accounts/models/automations/base.py:41
msgid "Can view push account execution"
msgstr "查看推送账号执行"
-#: accounts/models/automations/base.py:39
+#: accounts/models/automations/base.py:42
msgid "Can add push account execution"
msgstr "创建推送账号执行"
-#: accounts/models/automations/change_secret.py:18 accounts/models/base.py:36
-#: accounts/serializers/account/account.py:429
-#: accounts/serializers/account/base.py:16
-#: accounts/serializers/automations/change_secret.py:46
-#: authentication/serializers/connect_token_secret.py:41
-#: authentication/serializers/connect_token_secret.py:50
-msgid "Secret type"
-msgstr "密文类型"
-
-#: accounts/models/automations/change_secret.py:20
-#: accounts/models/mixins/vault.py:48 accounts/serializers/account/base.py:19
-#: authentication/models/temp_token.py:10
-#: authentication/templates/authentication/_access_key_modal.html:31
-#: settings/serializers/auth/radius.py:19
-msgid "Secret"
-msgstr "密钥"
-
-#: accounts/models/automations/change_secret.py:23
-#: accounts/serializers/automations/change_secret.py:40
-msgid "Secret strategy"
-msgstr "密文策略"
-
-#: accounts/models/automations/change_secret.py:25
-msgid "Password rules"
-msgstr "密码规则"
-
-#: accounts/models/automations/change_secret.py:28
+#: accounts/models/automations/base.py:54
msgid "SSH key change strategy"
msgstr "SSH 密钥推送方式"
-#: accounts/models/automations/change_secret.py:64
+#: accounts/models/automations/change_secret.py:15
#: accounts/serializers/account/backup.py:34
-#: accounts/serializers/automations/change_secret.py:57
+#: accounts/serializers/automations/change_secret.py:56
msgid "Recipient"
msgstr "收件人"
-#: accounts/models/automations/change_secret.py:71
+#: accounts/models/automations/change_secret.py:22
msgid "Change secret automation"
msgstr "自动化改密"
-#: accounts/models/automations/change_secret.py:88
+#: accounts/models/automations/change_secret.py:39
msgid "Old secret"
msgstr "原密钥"
-#: accounts/models/automations/change_secret.py:89
+#: accounts/models/automations/change_secret.py:40
msgid "New secret"
msgstr "新密钥"
-#: accounts/models/automations/change_secret.py:90
+#: accounts/models/automations/change_secret.py:41
msgid "Date started"
msgstr "开始日期"
-#: accounts/models/automations/change_secret.py:91
+#: accounts/models/automations/change_secret.py:42
#: assets/models/automations/base.py:116 ops/models/base.py:56
#: ops/models/celery.py:64 ops/models/job.py:229
#: terminal/models/applet/host.py:141
msgid "Date finished"
msgstr "结束日期"
-#: accounts/models/automations/change_secret.py:93
-#: accounts/serializers/account/account.py:249 assets/const/automation.py:8
+#: accounts/models/automations/change_secret.py:44
+#: accounts/serializers/account/account.py:252 assets/const/automation.py:8
+#: authentication/templates/authentication/passkey.html:173
#: authentication/views/base.py:26 authentication/views/base.py:27
#: authentication/views/base.py:28 common/const/choices.py:20
msgid "Error"
msgstr "错误"
-#: accounts/models/automations/change_secret.py:97
+#: accounts/models/automations/change_secret.py:48
msgid "Change secret record"
msgstr "改密记录"
@@ -444,15 +439,15 @@ msgid "Date last login"
msgstr "最后登录日期"
#: accounts/models/automations/gather_account.py:17
-#: accounts/models/automations/push_account.py:15 accounts/models/base.py:34
+#: accounts/models/automations/push_account.py:15 accounts/models/base.py:65
#: accounts/serializers/account/virtual.py:21 acls/serializers/base.py:19
-#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:179
+#: acls/serializers/base.py:50 assets/models/_user.py:23 audits/models.py:180
#: authentication/forms.py:25 authentication/forms.py:27
#: authentication/models/temp_token.py:9
#: authentication/templates/authentication/_msg_different_city.html:9
#: authentication/templates/authentication/_msg_oauth_bind.html:9
#: users/forms/profile.py:32 users/forms/profile.py:115
-#: users/models/user.py:785 users/templates/users/_msg_user_created.html:12
+#: users/models/user.py:796 users/templates/users/_msg_user_created.html:12
#: xpack/plugins/cloud/serializers/account_attrs.py:26
msgid "Username"
msgstr "用户名"
@@ -480,13 +475,13 @@ msgstr "触发方式"
#: accounts/models/automations/push_account.py:16 acls/models/base.py:41
#: acls/serializers/base.py:57 assets/models/cmd_filter.py:81
-#: audits/models.py:87 audits/serializers.py:83
+#: audits/models.py:88 audits/serializers.py:84
#: authentication/serializers/connect_token_secret.py:116
#: authentication/templates/authentication/_access_key_modal.html:34
msgid "Action"
msgstr "动作"
-#: accounts/models/automations/push_account.py:60
+#: accounts/models/automations/push_account.py:57
msgid "Push asset account"
msgstr "账号推送"
@@ -494,7 +489,34 @@ msgstr "账号推送"
msgid "Verify asset account"
msgstr "账号验证"
-#: accounts/models/base.py:33 accounts/serializers/account/virtual.py:20
+#: accounts/models/base.py:37 accounts/models/base.py:67
+#: accounts/serializers/account/account.py:432
+#: accounts/serializers/account/base.py:16
+#: accounts/serializers/automations/change_secret.py:45
+#: authentication/serializers/connect_token_secret.py:41
+#: authentication/serializers/connect_token_secret.py:50
+msgid "Secret type"
+msgstr "密文类型"
+
+#: accounts/models/base.py:39 accounts/models/mixins/vault.py:48
+#: accounts/serializers/account/base.py:19
+#: authentication/models/temp_token.py:10
+#: authentication/templates/authentication/_access_key_modal.html:31
+#: settings/serializers/auth/radius.py:19
+msgid "Secret"
+msgstr "密钥"
+
+#: accounts/models/base.py:42
+#: accounts/serializers/automations/change_secret.py:39
+msgid "Secret strategy"
+msgstr "密文策略"
+
+#: accounts/models/base.py:44 accounts/serializers/account/template.py:22
+#: accounts/serializers/automations/change_secret.py:44
+msgid "Password rules"
+msgstr "密码规则"
+
+#: accounts/models/base.py:64 accounts/serializers/account/virtual.py:20
#: acls/models/base.py:35 acls/models/base.py:96 acls/models/command_acl.py:21
#: acls/serializers/base.py:35 applications/models.py:9
#: assets/models/_user.py:22 assets/models/asset/common.py:91
@@ -502,46 +524,57 @@ msgstr "账号验证"
#: assets/models/domain.py:18 assets/models/group.py:17
#: assets/models/label.py:18 assets/models/platform.py:15
#: assets/models/platform.py:88 assets/serializers/asset/common.py:146
-#: assets/serializers/platform.py:110 assets/serializers/platform.py:223
+#: assets/serializers/platform.py:111 assets/serializers/platform.py:228
+#: authentication/backends/passkey/models.py:10
#: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21
#: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:126 ops/models/playbook.py:28 ops/serializers/job.py:20
#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:32 settings/serializers/msg.py:82
-#: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12
+#: terminal/models/applet/applet.py:33 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:94
#: terminal/models/component/storage.py:26 terminal/models/component/task.py:13
#: terminal/models/component/terminal.py:84 users/forms/profile.py:33
-#: users/models/group.py:13 users/models/user.py:787
-#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273
-#: xpack/plugins/cloud/serializers/task.py:68
+#: users/models/group.py:13 users/models/preference.py:11
+#: users/models/user.py:798 xpack/plugins/cloud/models.py:32
+#: xpack/plugins/cloud/models.py:273 xpack/plugins/cloud/serializers/task.py:68
msgid "Name"
msgstr "名称"
-#: accounts/models/base.py:38
+#: accounts/models/base.py:69
msgid "Privileged"
msgstr "特权账号"
-#: accounts/models/base.py:39 assets/models/asset/common.py:156
+#: accounts/models/base.py:70 assets/models/asset/common.py:156
#: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
#: assets/models/label.py:22
#: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:39
-#: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
+#: terminal/models/applet/applet.py:40
+#: terminal/models/component/endpoint.py:105 users/serializers/user.py:170
msgid "Is active"
msgstr "激活"
-#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325
+#: accounts/models/template.py:17 assets/models/_user.py:53
+msgid "Auto push"
+msgstr "自动推送"
+
+#: accounts/models/template.py:20
+msgid "Platforms"
+msgstr "系统平台"
+
+#: accounts/models/template.py:22
+msgid "Push params"
+msgstr "账号推送参数"
+
+#: accounts/models/template.py:25 xpack/plugins/cloud/models.py:325
msgid "Account template"
msgstr "账号模版"
-# msgid "Account template"
-# msgstr "账号模版"
-#: accounts/models/template.py:24
+#: accounts/models/template.py:30
msgid "Can view asset account template secret"
msgstr "可以查看资产账号模版密码"
-#: accounts/models/template.py:25
+#: accounts/models/template.py:31
msgid "Can change asset account template secret"
msgstr "可以更改资产账号模版密码"
@@ -622,54 +655,55 @@ msgstr "立即推送"
msgid "Exist policy"
msgstr "账号存在策略"
-#: accounts/serializers/account/account.py:182 applications/models.py:11
+#: accounts/serializers/account/account.py:185 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:89
#: assets/serializers/asset/common.py:121 assets/serializers/cagegory.py:8
-#: assets/serializers/platform.py:128 assets/serializers/platform.py:224
+#: assets/serializers/platform.py:133 assets/serializers/platform.py:229
#: perms/serializers/user_permission.py:26 settings/models.py:34
-#: tickets/models/ticket/apply_application.py:13
+#: tickets/models/ticket/apply_application.py:13 users/models/preference.py:12
msgid "Category"
msgstr "类别"
-#: accounts/serializers/account/account.py:183
+#: accounts/serializers/account/account.py:186
#: accounts/serializers/automations/base.py:54 acls/models/command_acl.py:24
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:90
-#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:112
-#: assets/serializers/platform.py:127 audits/serializers.py:49
+#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:113
+#: assets/serializers/platform.py:132 audits/serializers.py:50
+#: audits/serializers.py:170
#: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:137
-#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:38
+#: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39
#: terminal/models/component/storage.py:57
#: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
-#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
-#: terminal/serializers/storage.py:238 tickets/models/comment.py:26
+#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228
+#: terminal/serializers/storage.py:240 tickets/models/comment.py:26
#: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16
#: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53
#: tickets/serializers/ticket/ticket.py:19
msgid "Type"
msgstr "类型"
-#: accounts/serializers/account/account.py:198
+#: accounts/serializers/account/account.py:201
msgid "Asset not found"
msgstr "资产不存在"
-#: accounts/serializers/account/account.py:238
+#: accounts/serializers/account/account.py:241
msgid "Has secret"
msgstr "已托管密码"
-#: accounts/serializers/account/account.py:248 ops/models/celery.py:60
+#: accounts/serializers/account/account.py:251 ops/models/celery.py:60
#: tickets/models/comment.py:13 tickets/models/ticket/general.py:45
#: tickets/models/ticket/general.py:279 tickets/serializers/super_ticket.py:14
#: tickets/serializers/ticket/ticket.py:21
msgid "State"
msgstr "状态"
-#: accounts/serializers/account/account.py:250
+#: accounts/serializers/account/account.py:253
msgid "Changed"
msgstr "已修改"
-#: accounts/serializers/account/account.py:260
+#: accounts/serializers/account/account.py:263
#: accounts/serializers/automations/base.py:22 acls/models/base.py:97
#: assets/models/automations/base.py:19
#: assets/serializers/automations/base.py:20 ops/models/base.py:17
@@ -678,46 +712,46 @@ msgstr "已修改"
msgid "Assets"
msgstr "资产"
-#: accounts/serializers/account/account.py:315
+#: accounts/serializers/account/account.py:318
msgid "Account already exists"
msgstr "账号已存在"
-#: accounts/serializers/account/account.py:365
+#: accounts/serializers/account/account.py:368
#, python-format
msgid "Asset does not support this secret type: %s"
msgstr "资产不支持账号类型: %s"
-#: accounts/serializers/account/account.py:397
+#: accounts/serializers/account/account.py:400
msgid "Account has exist"
msgstr "账号已存在"
-#: accounts/serializers/account/account.py:430
+#: accounts/serializers/account/account.py:433
#: authentication/serializers/connect_token_secret.py:156
#: authentication/templates/authentication/_access_key_modal.html:30
#: perms/models/perm_node.py:21 users/serializers/group.py:31
msgid "ID"
msgstr "ID"
-#: accounts/serializers/account/account.py:437 acls/serializers/base.py:116
-#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:49
-#: audits/models.py:85 audits/models.py:163
-#: authentication/models/connection_token.py:32
+#: accounts/serializers/account/account.py:440 acls/serializers/base.py:116
+#: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:50
+#: audits/models.py:86 audits/models.py:164 audits/models.py:262
+#: audits/serializers.py:171 authentication/models/connection_token.py:32
#: authentication/models/sso_token.py:16
#: notifications/models/notification.py:12
#: perms/api/user_permission/mixin.py:55 perms/models/asset_permission.py:58
-#: perms/serializers/permission.py:30 rbac/builtin.py:123
+#: perms/serializers/permission.py:30 rbac/builtin.py:124
#: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17
#: terminal/backends/command/models.py:16 terminal/models/session/session.py:29
-#: terminal/models/session/sharing.py:33 terminal/notifications.py:156
+#: terminal/models/session/sharing.py:34 terminal/notifications.py:156
#: terminal/notifications.py:205 terminal/serializers/command.py:16
#: terminal/templates/terminal/_msg_command_warning.html:6
#: terminal/templates/terminal/_msg_session_sharing.html:6
-#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:981
-#: users/models/user.py:1017 users/serializers/group.py:18
+#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:996
+#: users/models/user.py:1032 users/serializers/group.py:18
msgid "User"
msgstr "用户"
-#: accounts/serializers/account/account.py:438
+#: accounts/serializers/account/account.py:441
#: authentication/templates/authentication/_access_key_modal.html:33
#: terminal/notifications.py:158 terminal/notifications.py:207
msgid "Date"
@@ -736,7 +770,7 @@ msgid "Executed amount"
msgstr "执行次数"
#: accounts/serializers/account/backup.py:35
-#: accounts/serializers/automations/change_secret.py:58
+#: accounts/serializers/automations/change_secret.py:57
msgid "Currently only mail sending is supported"
msgstr "当前只支持邮件发送"
@@ -761,27 +795,67 @@ msgstr ""
"提示: 如果认证时不需要用户名，可填写为 null, 如果是 AD 账号，格式为 "
"username@domain"
+#: accounts/serializers/account/template.py:11
+#, fuzzy
+#| msgid "Password strength"
+msgid "Password length"
+msgstr "密码强度："
+
+#: accounts/serializers/account/template.py:12
+#, fuzzy
+#| msgid "Powershell"
+msgid "Lowercase"
+msgstr "PowerShell"
+
+#: accounts/serializers/account/template.py:13
+msgid "Uppercase"
+msgstr ""
+
+#: accounts/serializers/account/template.py:14
+msgid "Digit"
+msgstr ""
+
+#: accounts/serializers/account/template.py:15
+msgid "Special symbol"
+msgstr ""
+
+#: accounts/serializers/account/template.py:36
+msgid "Secret generation strategy for account creation"
+msgstr "密码生成策略，用于账号创建时，设置密码"
+
+#: accounts/serializers/account/template.py:37
+msgid "Whether to automatically push the account to the asset"
+msgstr "是否自动推送账号到资产"
+
+#: accounts/serializers/account/template.py:40
+msgid ""
+"Associated platform, you can configure push parameters. If not associated, "
+"default parameters will be used"
+msgstr "关联平台，可配置推送参数，如果不关联，将使用默认参数"
+
#: accounts/serializers/account/virtual.py:19 assets/models/_user.py:27
#: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
#: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
#: ops/models/job.py:145 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:142
+#: settings/models.py:37 terminal/models/applet/applet.py:45
+#: terminal/models/applet/applet.py:302 terminal/models/applet/host.py:142
#: terminal/models/component/endpoint.py:24
#: terminal/models/component/endpoint.py:104
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
-#: tickets/models/ticket/general.py:297 users/models/user.py:826
+#: tickets/models/ticket/general.py:297 users/models/user.py:834
#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109
msgid "Comment"
msgstr "备注"
-#: accounts/serializers/account/virtual.py:22
+#: accounts/serializers/account/virtual.py:24
msgid ""
"Current only support login from AD/LDAP. Secret priority: Same account in "
-"asset secret > Login secret > Manual input"
+"asset secret > Login secret > Manual input.
For security, please set " +"config CACHE_LOGIN_PASSWORD_ENABLED to true" msgstr "" "当前仅支持 AD/LDAP 登录方式用户。 同名账号密码生效顺序: 资产上存在的同名账号" -"密码 > 登录密码 > 手动输入" +"密码 > 登录密码 > 手动输入
为了安全起见，请设置配置项 " +"CACHE_LOGIN_PASSWORD_ENABLED=true，重启服务才能开启" #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -800,31 +874,46 @@ msgstr "名称已存在" msgid "Automation snapshot" msgstr "自动化快照" -#: accounts/serializers/automations/change_secret.py:43 +#: accounts/serializers/automations/change_secret.py:42 msgid "SSH Key strategy" msgstr "SSH 密钥更改方式" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:80 msgid "* Please enter the correct password length" msgstr "* 请输入正确的密码长度" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:84 msgid "* Password length range 6-30 bits" msgstr "* 密码长度范围 6-30 位" -#: accounts/serializers/automations/change_secret.py:115 +#: accounts/serializers/automations/change_secret.py:114 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自动化任务执行历史" -#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 -#: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 -#: tickets/views/approve.py:115 +#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54 +#: audits/models.py:60 audits/signal_handlers/activity_log.py:33 +#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 +#: tickets/views/approve.py:119 msgid "Success" msgstr "成功" +#: accounts/signal_handlers.py:46 +#, python-format +msgid "Push related accounts to assets: %s, by system" +msgstr "推送账号到资产: %s, 由系统执行" + +#: accounts/signal_handlers.py:55 +#, python-format +msgid "Add account: %s" +msgstr "添加账号: %s" + +#: accounts/signal_handlers.py:57 +#, python-format +msgid "Delete account: %s" +msgstr "删除账号: %s" + #: accounts/tasks/automation.py:24 msgid "Account execute automation" msgstr "账号执行自动化" @@ -853,19 +942,23 @@ msgstr "验证资产账号可用性" msgid "Verify accounts connectivity" msgstr "测试账号可连接性" -#: accounts/utils.py:41 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "密码不能包含 `{{` 字符" -#: accounts/utils.py:44 +#: accounts/utils.py:55 +msgid "Password can not contains `{%` " +msgstr "密码不能包含 `{%` 字符" + +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "密码不能包含 `'` 字符" -#: accounts/utils.py:46 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "密码不能包含 `\"` 字符" -#: accounts/utils.py:52 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "密钥不合法或密钥密码错误" @@ -910,12 +1003,12 @@ msgstr "审批人" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "激活中" -#: acls/models/base.py:81 users/apps.py:9 +#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16 msgid "Users" msgstr "用户管理" @@ -1031,7 +1124,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:137 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1104,6 +1197,10 @@ msgstr "资产管理" msgid "{} disabled" msgstr "{} 已禁用" +#: assets/automations/base/manager.py:202 +msgid " - Platform {} ansible disabled" +msgstr " - 平台 {} Ansible 已禁用, 无法执行任务" + #: assets/automations/ping_gateway/manager.py:33 #: authentication/models/connection_token.py:128 msgid "No account" @@ -1128,7 +1225,7 @@ msgstr "认证失败" msgid "Connect failed" msgstr "连接失败" -#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36 +#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104 msgid "Unknown" @@ -1150,16 +1247,19 @@ msgstr "测试网关" msgid "Gather facts" msgstr "收集资产信息" -#: assets/const/base.py:33 audits/const.py:47 +#: assets/const/base.py:33 audits/const.py:48 #: terminal/serializers/applet_host.py:32 msgid "Disabled" msgstr "禁用" #: assets/const/base.py:34 settings/serializers/basic.py:6 +#: users/serializers/preference/koko.py:15 +#: users/serializers/preference/lina.py:32 +#: users/serializers/preference/luna.py:60 msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:245 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1181,8 +1281,8 @@ msgid "Cloud service" msgstr "云服务" #: assets/const/category.py:14 assets/models/asset/gpt.py:11 -#: assets/models/asset/web.py:16 audits/const.py:34 -#: terminal/models/applet/applet.py:26 +#: assets/models/asset/web.py:16 audits/const.py:35 +#: terminal/models/applet/applet.py:27 users/const.py:47 msgid "Web" msgstr "Web" @@ -1202,7 +1302,7 @@ msgstr "私有云" msgid "Kubernetes" msgstr "Kubernetes" -#: assets/const/device.py:7 terminal/models/applet/applet.py:25 +#: assets/const/device.py:7 terminal/models/applet/applet.py:26 #: tickets/const.py:8 msgid "General" msgstr "一般" @@ -1228,103 +1328,118 @@ msgid "Other" msgstr "其它" #: assets/const/protocol.py:48 -msgid "SFTP home" +msgid "SFTP root" msgstr "SFTP 根路径" -#: assets/const/protocol.py:59 +#: assets/const/protocol.py:50 +#, python-brace-format +msgid "" +"SFTP root directory, Support variable:
- ${ACCOUNT} The connected " +"account username
- ${HOME} The home directory of the connected account " +"
- ${USER} The username of the user" +msgstr "" +"SFTP根目录，支持变量：
-${ACCOUNT}已连接帐户用户名
-${HOME}连接帐户的主" +"目录
-${USER}用户的用户名" + +#: assets/const/protocol.py:65 msgid "Console" msgstr "控制台" -#: assets/const/protocol.py:60 +#: assets/const/protocol.py:66 msgid "Connect to console session" msgstr "连接到控制台会话" -#: assets/const/protocol.py:64 +#: assets/const/protocol.py:70 msgid "Any" msgstr "任意" -#: assets/const/protocol.py:66 settings/serializers/security.py:227 +#: assets/const/protocol.py:72 settings/serializers/security.py:228 msgid "Security" msgstr "安全" -#: assets/const/protocol.py:67 +#: assets/const/protocol.py:73 msgid "Security layer to use for the connection" msgstr "连接 RDP 使用的安全层" -#: assets/const/protocol.py:73 +#: assets/const/protocol.py:79 msgid "AD domain" msgstr "AD 网域" -#: assets/const/protocol.py:88 +#: assets/const/protocol.py:94 msgid "Username prompt" msgstr "用户名提示" -#: assets/const/protocol.py:89 +#: assets/const/protocol.py:95 msgid "We will send username when we see this prompt" msgstr "当我们看到这个提示时，我们将发送用户名" -#: assets/const/protocol.py:94 +#: assets/const/protocol.py:100 msgid "Password prompt" msgstr "密码提示" -#: assets/const/protocol.py:95 +#: assets/const/protocol.py:101 msgid "We will send password when we see this prompt" msgstr "当我们看到这个提示时，我们将发送密码" -#: assets/const/protocol.py:100 +#: assets/const/protocol.py:106 msgid "Success prompt" msgstr "成功提示" -#: assets/const/protocol.py:101 +#: assets/const/protocol.py:107 msgid "We will consider login success when we see this prompt" msgstr "当我们看到这个提示时，我们将认为登录成功" -#: assets/const/protocol.py:112 assets/models/asset/database.py:10 +#: assets/const/protocol.py:118 assets/models/asset/database.py:10 #: settings/serializers/msg.py:40 msgid "Use SSL" msgstr "使用 SSL" -#: assets/const/protocol.py:147 +#: assets/const/protocol.py:153 msgid "SYSDBA" msgstr "SYSDBA" -#: assets/const/protocol.py:148 +#: assets/const/protocol.py:154 msgid "Connect as SYSDBA" msgstr "以 SYSDBA 角色连接" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:169 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server 版本，不同版本有不同的连接驱动" + +#: assets/const/protocol.py:192 msgid "Auth username" msgstr "使用用户名认证" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:215 msgid "Safe mode" msgstr "安全模式" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:217 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." msgstr "" "当安全模式启用时，一些操作将被禁用，例如：新建标签页、右键、访问其它网站 等" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:222 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自动代填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:230 assets/models/asset/web.py:10 msgid "Username selector" msgstr "用户名选择器" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:235 assets/models/asset/web.py:11 msgid "Password selector" msgstr "密码选择器" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:240 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "确认按钮选择器" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:263 msgid "API mode" msgstr "API 模式" @@ -1352,19 +1467,19 @@ msgstr "SSH公钥" # msgstr "备注" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 -#: users/models/user.py:1018 +#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54 +#: ops/models/job.py:227 users/models/user.py:1033 msgid "Date created" msgstr "创建日期" #: assets/models/_user.py:29 assets/models/cmd_filter.py:42 -#: common/db/models.py:35 users/models/user.py:847 +#: common/db/models.py:35 users/models/user.py:855 msgid "Date updated" msgstr "更新日期" #: assets/models/_user.py:30 assets/models/cmd_filter.py:44 #: assets/models/cmd_filter.py:91 assets/models/group.py:18 -#: common/db/models.py:32 users/models/user.py:833 +#: common/db/models.py:32 users/models/user.py:841 #: users/serializers/group.py:29 msgid "Created by" msgstr "创建者" @@ -1391,15 +1506,11 @@ msgstr "用户名与用户相同" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "协议" -#: assets/models/_user.py:53 -msgid "Auto push" -msgstr "自动推送" - #: assets/models/_user.py:54 msgid "Sudo" msgstr "Sudo" @@ -1455,6 +1566,7 @@ msgid "Address" msgstr "地址" #: assets/models/asset/common.py:151 assets/models/platform.py:119 +#: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" @@ -1532,9 +1644,9 @@ msgstr "自动化任务" msgid "Asset automation task" msgstr "资产自动化任务" -#: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 +#: assets/models/automations/base.py:113 audits/models.py:200 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1561,7 +1673,7 @@ msgstr "校验日期" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61 #: perms/serializers/permission.py:32 users/models/group.py:25 -#: users/models/user.py:793 +#: users/models/user.py:804 msgid "User group" msgstr "用户组" @@ -1602,7 +1714,7 @@ msgid "Asset group" msgstr "资产组" #: assets/models/group.py:31 assets/models/platform.py:19 -#: assets/serializers/platform.py:113 +#: assets/serializers/platform.py:114 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1611,7 +1723,7 @@ msgstr "默认" msgid "Default asset group" msgstr "默认资产组" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018 msgid "System" msgstr "系统" @@ -1620,12 +1732,13 @@ msgstr "系统" #: authentication/models/connection_token.py:29 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:33 +#: users/models/preference.py:13 msgid "Value" msgstr "值" #: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:111 +#: assets/serializers/platform.py:112 #: authentication/serializers/connect_token_secret.py:121 #: common/serializers/common.py:85 perms/serializers/user_permission.py:28 #: settings/serializers/msg.py:83 @@ -1673,13 +1786,14 @@ msgstr "必须的" msgid "Public" msgstr "开放的" -#: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:65 +#: assets/models/platform.py:21 assets/serializers/platform.py:49 +#: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "设置" -#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36 +#: assets/models/platform.py:38 audits/const.py:49 +#: authentication/backends/passkey/models.py:11 settings/models.py:36 #: terminal/serializers/applet_host.py:33 msgid "Enabled" msgstr "启用" @@ -1688,11 +1802,11 @@ msgstr "启用" msgid "Ansible config" msgstr "Ansible 配置" -#: assets/models/platform.py:41 assets/serializers/platform.py:32 +#: assets/models/platform.py:41 assets/serializers/platform.py:33 msgid "Ping enabled" msgstr "启用资产探活" -#: assets/models/platform.py:42 assets/serializers/platform.py:33 +#: assets/models/platform.py:42 assets/serializers/platform.py:34 msgid "Ping method" msgstr "资产探活方式" @@ -1701,12 +1815,12 @@ msgid "Ping params" msgstr "资产探活参数" #: assets/models/platform.py:45 assets/models/platform.py:69 -#: assets/serializers/platform.py:34 +#: assets/serializers/platform.py:35 msgid "Gather facts enabled" msgstr "启用收集资产信息" #: assets/models/platform.py:47 assets/models/platform.py:71 -#: assets/serializers/platform.py:35 +#: assets/serializers/platform.py:36 msgid "Gather facts method" msgstr "收集信息方式" @@ -1714,11 +1828,11 @@ msgstr "收集信息方式" msgid "Gather facts params" msgstr "收集信息参数" -#: assets/models/platform.py:51 assets/serializers/platform.py:38 +#: assets/models/platform.py:51 assets/serializers/platform.py:39 msgid "Change secret enabled" msgstr "启用改密" -#: assets/models/platform.py:53 assets/serializers/platform.py:39 +#: assets/models/platform.py:53 assets/serializers/platform.py:40 msgid "Change secret method" msgstr "改密方式" @@ -1726,11 +1840,11 @@ msgstr "改密方式" msgid "Change secret params" msgstr "改密参数" -#: assets/models/platform.py:57 assets/serializers/platform.py:40 +#: assets/models/platform.py:57 assets/serializers/platform.py:41 msgid "Push account enabled" msgstr "启用账号推送" -#: assets/models/platform.py:59 assets/serializers/platform.py:41 +#: assets/models/platform.py:59 assets/serializers/platform.py:42 msgid "Push account method" msgstr "账号推送方式" @@ -1738,11 +1852,11 @@ msgstr "账号推送方式" msgid "Push account params" msgstr "账号推送参数" -#: assets/models/platform.py:63 assets/serializers/platform.py:36 +#: assets/models/platform.py:63 assets/serializers/platform.py:37 msgid "Verify account enabled" msgstr "开启账号验证" -#: assets/models/platform.py:65 assets/serializers/platform.py:37 +#: assets/models/platform.py:65 assets/serializers/platform.py:38 msgid "Verify account method" msgstr "账号验证方式" @@ -1758,23 +1872,23 @@ msgstr "元数据" msgid "Internal" msgstr "内置" -#: assets/models/platform.py:96 assets/serializers/platform.py:126 +#: assets/models/platform.py:96 assets/serializers/platform.py:131 msgid "Charset" msgstr "编码" -#: assets/models/platform.py:98 assets/serializers/platform.py:154 +#: assets/models/platform.py:98 assets/serializers/platform.py:159 msgid "Domain enabled" msgstr "启用网域" -#: assets/models/platform.py:100 assets/serializers/platform.py:153 +#: assets/models/platform.py:100 assets/serializers/platform.py:158 msgid "Su enabled" msgstr "启用账号切换" -#: assets/models/platform.py:101 assets/serializers/platform.py:132 +#: assets/models/platform.py:101 assets/serializers/platform.py:137 msgid "Su method" msgstr "账号切换方式" -#: assets/models/platform.py:102 assets/serializers/platform.py:135 +#: assets/models/platform.py:102 assets/serializers/platform.py:140 msgid "Custom fields" msgstr "自定义属性" @@ -1789,7 +1903,7 @@ msgid "" "type" msgstr "资产中批量更新平台，不符合平台类型跳过的资产" -#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 @@ -1922,59 +2036,59 @@ msgstr "值" msgid "Can't contains: /" msgstr "不能包含: /" -#: assets/serializers/platform.py:42 +#: assets/serializers/platform.py:43 msgid "Gather accounts enabled" msgstr "启用账号收集" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:44 msgid "Gather accounts method" msgstr "收集账号方式" -#: assets/serializers/platform.py:49 +#: assets/serializers/platform.py:50 msgid "Port from addr" msgstr "端口来自地址" -#: assets/serializers/platform.py:61 +#: assets/serializers/platform.py:62 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." msgstr "该协议是主要的，添加资产时必须设置。并且只能有一个主要协议" -#: assets/serializers/platform.py:66 +#: assets/serializers/platform.py:67 msgid "This protocol is required, and it must be set when adding assets." msgstr "该协议是必填的，添加资产时必须设置" -#: assets/serializers/platform.py:69 +#: assets/serializers/platform.py:70 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." msgstr "该协议是默认的，添加资产时，将默认显示" -#: assets/serializers/platform.py:72 +#: assets/serializers/platform.py:73 msgid "This protocol is public, asset will show this protocol to user" msgstr "该协议是公开的，资产将向用户显示该协议并可以连接使用" -#: assets/serializers/platform.py:114 +#: assets/serializers/platform.py:115 msgid "Help text" msgstr "帮助" -#: assets/serializers/platform.py:115 +#: assets/serializers/platform.py:116 msgid "Choices" msgstr "选择" -#: assets/serializers/platform.py:130 +#: assets/serializers/platform.py:135 msgid "Automation" msgstr "自动化" -#: assets/serializers/platform.py:155 +#: assets/serializers/platform.py:160 msgid "Default Domain" msgstr "默认网域" -#: assets/serializers/platform.py:176 +#: assets/serializers/platform.py:181 msgid "type is required" msgstr "类型 该字段是必填项。" -#: assets/serializers/platform.py:199 +#: assets/serializers/platform.py:204 msgid "Protocols is required" msgstr "协议是必填的" @@ -2066,7 +2180,7 @@ msgstr "删除目录" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 -#: perms/const.py:17 rbac/tree.py:234 +#: perms/const.py:17 rbac/tree.py:235 msgid "Delete" msgstr "删除" @@ -2082,7 +2196,8 @@ msgstr "重命名" msgid "Symlink" msgstr "建立软链接" -#: audits/const.py:18 perms/const.py:14 +#: audits/const.py:18 audits/const.py:28 perms/const.py:14 +#: terminal/api/session/session.py:141 msgid "Download" msgstr "下载" @@ -2090,7 +2205,7 @@ msgstr "下载" msgid "Rename dir" msgstr "映射目录" -#: audits/const.py:23 rbac/tree.py:232 +#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "View" @@ -2098,48 +2213,48 @@ msgstr "查看" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 -#: rbac/tree.py:231 +#: rbac/tree.py:232 msgid "Create" msgstr "创建" -#: audits/const.py:28 perms/const.py:12 +#: audits/const.py:29 perms/const.py:12 msgid "Connect" msgstr "连接" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 -#: templates/_header_bar.html:89 +#: audits/const.py:30 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 +#: templates/_header_bar.html:95 msgid "Login" msgstr "登录" -#: audits/const.py:30 ops/const.py:9 +#: audits/const.py:31 ops/const.py:9 msgid "Change password" msgstr "改密" -#: audits/const.py:35 settings/serializers/terminal.py:6 +#: audits/const.py:36 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "终端" -#: audits/const.py:40 audits/models.py:127 +#: audits/const.py:41 audits/models.py:128 msgid "Operate log" msgstr "操作日志" -#: audits/const.py:41 +#: audits/const.py:42 msgid "Session log" msgstr "会话日志" -#: audits/const.py:42 +#: audits/const.py:43 msgid "Login log" msgstr "登录日志" -#: audits/const.py:43 terminal/models/applet/host.py:143 +#: audits/const.py:44 terminal/models/applet/host.py:143 #: terminal/models/component/task.py:22 msgid "Task" msgstr "任务" -#: audits/const.py:49 +#: audits/const.py:50 msgid "-" msgstr "-" @@ -2151,120 +2266,141 @@ msgstr "是" msgid "No" msgstr "否" -#: audits/models.py:42 +#: audits/models.py:43 msgid "Job audit log" msgstr "作业审计日志" -#: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: audits/models.py:52 audits/models.py:96 audits/models.py:167 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "远端地址" -#: audits/models.py:56 audits/serializers.py:34 +#: audits/models.py:57 audits/serializers.py:35 msgid "Operate" msgstr "操作" -#: audits/models.py:58 +#: audits/models.py:59 msgid "Filename" msgstr "文件名" -#: audits/models.py:61 common/serializers/common.py:98 +#: audits/models.py:62 common/serializers/common.py:98 msgid "File" msgstr "文件" -#: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: audits/models.py:63 terminal/backends/command/models.py:21 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 msgid "Session" msgstr "会话" -#: audits/models.py:65 +#: audits/models.py:66 msgid "File transfer log" msgstr "文件管理" -#: audits/models.py:89 audits/serializers.py:85 +#: audits/models.py:90 audits/serializers.py:86 msgid "Resource Type" msgstr "资源类型" -#: audits/models.py:90 audits/models.py:93 audits/models.py:139 -#: audits/serializers.py:84 +#: audits/models.py:91 audits/models.py:94 audits/models.py:140 +#: audits/serializers.py:85 msgid "Resource" msgstr "资源" -#: audits/models.py:96 audits/models.py:142 audits/models.py:168 +#: audits/models.py:97 audits/models.py:143 audits/models.py:169 #: terminal/serializers/command.py:75 msgid "Datetime" msgstr "日期" -#: audits/models.py:135 +#: audits/models.py:136 msgid "Activity type" msgstr "活动类型" -#: audits/models.py:145 +#: audits/models.py:146 msgid "Detail" msgstr "详情" -#: audits/models.py:148 +#: audits/models.py:149 msgid "Detail ID" msgstr "详情 ID" -#: audits/models.py:152 +#: audits/models.py:153 msgid "Activity log" msgstr "活动日志" -#: audits/models.py:164 +#: audits/models.py:165 msgid "Change by" msgstr "修改者" -#: audits/models.py:174 +#: audits/models.py:175 msgid "Password change log" msgstr "改密日志" -#: audits/models.py:181 +#: audits/models.py:182 audits/models.py:257 msgid "Login type" msgstr "登录方式" -#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10 +#: audits/models.py:184 audits/models.py:253 +#: tickets/models/ticket/login_confirm.py:10 msgid "Login IP" msgstr "登录 IP" -#: audits/models.py:185 +#: audits/models.py:186 audits/models.py:255 #: authentication/templates/authentication/_msg_different_city.html:11 #: tickets/models/ticket/login_confirm.py:11 msgid "Login city" msgstr "登录城市" -#: audits/models.py:188 audits/serializers.py:64 +#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65 msgid "User agent" msgstr "用户代理" -#: audits/models.py:191 audits/serializers.py:48 +#: audits/models.py:192 audits/serializers.py:49 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:65 users/models/user.py:810 -#: users/serializers/profile.py:126 +#: users/forms/profile.py:65 users/models/user.py:821 +#: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" -#: audits/models.py:201 +#: audits/models.py:202 msgid "Date login" msgstr "登录日期" -#: audits/models.py:203 audits/serializers.py:66 +#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67 +#: audits/serializers.py:183 msgid "Authentication backend" msgstr "认证方式" -#: audits/models.py:247 +#: audits/models.py:248 msgid "User login log" msgstr "用户登录日志" -#: audits/serializers.py:65 +#: audits/models.py:254 +msgid "Session key" +msgstr "会话标识" + +#: audits/models.py:260 authentication/models/connection_token.py:47 +#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 +#: tickets/models/ticket/apply_application.py:31 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839 +msgid "Date expired" +msgstr "失效日期" + +#: audits/models.py:278 +msgid "User session" +msgstr "用户会话" + +#: audits/models.py:280 +msgid "Offline ussr session" +msgstr "下限用户会话" + +#: audits/serializers.py:66 msgid "Reason display" msgstr "原因描述" -#: audits/serializers.py:133 +#: audits/serializers.py:134 #, python-format msgid "User %s %s this resource" msgstr "用户 %s %s 了当前资源" @@ -2284,46 +2420,51 @@ msgstr "用户 %s 登录系统 %s" msgid "User %s perform a task for this resource: %s" msgstr "用户 %s 在当前资源， 执行了任务 (%s)" -#: audits/signal_handlers/login_log.py:27 +#: audits/signal_handlers/login_log.py:34 msgid "SSH Key" msgstr "SSH 密钥" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 +#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" -#: audits/signal_handlers/login_log.py:30 +#: audits/signal_handlers/login_log.py:37 msgid "Auth Token" msgstr "认证令牌" -#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 -#: users/models/user.py:740 users/models/user.py:848 +#: users/models/user.py:751 users/models/user.py:856 msgid "WeCom" msgstr "企业微信" -#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:13 users/models/user.py:742 -#: users/models/user.py:850 +#: settings/serializers/auth/feishu.py:13 users/models/user.py:753 +#: users/models/user.py:858 msgid "FeiShu" msgstr "飞书" -#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 -#: users/models/user.py:849 +#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752 +#: users/models/user.py:857 msgid "DingTalk" msgstr "钉钉" -#: audits/signal_handlers/login_log.py:34 +#: audits/signal_handlers/login_log.py:41 #: authentication/models/temp_token.py:16 msgid "Temporary token" msgstr "临时密码" -#: audits/tasks.py:101 +#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95 +#: settings/serializers/auth/passkey.py:8 +msgid "Passkey" +msgstr "" + +#: audits/tasks.py:101 users/signal_handlers.py:166 msgid "Clean audits session task log" msgstr "清理审计会话任务日志" @@ -2335,35 +2476,35 @@ msgstr "上传 FTP 文件到外部存储" msgid "This action require verify your MFA" msgstr "该操作需要验证您的 MFA, 请先开启并配置" -#: authentication/api/connection_token.py:258 +#: authentication/api/connection_token.py:260 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "不允许使用可重复使用的连接令牌，未启用全局设置" -#: authentication/api/connection_token.py:338 +#: authentication/api/connection_token.py:351 msgid "Anonymous account is not supported for this asset" msgstr "匿名账号不支持当前资产" -#: authentication/api/connection_token.py:357 +#: authentication/api/connection_token.py:370 msgid "Account not found" msgstr "账号未找到" -#: authentication/api/connection_token.py:360 +#: authentication/api/connection_token.py:373 msgid "Permission expired" msgstr "授权已过期" -#: authentication/api/connection_token.py:374 +#: authentication/api/connection_token.py:387 msgid "ACL action is reject: {}({})" msgstr "ACL 动作是拒绝: {}({})" -#: authentication/api/connection_token.py:378 +#: authentication/api/connection_token.py:391 msgid "ACL action is review" msgstr "ACL 动作是复核" -#: authentication/api/mfa.py:57 +#: authentication/api/mfa.py:59 msgid "Current user not support mfa type: {}" msgstr "当前用户不支持 MFA 类型: {}" -#: authentication/api/password.py:32 terminal/api/session/session.py:259 +#: authentication/api/password.py:32 terminal/api/session/session.py:300 #: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "用户不存在: {}" @@ -2379,7 +2520,7 @@ msgid "" msgstr "用户来自 {} 请去相应系统修改密码" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -2447,6 +2588,26 @@ msgstr "无效的令牌头。符号字符串不应包含无效字符。" msgid "Invalid token or cache refreshed." msgstr "刷新的令牌或缓存无效。" +#: authentication/backends/passkey/api.py:52 +msgid "Auth failed" +msgstr "认证失败" + +#: authentication/backends/passkey/fido.py:148 +msgid "This key is not registered" +msgstr "此密钥未注册" + +#: authentication/backends/passkey/models.py:13 +msgid "Added on" +msgstr "附加" + +#: authentication/backends/passkey/models.py:14 +msgid "Date last used" +msgstr "最后使用日期" + +#: authentication/backends/passkey/models.py:15 +msgid "Credential ID" +msgstr "凭证 ID" + #: authentication/confirm/password.py:16 msgid "Authentication failed password incorrect" msgstr "认证失败 (用户名或密码不正确)" @@ -2756,13 +2917,6 @@ msgstr "资产名称" msgid "Reusable" msgstr "可以重复使用" -#: authentication/models/connection_token.py:47 -#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 -#: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831 -msgid "Date expired" -msgstr "失效日期" - #: authentication/models/connection_token.py:51 #: perms/models/asset_permission.py:77 msgid "From ticket" @@ -2862,7 +3016,7 @@ msgstr "动作" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:38 perms/serializers/permission.py:57 -#: users/serializers/user.py:96 users/serializers/user.py:173 +#: users/serializers/user.py:97 users/serializers/user.py:174 msgid "Is expired" msgstr "已过期" @@ -2870,7 +3024,7 @@ msgstr "已过期" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:57 users/forms/profile.py:102 -#: users/forms/profile.py:109 users/models/user.py:789 +#: users/forms/profile.py:109 users/models/user.py:800 #: users/templates/users/forgot_password.html:117 #: users/views/profile/reset.py:73 msgid "Email" @@ -2882,8 +3036,8 @@ msgid "The {} cannot be empty" msgstr "{} 不能为空" #: authentication/serializers/token.py:79 perms/serializers/permission.py:37 -#: perms/serializers/permission.py:58 users/serializers/user.py:97 -#: users/serializers/user.py:170 +#: perms/serializers/permission.py:58 users/serializers/user.py:98 +#: users/serializers/user.py:171 msgid "Is valid" msgstr "是否有效" @@ -2908,13 +3062,13 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:635 users/serializers/profile.py:116 +#: users/models/user.py:646 users/serializers/profile.py:92 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:636 users/serializers/profile.py:117 +#: users/models/user.py:647 users/serializers/profile.py:93 #: users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" @@ -2959,7 +3113,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:444 +#: jumpserver/conf.py:447 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3013,7 +3167,7 @@ msgid "request new one" msgstr "重新申请" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3063,7 +3217,17 @@ msgstr "如果这次公钥更新不是由你发起的，那么你的账号可能 msgid "Cancel" msgstr "取消" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:237 +msgid "" +"Configuration file has problems and cannot be logged in. Please contact the " +"administrator or view latest docs" +msgstr "配置文件有问题，无法登录，请联系管理员或查看最新文档" + +#: authentication/templates/authentication/login.html:238 +msgid "If you are administrator, you can update the config resolve it, set" +msgstr "如果你是管理员，可以更新配置文件解决，设置配置项" + +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "其他方式登录" @@ -3099,6 +3263,16 @@ msgstr "返回" msgid "Copy success" msgstr "复制成功" +#: authentication/templates/authentication/passkey.html:162 +msgid "" +"This page is not served over HTTPS. Please use HTTPS to ensure security of " +"your credentials." +msgstr "本页面未使用 HTTPS 协议，请使用 HTTPS 协议以确保您的凭据安全。" + +#: authentication/templates/authentication/passkey.html:173 +msgid "Do you want to retry ?" +msgstr "是否重试 ？" + #: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24 #: xpack/plugins/cloud/const.py:29 msgid "LAN" @@ -3175,23 +3349,23 @@ msgstr "绑定 飞书 成功" msgid "Failed to get user from FeiShu" msgstr "从飞书获取用户失败" -#: authentication/views/login.py:183 +#: authentication/views/login.py:210 msgid "Redirecting" msgstr "跳转中" -#: authentication/views/login.py:184 +#: authentication/views/login.py:211 msgid "Redirecting to {} authentication" msgstr "正在跳转到 {} 认证" -#: authentication/views/login.py:207 +#: authentication/views/login.py:234 msgid "Login timeout, please try again." msgstr "登录超时，请重新登录" -#: authentication/views/login.py:250 +#: authentication/views/login.py:277 msgid "User email already exists ({})" msgstr "用户邮箱已存在 ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:361 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3199,15 +3373,15 @@ msgstr "" "等待 {} 确认, 你也可以复制链接发给他/她
\n" " 不要关闭本页面" -#: authentication/views/login.py:333 +#: authentication/views/login.py:366 msgid "No ticket found" msgstr "没有发现工单" -#: authentication/views/login.py:369 +#: authentication/views/login.py:402 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:403 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" @@ -3260,7 +3434,7 @@ msgstr "准备" msgid "Pending" msgstr "待定的" -#: common/const/choices.py:17 ops/const.py:58 +#: common/const/choices.py:17 ops/const.py:59 msgid "Running" msgstr "运行中" @@ -3344,7 +3518,7 @@ msgstr "忽略的" msgid "discard time" msgstr "忽略时间" -#: common/db/models.py:33 users/models/user.py:834 +#: common/db/models.py:33 users/models/user.py:842 msgid "Updated by" msgstr "最后更新者" @@ -3526,29 +3700,11 @@ msgstr "不能包含特殊字符" msgid "The mobile phone number format is incorrect" msgstr "手机号格式不正确" -#: common/views/mixins.py:74 -msgid "Export all" -msgstr "导出所有" - -#: common/views/mixins.py:76 -msgid "Export only selected items" -msgstr "仅导出选择项" - -#: common/views/mixins.py:81 -#, python-format -msgid "Export filtered: %s" -msgstr "导出搜素: %s" - -#: common/views/mixins.py:90 -#, python-format -msgid "User %s view/export secret" -msgstr "用户 %s 查看/导出 了密码" - -#: jumpserver/conf.py:443 +#: jumpserver/conf.py:446 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:445 +#: jumpserver/conf.py:448 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3615,23 +3771,23 @@ msgstr "发布站内消息" msgid "No account available" msgstr "无可用账号" -#: ops/ansible/inventory.py:260 +#: ops/ansible/inventory.py:263 msgid "Ansible disabled" msgstr "Ansible 已禁用" -#: ops/ansible/inventory.py:276 +#: ops/ansible/inventory.py:279 msgid "Skip hosts below:" msgstr "跳过以下主机: " -#: ops/api/celery.py:62 ops/api/celery.py:77 +#: ops/api/celery.py:64 ops/api/celery.py:79 msgid "Waiting task start" msgstr "等待任务开始" -#: ops/api/celery.py:138 +#: ops/api/celery.py:162 msgid "Task {} not found" msgstr "任务 {} 不存在" -#: ops/api/celery.py:143 +#: ops/api/celery.py:167 msgid "Task {} args or kwargs error" msgstr "任务 {} 执行参数错误" @@ -3715,7 +3871,11 @@ msgstr "PostgreSQL" msgid "SQLServer" msgstr "SQLServer" -#: ops/const.py:60 +#: ops/const.py:55 +msgid "Raw" +msgstr "" + +#: ops/const.py:61 msgid "Timeout" msgstr "超时" @@ -3763,7 +3923,7 @@ msgstr "参数" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "创建者" @@ -3804,7 +3964,7 @@ msgstr "可以查看任务监控" msgid "Kwargs" msgstr "其它参数" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "结束" @@ -3991,7 +4151,7 @@ msgstr "LDAP 同步设置组织为当前组织，请切换其他组织后再进 msgid "The organization have resource ({}) cannot be deleted" msgstr "组织存在资源 ({}) 不能被删除" -#: orgs/apps.py:7 rbac/tree.py:122 +#: orgs/apps.py:7 rbac/tree.py:123 msgid "App organizations" msgstr "组织管理" @@ -4020,7 +4180,7 @@ msgstr "默认组织" msgid "SYSTEM" msgstr "系统组织" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41 msgid "Builtin" msgstr "内置的" @@ -4034,7 +4194,7 @@ msgstr "可以查看所有加入的组织" #: orgs/models.py:233 msgid "Can not delete virtual org" -msgstr "" +msgstr "无法删除虚拟组织" #: orgs/tasks.py:9 msgid "Refresh organization cache" @@ -4156,27 +4316,27 @@ msgstr "{} 至少有一个系统角色" msgid "RBAC" msgstr "RBAC" -#: rbac/builtin.py:114 +#: rbac/builtin.py:115 msgid "SystemAdmin" msgstr "系统管理员" -#: rbac/builtin.py:117 +#: rbac/builtin.py:118 msgid "SystemAuditor" msgstr "系统审计员" -#: rbac/builtin.py:120 +#: rbac/builtin.py:121 msgid "SystemComponent" msgstr "系统组件" -#: rbac/builtin.py:126 +#: rbac/builtin.py:127 msgid "OrgAdmin" msgstr "组织管理员" -#: rbac/builtin.py:129 +#: rbac/builtin.py:130 msgid "OrgAuditor" msgstr "组织审计员" -#: rbac/builtin.py:132 +#: rbac/builtin.py:133 msgid "OrgUser" msgstr "组织用户" @@ -4214,7 +4374,7 @@ msgid "Scope" msgstr "范围" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:797 +#: users/models/user.py:808 msgid "Role" msgstr "角色" @@ -4248,7 +4408,7 @@ msgstr "组织角色绑定" msgid "System role binding" msgstr "系统角色绑定" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:132 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 msgid "Perms" msgstr "权限" @@ -4256,7 +4416,7 @@ msgstr "权限" msgid "Users amount" msgstr "用户数量" -#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33 +#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34 msgid "Display name" msgstr "显示名称" @@ -4316,26 +4476,26 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:52 +#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "远程应用" -#: rbac/tree.py:123 +#: rbac/tree.py:124 msgid "Ticket comment" msgstr "工单评论" -#: rbac/tree.py:124 settings/serializers/feature.py:58 +#: rbac/tree.py:125 settings/serializers/feature.py:58 #: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "工单管理" -#: rbac/tree.py:125 +#: rbac/tree.py:126 msgid "Common setting" msgstr "一般设置" -#: rbac/tree.py:126 +#: rbac/tree.py:127 msgid "View permission tree" msgstr "查看授权树" @@ -4380,7 +4540,7 @@ msgstr "测试手机号 该字段是必填项。" msgid "Settings" msgstr "系统设置" -#: settings/models.py:35 +#: settings/models.py:35 users/models/preference.py:14 msgid "Encrypted" msgstr "加密的" @@ -4468,11 +4628,15 @@ msgstr "企业微信 认证" msgid "SSO Auth" msgstr "SSO 令牌认证" -#: settings/serializers/auth/base.py:24 +#: settings/serializers/auth/base.py:22 +msgid "Passkey Auth" +msgstr "Passkey 认证" + +#: settings/serializers/auth/base.py:25 msgid "Forgot password url" msgstr "忘记密码 URL" -#: settings/serializers/auth/base.py:30 +#: settings/serializers/auth/base.py:28 msgid "Enable login redirect msg" msgstr "启用登录跳转提示" @@ -4709,6 +4873,30 @@ msgstr "使用状态" msgid "Use nonce" msgstr "临时使用" +#: settings/serializers/auth/passkey.py:11 +msgid "Enable passkey Auth" +msgstr "启用 Passkey 认证" + +#: settings/serializers/auth/passkey.py:12 +msgid "Only SSL domain can use passkey auth" +msgstr "只有 SSL 域名可以使用 Passkey(通行密钥)认证" + +#: settings/serializers/auth/passkey.py:15 +msgid "FIDO server ID" +msgstr "Passkey 服务域名" + +#: settings/serializers/auth/passkey.py:17 +msgid "" +"The hostname can using passkey auth, If not set, will use request host and " +"the request host in DOMAINS, If multiple domains, use comma to separate" +msgstr "" +"可以使用 Passkey 认证的域名，如果不设置，将使用请求主机(主机名在可信域 " +"DOMAINS中), 如果有多个域名，使用逗号分隔, 不需要端口号" + +#: settings/serializers/auth/passkey.py:22 +msgid "FIDO server name" +msgstr "Passkey 服务名称" + #: settings/serializers/auth/radius.py:13 msgid "Radius" msgstr "Radius" @@ -4853,41 +5041,43 @@ msgstr "启用企业微信认证" msgid "Site url" msgstr "当前站点 URL" -#: settings/serializers/basic.py:10 +#: settings/serializers/basic.py:11 msgid "" -"Email links or other system callbacks are used to access it, eg: http://dev." -"jumpserver.org:8080" +"External URL, email links or other system callbacks are used to access it, " +"eg: http://dev.jumpserver.org:8080" msgstr "" +"外部可访问的 URL, 用于邮件链接或其它系统回调, 例如: http://dev.jumpserver." +"org:8080" -#: settings/serializers/basic.py:13 +#: settings/serializers/basic.py:16 msgid "User guide url" msgstr "用户向导URL" -#: settings/serializers/basic.py:14 +#: settings/serializers/basic.py:17 msgid "User first login update profile done redirect to it" msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档" -#: settings/serializers/basic.py:17 +#: settings/serializers/basic.py:20 msgid "Global organization name" msgstr "全局组织名" -#: settings/serializers/basic.py:18 +#: settings/serializers/basic.py:21 msgid "The name of global organization to display" msgstr "全局组织的显示名称，默认为 全局组织" -#: settings/serializers/basic.py:21 +#: settings/serializers/basic.py:24 msgid "Help Docs URL" msgstr "文档链接" -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:25 msgid "default: http://docs.jumpserver.org" msgstr "默认: http://dev.jumpserver.org:8080" -#: settings/serializers/basic.py:25 +#: settings/serializers/basic.py:28 msgid "Help Support URL" msgstr "支持链接" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:29 msgid "default: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/" @@ -5103,11 +5293,11 @@ msgstr "" "放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问" "题" -#: settings/serializers/security.py:16 +#: settings/serializers/security.py:17 msgid "User password expiration (day)" msgstr "用户密码过期时间 (天)" -#: settings/serializers/security.py:18 +#: settings/serializers/security.py:19 msgid "" "If the user does not update the password during the time, the user password " "will expire failure;The password expiration reminder mail will be automatic " @@ -5116,85 +5306,85 @@ msgstr "" "如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期提醒邮件将在密码过" "期前5天内由系统 (每天)自动发送给用户" -#: settings/serializers/security.py:25 +#: settings/serializers/security.py:26 msgid "Number of repeated historical passwords" msgstr "不能设置近几次密码" -#: settings/serializers/security.py:27 +#: settings/serializers/security.py:28 msgid "" "Tip: When the user resets the password, it cannot be the previous n " "historical passwords of the user" msgstr "提示：用户重置密码时，不能为该用户前几次使用过的密码" -#: settings/serializers/security.py:33 +#: settings/serializers/security.py:34 msgid "Password minimum length" msgstr "密码最小长度" -#: settings/serializers/security.py:37 +#: settings/serializers/security.py:38 msgid "Admin user password minimum length" msgstr "管理员密码最小长度" -#: settings/serializers/security.py:40 +#: settings/serializers/security.py:41 msgid "Must contain capital" msgstr "必须包含大写字符" -#: settings/serializers/security.py:43 +#: settings/serializers/security.py:44 msgid "Must contain lowercase" msgstr "必须包含小写字符" -#: settings/serializers/security.py:46 +#: settings/serializers/security.py:47 msgid "Must contain numeric" msgstr "必须包含数字" -#: settings/serializers/security.py:49 +#: settings/serializers/security.py:50 msgid "Must contain special" msgstr "必须包含特殊字符" -#: settings/serializers/security.py:54 +#: settings/serializers/security.py:55 msgid "" "If the user has failed to log in for a limited number of times, no login is " "allowed during this time interval." msgstr "当用户登录失败次数达到限制后，那么在此间隔内禁止登录" -#: settings/serializers/security.py:62 +#: settings/serializers/security.py:63 msgid "Limit the number of user login failures" msgstr "限制用户登录失败次数" -#: settings/serializers/security.py:66 +#: settings/serializers/security.py:67 msgid "Block user login interval (minute)" msgstr "禁止用户登录间隔 (分)" -#: settings/serializers/security.py:72 +#: settings/serializers/security.py:73 msgid "Limit the number of IP login failures" msgstr "限制 IP 登录失败次数" -#: settings/serializers/security.py:76 +#: settings/serializers/security.py:77 msgid "Block IP login interval (minute)" msgstr "禁止 IP 登录间隔 (分)" -#: settings/serializers/security.py:80 +#: settings/serializers/security.py:81 msgid "Login IP White List" msgstr "IP 登录白名单" -#: settings/serializers/security.py:85 +#: settings/serializers/security.py:86 msgid "Login IP Black List" msgstr "IP 登录黑名单" -#: settings/serializers/security.py:90 +#: settings/serializers/security.py:91 msgid "Only single device login" msgstr "仅一台设备登录" -#: settings/serializers/security.py:91 +#: settings/serializers/security.py:92 msgid "" "After the user logs in on the new device, other logged-in devices will " "automatically log out" msgstr "用户在新设备登录后，其他已登录的设备会自动退出" -#: settings/serializers/security.py:94 +#: settings/serializers/security.py:95 msgid "Only exist user login" msgstr "仅已存在用户登录" -#: settings/serializers/security.py:96 +#: settings/serializers/security.py:97 msgid "" "If enabled, non-existent users will not be allowed to log in; if disabled, " "users of other authentication methods except local authentication methods " @@ -5204,11 +5394,11 @@ msgstr "" "如果开启，不存在的用户将不被允许登录；如果关闭，除本地认证方式外，其他认证方" "式的用户都允许登录并自动创建用户 (如果用户不存在)" -#: settings/serializers/security.py:102 +#: settings/serializers/security.py:103 msgid "Only from source login" msgstr "仅从用户来源登录" -#: settings/serializers/security.py:104 +#: settings/serializers/security.py:105 msgid "" "If it is enabled, the user will only authenticate to the source when logging " "in; if it is disabled, the user will authenticate all the enabled " @@ -5218,69 +5408,69 @@ msgstr "" "如果开启，用户登录时仅会向来源端进行认证；如果关闭，用户登录时会按照一定的顺" "序对所有已开启的认证方式进行顺序认证，只要有一个认证成功就可以直接登录" -#: settings/serializers/security.py:115 +#: settings/serializers/security.py:116 msgid "Not enabled" msgstr "未启用" -#: settings/serializers/security.py:116 +#: settings/serializers/security.py:117 msgid "All users" msgstr "所有用户" -#: settings/serializers/security.py:117 +#: settings/serializers/security.py:118 msgid "Only admin users" msgstr "仅管理员" -#: settings/serializers/security.py:119 +#: settings/serializers/security.py:120 msgid "Global MFA auth" msgstr "全局启用 MFA 认证" -#: settings/serializers/security.py:123 +#: settings/serializers/security.py:124 msgid "Third-party login users perform MFA authentication" msgstr "第三方认证开启 MFA" -#: settings/serializers/security.py:124 +#: settings/serializers/security.py:125 msgid "The third-party login modes include OIDC, CAS, and SAML2" msgstr "第三方登录方式包括: OIDC、CAS、SAML2" -#: settings/serializers/security.py:127 +#: settings/serializers/security.py:128 msgid "OTP issuer name" msgstr "OTP 扫描后的名称" -#: settings/serializers/security.py:131 +#: settings/serializers/security.py:132 msgid "OTP valid window" msgstr "OTP 延迟有效次数" -#: settings/serializers/security.py:135 +#: settings/serializers/security.py:136 msgid "MFA verify TTL" msgstr "MFA 校验有效期" -#: settings/serializers/security.py:137 +#: settings/serializers/security.py:138 msgid "" "Unit: second, The verification MFA takes effect only when you view the " "account password" msgstr "单位：秒，目前仅在查看账号密码校验 MFA 时生效" -#: settings/serializers/security.py:142 +#: settings/serializers/security.py:143 msgid "MFA in login page" msgstr "MFA 在登录页面输入" -#: settings/serializers/security.py:143 +#: settings/serializers/security.py:144 msgid "Eu security regulations(GDPR) require MFA to be on the login page" msgstr "欧盟数据安全法规(GDPR) 要求 MFA 在登录页面，来确保系统登录安全" -#: settings/serializers/security.py:147 +#: settings/serializers/security.py:148 msgid "Verify code TTL (second)" msgstr "验证码有效时间 (分)" -#: settings/serializers/security.py:148 +#: settings/serializers/security.py:149 msgid "Reset password and send SMS code expiration time" msgstr "重置密码的验证码及发送短信的验证码过期时间" -#: settings/serializers/security.py:152 +#: settings/serializers/security.py:153 msgid "Enable Login dynamic code" msgstr "启用登录附加码" -#: settings/serializers/security.py:153 +#: settings/serializers/security.py:154 msgid "" "The password and additional code are sent to a third party authentication " "system for verification" @@ -5288,19 +5478,19 @@ msgstr "" "密码和附加码一并发送给第三方认证系统进行校验, 如：有的第三方认证系统，需要 密" "码+6位数字 完成认证" -#: settings/serializers/security.py:157 +#: settings/serializers/security.py:158 msgid "Enable Login captcha" msgstr "启用登录验证码" -#: settings/serializers/security.py:158 +#: settings/serializers/security.py:159 msgid "Enable captcha to prevent robot authentication" msgstr "开启验证码，防止机器人登录" -#: settings/serializers/security.py:161 +#: settings/serializers/security.py:162 msgid "Remote Login Protection" msgstr "异地登录通知" -#: settings/serializers/security.py:163 +#: settings/serializers/security.py:164 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5309,66 +5499,66 @@ msgstr "" "根据登录 IP 是否所属常用登录城市进行判断，若账号在非常用城市登录，会发送异地" "登录提醒" -#: settings/serializers/security.py:169 +#: settings/serializers/security.py:170 msgid "Unused user timeout (day)" msgstr "不活跃用户自动禁用 (天)" -#: settings/serializers/security.py:170 +#: settings/serializers/security.py:171 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." msgstr "每天检测一次，超过预设时间的用户自动禁用" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:191 msgid "Enable watermark" msgstr "开启水印" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:192 msgid "Enabled, the web session and replay contains watermark information" msgstr "启用后，Web 会话和录像将包含水印信息" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:196 msgid "Connection max idle time (minute)" msgstr "连接最大空闲时间 (分)" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:197 msgid "If idle time more than it, disconnect connection." msgstr "提示：如果超过该配置没有操作，连接会被断开" -#: settings/serializers/security.py:200 +#: settings/serializers/security.py:201 msgid "Session max connection time (hour)" msgstr "会话连接最大时间 (时)" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:202 msgid "If session connection time more than it, disconnect connection." msgstr "提示：如果会话连接超过该配置，连接会被断开" -#: settings/serializers/security.py:204 +#: settings/serializers/security.py:205 msgid "Remember manual auth" msgstr "保存手动输入密码" -#: settings/serializers/security.py:207 +#: settings/serializers/security.py:208 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "Session share" msgstr "会话分享" -#: settings/serializers/security.py:208 +#: settings/serializers/security.py:209 msgid "Enabled, Allows user active session to be shared with other users" msgstr "开启后允许用户分享已连接的资产会话给他人，协同工作" -#: settings/serializers/security.py:214 +#: settings/serializers/security.py:215 msgid "Insecure command alert" msgstr "危险命令告警" -#: settings/serializers/security.py:217 +#: settings/serializers/security.py:218 msgid "Email recipient" msgstr "邮件收件人" -#: settings/serializers/security.py:218 +#: settings/serializers/security.py:219 msgid "Multiple user using , split" msgstr "多个用户，使用 , 分割" -#: settings/serializers/settings.py:69 +#: settings/serializers/settings.py:70 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5427,15 +5617,6 @@ msgstr "启用 Razor 服务" msgid "Enable SSH Client" msgstr "启用 SSH Client" -#: settings/serializers/terminal.py:52 -msgid "Default graphics resolution" -msgstr "默认图形化分辨率" - -#: settings/serializers/terminal.py:53 -msgid "" -"Tip: Default resolution to use when connecting graphical assets in Luna pages" -msgstr "提示：在Luna 页面中连接图形化资产时默认使用的分辨率" - #: settings/tasks/ldap.py:24 msgid "Periodic import ldap user" msgstr "周期导入 LDAP 用户" @@ -5581,27 +5762,27 @@ msgstr "帮助" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:25 +#: templates/_header_bar.html:27 msgid "Commercial support" msgstr "商业支持" -#: templates/_header_bar.html:76 users/forms/profile.py:44 +#: templates/_header_bar.html:79 users/forms/profile.py:44 msgid "Profile" msgstr "个人信息" -#: templates/_header_bar.html:79 +#: templates/_header_bar.html:83 msgid "Admin page" msgstr "管理页面" -#: templates/_header_bar.html:81 +#: templates/_header_bar.html:86 msgid "User page" msgstr "用户页面" -#: templates/_header_bar.html:84 +#: templates/_header_bar.html:90 msgid "API Key" msgstr "API Key" -#: templates/_header_bar.html:85 +#: templates/_header_bar.html:91 msgid "Logout" msgstr "注销登录" @@ -5697,6 +5878,7 @@ msgid "Home page" msgstr "首页" #: templates/resource_download.html:18 templates/resource_download.html:33 +#: users/const.py:48 msgid "Client" msgstr "客户端" @@ -5781,15 +5963,20 @@ msgstr "测试失败: 账号无效" msgid "Have online sessions" msgstr "有在线会话" -#: terminal/api/session/session.py:251 +#: terminal/api/session/session.py:46 +#, python-format +msgid "User %s %s session %s replay" +msgstr "用户 %s %s 了会话 %s 的录像" + +#: terminal/api/session/session.py:292 msgid "Session does not exist: {}" msgstr "会话不存在: {}" -#: terminal/api/session/session.py:254 +#: terminal/api/session/session.py:295 msgid "Session is finished or the protocol not supported" msgstr "会话已经完成或协议不支持" -#: terminal/api/session/session.py:267 +#: terminal/api/session/session.py:308 msgid "User does not have permission" msgstr "用户没有权限" @@ -5907,51 +6094,51 @@ msgstr "不支持批量创建" msgid "Storage is invalid" msgstr "存储无效" -#: terminal/models/applet/applet.py:29 -msgid "Community" +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +msgid "Community edition" msgstr "社区版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:31 msgid "Enterprise" msgstr "企业版" -#: terminal/models/applet/applet.py:35 +#: terminal/models/applet/applet.py:36 msgid "Author" msgstr "作者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31 +#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31 msgid "Edition" msgstr "版本" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Can concurrent" msgstr "可以并发" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:44 msgid "Tags" msgstr "标签" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "主机" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:93 msgid "Applet pkg not valid, Missing file {}" msgstr "Applet pkg 无效，缺少文件 {}" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:112 msgid "Load platform.yml failed: {}" msgstr "加载 platform.yml 失败: {}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:115 msgid "Only support custom platform" msgstr "只支持自定义平台" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:120 msgid "Missing type in platform.yml" msgstr "在 platform.yml 中缺少类型" -#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:137 msgid "Hosting" msgstr "宿主机" @@ -6110,7 +6297,7 @@ msgstr "可以下载会话录像" msgid "Account id" msgstr "账号 ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "登录来源" @@ -6146,61 +6333,61 @@ msgstr "可以终断会话" msgid "Can validate session action perm" msgstr "可以验证会话动作权限" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "过期时间 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "操作权限" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "来源" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "会话分享" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "可以创建超级会话分享" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "链接失效" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "链接过期" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "该用户无权加入会话" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "加入者" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "加入日期" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "结束日期" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "会话加入记录" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "验证码不正确" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "您已经加入过此会话" @@ -6270,7 +6457,7 @@ msgstr "" "建议填写内网地址，否则填写当前站点 URL
例如：https://172.16.10.110 or " "https://dev.jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "忽略证书认证" @@ -6454,30 +6641,34 @@ msgid "Endpoint suffix" msgstr "端点后缀" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "地址中不能包含特殊字符 `#`" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "地址格式不正确" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "主机无效" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "端口无效" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "按日期建索引" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "是否根据日期动态建立索引" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "索引" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "文档类型" @@ -6840,7 +7031,7 @@ msgid "Ticket information" msgstr "工单信息" #: tickets/templates/tickets/approve_check_password.html:29 -#: tickets/views/approve.py:39 +#: tickets/views/approve.py:40 msgid "Ticket approval" msgstr "工单审批" @@ -6852,24 +7043,24 @@ msgstr "同意" msgid "Go Login" msgstr "去登录" -#: tickets/views/approve.py:40 +#: tickets/views/approve.py:41 msgid "" "This ticket does not exist, the process has ended, or this link has expired" msgstr "工单不存在，或者工单流程已经结束，或者此链接已经过期" -#: tickets/views/approve.py:69 +#: tickets/views/approve.py:70 msgid "Click the button below to approve or reject" msgstr "点击下方按钮同意或者拒绝" -#: tickets/views/approve.py:71 +#: tickets/views/approve.py:72 msgid "After successful authentication, this ticket can be approved directly" msgstr "认证成功后，工单可直接审批" -#: tickets/views/approve.py:93 +#: tickets/views/approve.py:97 msgid "Illegal approval action" msgstr "无效的审批动作" -#: tickets/views/approve.py:106 +#: tickets/views/approve.py:110 msgid "This user is not authorized to approve this ticket" msgstr "此用户无权审批此工单" @@ -6905,6 +7096,30 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" +#: users/const.py:23 +msgid "AUTO" +msgstr "自动" + +#: users/const.py:31 +msgid "Full screen" +msgstr "全屏" + +#: users/const.py:32 +msgid "Multi screen" +msgstr "多屏显示" + +#: users/const.py:33 +msgid "Drives redirect" +msgstr "磁盘挂载" + +#: users/const.py:52 +msgid "Replace" +msgstr "替换" + +#: users/const.py:53 +msgid "Suffix" +msgstr "加后缀" + #: users/exceptions.py:10 msgid "MFA not enabled" msgstr "MFA 多因子认证没有开启" @@ -6983,83 +7198,87 @@ msgstr "复制你的公钥到这里" msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms/profile.py:162 users/serializers/profile.py:100 -#: users/serializers/profile.py:183 users/serializers/profile.py:210 +#: users/forms/profile.py:162 users/serializers/profile.py:76 +#: users/serializers/profile.py:159 users/serializers/profile.py:186 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:173 users/models/user.py:820 +#: users/forms/profile.py:173 users/models/user.py:831 #: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "SSH公钥" -#: users/models/user.py:637 users/serializers/profile.py:118 +#: users/models/preference.py:38 +msgid "Preference" +msgstr "用户设置" + +#: users/models/user.py:648 users/serializers/profile.py:94 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:799 users/serializers/user.py:171 +#: users/models/user.py:810 users/serializers/user.py:172 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:801 +#: users/models/user.py:812 msgid "Avatar" msgstr "头像" -#: users/models/user.py:804 +#: users/models/user.py:815 msgid "Wechat" msgstr "微信" -#: users/models/user.py:807 users/serializers/user.py:108 +#: users/models/user.py:818 users/serializers/user.py:109 msgid "Phone" msgstr "手机" -#: users/models/user.py:813 +#: users/models/user.py:824 msgid "OTP secret key" msgstr "OTP 密钥" -#: users/models/user.py:817 +#: users/models/user.py:828 #: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh私钥" -#: users/models/user.py:823 -msgid "Secret key" -msgstr "Secret key" - -#: users/models/user.py:828 users/serializers/profile.py:149 -#: users/serializers/user.py:168 +#: users/models/user.py:836 users/serializers/profile.py:125 +#: users/serializers/user.py:169 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:842 +#: users/models/user.py:850 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:845 +#: users/models/user.py:853 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:988 +#: users/models/user.py:977 +msgid "Can not delete admin user" +msgstr "无法删除管理员用户" + +#: users/models/user.py:1003 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:989 +#: users/models/user.py:1004 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:990 +#: users/models/user.py:1005 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:999 +#: users/models/user.py:1014 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1002 +#: users/models/user.py:1017 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1027 +#: users/models/user.py:1042 msgid "User password history" msgstr "用户密码历史" @@ -7094,11 +7313,67 @@ msgstr "重置 SSH 密钥" msgid "Reset MFA" msgstr "重置 MFA" +#: users/serializers/preference/koko.py:10 +msgid "File name conflict resolution" +msgstr "文件名冲突解决方案" + +#: users/serializers/preference/lina.py:11 +msgid "New file encryption password" +msgstr "文件加密密码" + +#: users/serializers/preference/lina.py:16 +msgid "Confirm file encryption password" +msgstr "确认文件加密密码" + +#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48 +msgid "The newly set password is inconsistent" +msgstr "两次密码不一致" + +#: users/serializers/preference/luna.py:23 +msgid "Async loading of asset tree" +msgstr "异步加载资产树" + +#: users/serializers/preference/luna.py:30 +msgid "RDP resolution" +msgstr "RDP 分辨率" + +#: users/serializers/preference/luna.py:34 +msgid "Keyboard layout" +msgstr "键盘布局" + +#: users/serializers/preference/luna.py:38 +msgid "RDP client option" +msgstr "RDP 客户端选项" + +#: users/serializers/preference/luna.py:42 +msgid "Remote application connection method" +msgstr "远程应用连接方式" + +#: users/serializers/preference/luna.py:49 +msgid "Character terminal font size" +msgstr "字符终端字体大小" + +#: users/serializers/preference/luna.py:52 +msgid "Backspace as Ctrl+H" +msgstr "字符终端Backspace As Ctrl+H" + +#: users/serializers/preference/luna.py:55 +msgid "Right click quickly paste" +msgstr "右键快速粘贴" + +#: users/serializers/preference/luna.py:61 +msgid "Graphics" +msgstr "图形化" + +#: users/serializers/preference/luna.py:62 +msgid "Command line" +msgstr "命令行" + #: users/serializers/profile.py:29 msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/profile.py:36 users/serializers/profile.py:197 +#: users/serializers/profile.py:36 users/serializers/profile.py:173 msgid "Password does not match security rules" msgstr "密码不满足安全规则" @@ -7106,10 +7381,6 @@ msgstr "密码不满足安全规则" msgid "The new password cannot be the last {} passwords" msgstr "新密码不能是最近 {} 次的密码" -#: users/serializers/profile.py:48 users/serializers/profile.py:71 -msgid "The newly set password is inconsistent" -msgstr "两次密码不一致" - #: users/serializers/user.py:42 msgid "System roles" msgstr "系统角色" @@ -7118,55 +7389,55 @@ msgstr "系统角色" msgid "Org roles" msgstr "组织角色" -#: users/serializers/user.py:89 +#: users/serializers/user.py:90 msgid "Password strategy" msgstr "密码策略" -#: users/serializers/user.py:91 +#: users/serializers/user.py:92 msgid "MFA enabled" msgstr "MFA 已启用" -#: users/serializers/user.py:93 +#: users/serializers/user.py:94 msgid "MFA force enabled" msgstr "强制 MFA" -#: users/serializers/user.py:95 +#: users/serializers/user.py:96 msgid "Login blocked" msgstr "登录被锁定" -#: users/serializers/user.py:98 users/serializers/user.py:177 +#: users/serializers/user.py:99 users/serializers/user.py:178 msgid "Is OTP bound" msgstr "是否绑定了虚拟 MFA" -#: users/serializers/user.py:100 +#: users/serializers/user.py:101 msgid "Can public key authentication" msgstr "可以使用公钥认证" -#: users/serializers/user.py:172 +#: users/serializers/user.py:173 msgid "Is org admin" msgstr "组织管理员" -#: users/serializers/user.py:174 +#: users/serializers/user.py:175 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:178 +#: users/serializers/user.py:179 msgid "MFA level" msgstr "MFA 级别" -#: users/serializers/user.py:284 +#: users/serializers/user.py:285 msgid "Select users" msgstr "选择用户" -#: users/serializers/user.py:285 +#: users/serializers/user.py:286 msgid "For security, only list several users" msgstr "为了安全，仅列出几个用户" -#: users/serializers/user.py:318 +#: users/serializers/user.py:319 msgid "name not unique" msgstr "名称重复" -#: users/signal_handlers.py:27 +#: users/signal_handlers.py:32 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -7174,23 +7445,23 @@ msgid "" msgstr "" "管理员已开启'仅允许已存在用户登录'，当前用户不在用户列表中，请联系管理员。" -#: users/tasks.py:24 +#: users/tasks.py:23 msgid "Check password expired" msgstr "校验密码已过期" -#: users/tasks.py:38 +#: users/tasks.py:37 msgid "Periodic check password expired" msgstr "周期校验密码过期" -#: users/tasks.py:52 +#: users/tasks.py:51 msgid "Check user expired" msgstr "校验用户已过期" -#: users/tasks.py:69 +#: users/tasks.py:68 msgid "Periodic check user expired" msgstr "周期检测用户过期" -#: users/tasks.py:83 +#: users/tasks.py:82 msgid "Check unused users" msgstr "校验用户已过期" @@ -7588,7 +7859,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 msgid "Regions" msgstr "地域" @@ -7597,17 +7868,17 @@ msgid "Hostname strategy" msgstr "主机名策略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "IP network segment group" msgstr "IP网段组" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同步IP类型" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/serializers/task.py:177 msgid "Always update" msgstr "总是更新" @@ -7700,9 +7971,9 @@ msgstr "规则匹配" msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:317 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 msgid "Strategy rule" -msgstr "策略规则" +msgstr "条件" #: xpack/plugins/cloud/models.py:332 msgid "Action attr" @@ -7712,9 +7983,9 @@ msgstr "动作属性" msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 msgid "Strategy action" -msgstr "策略动作" +msgstr "动作" #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" @@ -7999,7 +8270,7 @@ msgstr "测试超时时间" msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:143 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 " @@ -8011,11 +8282,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "Instance count" msgstr "实例个数" @@ -8071,22 +8342,25 @@ msgstr "许可证导入成功" msgid "License is invalid" msgstr "无效的许可证" -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138 +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140 msgid "License" msgstr "许可证" #: xpack/plugins/license/models.py:80 -msgid "Standard edition" -msgstr "标准版" +msgid "Basic edition" +msgstr "企业基础版" #: xpack/plugins/license/models.py:82 -msgid "Enterprise edition" -msgstr "企业版" +msgid "Standard edition" +msgstr "企业标准版" #: xpack/plugins/license/models.py:84 -msgid "Ultimate edition" -msgstr "旗舰版" +msgid "Professional edition" +msgstr "企业专业版" #: xpack/plugins/license/models.py:86 -msgid "Community edition" -msgstr "社区版" +msgid "Ultimate edition" +msgstr "企业旗舰版" + +#~ msgid "Random" +#~ msgstr "随机" diff --git a/apps/notifications/api/notifications.py b/apps/notifications/api/notifications.py index 827cb9d19..9f641ee70 100644 --- a/apps/notifications/api/notifications.py +++ b/apps/notifications/api/notifications.py @@ -96,6 +96,8 @@ def get_all_test_messages(request): import textwrap from ..notifications import Message from django.shortcuts import HttpResponse + if not request.user.is_superuser: + return HttpResponse('没有权限', status=401) msgs_cls = Message.get_all_sub_messages() html_data = '=7){this.setupTypeNumber(test);}
+ if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
+ this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
+ return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
+ for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
+ for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
+ this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);}
+ var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
+ this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
+ row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. ("
+ +buffer.getLengthInBits()
+ +">"
+ +totalDataCount*8
+ +")");}
+ if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
+ while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
+ while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD1,8);}
+ return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}}
+ var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
+ return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
+ return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
+ return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}}
+ for(var row=0;row=256){n-=255;}
+ return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
+ if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
+ this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
+
+ function _isSupportCanvas() {
+ return typeof CanvasRenderingContext2D != "undefined";
+ }
+
+ // android 2.x doesn't support Data-URI spec
+ function _getAndroid() {
+ var android = false;
+ var sAgent = navigator.userAgent;
+
+ if (/android/i.test(sAgent)) { // android
+ android = true;
+ var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
+
+ if (aMat && aMat[1]) {
+ android = parseFloat(aMat[1]);
+ }
+ }
+
+ return android;
+ }
+
+ var svgDrawer = (function() {
+
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+
+ this.clear();
+
+ function makeSVG(tag, attrs) {
+ var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
+ for (var k in attrs)
+ if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
+ return el;
+ }
+
+ var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
+ svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
+ _el.appendChild(svg);
+
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ if (oQRCode.isDark(row, col)) {
+ var child = makeSVG("use", {"x": String(col), "y": String(row)});
+ child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
+ svg.appendChild(child);
+ }
+ }
+ }
+ };
+ Drawing.prototype.clear = function () {
+ while (this._el.hasChildNodes())
+ this._el.removeChild(this._el.lastChild);
+ };
+ return Drawing;
+ })();
+
+ var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
+
+ // Drawing in DOM by using Table tag
+ var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+ var aHTML = [''];
+
+ for (var row = 0; row < nCount; row++) {
+ aHTML.push('
');
+ _el.innerHTML = aHTML.join('');
+
+ // Fix the margin values as real size.
+ var elTable = _el.childNodes[0];
+ var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
+ var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
+
+ if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
+ elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._el.innerHTML = '';
+ };
+
+ return Drawing;
+ })() : (function () { // Drawing in Canvas
+ function _onMakeImage() {
+ this._elImage.src = this._elCanvas.toDataURL("image/png");
+ this._elImage.style.display = "block";
+ this._elCanvas.style.display = "none";
+ }
+
+ // Android 2.1 bug workaround
+ // http://code.google.com/p/android/issues/detail?id=5141
+ if (this._android && this._android <= 2.1) {
+ var factor = 1 / window.devicePixelRatio;
+ var drawImage = CanvasRenderingContext2D.prototype.drawImage;
+ CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
+ if (("nodeName" in image) && /img/i.test(image.nodeName)) {
+ for (var i = arguments.length - 1; i >= 1; i--) {
+ arguments[i] = arguments[i] * factor;
+ }
+ } else if (typeof dw == "undefined") {
+ arguments[1] *= factor;
+ arguments[2] *= factor;
+ arguments[3] *= factor;
+ arguments[4] *= factor;
+ }
+
+ drawImage.apply(this, arguments);
+ };
+ }
+
+ /**
+ * Check whether the user's browser supports Data URI or not
+ *
+ * @private
+ * @param {Function} fSuccess Occurs if it supports Data URI
+ * @param {Function} fFail Occurs if it doesn't support Data URI
+ */
+ function _safeSetDataURI(fSuccess, fFail) {
+ var self = this;
+ self._fFail = fFail;
+ self._fSuccess = fSuccess;
+
+ // Check it just once
+ if (self._bSupportDataURI === null) {
+ var el = document.createElement("img");
+ var fOnError = function() {
+ self._bSupportDataURI = false;
+
+ if (self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+ var fOnSuccess = function() {
+ self._bSupportDataURI = true;
+
+ if (self._fSuccess) {
+ self._fSuccess.call(self);
+ }
+ };
+
+ el.onabort = fOnError;
+ el.onerror = fOnError;
+ el.onload = fOnSuccess;
+ el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
+ return;
+ } else if (self._bSupportDataURI === true && self._fSuccess) {
+ self._fSuccess.call(self);
+ } else if (self._bSupportDataURI === false && self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+
+ /**
+ * Drawing QRCode by using canvas
+ *
+ * @constructor
+ * @param {HTMLElement} el
+ * @param {Object} htOption QRCode Options
+ */
+ var Drawing = function (el, htOption) {
+ this._bIsPainted = false;
+ this._android = _getAndroid();
+
+ this._htOption = htOption;
+ this._elCanvas = document.createElement("canvas");
+ this._elCanvas.width = htOption.width;
+ this._elCanvas.height = htOption.height;
+ el.appendChild(this._elCanvas);
+ this._el = el;
+ this._oContext = this._elCanvas.getContext("2d");
+ this._bIsPainted = false;
+ this._elImage = document.createElement("img");
+ this._elImage.alt = "Scan me!";
+ this._elImage.style.display = "none";
+ this._el.appendChild(this._elImage);
+ this._bSupportDataURI = null;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _elImage = this._elImage;
+ var _oContext = this._oContext;
+ var _htOption = this._htOption;
+
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = _htOption.width / nCount;
+ var nHeight = _htOption.height / nCount;
+ var nRoundedWidth = Math.round(nWidth);
+ var nRoundedHeight = Math.round(nHeight);
+
+ _elImage.style.display = "none";
+ this.clear();
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ var bIsDark = oQRCode.isDark(row, col);
+ var nLeft = col * nWidth;
+ var nTop = row * nHeight;
+ _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.lineWidth = 1;
+ _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.fillRect(nLeft, nTop, nWidth, nHeight);
+
+ // 안티 앨리어싱 방지 처리
+ _oContext.strokeRect(
+ Math.floor(nLeft) + 0.5,
+ Math.floor(nTop) + 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+
+ _oContext.strokeRect(
+ Math.ceil(nLeft) - 0.5,
+ Math.ceil(nTop) - 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+ }
+ }
+
+ this._bIsPainted = true;
+ };
+
+ /**
+ * Make the image from Canvas if the browser supports Data URI.
+ */
+ Drawing.prototype.makeImage = function () {
+ if (this._bIsPainted) {
+ _safeSetDataURI.call(this, _onMakeImage);
+ }
+ };
+
+ /**
+ * Return whether the QRCode is painted or not
+ *
+ * @return {Boolean}
+ */
+ Drawing.prototype.isPainted = function () {
+ return this._bIsPainted;
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
+ this._bIsPainted = false;
+ };
+
+ /**
+ * @private
+ * @param {Number} nNumber
+ */
+ Drawing.prototype.round = function (nNumber) {
+ if (!nNumber) {
+ return nNumber;
+ }
+
+ return Math.floor(nNumber * 1000) / 1000;
+ };
+
+ return Drawing;
+ })();
+
+ /**
+ * Get the type by string length
+ *
+ * @private
+ * @param {String} sText
+ * @param {Number} nCorrectLevel
+ * @return {Number} type
+ */
+ function _getTypeNumber(sText, nCorrectLevel) {
+ var nType = 1;
+ var length = _getUTF8Length(sText);
+
+ for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+ var nLimit = 0;
+
+ switch (nCorrectLevel) {
+ case QRErrorCorrectLevel.L :
+ nLimit = QRCodeLimitLength[i][0];
+ break;
+ case QRErrorCorrectLevel.M :
+ nLimit = QRCodeLimitLength[i][1];
+ break;
+ case QRErrorCorrectLevel.Q :
+ nLimit = QRCodeLimitLength[i][2];
+ break;
+ case QRErrorCorrectLevel.H :
+ nLimit = QRCodeLimitLength[i][3];
+ break;
+ }
+
+ if (length <= nLimit) {
+ break;
+ } else {
+ nType++;
+ }
+ }
+
+ if (nType > QRCodeLimitLength.length) {
+ throw new Error("Too long data");
+ }
+
+ return nType;
+ }
+
+ function _getUTF8Length(sText) {
+ var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+ return replacedText.length + (replacedText.length != sText ? 3 : 0);
+ }
+
+ /**
+ * @class QRCode
+ * @constructor
+ * @example
+ * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
+ *
+ * @example
+ * var oQRCode = new QRCode("test", {
+ * text : "http://naver.com",
+ * width : 128,
+ * height : 128
+ * });
+ *
+ * oQRCode.clear(); // Clear the QRCode.
+ * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
+ *
+ * @param {HTMLElement|String} el target element or 'id' attribute of element.
+ * @param {Object|String} vOption
+ * @param {String} vOption.text QRCode link data
+ * @param {Number} [vOption.width=256]
+ * @param {Number} [vOption.height=256]
+ * @param {String} [vOption.colorDark="#000000"]
+ * @param {String} [vOption.colorLight="#ffffff"]
+ * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
+ */
+ QRCode = function (el, vOption) {
+ this._htOption = {
+ width : 256,
+ height : 256,
+ typeNumber : 4,
+ colorDark : "#000000",
+ colorLight : "#ffffff",
+ correctLevel : QRErrorCorrectLevel.H
+ };
+
+ if (typeof vOption === 'string') {
+ vOption = {
+ text : vOption
+ };
+ }
+
+ // Overwrites options
+ if (vOption) {
+ for (var i in vOption) {
+ this._htOption[i] = vOption[i];
+ }
+ }
+
+ if (typeof el == "string") {
+ el = document.getElementById(el);
+ }
+
+ if (this._htOption.useSVG) {
+ Drawing = svgDrawer;
+ }
+
+ this._android = _getAndroid();
+ this._el = el;
+ this._oQRCode = null;
+ this._oDrawing = new Drawing(this._el, this._htOption);
+
+ if (this._htOption.text) {
+ this.makeCode(this._htOption.text);
+ }
+ };
+
+ /**
+ * Make the QRCode
+ *
+ * @param {String} sText link data
+ */
+ QRCode.prototype.makeCode = function (sText) {
+ this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
+ this._oQRCode.addData(sText);
+ this._oQRCode.make();
+ this._el.title = sText;
+ this._oDrawing.draw(this._oQRCode);
+ this.makeImage();
+ };
+
+ /**
+ * Make the Image from Canvas element
+ * - It occurs automatically
+ * - Android below 3 doesn't support Data-URI spec.
+ *
+ * @private
+ */
+ QRCode.prototype.makeImage = function () {
+ if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
+ this._oDrawing.makeImage();
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ QRCode.prototype.clear = function () {
+ this._oDrawing.clear();
+ };
+
+ /**
+ * @name QRCode.CorrectLevel
+ */
+ QRCode.CorrectLevel = QRErrorCorrectLevel;
+})();
+
+if (typeof module != "undefined") {
+ module.exports = QRCode;
+}
diff --git a/apps/static/js/plugins/qrcode/qrcode.min.js b/apps/static/js/plugins/qrcode/qrcode.min.js
deleted file mode 100755
index 993e88f39..000000000
--- a/apps/static/js/plugins/qrcode/qrcode.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}();
\ No newline at end of file
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 62ddb52c4..72fb77201 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -14,13 +14,15 @@
For security, please set " +"config CACHE_LOGIN_PASSWORD_ENABLED to true" msgstr "" "現在、AD/LDAPからのログインのみをサポートしています。シークレットの優先順位: " -"資産シークレット内の同じアカウント > ログインシークレット > 手動入力" +"資産シークレット内の同じアカウント > ログインシークレット > 手動入力.
" +"セキュリティのために、「config CACHE_LOGIN_PASSWORD_ENABLED」をtrueに設定して" +"ください。 " #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -800,31 +877,46 @@ msgstr "名前は既に存在します。" msgid "Automation snapshot" msgstr "自動スナップショット" -#: accounts/serializers/automations/change_secret.py:43 +#: accounts/serializers/automations/change_secret.py:42 msgid "SSH Key strategy" msgstr "SSHキー戦略" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:80 msgid "* Please enter the correct password length" msgstr "* 正しいパスワードの長さを入力してください" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:84 msgid "* Password length range 6-30 bits" msgstr "* パスワードの長さの範囲6-30ビット" -#: accounts/serializers/automations/change_secret.py:115 +#: accounts/serializers/automations/change_secret.py:114 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自動タスク実行履歴" -#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 -#: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 -#: tickets/views/approve.py:115 +#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54 +#: audits/models.py:60 audits/signal_handlers/activity_log.py:33 +#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 +#: tickets/views/approve.py:119 msgid "Success" msgstr "成功" +#: accounts/signal_handlers.py:46 +#, python-format +msgid "Push related accounts to assets: %s, by system" +msgstr "関連するアカウントをアセットにプッシュ: %s, by system" + +#: accounts/signal_handlers.py:55 +#, python-format +msgid "Add account: %s" +msgstr "アカウントを追加: %s" + +#: accounts/signal_handlers.py:57 +#, python-format +msgid "Delete account: %s" +msgstr "アカウントを削除: %s" + #: accounts/tasks/automation.py:24 msgid "Account execute automation" msgstr "アカウント実行の自動化" @@ -853,19 +945,23 @@ msgstr "アセット アカウントの可用性を確認する" msgid "Verify accounts connectivity" msgstr "アカウント接続のテスト" -#: accounts/utils.py:41 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "パスワードには '{{' を含まない" -#: accounts/utils.py:44 +#: accounts/utils.py:55 +msgid "Password can not contains `{%` " +msgstr "パスワードには '{%' を含まない" + +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "パスワードには `'` を含まない" -#: accounts/utils.py:46 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "パスワードには `\"` を含まない" -#: accounts/utils.py:52 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "秘密鍵が無効またはpassphraseエラー" @@ -910,12 +1006,12 @@ msgstr "レビュー担当者" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "アクティブ" -#: acls/models/base.py:81 users/apps.py:9 +#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16 msgid "Users" msgstr "ユーザー" @@ -1032,7 +1128,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:137 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1107,6 +1203,10 @@ msgstr "アプリ資産" msgid "{} disabled" msgstr "{} 無効" +#: assets/automations/base/manager.py:202 +msgid " - Platform {} ansible disabled" +msgstr " - プラットフォーム {} ansible 無効" + #: assets/automations/ping_gateway/manager.py:33 #: authentication/models/connection_token.py:128 msgid "No account" @@ -1131,7 +1231,7 @@ msgstr "認証に失敗しました" msgid "Connect failed" msgstr "接続に失敗しました" -#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36 +#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104 msgid "Unknown" @@ -1153,16 +1253,19 @@ msgstr "テストゲートウェイ" msgid "Gather facts" msgstr "資産情報の収集" -#: assets/const/base.py:33 audits/const.py:47 +#: assets/const/base.py:33 audits/const.py:48 #: terminal/serializers/applet_host.py:32 msgid "Disabled" msgstr "無効" #: assets/const/base.py:34 settings/serializers/basic.py:6 +#: users/serializers/preference/koko.py:15 +#: users/serializers/preference/lina.py:32 +#: users/serializers/preference/luna.py:60 msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:245 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1184,8 +1287,8 @@ msgid "Cloud service" msgstr "クラウド サービス" #: assets/const/category.py:14 assets/models/asset/gpt.py:11 -#: assets/models/asset/web.py:16 audits/const.py:34 -#: terminal/models/applet/applet.py:26 +#: assets/models/asset/web.py:16 audits/const.py:35 +#: terminal/models/applet/applet.py:27 users/const.py:47 msgid "Web" msgstr "Web" @@ -1205,7 +1308,7 @@ msgstr "私有雲" msgid "Kubernetes" msgstr "Kubernetes" -#: assets/const/device.py:7 terminal/models/applet/applet.py:25 +#: assets/const/device.py:7 terminal/models/applet/applet.py:26 #: tickets/const.py:8 msgid "General" msgstr "一般" @@ -1224,86 +1327,102 @@ msgstr "ファイアウォール" #: assets/const/gpt.py:7 msgid "ChatGPT" -msgstr "" +msgstr "ChatGPT" #: assets/const/host.py:12 rbac/tree.py:28 msgid "Other" msgstr "その他" #: assets/const/protocol.py:48 -msgid "SFTP home" -msgstr "SFTP ルート パス" +msgid "SFTP root" +msgstr "SFTPルート" -#: assets/const/protocol.py:59 +#: assets/const/protocol.py:50 +#, python-brace-format +msgid "" +"SFTP root directory, Support variable:
- ${ACCOUNT} The connected " +"account username
- ${HOME} The home directory of the connected account " +"
- ${USER} The username of the user" +msgstr "" +"SFTPルートディレクトリ、サポート変数：
-${ACCOUNT}接続されたアカウントの" +"ユーザー名
-${HOME}接続されたアカウントのホームディレクトリ
-${USER}" +"ユーザーのユーザー名" + +#: assets/const/protocol.py:65 msgid "Console" msgstr "Console" -#: assets/const/protocol.py:60 +#: assets/const/protocol.py:66 msgid "Connect to console session" msgstr "コンソールセッションに接続" -#: assets/const/protocol.py:64 +#: assets/const/protocol.py:70 msgid "Any" msgstr "任意" -#: assets/const/protocol.py:66 settings/serializers/security.py:227 +#: assets/const/protocol.py:72 settings/serializers/security.py:228 msgid "Security" msgstr "セキュリティ" -#: assets/const/protocol.py:67 +#: assets/const/protocol.py:73 msgid "Security layer to use for the connection" msgstr "接続に使用するセキュリティ レイヤー" -#: assets/const/protocol.py:73 +#: assets/const/protocol.py:79 msgid "AD domain" msgstr "AD ドメイン" -#: assets/const/protocol.py:88 +#: assets/const/protocol.py:94 msgid "Username prompt" msgstr "ユーザー名プロンプト" -#: assets/const/protocol.py:89 +#: assets/const/protocol.py:95 msgid "We will send username when we see this prompt" msgstr "このプロンプトが表示されたらユーザー名を送信します" -#: assets/const/protocol.py:94 +#: assets/const/protocol.py:100 msgid "Password prompt" msgstr "パスワードプロンプト" -#: assets/const/protocol.py:95 +#: assets/const/protocol.py:101 msgid "We will send password when we see this prompt" msgstr "このプロンプトが表示されたらパスワードを送信します" -#: assets/const/protocol.py:100 +#: assets/const/protocol.py:106 msgid "Success prompt" msgstr "成功プロンプト" -#: assets/const/protocol.py:101 +#: assets/const/protocol.py:107 msgid "We will consider login success when we see this prompt" msgstr "このプロンプトが表示されたらログイン成功とみなします" -#: assets/const/protocol.py:112 assets/models/asset/database.py:10 +#: assets/const/protocol.py:118 assets/models/asset/database.py:10 #: settings/serializers/msg.py:40 msgid "Use SSL" msgstr "SSLの使用" -#: assets/const/protocol.py:147 +#: assets/const/protocol.py:153 msgid "SYSDBA" msgstr "SYSDBA" -#: assets/const/protocol.py:148 +#: assets/const/protocol.py:154 msgid "Connect as SYSDBA" msgstr "SYSDBA として接続" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:169 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server のバージョン。バージョンによって接続ドライバが異なります" + +#: assets/const/protocol.py:192 msgid "Auth username" msgstr "ユーザー名で認証する" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:215 msgid "Safe mode" msgstr "安全モード" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:217 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." @@ -1311,24 +1430,24 @@ msgstr "" "安全モードが有効になっている場合、新しいタブ、右クリック、他のウェブサイトへ" "のアクセスなど、一部の操作が無効になります" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:222 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自動充填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:230 assets/models/asset/web.py:10 msgid "Username selector" msgstr "ユーザー名ピッカー" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:235 assets/models/asset/web.py:11 msgid "Password selector" msgstr "パスワードセレクター" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:240 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "ボタンセレクターを確認する" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:263 msgid "API mode" msgstr "APIモード" @@ -1354,19 +1473,19 @@ msgstr "SSHパブリックキー" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 -#: users/models/user.py:1018 +#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54 +#: ops/models/job.py:227 users/models/user.py:1033 msgid "Date created" msgstr "作成された日付" #: assets/models/_user.py:29 assets/models/cmd_filter.py:42 -#: common/db/models.py:35 users/models/user.py:847 +#: common/db/models.py:35 users/models/user.py:855 msgid "Date updated" msgstr "更新日" #: assets/models/_user.py:30 assets/models/cmd_filter.py:44 #: assets/models/cmd_filter.py:91 assets/models/group.py:18 -#: common/db/models.py:32 users/models/user.py:833 +#: common/db/models.py:32 users/models/user.py:841 #: users/serializers/group.py:29 msgid "Created by" msgstr "によって作成された" @@ -1393,15 +1512,11 @@ msgstr "ユーザーと同じユーザー名" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "プロトコル" -#: assets/models/_user.py:53 -msgid "Auto push" -msgstr "オートプッシュ" - #: assets/models/_user.py:54 msgid "Sudo" msgstr "すど" @@ -1457,6 +1572,7 @@ msgid "Address" msgstr "アドレス" #: assets/models/asset/common.py:151 assets/models/platform.py:119 +#: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" @@ -1534,9 +1650,9 @@ msgstr "自動化されたタスク" msgid "Asset automation task" msgstr "アセットの自動化タスク" -#: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 +#: assets/models/automations/base.py:113 audits/models.py:200 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1563,7 +1679,7 @@ msgstr "確認済みの日付" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61 #: perms/serializers/permission.py:32 users/models/group.py:25 -#: users/models/user.py:793 +#: users/models/user.py:804 msgid "User group" msgstr "ユーザーグループ" @@ -1604,7 +1720,7 @@ msgid "Asset group" msgstr "資産グループ" #: assets/models/group.py:31 assets/models/platform.py:19 -#: assets/serializers/platform.py:113 +#: assets/serializers/platform.py:114 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1613,7 +1729,7 @@ msgstr "デフォルト" msgid "Default asset group" msgstr "デフォルトアセットグループ" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018 msgid "System" msgstr "システム" @@ -1622,12 +1738,13 @@ msgstr "システム" #: authentication/models/connection_token.py:29 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:33 +#: users/models/preference.py:13 msgid "Value" msgstr "値" #: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:111 +#: assets/serializers/platform.py:112 #: authentication/serializers/connect_token_secret.py:121 #: common/serializers/common.py:85 perms/serializers/user_permission.py:28 #: settings/serializers/msg.py:83 @@ -1675,13 +1792,14 @@ msgstr "必要" msgid "Public" msgstr "開ける" -#: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:65 +#: assets/models/platform.py:21 assets/serializers/platform.py:49 +#: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "設定" -#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36 +#: assets/models/platform.py:38 audits/const.py:49 +#: authentication/backends/passkey/models.py:11 settings/models.py:36 #: terminal/serializers/applet_host.py:33 msgid "Enabled" msgstr "有効化" @@ -1690,11 +1808,11 @@ msgstr "有効化" msgid "Ansible config" msgstr "Ansible 構成" -#: assets/models/platform.py:41 assets/serializers/platform.py:32 +#: assets/models/platform.py:41 assets/serializers/platform.py:33 msgid "Ping enabled" msgstr "アセット ディスカバリを有効にする" -#: assets/models/platform.py:42 assets/serializers/platform.py:33 +#: assets/models/platform.py:42 assets/serializers/platform.py:34 msgid "Ping method" msgstr "資産検出方法" @@ -1703,12 +1821,12 @@ msgid "Ping params" msgstr "資産検出パラメータ" #: assets/models/platform.py:45 assets/models/platform.py:69 -#: assets/serializers/platform.py:34 +#: assets/serializers/platform.py:35 msgid "Gather facts enabled" msgstr "資産情報の収集を有効にする" #: assets/models/platform.py:47 assets/models/platform.py:71 -#: assets/serializers/platform.py:35 +#: assets/serializers/platform.py:36 msgid "Gather facts method" msgstr "情報収集の方法" @@ -1716,11 +1834,11 @@ msgstr "情報収集の方法" msgid "Gather facts params" msgstr "情報収集パラメータ" -#: assets/models/platform.py:51 assets/serializers/platform.py:38 +#: assets/models/platform.py:51 assets/serializers/platform.py:39 msgid "Change secret enabled" msgstr "パスワードの変更が有効" -#: assets/models/platform.py:53 assets/serializers/platform.py:39 +#: assets/models/platform.py:53 assets/serializers/platform.py:40 msgid "Change secret method" msgstr "パスワード変更モード" @@ -1728,11 +1846,11 @@ msgstr "パスワード変更モード" msgid "Change secret params" msgstr "パスワード変更パラメータ" -#: assets/models/platform.py:57 assets/serializers/platform.py:40 +#: assets/models/platform.py:57 assets/serializers/platform.py:41 msgid "Push account enabled" msgstr "アカウントのプッシュを有効にする" -#: assets/models/platform.py:59 assets/serializers/platform.py:41 +#: assets/models/platform.py:59 assets/serializers/platform.py:42 msgid "Push account method" msgstr "アカウントプッシュ方式" @@ -1740,11 +1858,11 @@ msgstr "アカウントプッシュ方式" msgid "Push account params" msgstr "アカウントプッシュパラメータ" -#: assets/models/platform.py:63 assets/serializers/platform.py:36 +#: assets/models/platform.py:63 assets/serializers/platform.py:37 msgid "Verify account enabled" msgstr "アカウントの確認をオンにする" -#: assets/models/platform.py:65 assets/serializers/platform.py:37 +#: assets/models/platform.py:65 assets/serializers/platform.py:38 msgid "Verify account method" msgstr "アカウント認証方法" @@ -1760,23 +1878,23 @@ msgstr "メタ" msgid "Internal" msgstr "ビルトイン" -#: assets/models/platform.py:96 assets/serializers/platform.py:126 +#: assets/models/platform.py:96 assets/serializers/platform.py:131 msgid "Charset" msgstr "シャーセット" -#: assets/models/platform.py:98 assets/serializers/platform.py:154 +#: assets/models/platform.py:98 assets/serializers/platform.py:159 msgid "Domain enabled" msgstr "ドメインを有効にする" -#: assets/models/platform.py:100 assets/serializers/platform.py:153 +#: assets/models/platform.py:100 assets/serializers/platform.py:158 msgid "Su enabled" msgstr "アカウントの切り替えを有効にする" -#: assets/models/platform.py:101 assets/serializers/platform.py:132 +#: assets/models/platform.py:101 assets/serializers/platform.py:137 msgid "Su method" msgstr "アカウントの切り替え方法" -#: assets/models/platform.py:102 assets/serializers/platform.py:135 +#: assets/models/platform.py:102 assets/serializers/platform.py:140 msgid "Custom fields" msgstr "カスタムフィールド" @@ -1793,7 +1911,7 @@ msgstr "" "プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ" "ラットフォーム" -#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 @@ -1926,19 +2044,19 @@ msgstr "値" msgid "Can't contains: /" msgstr "含まれない:/" -#: assets/serializers/platform.py:42 +#: assets/serializers/platform.py:43 msgid "Gather accounts enabled" msgstr "アカウント収集を有効にする" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:44 msgid "Gather accounts method" msgstr "アカウントの収集方法" -#: assets/serializers/platform.py:49 +#: assets/serializers/platform.py:50 msgid "Port from addr" msgstr "アドレスからのポート" -#: assets/serializers/platform.py:61 +#: assets/serializers/platform.py:62 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." @@ -1946,11 +2064,11 @@ msgstr "" "このプロトコルはプライマリであり、資産を追加するときに設定する必要がありま" "す。また、プライマリプロトコルは1つしかありません" -#: assets/serializers/platform.py:66 +#: assets/serializers/platform.py:67 msgid "This protocol is required, and it must be set when adding assets." msgstr "このプロトコルは必須であり、資産を追加するときに設定する必要があります" -#: assets/serializers/platform.py:69 +#: assets/serializers/platform.py:70 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." @@ -1958,32 +2076,32 @@ msgstr "" "このプロトコルはデフォルトです。資産を追加するときに、デフォルトで表示されま" "す" -#: assets/serializers/platform.py:72 +#: assets/serializers/platform.py:73 msgid "This protocol is public, asset will show this protocol to user" msgstr "" "このプロトコルは公開されており、資産はこのプロトコルをユーザーに表示します" -#: assets/serializers/platform.py:114 +#: assets/serializers/platform.py:115 msgid "Help text" msgstr "ヘルプ" -#: assets/serializers/platform.py:115 +#: assets/serializers/platform.py:116 msgid "Choices" msgstr "せんたく" -#: assets/serializers/platform.py:130 +#: assets/serializers/platform.py:135 msgid "Automation" msgstr "オートメーション" -#: assets/serializers/platform.py:155 +#: assets/serializers/platform.py:160 msgid "Default Domain" msgstr "デフォルト ドメイン" -#: assets/serializers/platform.py:176 +#: assets/serializers/platform.py:181 msgid "type is required" msgstr "タイプ このフィールドは必須です." -#: assets/serializers/platform.py:199 +#: assets/serializers/platform.py:204 msgid "Protocols is required" msgstr "同意が必要です" @@ -2077,7 +2195,7 @@ msgstr "Rmdir" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 -#: perms/const.py:17 rbac/tree.py:234 +#: perms/const.py:17 rbac/tree.py:235 msgid "Delete" msgstr "削除" @@ -2093,7 +2211,8 @@ msgstr "名前の変更" msgid "Symlink" msgstr "Symlink" -#: audits/const.py:18 perms/const.py:14 +#: audits/const.py:18 audits/const.py:28 perms/const.py:14 +#: terminal/api/session/session.py:141 msgid "Download" msgstr "ダウンロード" @@ -2101,7 +2220,7 @@ msgstr "ダウンロード" msgid "Rename dir" msgstr "マップディレクトリ" -#: audits/const.py:23 rbac/tree.py:232 +#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "View" @@ -2109,48 +2228,48 @@ msgstr "表示" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 -#: rbac/tree.py:231 +#: rbac/tree.py:232 msgid "Create" msgstr "作成" -#: audits/const.py:28 perms/const.py:12 +#: audits/const.py:29 perms/const.py:12 msgid "Connect" msgstr "接続" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 -#: templates/_header_bar.html:89 +#: audits/const.py:30 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 +#: templates/_header_bar.html:95 msgid "Login" msgstr "ログイン" -#: audits/const.py:30 ops/const.py:9 +#: audits/const.py:31 ops/const.py:9 msgid "Change password" msgstr "パスワードを変更する" -#: audits/const.py:35 settings/serializers/terminal.py:6 +#: audits/const.py:36 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "ターミナル" -#: audits/const.py:40 audits/models.py:127 +#: audits/const.py:41 audits/models.py:128 msgid "Operate log" msgstr "ログの操作" -#: audits/const.py:41 +#: audits/const.py:42 msgid "Session log" msgstr "セッションログ" -#: audits/const.py:42 +#: audits/const.py:43 msgid "Login log" msgstr "ログインログ" -#: audits/const.py:43 terminal/models/applet/host.py:143 +#: audits/const.py:44 terminal/models/applet/host.py:143 #: terminal/models/component/task.py:22 msgid "Task" msgstr "タスク" -#: audits/const.py:49 +#: audits/const.py:50 msgid "-" msgstr "-" @@ -2162,120 +2281,141 @@ msgstr "是" msgid "No" msgstr "否" -#: audits/models.py:42 +#: audits/models.py:43 msgid "Job audit log" msgstr "ジョブ監査ログ" -#: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: audits/models.py:52 audits/models.py:96 audits/models.py:167 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "リモートaddr" -#: audits/models.py:56 audits/serializers.py:34 +#: audits/models.py:57 audits/serializers.py:35 msgid "Operate" msgstr "操作" -#: audits/models.py:58 +#: audits/models.py:59 msgid "Filename" msgstr "ファイル名" -#: audits/models.py:61 common/serializers/common.py:98 +#: audits/models.py:62 common/serializers/common.py:98 msgid "File" msgstr "書類" -#: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: audits/models.py:63 terminal/backends/command/models.py:21 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 msgid "Session" msgstr "セッション" -#: audits/models.py:65 +#: audits/models.py:66 msgid "File transfer log" msgstr "ファイル転送ログ" -#: audits/models.py:89 audits/serializers.py:85 +#: audits/models.py:90 audits/serializers.py:86 msgid "Resource Type" msgstr "リソースタイプ" -#: audits/models.py:90 audits/models.py:93 audits/models.py:139 -#: audits/serializers.py:84 +#: audits/models.py:91 audits/models.py:94 audits/models.py:140 +#: audits/serializers.py:85 msgid "Resource" msgstr "リソース" -#: audits/models.py:96 audits/models.py:142 audits/models.py:168 +#: audits/models.py:97 audits/models.py:143 audits/models.py:169 #: terminal/serializers/command.py:75 msgid "Datetime" msgstr "時間" -#: audits/models.py:135 +#: audits/models.py:136 msgid "Activity type" msgstr "活動の種類" -#: audits/models.py:145 +#: audits/models.py:146 msgid "Detail" msgstr "詳細" -#: audits/models.py:148 +#: audits/models.py:149 msgid "Detail ID" msgstr "詳細 ID" -#: audits/models.py:152 +#: audits/models.py:153 msgid "Activity log" msgstr "活動記録" -#: audits/models.py:164 +#: audits/models.py:165 msgid "Change by" msgstr "による変更" -#: audits/models.py:174 +#: audits/models.py:175 msgid "Password change log" msgstr "パスワード変更ログ" -#: audits/models.py:181 +#: audits/models.py:182 audits/models.py:257 msgid "Login type" msgstr "ログインタイプ" -#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10 +#: audits/models.py:184 audits/models.py:253 +#: tickets/models/ticket/login_confirm.py:10 msgid "Login IP" msgstr "ログインIP" -#: audits/models.py:185 +#: audits/models.py:186 audits/models.py:255 #: authentication/templates/authentication/_msg_different_city.html:11 #: tickets/models/ticket/login_confirm.py:11 msgid "Login city" msgstr "ログイン都市" -#: audits/models.py:188 audits/serializers.py:64 +#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65 msgid "User agent" msgstr "ユーザーエージェント" -#: audits/models.py:191 audits/serializers.py:48 +#: audits/models.py:192 audits/serializers.py:49 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:65 users/models/user.py:810 -#: users/serializers/profile.py:126 +#: users/forms/profile.py:65 users/models/user.py:821 +#: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" -#: audits/models.py:201 +#: audits/models.py:202 msgid "Date login" msgstr "日付ログイン" -#: audits/models.py:203 audits/serializers.py:66 +#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67 +#: audits/serializers.py:183 msgid "Authentication backend" msgstr "認証バックエンド" -#: audits/models.py:247 +#: audits/models.py:248 msgid "User login log" msgstr "ユーザーログインログ" -#: audits/serializers.py:65 +#: audits/models.py:254 +msgid "Session key" +msgstr "セッションID" + +#: audits/models.py:260 authentication/models/connection_token.py:47 +#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 +#: tickets/models/ticket/apply_application.py:31 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839 +msgid "Date expired" +msgstr "期限切れの日付" + +#: audits/models.py:278 +msgid "User session" +msgstr "ユーザーセッション" + +#: audits/models.py:280 +msgid "Offline ussr session" +msgstr "ユーザー・セッションの下限" + +#: audits/serializers.py:66 msgid "Reason display" msgstr "理由表示" -#: audits/serializers.py:133 +#: audits/serializers.py:134 #, python-format msgid "User %s %s this resource" msgstr "ユーザー %s %s が現在のリソースをサブスクライブしました。" @@ -2295,46 +2435,51 @@ msgstr "ユーザー %s はシステム %s にログインしています" msgid "User %s perform a task for this resource: %s" msgstr "ユーザー %s が現在のリソースでタスク (%s) を実行しました" -#: audits/signal_handlers/login_log.py:27 +#: audits/signal_handlers/login_log.py:34 msgid "SSH Key" msgstr "SSHキー" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 +#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" -#: audits/signal_handlers/login_log.py:30 +#: audits/signal_handlers/login_log.py:37 msgid "Auth Token" msgstr "認証トークン" -#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 -#: users/models/user.py:740 users/models/user.py:848 +#: users/models/user.py:751 users/models/user.py:856 msgid "WeCom" msgstr "企業微信" -#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:13 users/models/user.py:742 -#: users/models/user.py:850 +#: settings/serializers/auth/feishu.py:13 users/models/user.py:753 +#: users/models/user.py:858 msgid "FeiShu" msgstr "本を飛ばす" -#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 -#: users/models/user.py:849 +#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752 +#: users/models/user.py:857 msgid "DingTalk" msgstr "DingTalk" -#: audits/signal_handlers/login_log.py:34 +#: audits/signal_handlers/login_log.py:41 #: authentication/models/temp_token.py:16 msgid "Temporary token" msgstr "仮パスワード" -#: audits/tasks.py:101 +#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95 +#: settings/serializers/auth/passkey.py:8 +msgid "Passkey" +msgstr "" + +#: audits/tasks.py:101 users/signal_handlers.py:166 msgid "Clean audits session task log" msgstr "監査セッション タスク ログのクリーンアップ" @@ -2346,37 +2491,37 @@ msgstr "外部ストレージへのFTPファイルのアップロード" msgid "This action require verify your MFA" msgstr "この操作には、MFAを検証する必要があります" -#: authentication/api/connection_token.py:258 +#: authentication/api/connection_token.py:260 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "" "再使用可能な接続トークンの使用は許可されていません。グローバル設定は有効に" "なっていません" -#: authentication/api/connection_token.py:338 +#: authentication/api/connection_token.py:351 msgid "Anonymous account is not supported for this asset" msgstr "匿名アカウントはこのプロパティではサポートされていません" -#: authentication/api/connection_token.py:357 +#: authentication/api/connection_token.py:370 msgid "Account not found" msgstr "アカウントが見つかりません" -#: authentication/api/connection_token.py:360 +#: authentication/api/connection_token.py:373 msgid "Permission expired" msgstr "承認の有効期限が切れています" -#: authentication/api/connection_token.py:374 +#: authentication/api/connection_token.py:387 msgid "ACL action is reject: {}({})" msgstr "ACL アクションは拒否です: {}({})" -#: authentication/api/connection_token.py:378 +#: authentication/api/connection_token.py:391 msgid "ACL action is review" msgstr "ACL アクションはレビューです" -#: authentication/api/mfa.py:57 +#: authentication/api/mfa.py:59 msgid "Current user not support mfa type: {}" msgstr "現在のユーザーはmfaタイプをサポートしていません: {}" -#: authentication/api/password.py:32 terminal/api/session/session.py:259 +#: authentication/api/password.py:32 terminal/api/session/session.py:300 #: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "ユーザーが存在しない: {}" @@ -2394,7 +2539,7 @@ msgstr "" "さい。" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -2464,6 +2609,26 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "無効なトークンまたはキャッシュの更新。" +#: authentication/backends/passkey/api.py:52 +msgid "Auth failed" +msgstr "認証に失敗しました" + +#: authentication/backends/passkey/fido.py:148 +msgid "This key is not registered" +msgstr "このキーは登録されていません" + +#: authentication/backends/passkey/models.py:13 +msgid "Added on" +msgstr "に追加" + +#: authentication/backends/passkey/models.py:14 +msgid "Date last used" +msgstr "最後に使用した日付" + +#: authentication/backends/passkey/models.py:15 +msgid "Credential ID" +msgstr "資格情報ID" + #: authentication/confirm/password.py:16 msgid "Authentication failed password incorrect" msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません)" @@ -2783,13 +2948,6 @@ msgstr "アセット名" msgid "Reusable" msgstr "再利用可能" -#: authentication/models/connection_token.py:47 -#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 -#: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831 -msgid "Date expired" -msgstr "期限切れの日付" - #: authentication/models/connection_token.py:51 #: perms/models/asset_permission.py:77 msgid "From ticket" @@ -2889,7 +3047,7 @@ msgstr "アクション" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:38 perms/serializers/permission.py:57 -#: users/serializers/user.py:96 users/serializers/user.py:173 +#: users/serializers/user.py:97 users/serializers/user.py:174 msgid "Is expired" msgstr "期限切れです" @@ -2897,7 +3055,7 @@ msgstr "期限切れです" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:57 users/forms/profile.py:102 -#: users/forms/profile.py:109 users/models/user.py:789 +#: users/forms/profile.py:109 users/models/user.py:800 #: users/templates/users/forgot_password.html:117 #: users/views/profile/reset.py:73 msgid "Email" @@ -2909,8 +3067,8 @@ msgid "The {} cannot be empty" msgstr "{} 空にしてはならない" #: authentication/serializers/token.py:79 perms/serializers/permission.py:37 -#: perms/serializers/permission.py:58 users/serializers/user.py:97 -#: users/serializers/user.py:170 +#: perms/serializers/permission.py:58 users/serializers/user.py:98 +#: users/serializers/user.py:171 msgid "Is valid" msgstr "有効です" @@ -2935,13 +3093,13 @@ msgid "Show" msgstr "表示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:635 users/serializers/profile.py:116 +#: users/models/user.py:646 users/serializers/profile.py:92 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "無効化" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:636 users/serializers/profile.py:117 +#: users/models/user.py:647 users/serializers/profile.py:93 #: users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" @@ -2986,7 +3144,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:444 +#: jumpserver/conf.py:447 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3044,7 +3202,7 @@ msgid "request new one" msgstr "新しいものを要求する" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3098,7 +3256,19 @@ msgstr "" msgid "Cancel" msgstr "キャンセル" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:237 +msgid "" +"Configuration file has problems and cannot be logged in. Please contact the " +"administrator or view latest docs" +msgstr "" +"設定ファイルに問題があり、ログインできません。管理者に連絡するか、最新のド" +"キュメントを参照してください。" + +#: authentication/templates/authentication/login.html:238 +msgid "If you are administrator, you can update the config resolve it, set" +msgstr "管理者の場合は、configを更新して解決することができます。" + +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "その他のログインオプション" @@ -3134,6 +3304,18 @@ msgstr "返品" msgid "Copy success" msgstr "コピー成功" +#: authentication/templates/authentication/passkey.html:162 +msgid "" +"This page is not served over HTTPS. Please use HTTPS to ensure security of " +"your credentials." +msgstr "" +"このページはHTTPSで提供されていません。HTTPSを使用して、資格情報のセキュリ" +"ティを確保してください。" + +#: authentication/templates/authentication/passkey.html:173 +msgid "Do you want to retry ?" +msgstr "再試行しますか？" + #: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24 #: xpack/plugins/cloud/const.py:29 msgid "LAN" @@ -3210,23 +3392,23 @@ msgstr "本を飛ばすのバインドに成功" msgid "Failed to get user from FeiShu" msgstr "本を飛ばすからユーザーを取得できませんでした" -#: authentication/views/login.py:183 +#: authentication/views/login.py:210 msgid "Redirecting" msgstr "リダイレクト" -#: authentication/views/login.py:184 +#: authentication/views/login.py:211 msgid "Redirecting to {} authentication" msgstr "{} 認証へのリダイレクト" -#: authentication/views/login.py:207 +#: authentication/views/login.py:234 msgid "Login timeout, please try again." msgstr "ログインタイムアウト、もう一度お試しください" -#: authentication/views/login.py:250 +#: authentication/views/login.py:277 msgid "User email already exists ({})" msgstr "ユーザー メールボックスは既に存在します ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:361 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3234,15 +3416,15 @@ msgstr "" "{} 確認を待ちます。彼女/彼へのリンクをコピーすることもできます
\n" " このページを閉じないでください" -#: authentication/views/login.py:333 +#: authentication/views/login.py:366 msgid "No ticket found" msgstr "チケットが見つかりません" -#: authentication/views/login.py:369 +#: authentication/views/login.py:402 msgid "Logout success" msgstr "ログアウト成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:403 msgid "Logout success, return login page" msgstr "ログアウト成功、ログインページを返す" @@ -3295,7 +3477,7 @@ msgstr "の準備を" msgid "Pending" msgstr "未定" -#: common/const/choices.py:17 ops/const.py:58 +#: common/const/choices.py:17 ops/const.py:59 msgid "Running" msgstr "ランニング" @@ -3379,7 +3561,7 @@ msgstr "は破棄されます" msgid "discard time" msgstr "時間を捨てる" -#: common/db/models.py:33 users/models/user.py:834 +#: common/db/models.py:33 users/models/user.py:842 msgid "Updated by" msgstr "によって更新" @@ -3510,7 +3692,7 @@ msgstr "{} 秒待ってから送信してください" #: common/serializers/common.py:90 msgid "Children" -msgstr "" +msgstr "ノード" #: common/serializers/fields.py:105 #, python-brace-format @@ -3563,29 +3745,11 @@ msgstr "特殊文字を含むべきではない" msgid "The mobile phone number format is incorrect" msgstr "携帯電話番号の形式が正しくありません" -#: common/views/mixins.py:74 -msgid "Export all" -msgstr "すべてエクスポート" - -#: common/views/mixins.py:76 -msgid "Export only selected items" -msgstr "選択項目のみエクスポート" - -#: common/views/mixins.py:81 -#, python-format -msgid "Export filtered: %s" -msgstr "検索のエクスポート: %s" - -#: common/views/mixins.py:90 -#, python-format -msgid "User %s view/export secret" -msgstr "ユーザー %s がパスワードを閲覧/導き出しました" - -#: jumpserver/conf.py:443 +#: jumpserver/conf.py:446 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:445 +#: jumpserver/conf.py:448 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -3657,23 +3821,23 @@ msgstr "投稿サイトニュース" msgid "No account available" msgstr "利用可能なアカウントがありません" -#: ops/ansible/inventory.py:260 +#: ops/ansible/inventory.py:263 msgid "Ansible disabled" msgstr "Ansible 無効" -#: ops/ansible/inventory.py:276 +#: ops/ansible/inventory.py:279 msgid "Skip hosts below:" msgstr "次のホストをスキップします: " -#: ops/api/celery.py:62 ops/api/celery.py:77 +#: ops/api/celery.py:64 ops/api/celery.py:79 msgid "Waiting task start" msgstr "タスク開始待ち" -#: ops/api/celery.py:138 +#: ops/api/celery.py:162 msgid "Task {} not found" msgstr "タスクは存在しません" -#: ops/api/celery.py:143 +#: ops/api/celery.py:167 msgid "Task {} args or kwargs error" msgstr "タスク実行パラメータエラー" @@ -3757,7 +3921,11 @@ msgstr "PostgreSQL" msgid "SQLServer" msgstr "SQLServer" -#: ops/const.py:60 +#: ops/const.py:55 +msgid "Raw" +msgstr "" + +#: ops/const.py:61 msgid "Timeout" msgstr "タイムアウト" @@ -3805,7 +3973,7 @@ msgstr "アルグ" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "作成者" @@ -3846,7 +4014,7 @@ msgstr "タスクモニターを表示できます" msgid "Kwargs" msgstr "クワーグ" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "終了" @@ -4034,7 +4202,7 @@ msgstr "" msgid "The organization have resource ({}) cannot be deleted" msgstr "組織のリソース ({}) は削除できません" -#: orgs/apps.py:7 rbac/tree.py:122 +#: orgs/apps.py:7 rbac/tree.py:123 msgid "App organizations" msgstr "アプリ組織" @@ -4063,7 +4231,7 @@ msgstr "デフォルト組織" msgid "SYSTEM" msgstr "システム組織" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41 msgid "Builtin" msgstr "ビルトイン" @@ -4077,7 +4245,7 @@ msgstr "参加しているすべての組織を表示できます" #: orgs/models.py:233 msgid "Can not delete virtual org" -msgstr "" +msgstr "仮想組織を削除できませんでした" #: orgs/tasks.py:9 msgid "Refresh organization cache" @@ -4199,27 +4367,27 @@ msgstr "{} 少なくとも1つのシステムロール" msgid "RBAC" msgstr "RBAC" -#: rbac/builtin.py:114 +#: rbac/builtin.py:115 msgid "SystemAdmin" msgstr "システム管理者" -#: rbac/builtin.py:117 +#: rbac/builtin.py:118 msgid "SystemAuditor" msgstr "システム監査人" -#: rbac/builtin.py:120 +#: rbac/builtin.py:121 msgid "SystemComponent" msgstr "システムコンポーネント" -#: rbac/builtin.py:126 +#: rbac/builtin.py:127 msgid "OrgAdmin" msgstr "組織管理者" -#: rbac/builtin.py:129 +#: rbac/builtin.py:130 msgid "OrgAuditor" msgstr "監査員を組織する" -#: rbac/builtin.py:132 +#: rbac/builtin.py:133 msgid "OrgUser" msgstr "組織ユーザー" @@ -4257,7 +4425,7 @@ msgid "Scope" msgstr "スコープ" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:797 +#: users/models/user.py:808 msgid "Role" msgstr "ロール" @@ -4292,7 +4460,7 @@ msgstr "組織の役割バインディング" msgid "System role binding" msgstr "システムロールバインディング" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:132 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 msgid "Perms" msgstr "パーマ" @@ -4300,7 +4468,7 @@ msgstr "パーマ" msgid "Users amount" msgstr "ユーザー数" -#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33 +#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34 msgid "Display name" msgstr "表示名" @@ -4360,26 +4528,26 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:52 +#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "リモートアプリケーション" -#: rbac/tree.py:123 +#: rbac/tree.py:124 msgid "Ticket comment" msgstr "チケットコメント" -#: rbac/tree.py:124 settings/serializers/feature.py:58 +#: rbac/tree.py:125 settings/serializers/feature.py:58 #: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "チケット" -#: rbac/tree.py:125 +#: rbac/tree.py:126 msgid "Common setting" msgstr "共通設定" -#: rbac/tree.py:126 +#: rbac/tree.py:127 msgid "View permission tree" msgstr "権限ツリーの表示" @@ -4424,7 +4592,7 @@ msgstr "携帯番号をテストこのフィールドは必須です" msgid "Settings" msgstr "設定" -#: settings/models.py:35 +#: settings/models.py:35 users/models/preference.py:14 msgid "Encrypted" msgstr "暗号化された" @@ -4512,11 +4680,15 @@ msgstr "企業微信 認証" msgid "SSO Auth" msgstr "SSO Token 認証" -#: settings/serializers/auth/base.py:24 +#: settings/serializers/auth/base.py:22 +msgid "Passkey Auth" +msgstr "Passkey 認証" + +#: settings/serializers/auth/base.py:25 msgid "Forgot password url" msgstr "パスワードのURLを忘れた" -#: settings/serializers/auth/base.py:30 +#: settings/serializers/auth/base.py:28 msgid "Enable login redirect msg" msgstr "ログインリダイレクトの有効化msg" @@ -4753,6 +4925,31 @@ msgstr "使用状態" msgid "Use nonce" msgstr "Nonceを使用" +#: settings/serializers/auth/passkey.py:11 +msgid "Enable passkey Auth" +msgstr "パスキー認証を有効にする" + +#: settings/serializers/auth/passkey.py:12 +msgid "Only SSL domain can use passkey auth" +msgstr "SSLドメインのみがパスキー認証を使用できます" + +#: settings/serializers/auth/passkey.py:15 +msgid "FIDO server ID" +msgstr "FIDOサーバーID" + +#: settings/serializers/auth/passkey.py:17 +msgid "" +"The hostname can using passkey auth, If not set, will use request host and " +"the request host in DOMAINS, If multiple domains, use comma to separate" +msgstr "" +"パスキー認証を使用できるホスト名、設定されていない場合は、リクエストホストと" +"DOMAINSのリクエストホストを使用します。複数のドメインの場合は、カンマで区切り" +"ます" + +#: settings/serializers/auth/passkey.py:22 +msgid "FIDO server name" +msgstr "FIDOサーバー名" + #: settings/serializers/auth/radius.py:13 msgid "Radius" msgstr "Radius" @@ -4899,41 +5096,43 @@ msgstr "企業微信認証の有効化" msgid "Site url" msgstr "サイトURL" -#: settings/serializers/basic.py:10 +#: settings/serializers/basic.py:11 msgid "" -"Email links or other system callbacks are used to access it, eg: http://dev." -"jumpserver.org:8080" +"External URL, email links or other system callbacks are used to access it, " +"eg: http://dev.jumpserver.org:8080" msgstr "" +"外部URL、メールリンクまたは他のシステムコールバックにアクセスするには、" +"http://dev.jumpserver.org:8080などを使用します" -#: settings/serializers/basic.py:13 +#: settings/serializers/basic.py:16 msgid "User guide url" msgstr "ユーザーガイドurl" -#: settings/serializers/basic.py:14 +#: settings/serializers/basic.py:17 msgid "User first login update profile done redirect to it" msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました" -#: settings/serializers/basic.py:17 +#: settings/serializers/basic.py:20 msgid "Global organization name" msgstr "グローバル組織名" -#: settings/serializers/basic.py:18 +#: settings/serializers/basic.py:21 msgid "The name of global organization to display" msgstr "表示するグローバル組織の名前" -#: settings/serializers/basic.py:21 +#: settings/serializers/basic.py:24 msgid "Help Docs URL" msgstr "ドキュメントリンク" -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:25 msgid "default: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org" -#: settings/serializers/basic.py:25 +#: settings/serializers/basic.py:28 msgid "Help Support URL" msgstr "サポートリンク" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:29 msgid "default: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/" @@ -5157,11 +5356,11 @@ msgstr "" "ノードが表示されないようにしますが、そのノードが許可されていないという質問に" "質問" -#: settings/serializers/security.py:16 +#: settings/serializers/security.py:17 msgid "User password expiration (day)" msgstr "ユーザーパスワードの有効期限（天）" -#: settings/serializers/security.py:18 +#: settings/serializers/security.py:19 msgid "" "If the user does not update the password during the time, the user password " "will expire failure;The password expiration reminder mail will be automatic " @@ -5172,11 +5371,11 @@ msgstr "" "ドの有効期限が切れるリマインダーメールがシステムからユーザーに自動的に送信さ" "れます。" -#: settings/serializers/security.py:25 +#: settings/serializers/security.py:26 msgid "Number of repeated historical passwords" msgstr "繰り返された履歴パスワードの数" -#: settings/serializers/security.py:27 +#: settings/serializers/security.py:28 msgid "" "Tip: When the user resets the password, it cannot be the previous n " "historical passwords of the user" @@ -5184,31 +5383,31 @@ msgstr "" "ヒント: ユーザーがパスワードをリセットすると、ユーザーの前のnの履歴パスワード" "にすることはできません" -#: settings/serializers/security.py:33 +#: settings/serializers/security.py:34 msgid "Password minimum length" msgstr "パスワードの最小長" -#: settings/serializers/security.py:37 +#: settings/serializers/security.py:38 msgid "Admin user password minimum length" msgstr "管理者ユーザーパスワードの最小長" -#: settings/serializers/security.py:40 +#: settings/serializers/security.py:41 msgid "Must contain capital" msgstr "資本を含める必要があります" -#: settings/serializers/security.py:43 +#: settings/serializers/security.py:44 msgid "Must contain lowercase" msgstr "小文字を含める必要があります。" -#: settings/serializers/security.py:46 +#: settings/serializers/security.py:47 msgid "Must contain numeric" msgstr "数値を含める必要があります" -#: settings/serializers/security.py:49 +#: settings/serializers/security.py:50 msgid "Must contain special" msgstr "特別な" -#: settings/serializers/security.py:54 +#: settings/serializers/security.py:55 msgid "" "If the user has failed to log in for a limited number of times, no login is " "allowed during this time interval." @@ -5216,35 +5415,35 @@ msgstr "" "ユーザーが限られた回数だけログインできなかった場合、この時間間隔ではログイン" "はできません。" -#: settings/serializers/security.py:62 +#: settings/serializers/security.py:63 msgid "Limit the number of user login failures" msgstr "ユーザーログインの失敗数を制限する" -#: settings/serializers/security.py:66 +#: settings/serializers/security.py:67 msgid "Block user login interval (minute)" msgstr "ユーザーのログイン間隔をブロックする（分）" -#: settings/serializers/security.py:72 +#: settings/serializers/security.py:73 msgid "Limit the number of IP login failures" msgstr "IPログイン失敗の数を制限する" -#: settings/serializers/security.py:76 +#: settings/serializers/security.py:77 msgid "Block IP login interval (minute)" msgstr "IPログイン間隔をブロックする（分）" -#: settings/serializers/security.py:80 +#: settings/serializers/security.py:81 msgid "Login IP White List" msgstr "ログインIPホワイトリスト" -#: settings/serializers/security.py:85 +#: settings/serializers/security.py:86 msgid "Login IP Black List" msgstr "ログインIPブラックリスト" -#: settings/serializers/security.py:90 +#: settings/serializers/security.py:91 msgid "Only single device login" msgstr "単一デバイスログインのみ" -#: settings/serializers/security.py:91 +#: settings/serializers/security.py:92 msgid "" "After the user logs in on the new device, other logged-in devices will " "automatically log out" @@ -5252,11 +5451,11 @@ msgstr "" "ユーザーが新しいデバイスにログインすると、ログインしている他のデバイスは自動" "的にログアウトします。" -#: settings/serializers/security.py:94 +#: settings/serializers/security.py:95 msgid "Only exist user login" msgstr "ユーザーログインのみ存在" -#: settings/serializers/security.py:96 +#: settings/serializers/security.py:97 msgid "" "If enabled, non-existent users will not be allowed to log in; if disabled, " "users of other authentication methods except local authentication methods " @@ -5267,11 +5466,11 @@ msgstr "" "ローカル認証方法を除く他の認証方法のユーザーはログインでき、ユーザーが自動的" "に作成されます (ユーザーが存在しない場合)。" -#: settings/serializers/security.py:102 +#: settings/serializers/security.py:103 msgid "Only from source login" msgstr "ソースログインからのみ" -#: settings/serializers/security.py:104 +#: settings/serializers/security.py:105 msgid "" "If it is enabled, the user will only authenticate to the source when logging " "in; if it is disabled, the user will authenticate all the enabled " @@ -5282,70 +5481,70 @@ msgstr "" "な場合、ユーザーはログイン時に、いずれかの認証方法が成功する限り、有効なすべ" "ての認証方法を特定の順序で認証します。 、直接ログインできます" -#: settings/serializers/security.py:115 +#: settings/serializers/security.py:116 msgid "Not enabled" msgstr "有効化されていません" -#: settings/serializers/security.py:116 +#: settings/serializers/security.py:117 msgid "All users" msgstr "すべてのユーザー" -#: settings/serializers/security.py:117 +#: settings/serializers/security.py:118 msgid "Only admin users" msgstr "管理者のみ" -#: settings/serializers/security.py:119 +#: settings/serializers/security.py:120 msgid "Global MFA auth" msgstr "グローバル有効化MFA認証" -#: settings/serializers/security.py:123 +#: settings/serializers/security.py:124 msgid "Third-party login users perform MFA authentication" msgstr "サードパーティのログインユーザーがMFA認証を実行" -#: settings/serializers/security.py:124 +#: settings/serializers/security.py:125 msgid "The third-party login modes include OIDC, CAS, and SAML2" msgstr "サードパーティのログインモードには、OIDC、CAS、SAML2" -#: settings/serializers/security.py:127 +#: settings/serializers/security.py:128 msgid "OTP issuer name" msgstr "OTP発行者名" -#: settings/serializers/security.py:131 +#: settings/serializers/security.py:132 msgid "OTP valid window" msgstr "OTP有効なウィンドウ" -#: settings/serializers/security.py:135 +#: settings/serializers/security.py:136 msgid "MFA verify TTL" msgstr "MFAはTTLを確認します（秒）" -#: settings/serializers/security.py:137 +#: settings/serializers/security.py:138 msgid "" "Unit: second, The verification MFA takes effect only when you view the " "account password" msgstr "検証MFAはアカウントのパスワードを表示したときにのみ有効になります。" -#: settings/serializers/security.py:142 +#: settings/serializers/security.py:143 msgid "MFA in login page" msgstr "ログインページのMFA" -#: settings/serializers/security.py:143 +#: settings/serializers/security.py:144 msgid "Eu security regulations(GDPR) require MFA to be on the login page" msgstr "" "Euセキュリティ規制 (GDPR) では、MFAがログインページにある必要があります" -#: settings/serializers/security.py:147 +#: settings/serializers/security.py:148 msgid "Verify code TTL (second)" msgstr "認証コード有効時間" -#: settings/serializers/security.py:148 +#: settings/serializers/security.py:149 msgid "Reset password and send SMS code expiration time" msgstr "パスワードをリセットしてSMSコードの有効期限を送信します" -#: settings/serializers/security.py:152 +#: settings/serializers/security.py:153 msgid "Enable Login dynamic code" msgstr "ログイン動的コードの有効化" -#: settings/serializers/security.py:153 +#: settings/serializers/security.py:154 msgid "" "The password and additional code are sent to a third party authentication " "system for verification" @@ -5353,19 +5552,19 @@ msgstr "" "パスワードと追加コードは、検証のためにサードパーティの認証システムに送信され" "ます" -#: settings/serializers/security.py:157 +#: settings/serializers/security.py:158 msgid "Enable Login captcha" msgstr "ログインcaptchaの有効化" -#: settings/serializers/security.py:158 +#: settings/serializers/security.py:159 msgid "Enable captcha to prevent robot authentication" msgstr "Captchaを有効にしてロボット認証を防止する" -#: settings/serializers/security.py:161 +#: settings/serializers/security.py:162 msgid "Remote Login Protection" msgstr "リモートログイン保護" -#: settings/serializers/security.py:163 +#: settings/serializers/security.py:164 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5375,11 +5574,11 @@ msgstr "" "します。アカウントが共通のログイン都市からログインしている場合、システムはリ" "モートログインリマインダーを送信します" -#: settings/serializers/security.py:169 +#: settings/serializers/security.py:170 msgid "Unused user timeout (day)" msgstr "未使用のユーザータイムアウト（日）" -#: settings/serializers/security.py:170 +#: settings/serializers/security.py:171 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." @@ -5387,57 +5586,57 @@ msgstr "" "毎日、頻度の低いユーザーを検出し、予め決められた時間制限を超えた場合は無効に" "します。" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:191 msgid "Enable watermark" msgstr "透かしの有効化" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:192 msgid "Enabled, the web session and replay contains watermark information" msgstr "Webセッションとリプレイには透かし情報が含まれています。" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:196 msgid "Connection max idle time (minute)" msgstr "接続最大アイドル時間（分）" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:197 msgid "If idle time more than it, disconnect connection." msgstr "この設定以上の操作がない場合、接続は切断されます" -#: settings/serializers/security.py:200 +#: settings/serializers/security.py:201 msgid "Session max connection time (hour)" msgstr "セッション最大接続時間（時間）" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:202 msgid "If session connection time more than it, disconnect connection." msgstr "セッション接続時間がこれを超えると、接続が切断されます" -#: settings/serializers/security.py:204 +#: settings/serializers/security.py:205 msgid "Remember manual auth" msgstr "手動入力パスワードの保存" -#: settings/serializers/security.py:207 +#: settings/serializers/security.py:208 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "Session share" msgstr "セッション共有" -#: settings/serializers/security.py:208 +#: settings/serializers/security.py:209 msgid "Enabled, Allows user active session to be shared with other users" msgstr "" "ユーザーのアクティブなセッションを他のユーザーと共有できるようにします。" -#: settings/serializers/security.py:214 +#: settings/serializers/security.py:215 msgid "Insecure command alert" msgstr "安全でないコマンドアラート" -#: settings/serializers/security.py:217 +#: settings/serializers/security.py:218 msgid "Email recipient" msgstr "メール受信者" -#: settings/serializers/security.py:218 +#: settings/serializers/security.py:219 msgid "Multiple user using , split" msgstr "複数のユーザーを使用して、分割" -#: settings/serializers/settings.py:69 +#: settings/serializers/settings.py:70 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5498,17 +5697,6 @@ msgstr "Razor の有効化" msgid "Enable SSH Client" msgstr "SSH Clientの有効化" -#: settings/serializers/terminal.py:52 -msgid "Default graphics resolution" -msgstr "デフォルトのグラフィック解像度" - -#: settings/serializers/terminal.py:53 -msgid "" -"Tip: Default resolution to use when connecting graphical assets in Luna pages" -msgstr "" -"ヒント: Luna ページでグラフィック アセットを接続するときに使用するデフォルト" -"の解像度" - #: settings/tasks/ldap.py:24 msgid "Periodic import ldap user" msgstr "LDAP ユーザーを定期的にインポートする" @@ -5658,27 +5846,27 @@ msgstr "ヘルプ" msgid "Docs" msgstr "ドキュメント" -#: templates/_header_bar.html:25 +#: templates/_header_bar.html:27 msgid "Commercial support" msgstr "商用サポート" -#: templates/_header_bar.html:76 users/forms/profile.py:44 +#: templates/_header_bar.html:79 users/forms/profile.py:44 msgid "Profile" msgstr "プロフィール" -#: templates/_header_bar.html:79 +#: templates/_header_bar.html:83 msgid "Admin page" msgstr "ページの管理" -#: templates/_header_bar.html:81 +#: templates/_header_bar.html:86 msgid "User page" msgstr "ユーザーページ" -#: templates/_header_bar.html:84 +#: templates/_header_bar.html:90 msgid "API Key" msgstr "API Key" -#: templates/_header_bar.html:85 +#: templates/_header_bar.html:91 msgid "Logout" msgstr "ログアウト" @@ -5775,6 +5963,7 @@ msgid "Home page" msgstr "ホームページ" #: templates/resource_download.html:18 templates/resource_download.html:33 +#: users/const.py:48 msgid "Client" msgstr "クライアント" @@ -5864,15 +6053,20 @@ msgstr "テスト失敗: アカウントが無効" msgid "Have online sessions" msgstr "オンラインセッションを持つ" -#: terminal/api/session/session.py:251 +#: terminal/api/session/session.py:46 +#, python-format +msgid "User %s %s session %s replay" +msgstr "ユーザー%s %sこのセッション %s の録画です" + +#: terminal/api/session/session.py:292 msgid "Session does not exist: {}" msgstr "セッションが存在しません: {}" -#: terminal/api/session/session.py:254 +#: terminal/api/session/session.py:295 msgid "Session is finished or the protocol not supported" msgstr "セッションが終了したか、プロトコルがサポートされていません" -#: terminal/api/session/session.py:267 +#: terminal/api/session/session.py:308 msgid "User does not have permission" msgstr "ユーザーに権限がありません" @@ -5911,7 +6105,7 @@ msgstr "SFTP クライアント" #: terminal/connect_methods.py:33 msgid "DB Guide" -msgstr "" +msgstr "DB 接続ウィザード" #: terminal/connect_methods.py:34 msgid "DB Client" @@ -5956,7 +6150,7 @@ msgstr "一致しない" #: terminal/const.py:83 msgid "Tunnel" -msgstr "" +msgstr "ちかチャネル" #: terminal/const.py:85 msgid "SFTP" @@ -5990,51 +6184,51 @@ msgstr "一括作成非サポート" msgid "Storage is invalid" msgstr "ストレージが無効です" -#: terminal/models/applet/applet.py:29 -msgid "Community" +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +msgid "Community edition" msgstr "コミュニティ版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:31 msgid "Enterprise" msgstr "エンタープライズ版" -#: terminal/models/applet/applet.py:35 +#: terminal/models/applet/applet.py:36 msgid "Author" msgstr "著者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31 +#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31 msgid "Edition" msgstr "バージョン" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Can concurrent" msgstr "同時実行可能" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:44 msgid "Tags" msgstr "ラベル" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "ホスト" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:93 msgid "Applet pkg not valid, Missing file {}" msgstr "無効なアプレット パッケージ、ファイル {} がありません" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:112 msgid "Load platform.yml failed: {}" msgstr "platform.ymlのロードに失敗しました:{}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:115 msgid "Only support custom platform" msgstr "カスタムプラットフォームのみをサポート" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:120 msgid "Missing type in platform.yml" msgstr "platform.ymlにタイプがありません" -#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:137 msgid "Hosting" msgstr "ホスト マシン" @@ -6193,7 +6387,7 @@ msgstr "セッション再生をダウンロードできます" msgid "Account id" msgstr "アカウント ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "ログイン元" @@ -6229,61 +6423,61 @@ msgstr "セッションを終了できます" msgid "Can validate session action perm" msgstr "セッションアクションのパーマを検証できます" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "期限切れ時間 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "アクションパーミッション" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "ソース" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "セッション共有" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "スーパーセッション共有を追加できます" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "リンクがアクティブでない" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "リンク期限切れ" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "ユーザーはセッションに参加できません" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "ジョイナー" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "参加日" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "日付が残っています" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "セッション参加記録" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "検証コードが無効" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "すでにこのセッションに参加しています" @@ -6355,7 +6549,7 @@ msgstr "" "URL を入力します。
例: https://172.16.10.110 または https://dev." "jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "証明書の検証を無視する" @@ -6543,30 +6737,34 @@ msgid "Endpoint suffix" msgstr "エンドポイントサフィックス" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "アドレスには特殊文字「#」を含めることはできません" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "アドレス形式が正しくありません" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "ホスト無効" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "ポートが無効" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "日付による索引付け" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "現在の日付に基づいてインデックスを動的に作成するかどうか" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "インデックス" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "Docタイプ" @@ -6646,7 +6844,7 @@ msgstr "オープン" #: tickets/const.py:18 tickets/const.py:31 msgid "Reopen" -msgstr "" +msgstr "再オープン" #: tickets/const.py:19 tickets/const.py:32 msgid "Approved" @@ -6933,7 +7131,7 @@ msgid "Ticket information" msgstr "作業指示情報" #: tickets/templates/tickets/approve_check_password.html:29 -#: tickets/views/approve.py:39 +#: tickets/views/approve.py:40 msgid "Ticket approval" msgstr "作業指示の承認" @@ -6945,26 +7143,26 @@ msgstr "承認" msgid "Go Login" msgstr "ログイン" -#: tickets/views/approve.py:40 +#: tickets/views/approve.py:41 msgid "" "This ticket does not exist, the process has ended, or this link has expired" msgstr "" "このワークシートが存在しないか、ワークシートが終了したか、このリンクが無効に" "なっています" -#: tickets/views/approve.py:69 +#: tickets/views/approve.py:70 msgid "Click the button below to approve or reject" msgstr "下のボタンをクリックして同意または拒否。" -#: tickets/views/approve.py:71 +#: tickets/views/approve.py:72 msgid "After successful authentication, this ticket can be approved directly" msgstr "認証に成功した後、作業指示書は直接承認することができる。" -#: tickets/views/approve.py:93 +#: tickets/views/approve.py:97 msgid "Illegal approval action" msgstr "無効な承認アクション" -#: tickets/views/approve.py:106 +#: tickets/views/approve.py:110 msgid "This user is not authorized to approve this ticket" msgstr "このユーザーはこの作業指示を承認する権限がありません" @@ -7000,6 +7198,30 @@ msgstr "リセットリンクが生成され、ユーザーに送信されます msgid "Set password" msgstr "パスワードの設定" +#: users/const.py:23 +msgid "AUTO" +msgstr "自動" + +#: users/const.py:31 +msgid "Full screen" +msgstr "フルスクリーン" + +#: users/const.py:32 +msgid "Multi screen" +msgstr "マルチスクリーンディスプレイ" + +#: users/const.py:33 +msgid "Drives redirect" +msgstr "ディスクマウント" + +#: users/const.py:52 +msgid "Replace" +msgstr "置換" + +#: users/const.py:53 +msgid "Suffix" +msgstr "接尾辞を付ける" + #: users/exceptions.py:10 msgid "MFA not enabled" msgstr "MFAが有効化されていません" @@ -7078,83 +7300,87 @@ msgstr "ここにid_rsa.pubを貼り付けます。" msgid "Public key should not be the same as your old one." msgstr "公開鍵は古いものと同じであってはなりません。" -#: users/forms/profile.py:162 users/serializers/profile.py:100 -#: users/serializers/profile.py:183 users/serializers/profile.py:210 +#: users/forms/profile.py:162 users/serializers/profile.py:76 +#: users/serializers/profile.py:159 users/serializers/profile.py:186 msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" -#: users/forms/profile.py:173 users/models/user.py:820 +#: users/forms/profile.py:173 users/models/user.py:831 #: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "公開キー" -#: users/models/user.py:637 users/serializers/profile.py:118 +#: users/models/preference.py:38 +msgid "Preference" +msgstr "ユーザー設定" + +#: users/models/user.py:648 users/serializers/profile.py:94 msgid "Force enable" msgstr "強制有効" -#: users/models/user.py:799 users/serializers/user.py:171 +#: users/models/user.py:810 users/serializers/user.py:172 msgid "Is service account" msgstr "サービスアカウントです" -#: users/models/user.py:801 +#: users/models/user.py:812 msgid "Avatar" msgstr "アバター" -#: users/models/user.py:804 +#: users/models/user.py:815 msgid "Wechat" msgstr "微信" -#: users/models/user.py:807 users/serializers/user.py:108 +#: users/models/user.py:818 users/serializers/user.py:109 msgid "Phone" msgstr "電話" -#: users/models/user.py:813 +#: users/models/user.py:824 msgid "OTP secret key" msgstr "OTP 秘密" -#: users/models/user.py:817 +#: users/models/user.py:828 #: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh秘密鍵" -#: users/models/user.py:823 -msgid "Secret key" -msgstr "秘密キー" - -#: users/models/user.py:828 users/serializers/profile.py:149 -#: users/serializers/user.py:168 +#: users/models/user.py:836 users/serializers/profile.py:125 +#: users/serializers/user.py:169 msgid "Is first login" msgstr "最初のログインです" -#: users/models/user.py:842 +#: users/models/user.py:850 msgid "Date password last updated" msgstr "最終更新日パスワード" -#: users/models/user.py:845 +#: users/models/user.py:853 msgid "Need update password" msgstr "更新パスワードが必要" -#: users/models/user.py:988 +#: users/models/user.py:977 +msgid "Can not delete admin user" +msgstr "管理者ユーザーを削除できませんでした" + +#: users/models/user.py:1003 msgid "Can invite user" msgstr "ユーザーを招待できます" -#: users/models/user.py:989 +#: users/models/user.py:1004 msgid "Can remove user" msgstr "ユーザーを削除できます" -#: users/models/user.py:990 +#: users/models/user.py:1005 msgid "Can match user" msgstr "ユーザーに一致できます" -#: users/models/user.py:999 +#: users/models/user.py:1014 msgid "Administrator" msgstr "管理者" -#: users/models/user.py:1002 +#: users/models/user.py:1017 msgid "Administrator is the super user of system" msgstr "管理者はシステムのスーパーユーザーです" -#: users/models/user.py:1027 +#: users/models/user.py:1042 msgid "User password history" msgstr "ユーザーパスワード履歴" @@ -7189,11 +7415,67 @@ msgstr "SSHキーのリセット" msgid "Reset MFA" msgstr "MFAのリセット" +#: users/serializers/preference/koko.py:10 +msgid "File name conflict resolution" +msgstr "ファイル名競合ソリューション" + +#: users/serializers/preference/lina.py:11 +msgid "New file encryption password" +msgstr "新しいファイルの暗号化パスワード" + +#: users/serializers/preference/lina.py:16 +msgid "Confirm file encryption password" +msgstr "ファイルの暗号化パスワードを確認する" + +#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48 +msgid "The newly set password is inconsistent" +msgstr "新しく設定されたパスワードが一致しない" + +#: users/serializers/preference/luna.py:23 +msgid "Async loading of asset tree" +msgstr "非同期ロード資産ツリー" + +#: users/serializers/preference/luna.py:30 +msgid "RDP resolution" +msgstr "RDP 解像度" + +#: users/serializers/preference/luna.py:34 +msgid "Keyboard layout" +msgstr "キーボードレイアウト" + +#: users/serializers/preference/luna.py:38 +msgid "RDP client option" +msgstr "RDPクライアントオプション" + +#: users/serializers/preference/luna.py:42 +msgid "Remote application connection method" +msgstr "リモートアプリケーション接続方式" + +#: users/serializers/preference/luna.py:49 +msgid "Character terminal font size" +msgstr "文字終端フォントサイズ" + +#: users/serializers/preference/luna.py:52 +msgid "Backspace as Ctrl+H" +msgstr "文字終端Backspace As Ctrl+H" + +#: users/serializers/preference/luna.py:55 +msgid "Right click quickly paste" +msgstr "右クリックでクイック貼り付け" + +#: users/serializers/preference/luna.py:61 +msgid "Graphics" +msgstr "図形化" + +#: users/serializers/preference/luna.py:62 +msgid "Command line" +msgstr "コマンドライン" + #: users/serializers/profile.py:29 msgid "The old password is incorrect" msgstr "古いパスワードが正しくありません" -#: users/serializers/profile.py:36 users/serializers/profile.py:197 +#: users/serializers/profile.py:36 users/serializers/profile.py:173 msgid "Password does not match security rules" msgstr "パスワードがセキュリティルールと一致しない" @@ -7201,10 +7483,6 @@ msgstr "パスワードがセキュリティルールと一致しない" msgid "The new password cannot be the last {} passwords" msgstr "新しいパスワードを最後の {} 個のパスワードにすることはできません" -#: users/serializers/profile.py:48 users/serializers/profile.py:71 -msgid "The newly set password is inconsistent" -msgstr "新しく設定されたパスワードが一致しない" - #: users/serializers/user.py:42 msgid "System roles" msgstr "システムの役割" @@ -7213,55 +7491,55 @@ msgstr "システムの役割" msgid "Org roles" msgstr "組織ロール" -#: users/serializers/user.py:89 +#: users/serializers/user.py:90 msgid "Password strategy" msgstr "パスワード戦略" -#: users/serializers/user.py:91 +#: users/serializers/user.py:92 msgid "MFA enabled" msgstr "MFA有効化" -#: users/serializers/user.py:93 +#: users/serializers/user.py:94 msgid "MFA force enabled" msgstr "MFAフォース有効化" -#: users/serializers/user.py:95 +#: users/serializers/user.py:96 msgid "Login blocked" msgstr "ログインがロックされました" -#: users/serializers/user.py:98 users/serializers/user.py:177 +#: users/serializers/user.py:99 users/serializers/user.py:178 msgid "Is OTP bound" msgstr "仮想MFAがバインドされているか" -#: users/serializers/user.py:100 +#: users/serializers/user.py:101 msgid "Can public key authentication" msgstr "公開鍵認証が可能" -#: users/serializers/user.py:172 +#: users/serializers/user.py:173 msgid "Is org admin" msgstr "組織管理者です" -#: users/serializers/user.py:174 +#: users/serializers/user.py:175 msgid "Avatar url" msgstr "アバターURL" -#: users/serializers/user.py:178 +#: users/serializers/user.py:179 msgid "MFA level" msgstr "MFA レベル" -#: users/serializers/user.py:284 +#: users/serializers/user.py:285 msgid "Select users" msgstr "ユーザーの選択" -#: users/serializers/user.py:285 +#: users/serializers/user.py:286 msgid "For security, only list several users" msgstr "セキュリティのために、複数のユーザーのみをリストします" -#: users/serializers/user.py:318 +#: users/serializers/user.py:319 msgid "name not unique" msgstr "名前が一意ではない" -#: users/signal_handlers.py:27 +#: users/signal_handlers.py:32 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -7270,23 +7548,23 @@ msgstr "" "管理者は「既存のユーザーのみログインを許可」をオンにしており、現在のユーザー" "はユーザーリストにありません。管理者に連絡してください。" -#: users/tasks.py:24 +#: users/tasks.py:23 msgid "Check password expired" msgstr "パスワードの有効期限が切れていることを確認する" -#: users/tasks.py:38 +#: users/tasks.py:37 msgid "Periodic check password expired" msgstr "定期認証パスワードの有効期限" -#: users/tasks.py:52 +#: users/tasks.py:51 msgid "Check user expired" msgstr "ユーザーの有効期限が切れていることを確認する" -#: users/tasks.py:69 +#: users/tasks.py:68 msgid "Periodic check user expired" msgstr "ユーザーの有効期限の定期的な検出" -#: users/tasks.py:83 +#: users/tasks.py:82 msgid "Check unused users" msgstr "未使用のユーザーを確認する" @@ -7696,7 +7974,7 @@ msgstr "クラウドアカウント" msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 msgid "Regions" msgstr "リージョン" @@ -7705,17 +7983,17 @@ msgid "Hostname strategy" msgstr "ホスト名戦略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同期IPタイプ" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/serializers/task.py:177 msgid "Always update" msgstr "常に更新" @@ -7808,7 +8086,7 @@ msgstr "ルール一致" msgid "Rule value" msgstr "ルール値" -#: xpack/plugins/cloud/models.py:317 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 msgid "Strategy rule" msgstr "戦略ルール" @@ -7820,7 +8098,7 @@ msgstr "アクション属性" msgid "Action value" msgstr "アクション値" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 msgid "Strategy action" msgstr "戦略アクション" @@ -8108,7 +8386,7 @@ msgstr "テストタイムアウト" msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:143 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 " @@ -8122,11 +8400,11 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "Instance count" msgstr "インスタンス数" @@ -8182,22 +8460,28 @@ msgstr "ライセンスのインポートに成功" msgid "License is invalid" msgstr "ライセンスが無効です" -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138 +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140 msgid "License" msgstr "ライセンス" #: xpack/plugins/license/models.py:80 -msgid "Standard edition" -msgstr "標準版" +msgid "Basic edition" +msgstr "エンタープライズ基本版" #: xpack/plugins/license/models.py:82 -msgid "Enterprise edition" -msgstr "エンタープライズ版" +msgid "Standard edition" +msgstr "エンタープライズ標準版" #: xpack/plugins/license/models.py:84 -msgid "Ultimate edition" -msgstr "究極のエディション" +msgid "Professional edition" +msgstr "エンタープライズプロフェッショナル版" #: xpack/plugins/license/models.py:86 -msgid "Community edition" -msgstr "コミュニティ版" +msgid "Ultimate edition" +msgstr "エンタープライズ・フラッグシップ・エディション" + +#~ msgid "Random" +#~ msgstr "ランダム" + +#~ msgid "Enterprise edition" +#~ msgstr "エンタープライズ基本版" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 16bde8040..3f9d48c80 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:da4f312ed86d27fa8b6bde8da3bc70b0f32fe40811ee855f9fe81d89a68a646f -size 126402 +oid sha256:78fa10c674b853ebde73bbdef255beeb794a7a7b4bf5483ac1464c282aab0819 +size 131200 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 5f14e8671..d6b011d9d 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-08-17 15:30+0800\n" +"POT-Creation-Date: 2023-09-19 10:39+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler
For security, please set " +"config CACHE_LOGIN_PASSWORD_ENABLED to true" msgstr "" "当前仅支持 AD/LDAP 登录方式用户。 同名账号密码生效顺序: 资产上存在的同名账号" -"密码 > 登录密码 > 手动输入" +"密码 > 登录密码 > 手动输入
为了安全起见，请设置配置项 " +"CACHE_LOGIN_PASSWORD_ENABLED=true，重启服务才能开启" #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -800,31 +874,46 @@ msgstr "名称已存在" msgid "Automation snapshot" msgstr "自动化快照" -#: accounts/serializers/automations/change_secret.py:43 +#: accounts/serializers/automations/change_secret.py:42 msgid "SSH Key strategy" msgstr "SSH 密钥更改方式" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:80 msgid "* Please enter the correct password length" msgstr "* 请输入正确的密码长度" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:84 msgid "* Password length range 6-30 bits" msgstr "* 密码长度范围 6-30 位" -#: accounts/serializers/automations/change_secret.py:115 +#: accounts/serializers/automations/change_secret.py:114 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自动化任务执行历史" -#: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 -#: audits/models.py:59 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 -#: tickets/views/approve.py:115 +#: accounts/serializers/automations/change_secret.py:154 audits/const.py:54 +#: audits/models.py:60 audits/signal_handlers/activity_log.py:33 +#: common/const/choices.py:18 ops/const.py:60 ops/serializers/celery.py:40 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 +#: tickets/views/approve.py:119 msgid "Success" msgstr "成功" +#: accounts/signal_handlers.py:46 +#, python-format +msgid "Push related accounts to assets: %s, by system" +msgstr "推送账号到资产: %s, 由系统执行" + +#: accounts/signal_handlers.py:55 +#, python-format +msgid "Add account: %s" +msgstr "添加账号: %s" + +#: accounts/signal_handlers.py:57 +#, python-format +msgid "Delete account: %s" +msgstr "删除账号: %s" + #: accounts/tasks/automation.py:24 msgid "Account execute automation" msgstr "账号执行自动化" @@ -853,19 +942,23 @@ msgstr "验证资产账号可用性" msgid "Verify accounts connectivity" msgstr "测试账号可连接性" -#: accounts/utils.py:41 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "密码不能包含 `{{` 字符" -#: accounts/utils.py:44 +#: accounts/utils.py:55 +msgid "Password can not contains `{%` " +msgstr "密码不能包含 `{%` 字符" + +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "密码不能包含 `'` 字符" -#: accounts/utils.py:46 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "密码不能包含 `\"` 字符" -#: accounts/utils.py:52 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "密钥不合法或密钥密码错误" @@ -910,12 +1003,12 @@ msgstr "审批人" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "激活中" -#: acls/models/base.py:81 users/apps.py:9 +#: acls/models/base.py:81 users/apps.py:9 users/models/preference.py:16 msgid "Users" msgstr "用户管理" @@ -1031,7 +1124,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:133 +#: xpack/plugins/cloud/serializers/task.py:137 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1104,6 +1197,10 @@ msgstr "资产管理" msgid "{} disabled" msgstr "{} 已禁用" +#: assets/automations/base/manager.py:202 +msgid " - Platform {} ansible disabled" +msgstr " - 平台 {} Ansible 已禁用, 无法执行任务" + #: assets/automations/ping_gateway/manager.py:33 #: authentication/models/connection_token.py:128 msgid "No account" @@ -1128,7 +1225,7 @@ msgstr "认证失败" msgid "Connect failed" msgstr "连接失败" -#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:36 +#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:37 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104 msgid "Unknown" @@ -1150,16 +1247,19 @@ msgstr "测试网关" msgid "Gather facts" msgstr "收集资产信息" -#: assets/const/base.py:33 audits/const.py:47 +#: assets/const/base.py:33 audits/const.py:48 #: terminal/serializers/applet_host.py:32 msgid "Disabled" msgstr "禁用" #: assets/const/base.py:34 settings/serializers/basic.py:6 +#: users/serializers/preference/koko.py:15 +#: users/serializers/preference/lina.py:32 +#: users/serializers/preference/luna.py:60 msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:245 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1181,8 +1281,8 @@ msgid "Cloud service" msgstr "云服务" #: assets/const/category.py:14 assets/models/asset/gpt.py:11 -#: assets/models/asset/web.py:16 audits/const.py:34 -#: terminal/models/applet/applet.py:26 +#: assets/models/asset/web.py:16 audits/const.py:35 +#: terminal/models/applet/applet.py:27 users/const.py:47 msgid "Web" msgstr "Web" @@ -1202,7 +1302,7 @@ msgstr "私有云" msgid "Kubernetes" msgstr "Kubernetes" -#: assets/const/device.py:7 terminal/models/applet/applet.py:25 +#: assets/const/device.py:7 terminal/models/applet/applet.py:26 #: tickets/const.py:8 msgid "General" msgstr "一般" @@ -1228,103 +1328,118 @@ msgid "Other" msgstr "其它" #: assets/const/protocol.py:48 -msgid "SFTP home" +msgid "SFTP root" msgstr "SFTP 根路径" -#: assets/const/protocol.py:59 +#: assets/const/protocol.py:50 +#, python-brace-format +msgid "" +"SFTP root directory, Support variable:
- ${ACCOUNT} The connected " +"account username
- ${HOME} The home directory of the connected account " +"
- ${USER} The username of the user" +msgstr "" +"SFTP根目录，支持变量：
-${ACCOUNT}已连接帐户用户名
-${HOME}连接帐户的主" +"目录
-${USER}用户的用户名" + +#: assets/const/protocol.py:65 msgid "Console" msgstr "控制台" -#: assets/const/protocol.py:60 +#: assets/const/protocol.py:66 msgid "Connect to console session" msgstr "连接到控制台会话" -#: assets/const/protocol.py:64 +#: assets/const/protocol.py:70 msgid "Any" msgstr "任意" -#: assets/const/protocol.py:66 settings/serializers/security.py:227 +#: assets/const/protocol.py:72 settings/serializers/security.py:228 msgid "Security" msgstr "安全" -#: assets/const/protocol.py:67 +#: assets/const/protocol.py:73 msgid "Security layer to use for the connection" msgstr "连接 RDP 使用的安全层" -#: assets/const/protocol.py:73 +#: assets/const/protocol.py:79 msgid "AD domain" msgstr "AD 网域" -#: assets/const/protocol.py:88 +#: assets/const/protocol.py:94 msgid "Username prompt" msgstr "用户名提示" -#: assets/const/protocol.py:89 +#: assets/const/protocol.py:95 msgid "We will send username when we see this prompt" msgstr "当我们看到这个提示时，我们将发送用户名" -#: assets/const/protocol.py:94 +#: assets/const/protocol.py:100 msgid "Password prompt" msgstr "密码提示" -#: assets/const/protocol.py:95 +#: assets/const/protocol.py:101 msgid "We will send password when we see this prompt" msgstr "当我们看到这个提示时，我们将发送密码" -#: assets/const/protocol.py:100 +#: assets/const/protocol.py:106 msgid "Success prompt" msgstr "成功提示" -#: assets/const/protocol.py:101 +#: assets/const/protocol.py:107 msgid "We will consider login success when we see this prompt" msgstr "当我们看到这个提示时，我们将认为登录成功" -#: assets/const/protocol.py:112 assets/models/asset/database.py:10 +#: assets/const/protocol.py:118 assets/models/asset/database.py:10 #: settings/serializers/msg.py:40 msgid "Use SSL" msgstr "使用 SSL" -#: assets/const/protocol.py:147 +#: assets/const/protocol.py:153 msgid "SYSDBA" msgstr "SYSDBA" -#: assets/const/protocol.py:148 +#: assets/const/protocol.py:154 msgid "Connect as SYSDBA" msgstr "以 SYSDBA 角色连接" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:169 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server 版本，不同版本有不同的连接驱动" + +#: assets/const/protocol.py:192 msgid "Auth username" msgstr "使用用户名认证" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:215 msgid "Safe mode" msgstr "安全模式" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:217 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." msgstr "" "当安全模式启用时，一些操作将被禁用，例如：新建标签页、右键、访问其它网站 等" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:222 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自动代填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:230 assets/models/asset/web.py:10 msgid "Username selector" msgstr "用户名选择器" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:235 assets/models/asset/web.py:11 msgid "Password selector" msgstr "密码选择器" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:240 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "确认按钮选择器" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:263 msgid "API mode" msgstr "API 模式" @@ -1352,19 +1467,19 @@ msgstr "SSH公钥" # msgstr "备注" #: assets/models/_user.py:28 assets/models/automations/base.py:114 #: assets/models/cmd_filter.py:41 assets/models/group.py:19 -#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:227 -#: users/models/user.py:1018 +#: audits/models.py:259 common/db/models.py:34 ops/models/base.py:54 +#: ops/models/job.py:227 users/models/user.py:1033 msgid "Date created" msgstr "创建日期" #: assets/models/_user.py:29 assets/models/cmd_filter.py:42 -#: common/db/models.py:35 users/models/user.py:847 +#: common/db/models.py:35 users/models/user.py:855 msgid "Date updated" msgstr "更新日期" #: assets/models/_user.py:30 assets/models/cmd_filter.py:44 #: assets/models/cmd_filter.py:91 assets/models/group.py:18 -#: common/db/models.py:32 users/models/user.py:833 +#: common/db/models.py:32 users/models/user.py:841 #: users/serializers/group.py:29 msgid "Created by" msgstr "创建者" @@ -1391,15 +1506,11 @@ msgstr "用户名与用户相同" #: assets/models/_user.py:52 authentication/models/connection_token.py:41 #: authentication/serializers/connect_token_secret.py:111 -#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19 +#: terminal/models/applet/applet.py:42 terminal/serializers/session.py:19 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70 msgid "Protocol" msgstr "协议" -#: assets/models/_user.py:53 -msgid "Auto push" -msgstr "自动推送" - #: assets/models/_user.py:54 msgid "Sudo" msgstr "Sudo" @@ -1455,6 +1566,7 @@ msgid "Address" msgstr "地址" #: assets/models/asset/common.py:151 assets/models/platform.py:119 +#: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:115 #: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" @@ -1532,9 +1644,9 @@ msgstr "自动化任务" msgid "Asset automation task" msgstr "资产自动化任务" -#: assets/models/automations/base.py:113 audits/models.py:199 -#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:139 +#: assets/models/automations/base.py:113 audits/models.py:200 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:301 terminal/models/applet/host.py:139 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 @@ -1561,7 +1673,7 @@ msgstr "校验日期" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:61 #: perms/serializers/permission.py:32 users/models/group.py:25 -#: users/models/user.py:793 +#: users/models/user.py:804 msgid "User group" msgstr "用户组" @@ -1602,7 +1714,7 @@ msgid "Asset group" msgstr "资产组" #: assets/models/group.py:31 assets/models/platform.py:19 -#: assets/serializers/platform.py:113 +#: assets/serializers/platform.py:114 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1611,7 +1723,7 @@ msgstr "默认" msgid "Default asset group" msgstr "默认资产组" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1003 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1018 msgid "System" msgstr "系统" @@ -1620,12 +1732,13 @@ msgstr "系统" #: authentication/models/connection_token.py:29 #: authentication/serializers/connect_token_secret.py:122 #: common/serializers/common.py:86 settings/models.py:33 +#: users/models/preference.py:13 msgid "Value" msgstr "值" #: assets/models/label.py:40 assets/serializers/asset/common.py:123 #: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13 -#: assets/serializers/platform.py:111 +#: assets/serializers/platform.py:112 #: authentication/serializers/connect_token_secret.py:121 #: common/serializers/common.py:85 perms/serializers/user_permission.py:28 #: settings/serializers/msg.py:83 @@ -1673,13 +1786,14 @@ msgstr "必须的" msgid "Public" msgstr "开放的" -#: assets/models/platform.py:21 assets/serializers/platform.py:48 -#: settings/serializers/settings.py:65 +#: assets/models/platform.py:21 assets/serializers/platform.py:49 +#: settings/serializers/settings.py:66 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "设置" -#: assets/models/platform.py:38 audits/const.py:48 settings/models.py:36 +#: assets/models/platform.py:38 audits/const.py:49 +#: authentication/backends/passkey/models.py:11 settings/models.py:36 #: terminal/serializers/applet_host.py:33 msgid "Enabled" msgstr "启用" @@ -1688,11 +1802,11 @@ msgstr "启用" msgid "Ansible config" msgstr "Ansible 配置" -#: assets/models/platform.py:41 assets/serializers/platform.py:32 +#: assets/models/platform.py:41 assets/serializers/platform.py:33 msgid "Ping enabled" msgstr "启用资产探活" -#: assets/models/platform.py:42 assets/serializers/platform.py:33 +#: assets/models/platform.py:42 assets/serializers/platform.py:34 msgid "Ping method" msgstr "资产探活方式" @@ -1701,12 +1815,12 @@ msgid "Ping params" msgstr "资产探活参数" #: assets/models/platform.py:45 assets/models/platform.py:69 -#: assets/serializers/platform.py:34 +#: assets/serializers/platform.py:35 msgid "Gather facts enabled" msgstr "启用收集资产信息" #: assets/models/platform.py:47 assets/models/platform.py:71 -#: assets/serializers/platform.py:35 +#: assets/serializers/platform.py:36 msgid "Gather facts method" msgstr "收集信息方式" @@ -1714,11 +1828,11 @@ msgstr "收集信息方式" msgid "Gather facts params" msgstr "收集信息参数" -#: assets/models/platform.py:51 assets/serializers/platform.py:38 +#: assets/models/platform.py:51 assets/serializers/platform.py:39 msgid "Change secret enabled" msgstr "启用改密" -#: assets/models/platform.py:53 assets/serializers/platform.py:39 +#: assets/models/platform.py:53 assets/serializers/platform.py:40 msgid "Change secret method" msgstr "改密方式" @@ -1726,11 +1840,11 @@ msgstr "改密方式" msgid "Change secret params" msgstr "改密参数" -#: assets/models/platform.py:57 assets/serializers/platform.py:40 +#: assets/models/platform.py:57 assets/serializers/platform.py:41 msgid "Push account enabled" msgstr "启用账号推送" -#: assets/models/platform.py:59 assets/serializers/platform.py:41 +#: assets/models/platform.py:59 assets/serializers/platform.py:42 msgid "Push account method" msgstr "账号推送方式" @@ -1738,11 +1852,11 @@ msgstr "账号推送方式" msgid "Push account params" msgstr "账号推送参数" -#: assets/models/platform.py:63 assets/serializers/platform.py:36 +#: assets/models/platform.py:63 assets/serializers/platform.py:37 msgid "Verify account enabled" msgstr "开启账号验证" -#: assets/models/platform.py:65 assets/serializers/platform.py:37 +#: assets/models/platform.py:65 assets/serializers/platform.py:38 msgid "Verify account method" msgstr "账号验证方式" @@ -1758,23 +1872,23 @@ msgstr "元数据" msgid "Internal" msgstr "内置" -#: assets/models/platform.py:96 assets/serializers/platform.py:126 +#: assets/models/platform.py:96 assets/serializers/platform.py:131 msgid "Charset" msgstr "编码" -#: assets/models/platform.py:98 assets/serializers/platform.py:154 +#: assets/models/platform.py:98 assets/serializers/platform.py:159 msgid "Domain enabled" msgstr "启用网域" -#: assets/models/platform.py:100 assets/serializers/platform.py:153 +#: assets/models/platform.py:100 assets/serializers/platform.py:158 msgid "Su enabled" msgstr "启用账号切换" -#: assets/models/platform.py:101 assets/serializers/platform.py:132 +#: assets/models/platform.py:101 assets/serializers/platform.py:137 msgid "Su method" msgstr "账号切换方式" -#: assets/models/platform.py:102 assets/serializers/platform.py:135 +#: assets/models/platform.py:102 assets/serializers/platform.py:140 msgid "Custom fields" msgstr "自定义属性" @@ -1789,7 +1903,7 @@ msgid "" "type" msgstr "资产中批量更新平台，不符合平台类型跳过的资产" -#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 +#: assets/serializers/asset/common.py:124 assets/serializers/platform.py:134 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 @@ -1922,59 +2036,59 @@ msgstr "值" msgid "Can't contains: /" msgstr "不能包含: /" -#: assets/serializers/platform.py:42 +#: assets/serializers/platform.py:43 msgid "Gather accounts enabled" msgstr "启用账号收集" -#: assets/serializers/platform.py:43 +#: assets/serializers/platform.py:44 msgid "Gather accounts method" msgstr "收集账号方式" -#: assets/serializers/platform.py:49 +#: assets/serializers/platform.py:50 msgid "Port from addr" msgstr "端口来自地址" -#: assets/serializers/platform.py:61 +#: assets/serializers/platform.py:62 msgid "" "This protocol is primary, and it must be set when adding assets. " "Additionally, there can only be one primary protocol." msgstr "该协议是主要的，添加资产时必须设置。并且只能有一个主要协议" -#: assets/serializers/platform.py:66 +#: assets/serializers/platform.py:67 msgid "This protocol is required, and it must be set when adding assets." msgstr "该协议是必填的，添加资产时必须设置" -#: assets/serializers/platform.py:69 +#: assets/serializers/platform.py:70 msgid "" "This protocol is default, when adding assets, it will be displayed by " "default." msgstr "该协议是默认的，添加资产时，将默认显示" -#: assets/serializers/platform.py:72 +#: assets/serializers/platform.py:73 msgid "This protocol is public, asset will show this protocol to user" msgstr "该协议是公开的，资产将向用户显示该协议并可以连接使用" -#: assets/serializers/platform.py:114 +#: assets/serializers/platform.py:115 msgid "Help text" msgstr "帮助" -#: assets/serializers/platform.py:115 +#: assets/serializers/platform.py:116 msgid "Choices" msgstr "选择" -#: assets/serializers/platform.py:130 +#: assets/serializers/platform.py:135 msgid "Automation" msgstr "自动化" -#: assets/serializers/platform.py:155 +#: assets/serializers/platform.py:160 msgid "Default Domain" msgstr "默认网域" -#: assets/serializers/platform.py:176 +#: assets/serializers/platform.py:181 msgid "type is required" msgstr "类型 该字段是必填项。" -#: assets/serializers/platform.py:199 +#: assets/serializers/platform.py:204 msgid "Protocols is required" msgstr "协议是必填的" @@ -2066,7 +2180,7 @@ msgstr "删除目录" #: audits/const.py:14 audits/const.py:25 #: authentication/templates/authentication/_access_key_modal.html:65 -#: perms/const.py:17 rbac/tree.py:234 +#: perms/const.py:17 rbac/tree.py:235 msgid "Delete" msgstr "删除" @@ -2082,7 +2196,8 @@ msgstr "重命名" msgid "Symlink" msgstr "建立软链接" -#: audits/const.py:18 perms/const.py:14 +#: audits/const.py:18 audits/const.py:28 perms/const.py:14 +#: terminal/api/session/session.py:141 msgid "Download" msgstr "下载" @@ -2090,7 +2205,7 @@ msgstr "下载" msgid "Rename dir" msgstr "映射目录" -#: audits/const.py:23 rbac/tree.py:232 +#: audits/const.py:23 rbac/tree.py:233 terminal/api/session/session.py:252 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "View" @@ -2098,48 +2213,48 @@ msgstr "查看" #: audits/const.py:26 #: authentication/templates/authentication/_access_key_modal.html:22 -#: rbac/tree.py:231 +#: rbac/tree.py:232 msgid "Create" msgstr "创建" -#: audits/const.py:28 perms/const.py:12 +#: audits/const.py:29 perms/const.py:12 msgid "Connect" msgstr "连接" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 -#: templates/_header_bar.html:89 +#: audits/const.py:30 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 +#: templates/_header_bar.html:95 msgid "Login" msgstr "登录" -#: audits/const.py:30 ops/const.py:9 +#: audits/const.py:31 ops/const.py:9 msgid "Change password" msgstr "改密" -#: audits/const.py:35 settings/serializers/terminal.py:6 +#: audits/const.py:36 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "终端" -#: audits/const.py:40 audits/models.py:127 +#: audits/const.py:41 audits/models.py:128 msgid "Operate log" msgstr "操作日志" -#: audits/const.py:41 +#: audits/const.py:42 msgid "Session log" msgstr "会话日志" -#: audits/const.py:42 +#: audits/const.py:43 msgid "Login log" msgstr "登录日志" -#: audits/const.py:43 terminal/models/applet/host.py:143 +#: audits/const.py:44 terminal/models/applet/host.py:143 #: terminal/models/component/task.py:22 msgid "Task" msgstr "任务" -#: audits/const.py:49 +#: audits/const.py:50 msgid "-" msgstr "-" @@ -2151,120 +2266,141 @@ msgstr "是" msgid "No" msgstr "否" -#: audits/models.py:42 +#: audits/models.py:43 msgid "Job audit log" msgstr "作业审计日志" -#: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: audits/models.py:52 audits/models.py:96 audits/models.py:167 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "远端地址" -#: audits/models.py:56 audits/serializers.py:34 +#: audits/models.py:57 audits/serializers.py:35 msgid "Operate" msgstr "操作" -#: audits/models.py:58 +#: audits/models.py:59 msgid "Filename" msgstr "文件名" -#: audits/models.py:61 common/serializers/common.py:98 +#: audits/models.py:62 common/serializers/common.py:98 msgid "File" msgstr "文件" -#: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: audits/models.py:63 terminal/backends/command/models.py:21 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 msgid "Session" msgstr "会话" -#: audits/models.py:65 +#: audits/models.py:66 msgid "File transfer log" msgstr "文件管理" -#: audits/models.py:89 audits/serializers.py:85 +#: audits/models.py:90 audits/serializers.py:86 msgid "Resource Type" msgstr "资源类型" -#: audits/models.py:90 audits/models.py:93 audits/models.py:139 -#: audits/serializers.py:84 +#: audits/models.py:91 audits/models.py:94 audits/models.py:140 +#: audits/serializers.py:85 msgid "Resource" msgstr "资源" -#: audits/models.py:96 audits/models.py:142 audits/models.py:168 +#: audits/models.py:97 audits/models.py:143 audits/models.py:169 #: terminal/serializers/command.py:75 msgid "Datetime" msgstr "日期" -#: audits/models.py:135 +#: audits/models.py:136 msgid "Activity type" msgstr "活动类型" -#: audits/models.py:145 +#: audits/models.py:146 msgid "Detail" msgstr "详情" -#: audits/models.py:148 +#: audits/models.py:149 msgid "Detail ID" msgstr "详情 ID" -#: audits/models.py:152 +#: audits/models.py:153 msgid "Activity log" msgstr "活动日志" -#: audits/models.py:164 +#: audits/models.py:165 msgid "Change by" msgstr "修改者" -#: audits/models.py:174 +#: audits/models.py:175 msgid "Password change log" msgstr "改密日志" -#: audits/models.py:181 +#: audits/models.py:182 audits/models.py:257 msgid "Login type" msgstr "登录方式" -#: audits/models.py:183 tickets/models/ticket/login_confirm.py:10 +#: audits/models.py:184 audits/models.py:253 +#: tickets/models/ticket/login_confirm.py:10 msgid "Login IP" msgstr "登录 IP" -#: audits/models.py:185 +#: audits/models.py:186 audits/models.py:255 #: authentication/templates/authentication/_msg_different_city.html:11 #: tickets/models/ticket/login_confirm.py:11 msgid "Login city" msgstr "登录城市" -#: audits/models.py:188 audits/serializers.py:64 +#: audits/models.py:189 audits/models.py:256 audits/serializers.py:65 msgid "User agent" msgstr "用户代理" -#: audits/models.py:191 audits/serializers.py:48 +#: audits/models.py:192 audits/serializers.py:49 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:65 users/models/user.py:810 -#: users/serializers/profile.py:126 +#: users/forms/profile.py:65 users/models/user.py:821 +#: users/serializers/profile.py:102 msgid "MFA" msgstr "MFA" -#: audits/models.py:201 +#: audits/models.py:202 msgid "Date login" msgstr "登录日期" -#: audits/models.py:203 audits/serializers.py:66 +#: audits/models.py:204 audits/models.py:258 audits/serializers.py:67 +#: audits/serializers.py:183 msgid "Authentication backend" msgstr "认证方式" -#: audits/models.py:247 +#: audits/models.py:248 msgid "User login log" msgstr "用户登录日志" -#: audits/serializers.py:65 +#: audits/models.py:254 +msgid "Session key" +msgstr "会话标识" + +#: audits/models.py:260 authentication/models/connection_token.py:47 +#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 +#: tickets/models/ticket/apply_application.py:31 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:839 +msgid "Date expired" +msgstr "失效日期" + +#: audits/models.py:278 +msgid "User session" +msgstr "用户会话" + +#: audits/models.py:280 +msgid "Offline ussr session" +msgstr "下限用户会话" + +#: audits/serializers.py:66 msgid "Reason display" msgstr "原因描述" -#: audits/serializers.py:133 +#: audits/serializers.py:134 #, python-format msgid "User %s %s this resource" msgstr "用户 %s %s 了当前资源" @@ -2284,46 +2420,51 @@ msgstr "用户 %s 登录系统 %s" msgid "User %s perform a task for this resource: %s" msgstr "用户 %s 在当前资源， 执行了任务 (%s)" -#: audits/signal_handlers/login_log.py:27 +#: audits/signal_handlers/login_log.py:34 msgid "SSH Key" msgstr "SSH 密钥" -#: audits/signal_handlers/login_log.py:29 settings/serializers/auth/sso.py:13 +#: audits/signal_handlers/login_log.py:36 settings/serializers/auth/sso.py:13 msgid "SSO" msgstr "SSO" -#: audits/signal_handlers/login_log.py:30 +#: audits/signal_handlers/login_log.py:37 msgid "Auth Token" msgstr "认证令牌" -#: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: audits/signal_handlers/login_log.py:38 authentication/notifications.py:73 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 -#: users/models/user.py:740 users/models/user.py:848 +#: users/models/user.py:751 users/models/user.py:856 msgid "WeCom" msgstr "企业微信" -#: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: audits/signal_handlers/login_log.py:39 authentication/views/feishu.py:122 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:13 users/models/user.py:742 -#: users/models/user.py:850 +#: settings/serializers/auth/feishu.py:13 users/models/user.py:753 +#: users/models/user.py:858 msgid "FeiShu" msgstr "飞书" -#: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 -#: users/models/user.py:849 +#: audits/signal_handlers/login_log.py:40 authentication/views/dingtalk.py:159 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:752 +#: users/models/user.py:857 msgid "DingTalk" msgstr "钉钉" -#: audits/signal_handlers/login_log.py:34 +#: audits/signal_handlers/login_log.py:41 #: authentication/models/temp_token.py:16 msgid "Temporary token" msgstr "临时密码" -#: audits/tasks.py:101 +#: audits/signal_handlers/login_log.py:42 authentication/views/login.py:95 +#: settings/serializers/auth/passkey.py:8 +msgid "Passkey" +msgstr "" + +#: audits/tasks.py:101 users/signal_handlers.py:166 msgid "Clean audits session task log" msgstr "清理审计会话任务日志" @@ -2335,35 +2476,35 @@ msgstr "上传 FTP 文件到外部存储" msgid "This action require verify your MFA" msgstr "该操作需要验证您的 MFA, 请先开启并配置" -#: authentication/api/connection_token.py:258 +#: authentication/api/connection_token.py:260 msgid "Reusable connection token is not allowed, global setting not enabled" msgstr "不允许使用可重复使用的连接令牌，未启用全局设置" -#: authentication/api/connection_token.py:338 +#: authentication/api/connection_token.py:351 msgid "Anonymous account is not supported for this asset" msgstr "匿名账号不支持当前资产" -#: authentication/api/connection_token.py:357 +#: authentication/api/connection_token.py:370 msgid "Account not found" msgstr "账号未找到" -#: authentication/api/connection_token.py:360 +#: authentication/api/connection_token.py:373 msgid "Permission expired" msgstr "授权已过期" -#: authentication/api/connection_token.py:374 +#: authentication/api/connection_token.py:387 msgid "ACL action is reject: {}({})" msgstr "ACL 动作是拒绝: {}({})" -#: authentication/api/connection_token.py:378 +#: authentication/api/connection_token.py:391 msgid "ACL action is review" msgstr "ACL 动作是复核" -#: authentication/api/mfa.py:57 +#: authentication/api/mfa.py:59 msgid "Current user not support mfa type: {}" msgstr "当前用户不支持 MFA 类型: {}" -#: authentication/api/password.py:32 terminal/api/session/session.py:259 +#: authentication/api/password.py:32 terminal/api/session/session.py:300 #: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "用户不存在: {}" @@ -2379,7 +2520,7 @@ msgid "" msgstr "用户来自 {} 请去相应系统修改密码" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -2447,6 +2588,26 @@ msgstr "无效的令牌头。符号字符串不应包含无效字符。" msgid "Invalid token or cache refreshed." msgstr "刷新的令牌或缓存无效。" +#: authentication/backends/passkey/api.py:52 +msgid "Auth failed" +msgstr "认证失败" + +#: authentication/backends/passkey/fido.py:148 +msgid "This key is not registered" +msgstr "此密钥未注册" + +#: authentication/backends/passkey/models.py:13 +msgid "Added on" +msgstr "附加" + +#: authentication/backends/passkey/models.py:14 +msgid "Date last used" +msgstr "最后使用日期" + +#: authentication/backends/passkey/models.py:15 +msgid "Credential ID" +msgstr "凭证 ID" + #: authentication/confirm/password.py:16 msgid "Authentication failed password incorrect" msgstr "认证失败 (用户名或密码不正确)" @@ -2756,13 +2917,6 @@ msgstr "资产名称" msgid "Reusable" msgstr "可以重复使用" -#: authentication/models/connection_token.py:47 -#: authentication/models/temp_token.py:13 perms/models/asset_permission.py:74 -#: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:831 -msgid "Date expired" -msgstr "失效日期" - #: authentication/models/connection_token.py:51 #: perms/models/asset_permission.py:77 msgid "From ticket" @@ -2862,7 +3016,7 @@ msgstr "动作" #: authentication/serializers/connection_token.py:42 #: perms/serializers/permission.py:38 perms/serializers/permission.py:57 -#: users/serializers/user.py:96 users/serializers/user.py:173 +#: users/serializers/user.py:97 users/serializers/user.py:174 msgid "Is expired" msgstr "已过期" @@ -2870,7 +3024,7 @@ msgstr "已过期" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:22 #: settings/serializers/msg.py:57 users/forms/profile.py:102 -#: users/forms/profile.py:109 users/models/user.py:789 +#: users/forms/profile.py:109 users/models/user.py:800 #: users/templates/users/forgot_password.html:117 #: users/views/profile/reset.py:73 msgid "Email" @@ -2882,8 +3036,8 @@ msgid "The {} cannot be empty" msgstr "{} 不能为空" #: authentication/serializers/token.py:79 perms/serializers/permission.py:37 -#: perms/serializers/permission.py:58 users/serializers/user.py:97 -#: users/serializers/user.py:170 +#: perms/serializers/permission.py:58 users/serializers/user.py:98 +#: users/serializers/user.py:171 msgid "Is valid" msgstr "是否有效" @@ -2908,13 +3062,13 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:635 users/serializers/profile.py:116 +#: users/models/user.py:646 users/serializers/profile.py:92 #: users/templates/users/user_verify_mfa.html:36 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:636 users/serializers/profile.py:117 +#: users/models/user.py:647 users/serializers/profile.py:93 #: users/templates/users/mfa_setting.html:26 #: users/templates/users/mfa_setting.html:68 msgid "Enable" @@ -2959,7 +3113,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:444 +#: jumpserver/conf.py:447 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -3013,7 +3167,7 @@ msgid "request new one" msgstr "重新申请" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3063,7 +3217,17 @@ msgstr "如果这次公钥更新不是由你发起的，那么你的账号可能 msgid "Cancel" msgstr "取消" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:237 +msgid "" +"Configuration file has problems and cannot be logged in. Please contact the " +"administrator or view latest docs" +msgstr "配置文件有问题，无法登录，请联系管理员或查看最新文档" + +#: authentication/templates/authentication/login.html:238 +msgid "If you are administrator, you can update the config resolve it, set" +msgstr "如果你是管理员，可以更新配置文件解决，设置配置项" + +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "其他方式登录" @@ -3099,6 +3263,16 @@ msgstr "返回" msgid "Copy success" msgstr "复制成功" +#: authentication/templates/authentication/passkey.html:162 +msgid "" +"This page is not served over HTTPS. Please use HTTPS to ensure security of " +"your credentials." +msgstr "本页面未使用 HTTPS 协议，请使用 HTTPS 协议以确保您的凭据安全。" + +#: authentication/templates/authentication/passkey.html:173 +msgid "Do you want to retry ?" +msgstr "是否重试 ？" + #: authentication/utils.py:28 common/utils/ip/geoip/utils.py:24 #: xpack/plugins/cloud/const.py:29 msgid "LAN" @@ -3175,23 +3349,23 @@ msgstr "绑定 飞书 成功" msgid "Failed to get user from FeiShu" msgstr "从飞书获取用户失败" -#: authentication/views/login.py:183 +#: authentication/views/login.py:210 msgid "Redirecting" msgstr "跳转中" -#: authentication/views/login.py:184 +#: authentication/views/login.py:211 msgid "Redirecting to {} authentication" msgstr "正在跳转到 {} 认证" -#: authentication/views/login.py:207 +#: authentication/views/login.py:234 msgid "Login timeout, please try again." msgstr "登录超时，请重新登录" -#: authentication/views/login.py:250 +#: authentication/views/login.py:277 msgid "User email already exists ({})" msgstr "用户邮箱已存在 ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:361 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3199,15 +3373,15 @@ msgstr "" "等待 {} 确认, 你也可以复制链接发给他/她
\n" " 不要关闭本页面" -#: authentication/views/login.py:333 +#: authentication/views/login.py:366 msgid "No ticket found" msgstr "没有发现工单" -#: authentication/views/login.py:369 +#: authentication/views/login.py:402 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:403 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" @@ -3260,7 +3434,7 @@ msgstr "准备" msgid "Pending" msgstr "待定的" -#: common/const/choices.py:17 ops/const.py:58 +#: common/const/choices.py:17 ops/const.py:59 msgid "Running" msgstr "运行中" @@ -3344,7 +3518,7 @@ msgstr "忽略的" msgid "discard time" msgstr "忽略时间" -#: common/db/models.py:33 users/models/user.py:834 +#: common/db/models.py:33 users/models/user.py:842 msgid "Updated by" msgstr "最后更新者" @@ -3526,29 +3700,11 @@ msgstr "不能包含特殊字符" msgid "The mobile phone number format is incorrect" msgstr "手机号格式不正确" -#: common/views/mixins.py:74 -msgid "Export all" -msgstr "导出所有" - -#: common/views/mixins.py:76 -msgid "Export only selected items" -msgstr "仅导出选择项" - -#: common/views/mixins.py:81 -#, python-format -msgid "Export filtered: %s" -msgstr "导出搜素: %s" - -#: common/views/mixins.py:90 -#, python-format -msgid "User %s view/export secret" -msgstr "用户 %s 查看/导出 了密码" - -#: jumpserver/conf.py:443 +#: jumpserver/conf.py:446 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:445 +#: jumpserver/conf.py:448 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3615,23 +3771,23 @@ msgstr "发布站内消息" msgid "No account available" msgstr "无可用账号" -#: ops/ansible/inventory.py:260 +#: ops/ansible/inventory.py:263 msgid "Ansible disabled" msgstr "Ansible 已禁用" -#: ops/ansible/inventory.py:276 +#: ops/ansible/inventory.py:279 msgid "Skip hosts below:" msgstr "跳过以下主机: " -#: ops/api/celery.py:62 ops/api/celery.py:77 +#: ops/api/celery.py:64 ops/api/celery.py:79 msgid "Waiting task start" msgstr "等待任务开始" -#: ops/api/celery.py:138 +#: ops/api/celery.py:162 msgid "Task {} not found" msgstr "任务 {} 不存在" -#: ops/api/celery.py:143 +#: ops/api/celery.py:167 msgid "Task {} args or kwargs error" msgstr "任务 {} 执行参数错误" @@ -3715,7 +3871,11 @@ msgstr "PostgreSQL" msgid "SQLServer" msgstr "SQLServer" -#: ops/const.py:60 +#: ops/const.py:55 +msgid "Raw" +msgstr "" + +#: ops/const.py:61 msgid "Timeout" msgstr "超时" @@ -3763,7 +3923,7 @@ msgstr "参数" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "创建者" @@ -3804,7 +3964,7 @@ msgstr "可以查看任务监控" msgid "Kwargs" msgstr "其它参数" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "结束" @@ -3991,7 +4151,7 @@ msgstr "LDAP 同步设置组织为当前组织，请切换其他组织后再进 msgid "The organization have resource ({}) cannot be deleted" msgstr "组织存在资源 ({}) 不能被删除" -#: orgs/apps.py:7 rbac/tree.py:122 +#: orgs/apps.py:7 rbac/tree.py:123 msgid "App organizations" msgstr "组织管理" @@ -4020,7 +4180,7 @@ msgstr "默认组织" msgid "SYSTEM" msgstr "系统组织" -#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:41 msgid "Builtin" msgstr "内置的" @@ -4034,7 +4194,7 @@ msgstr "可以查看所有加入的组织" #: orgs/models.py:233 msgid "Can not delete virtual org" -msgstr "" +msgstr "无法删除虚拟组织" #: orgs/tasks.py:9 msgid "Refresh organization cache" @@ -4156,27 +4316,27 @@ msgstr "{} 至少有一个系统角色" msgid "RBAC" msgstr "RBAC" -#: rbac/builtin.py:114 +#: rbac/builtin.py:115 msgid "SystemAdmin" msgstr "系统管理员" -#: rbac/builtin.py:117 +#: rbac/builtin.py:118 msgid "SystemAuditor" msgstr "系统审计员" -#: rbac/builtin.py:120 +#: rbac/builtin.py:121 msgid "SystemComponent" msgstr "系统组件" -#: rbac/builtin.py:126 +#: rbac/builtin.py:127 msgid "OrgAdmin" msgstr "组织管理员" -#: rbac/builtin.py:129 +#: rbac/builtin.py:130 msgid "OrgAuditor" msgstr "组织审计员" -#: rbac/builtin.py:132 +#: rbac/builtin.py:133 msgid "OrgUser" msgstr "组织用户" @@ -4214,7 +4374,7 @@ msgid "Scope" msgstr "范围" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:797 +#: users/models/user.py:808 msgid "Role" msgstr "角色" @@ -4248,7 +4408,7 @@ msgstr "组织角色绑定" msgid "System role binding" msgstr "系统角色绑定" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:132 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 msgid "Perms" msgstr "权限" @@ -4256,7 +4416,7 @@ msgstr "权限" msgid "Users amount" msgstr "用户数量" -#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:33 +#: rbac/serializers/role.py:28 terminal/models/applet/applet.py:34 msgid "Display name" msgstr "显示名称" @@ -4316,26 +4476,26 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" -#: rbac/tree.py:56 terminal/models/applet/applet.py:51 -#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29 +#: rbac/tree.py:56 terminal/models/applet/applet.py:52 +#: terminal/models/applet/applet.py:298 terminal/models/applet/host.py:29 #: terminal/serializers/applet.py:15 msgid "Applet" msgstr "远程应用" -#: rbac/tree.py:123 +#: rbac/tree.py:124 msgid "Ticket comment" msgstr "工单评论" -#: rbac/tree.py:124 settings/serializers/feature.py:58 +#: rbac/tree.py:125 settings/serializers/feature.py:58 #: tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "工单管理" -#: rbac/tree.py:125 +#: rbac/tree.py:126 msgid "Common setting" msgstr "一般设置" -#: rbac/tree.py:126 +#: rbac/tree.py:127 msgid "View permission tree" msgstr "查看授权树" @@ -4380,7 +4540,7 @@ msgstr "测试手机号 该字段是必填项。" msgid "Settings" msgstr "系统设置" -#: settings/models.py:35 +#: settings/models.py:35 users/models/preference.py:14 msgid "Encrypted" msgstr "加密的" @@ -4468,11 +4628,15 @@ msgstr "企业微信 认证" msgid "SSO Auth" msgstr "SSO 令牌认证" -#: settings/serializers/auth/base.py:24 +#: settings/serializers/auth/base.py:22 +msgid "Passkey Auth" +msgstr "Passkey 认证" + +#: settings/serializers/auth/base.py:25 msgid "Forgot password url" msgstr "忘记密码 URL" -#: settings/serializers/auth/base.py:30 +#: settings/serializers/auth/base.py:28 msgid "Enable login redirect msg" msgstr "启用登录跳转提示" @@ -4709,6 +4873,30 @@ msgstr "使用状态" msgid "Use nonce" msgstr "临时使用" +#: settings/serializers/auth/passkey.py:11 +msgid "Enable passkey Auth" +msgstr "启用 Passkey 认证" + +#: settings/serializers/auth/passkey.py:12 +msgid "Only SSL domain can use passkey auth" +msgstr "只有 SSL 域名可以使用 Passkey(通行密钥)认证" + +#: settings/serializers/auth/passkey.py:15 +msgid "FIDO server ID" +msgstr "Passkey 服务域名" + +#: settings/serializers/auth/passkey.py:17 +msgid "" +"The hostname can using passkey auth, If not set, will use request host and " +"the request host in DOMAINS, If multiple domains, use comma to separate" +msgstr "" +"可以使用 Passkey 认证的域名，如果不设置，将使用请求主机(主机名在可信域 " +"DOMAINS中), 如果有多个域名，使用逗号分隔, 不需要端口号" + +#: settings/serializers/auth/passkey.py:22 +msgid "FIDO server name" +msgstr "Passkey 服务名称" + #: settings/serializers/auth/radius.py:13 msgid "Radius" msgstr "Radius" @@ -4853,41 +5041,43 @@ msgstr "启用企业微信认证" msgid "Site url" msgstr "当前站点 URL" -#: settings/serializers/basic.py:10 +#: settings/serializers/basic.py:11 msgid "" -"Email links or other system callbacks are used to access it, eg: http://dev." -"jumpserver.org:8080" +"External URL, email links or other system callbacks are used to access it, " +"eg: http://dev.jumpserver.org:8080" msgstr "" +"外部可访问的 URL, 用于邮件链接或其它系统回调, 例如: http://dev.jumpserver." +"org:8080" -#: settings/serializers/basic.py:13 +#: settings/serializers/basic.py:16 msgid "User guide url" msgstr "用户向导URL" -#: settings/serializers/basic.py:14 +#: settings/serializers/basic.py:17 msgid "User first login update profile done redirect to it" msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档" -#: settings/serializers/basic.py:17 +#: settings/serializers/basic.py:20 msgid "Global organization name" msgstr "全局组织名" -#: settings/serializers/basic.py:18 +#: settings/serializers/basic.py:21 msgid "The name of global organization to display" msgstr "全局组织的显示名称，默认为 全局组织" -#: settings/serializers/basic.py:21 +#: settings/serializers/basic.py:24 msgid "Help Docs URL" msgstr "文档链接" -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:25 msgid "default: http://docs.jumpserver.org" msgstr "默认: http://dev.jumpserver.org:8080" -#: settings/serializers/basic.py:25 +#: settings/serializers/basic.py:28 msgid "Help Support URL" msgstr "支持链接" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:29 msgid "default: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/" @@ -5103,11 +5293,11 @@ msgstr "" "放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问" "题" -#: settings/serializers/security.py:16 +#: settings/serializers/security.py:17 msgid "User password expiration (day)" msgstr "用户密码过期时间 (天)" -#: settings/serializers/security.py:18 +#: settings/serializers/security.py:19 msgid "" "If the user does not update the password during the time, the user password " "will expire failure;The password expiration reminder mail will be automatic " @@ -5116,85 +5306,85 @@ msgstr "" "如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期提醒邮件将在密码过" "期前5天内由系统 (每天)自动发送给用户" -#: settings/serializers/security.py:25 +#: settings/serializers/security.py:26 msgid "Number of repeated historical passwords" msgstr "不能设置近几次密码" -#: settings/serializers/security.py:27 +#: settings/serializers/security.py:28 msgid "" "Tip: When the user resets the password, it cannot be the previous n " "historical passwords of the user" msgstr "提示：用户重置密码时，不能为该用户前几次使用过的密码" -#: settings/serializers/security.py:33 +#: settings/serializers/security.py:34 msgid "Password minimum length" msgstr "密码最小长度" -#: settings/serializers/security.py:37 +#: settings/serializers/security.py:38 msgid "Admin user password minimum length" msgstr "管理员密码最小长度" -#: settings/serializers/security.py:40 +#: settings/serializers/security.py:41 msgid "Must contain capital" msgstr "必须包含大写字符" -#: settings/serializers/security.py:43 +#: settings/serializers/security.py:44 msgid "Must contain lowercase" msgstr "必须包含小写字符" -#: settings/serializers/security.py:46 +#: settings/serializers/security.py:47 msgid "Must contain numeric" msgstr "必须包含数字" -#: settings/serializers/security.py:49 +#: settings/serializers/security.py:50 msgid "Must contain special" msgstr "必须包含特殊字符" -#: settings/serializers/security.py:54 +#: settings/serializers/security.py:55 msgid "" "If the user has failed to log in for a limited number of times, no login is " "allowed during this time interval." msgstr "当用户登录失败次数达到限制后，那么在此间隔内禁止登录" -#: settings/serializers/security.py:62 +#: settings/serializers/security.py:63 msgid "Limit the number of user login failures" msgstr "限制用户登录失败次数" -#: settings/serializers/security.py:66 +#: settings/serializers/security.py:67 msgid "Block user login interval (minute)" msgstr "禁止用户登录间隔 (分)" -#: settings/serializers/security.py:72 +#: settings/serializers/security.py:73 msgid "Limit the number of IP login failures" msgstr "限制 IP 登录失败次数" -#: settings/serializers/security.py:76 +#: settings/serializers/security.py:77 msgid "Block IP login interval (minute)" msgstr "禁止 IP 登录间隔 (分)" -#: settings/serializers/security.py:80 +#: settings/serializers/security.py:81 msgid "Login IP White List" msgstr "IP 登录白名单" -#: settings/serializers/security.py:85 +#: settings/serializers/security.py:86 msgid "Login IP Black List" msgstr "IP 登录黑名单" -#: settings/serializers/security.py:90 +#: settings/serializers/security.py:91 msgid "Only single device login" msgstr "仅一台设备登录" -#: settings/serializers/security.py:91 +#: settings/serializers/security.py:92 msgid "" "After the user logs in on the new device, other logged-in devices will " "automatically log out" msgstr "用户在新设备登录后，其他已登录的设备会自动退出" -#: settings/serializers/security.py:94 +#: settings/serializers/security.py:95 msgid "Only exist user login" msgstr "仅已存在用户登录" -#: settings/serializers/security.py:96 +#: settings/serializers/security.py:97 msgid "" "If enabled, non-existent users will not be allowed to log in; if disabled, " "users of other authentication methods except local authentication methods " @@ -5204,11 +5394,11 @@ msgstr "" "如果开启，不存在的用户将不被允许登录；如果关闭，除本地认证方式外，其他认证方" "式的用户都允许登录并自动创建用户 (如果用户不存在)" -#: settings/serializers/security.py:102 +#: settings/serializers/security.py:103 msgid "Only from source login" msgstr "仅从用户来源登录" -#: settings/serializers/security.py:104 +#: settings/serializers/security.py:105 msgid "" "If it is enabled, the user will only authenticate to the source when logging " "in; if it is disabled, the user will authenticate all the enabled " @@ -5218,69 +5408,69 @@ msgstr "" "如果开启，用户登录时仅会向来源端进行认证；如果关闭，用户登录时会按照一定的顺" "序对所有已开启的认证方式进行顺序认证，只要有一个认证成功就可以直接登录" -#: settings/serializers/security.py:115 +#: settings/serializers/security.py:116 msgid "Not enabled" msgstr "未启用" -#: settings/serializers/security.py:116 +#: settings/serializers/security.py:117 msgid "All users" msgstr "所有用户" -#: settings/serializers/security.py:117 +#: settings/serializers/security.py:118 msgid "Only admin users" msgstr "仅管理员" -#: settings/serializers/security.py:119 +#: settings/serializers/security.py:120 msgid "Global MFA auth" msgstr "全局启用 MFA 认证" -#: settings/serializers/security.py:123 +#: settings/serializers/security.py:124 msgid "Third-party login users perform MFA authentication" msgstr "第三方认证开启 MFA" -#: settings/serializers/security.py:124 +#: settings/serializers/security.py:125 msgid "The third-party login modes include OIDC, CAS, and SAML2" msgstr "第三方登录方式包括: OIDC、CAS、SAML2" -#: settings/serializers/security.py:127 +#: settings/serializers/security.py:128 msgid "OTP issuer name" msgstr "OTP 扫描后的名称" -#: settings/serializers/security.py:131 +#: settings/serializers/security.py:132 msgid "OTP valid window" msgstr "OTP 延迟有效次数" -#: settings/serializers/security.py:135 +#: settings/serializers/security.py:136 msgid "MFA verify TTL" msgstr "MFA 校验有效期" -#: settings/serializers/security.py:137 +#: settings/serializers/security.py:138 msgid "" "Unit: second, The verification MFA takes effect only when you view the " "account password" msgstr "单位：秒，目前仅在查看账号密码校验 MFA 时生效" -#: settings/serializers/security.py:142 +#: settings/serializers/security.py:143 msgid "MFA in login page" msgstr "MFA 在登录页面输入" -#: settings/serializers/security.py:143 +#: settings/serializers/security.py:144 msgid "Eu security regulations(GDPR) require MFA to be on the login page" msgstr "欧盟数据安全法规(GDPR) 要求 MFA 在登录页面，来确保系统登录安全" -#: settings/serializers/security.py:147 +#: settings/serializers/security.py:148 msgid "Verify code TTL (second)" msgstr "验证码有效时间 (分)" -#: settings/serializers/security.py:148 +#: settings/serializers/security.py:149 msgid "Reset password and send SMS code expiration time" msgstr "重置密码的验证码及发送短信的验证码过期时间" -#: settings/serializers/security.py:152 +#: settings/serializers/security.py:153 msgid "Enable Login dynamic code" msgstr "启用登录附加码" -#: settings/serializers/security.py:153 +#: settings/serializers/security.py:154 msgid "" "The password and additional code are sent to a third party authentication " "system for verification" @@ -5288,19 +5478,19 @@ msgstr "" "密码和附加码一并发送给第三方认证系统进行校验, 如：有的第三方认证系统，需要 密" "码+6位数字 完成认证" -#: settings/serializers/security.py:157 +#: settings/serializers/security.py:158 msgid "Enable Login captcha" msgstr "启用登录验证码" -#: settings/serializers/security.py:158 +#: settings/serializers/security.py:159 msgid "Enable captcha to prevent robot authentication" msgstr "开启验证码，防止机器人登录" -#: settings/serializers/security.py:161 +#: settings/serializers/security.py:162 msgid "Remote Login Protection" msgstr "异地登录通知" -#: settings/serializers/security.py:163 +#: settings/serializers/security.py:164 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5309,66 +5499,66 @@ msgstr "" "根据登录 IP 是否所属常用登录城市进行判断，若账号在非常用城市登录，会发送异地" "登录提醒" -#: settings/serializers/security.py:169 +#: settings/serializers/security.py:170 msgid "Unused user timeout (day)" msgstr "不活跃用户自动禁用 (天)" -#: settings/serializers/security.py:170 +#: settings/serializers/security.py:171 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." msgstr "每天检测一次，超过预设时间的用户自动禁用" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:191 msgid "Enable watermark" msgstr "开启水印" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:192 msgid "Enabled, the web session and replay contains watermark information" msgstr "启用后，Web 会话和录像将包含水印信息" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:196 msgid "Connection max idle time (minute)" msgstr "连接最大空闲时间 (分)" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:197 msgid "If idle time more than it, disconnect connection." msgstr "提示：如果超过该配置没有操作，连接会被断开" -#: settings/serializers/security.py:200 +#: settings/serializers/security.py:201 msgid "Session max connection time (hour)" msgstr "会话连接最大时间 (时)" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:202 msgid "If session connection time more than it, disconnect connection." msgstr "提示：如果会话连接超过该配置，连接会被断开" -#: settings/serializers/security.py:204 +#: settings/serializers/security.py:205 msgid "Remember manual auth" msgstr "保存手动输入密码" -#: settings/serializers/security.py:207 +#: settings/serializers/security.py:208 #: terminal/templates/terminal/_msg_session_sharing.html:10 msgid "Session share" msgstr "会话分享" -#: settings/serializers/security.py:208 +#: settings/serializers/security.py:209 msgid "Enabled, Allows user active session to be shared with other users" msgstr "开启后允许用户分享已连接的资产会话给他人，协同工作" -#: settings/serializers/security.py:214 +#: settings/serializers/security.py:215 msgid "Insecure command alert" msgstr "危险命令告警" -#: settings/serializers/security.py:217 +#: settings/serializers/security.py:218 msgid "Email recipient" msgstr "邮件收件人" -#: settings/serializers/security.py:218 +#: settings/serializers/security.py:219 msgid "Multiple user using , split" msgstr "多个用户，使用 , 分割" -#: settings/serializers/settings.py:69 +#: settings/serializers/settings.py:70 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -5427,15 +5617,6 @@ msgstr "启用 Razor 服务" msgid "Enable SSH Client" msgstr "启用 SSH Client" -#: settings/serializers/terminal.py:52 -msgid "Default graphics resolution" -msgstr "默认图形化分辨率" - -#: settings/serializers/terminal.py:53 -msgid "" -"Tip: Default resolution to use when connecting graphical assets in Luna pages" -msgstr "提示：在Luna 页面中连接图形化资产时默认使用的分辨率" - #: settings/tasks/ldap.py:24 msgid "Periodic import ldap user" msgstr "周期导入 LDAP 用户" @@ -5581,27 +5762,27 @@ msgstr "帮助" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:25 +#: templates/_header_bar.html:27 msgid "Commercial support" msgstr "商业支持" -#: templates/_header_bar.html:76 users/forms/profile.py:44 +#: templates/_header_bar.html:79 users/forms/profile.py:44 msgid "Profile" msgstr "个人信息" -#: templates/_header_bar.html:79 +#: templates/_header_bar.html:83 msgid "Admin page" msgstr "管理页面" -#: templates/_header_bar.html:81 +#: templates/_header_bar.html:86 msgid "User page" msgstr "用户页面" -#: templates/_header_bar.html:84 +#: templates/_header_bar.html:90 msgid "API Key" msgstr "API Key" -#: templates/_header_bar.html:85 +#: templates/_header_bar.html:91 msgid "Logout" msgstr "注销登录" @@ -5697,6 +5878,7 @@ msgid "Home page" msgstr "首页" #: templates/resource_download.html:18 templates/resource_download.html:33 +#: users/const.py:48 msgid "Client" msgstr "客户端" @@ -5781,15 +5963,20 @@ msgstr "测试失败: 账号无效" msgid "Have online sessions" msgstr "有在线会话" -#: terminal/api/session/session.py:251 +#: terminal/api/session/session.py:46 +#, python-format +msgid "User %s %s session %s replay" +msgstr "用户 %s %s 了会话 %s 的录像" + +#: terminal/api/session/session.py:292 msgid "Session does not exist: {}" msgstr "会话不存在: {}" -#: terminal/api/session/session.py:254 +#: terminal/api/session/session.py:295 msgid "Session is finished or the protocol not supported" msgstr "会话已经完成或协议不支持" -#: terminal/api/session/session.py:267 +#: terminal/api/session/session.py:308 msgid "User does not have permission" msgstr "用户没有权限" @@ -5907,51 +6094,51 @@ msgstr "不支持批量创建" msgid "Storage is invalid" msgstr "存储无效" -#: terminal/models/applet/applet.py:29 -msgid "Community" +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 +msgid "Community edition" msgstr "社区版" -#: terminal/models/applet/applet.py:30 +#: terminal/models/applet/applet.py:31 msgid "Enterprise" msgstr "企业版" -#: terminal/models/applet/applet.py:35 +#: terminal/models/applet/applet.py:36 msgid "Author" msgstr "作者" -#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31 +#: terminal/models/applet/applet.py:38 terminal/serializers/applet.py:31 msgid "Edition" msgstr "版本" -#: terminal/models/applet/applet.py:42 +#: terminal/models/applet/applet.py:43 msgid "Can concurrent" msgstr "可以并发" -#: terminal/models/applet/applet.py:43 +#: terminal/models/applet/applet.py:44 msgid "Tags" msgstr "标签" -#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "主机" -#: terminal/models/applet/applet.py:92 +#: terminal/models/applet/applet.py:93 msgid "Applet pkg not valid, Missing file {}" msgstr "Applet pkg 无效，缺少文件 {}" -#: terminal/models/applet/applet.py:111 +#: terminal/models/applet/applet.py:112 msgid "Load platform.yml failed: {}" msgstr "加载 platform.yml 失败: {}" -#: terminal/models/applet/applet.py:114 +#: terminal/models/applet/applet.py:115 msgid "Only support custom platform" msgstr "只支持自定义平台" -#: terminal/models/applet/applet.py:119 +#: terminal/models/applet/applet.py:120 msgid "Missing type in platform.yml" msgstr "在 platform.yml 中缺少类型" -#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35 +#: terminal/models/applet/applet.py:300 terminal/models/applet/host.py:35 #: terminal/models/applet/host.py:137 msgid "Hosting" msgstr "宿主机" @@ -6110,7 +6297,7 @@ msgstr "可以下载会话录像" msgid "Account id" msgstr "账号 ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "登录来源" @@ -6146,61 +6333,61 @@ msgstr "可以终断会话" msgid "Can validate session action perm" msgstr "可以验证会话动作权限" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "过期时间 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "操作权限" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "来源" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "会话分享" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "可以创建超级会话分享" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "链接失效" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "链接过期" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "该用户无权加入会话" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "加入者" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "加入日期" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "结束日期" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "会话加入记录" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "验证码不正确" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "您已经加入过此会话" @@ -6270,7 +6457,7 @@ msgstr "" "建议填写内网地址，否则填写当前站点 URL
例如：https://172.16.10.110 or " "https://dev.jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "忽略证书认证" @@ -6454,30 +6641,34 @@ msgid "Endpoint suffix" msgstr "端点后缀" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "地址中不能包含特殊字符 `#`" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "地址格式不正确" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "主机无效" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "端口无效" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "按日期建索引" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "是否根据日期动态建立索引" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "索引" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "文档类型" @@ -6840,7 +7031,7 @@ msgid "Ticket information" msgstr "工单信息" #: tickets/templates/tickets/approve_check_password.html:29 -#: tickets/views/approve.py:39 +#: tickets/views/approve.py:40 msgid "Ticket approval" msgstr "工单审批" @@ -6852,24 +7043,24 @@ msgstr "同意" msgid "Go Login" msgstr "去登录" -#: tickets/views/approve.py:40 +#: tickets/views/approve.py:41 msgid "" "This ticket does not exist, the process has ended, or this link has expired" msgstr "工单不存在，或者工单流程已经结束，或者此链接已经过期" -#: tickets/views/approve.py:69 +#: tickets/views/approve.py:70 msgid "Click the button below to approve or reject" msgstr "点击下方按钮同意或者拒绝" -#: tickets/views/approve.py:71 +#: tickets/views/approve.py:72 msgid "After successful authentication, this ticket can be approved directly" msgstr "认证成功后，工单可直接审批" -#: tickets/views/approve.py:93 +#: tickets/views/approve.py:97 msgid "Illegal approval action" msgstr "无效的审批动作" -#: tickets/views/approve.py:106 +#: tickets/views/approve.py:110 msgid "This user is not authorized to approve this ticket" msgstr "此用户无权审批此工单" @@ -6905,6 +7096,30 @@ msgstr "生成重置密码链接，通过邮件发送给用户" msgid "Set password" msgstr "设置密码" +#: users/const.py:23 +msgid "AUTO" +msgstr "自动" + +#: users/const.py:31 +msgid "Full screen" +msgstr "全屏" + +#: users/const.py:32 +msgid "Multi screen" +msgstr "多屏显示" + +#: users/const.py:33 +msgid "Drives redirect" +msgstr "磁盘挂载" + +#: users/const.py:52 +msgid "Replace" +msgstr "替换" + +#: users/const.py:53 +msgid "Suffix" +msgstr "加后缀" + #: users/exceptions.py:10 msgid "MFA not enabled" msgstr "MFA 多因子认证没有开启" @@ -6983,83 +7198,87 @@ msgstr "复制你的公钥到这里" msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms/profile.py:162 users/serializers/profile.py:100 -#: users/serializers/profile.py:183 users/serializers/profile.py:210 +#: users/forms/profile.py:162 users/serializers/profile.py:76 +#: users/serializers/profile.py:159 users/serializers/profile.py:186 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:173 users/models/user.py:820 +#: users/forms/profile.py:173 users/models/user.py:831 #: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "SSH公钥" -#: users/models/user.py:637 users/serializers/profile.py:118 +#: users/models/preference.py:38 +msgid "Preference" +msgstr "用户设置" + +#: users/models/user.py:648 users/serializers/profile.py:94 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:799 users/serializers/user.py:171 +#: users/models/user.py:810 users/serializers/user.py:172 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:801 +#: users/models/user.py:812 msgid "Avatar" msgstr "头像" -#: users/models/user.py:804 +#: users/models/user.py:815 msgid "Wechat" msgstr "微信" -#: users/models/user.py:807 users/serializers/user.py:108 +#: users/models/user.py:818 users/serializers/user.py:109 msgid "Phone" msgstr "手机" -#: users/models/user.py:813 +#: users/models/user.py:824 msgid "OTP secret key" msgstr "OTP 密钥" -#: users/models/user.py:817 +#: users/models/user.py:828 #: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh私钥" -#: users/models/user.py:823 -msgid "Secret key" -msgstr "Secret key" - -#: users/models/user.py:828 users/serializers/profile.py:149 -#: users/serializers/user.py:168 +#: users/models/user.py:836 users/serializers/profile.py:125 +#: users/serializers/user.py:169 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:842 +#: users/models/user.py:850 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:845 +#: users/models/user.py:853 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:988 +#: users/models/user.py:977 +msgid "Can not delete admin user" +msgstr "无法删除管理员用户" + +#: users/models/user.py:1003 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:989 +#: users/models/user.py:1004 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:990 +#: users/models/user.py:1005 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:999 +#: users/models/user.py:1014 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1002 +#: users/models/user.py:1017 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1027 +#: users/models/user.py:1042 msgid "User password history" msgstr "用户密码历史" @@ -7094,11 +7313,67 @@ msgstr "重置 SSH 密钥" msgid "Reset MFA" msgstr "重置 MFA" +#: users/serializers/preference/koko.py:10 +msgid "File name conflict resolution" +msgstr "文件名冲突解决方案" + +#: users/serializers/preference/lina.py:11 +msgid "New file encryption password" +msgstr "文件加密密码" + +#: users/serializers/preference/lina.py:16 +msgid "Confirm file encryption password" +msgstr "确认文件加密密码" + +#: users/serializers/preference/lina.py:24 users/serializers/profile.py:48 +msgid "The newly set password is inconsistent" +msgstr "两次密码不一致" + +#: users/serializers/preference/luna.py:23 +msgid "Async loading of asset tree" +msgstr "异步加载资产树" + +#: users/serializers/preference/luna.py:30 +msgid "RDP resolution" +msgstr "RDP 分辨率" + +#: users/serializers/preference/luna.py:34 +msgid "Keyboard layout" +msgstr "键盘布局" + +#: users/serializers/preference/luna.py:38 +msgid "RDP client option" +msgstr "RDP 客户端选项" + +#: users/serializers/preference/luna.py:42 +msgid "Remote application connection method" +msgstr "远程应用连接方式" + +#: users/serializers/preference/luna.py:49 +msgid "Character terminal font size" +msgstr "字符终端字体大小" + +#: users/serializers/preference/luna.py:52 +msgid "Backspace as Ctrl+H" +msgstr "字符终端Backspace As Ctrl+H" + +#: users/serializers/preference/luna.py:55 +msgid "Right click quickly paste" +msgstr "右键快速粘贴" + +#: users/serializers/preference/luna.py:61 +msgid "Graphics" +msgstr "图形化" + +#: users/serializers/preference/luna.py:62 +msgid "Command line" +msgstr "命令行" + #: users/serializers/profile.py:29 msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/profile.py:36 users/serializers/profile.py:197 +#: users/serializers/profile.py:36 users/serializers/profile.py:173 msgid "Password does not match security rules" msgstr "密码不满足安全规则" @@ -7106,10 +7381,6 @@ msgstr "密码不满足安全规则" msgid "The new password cannot be the last {} passwords" msgstr "新密码不能是最近 {} 次的密码" -#: users/serializers/profile.py:48 users/serializers/profile.py:71 -msgid "The newly set password is inconsistent" -msgstr "两次密码不一致" - #: users/serializers/user.py:42 msgid "System roles" msgstr "系统角色" @@ -7118,55 +7389,55 @@ msgstr "系统角色" msgid "Org roles" msgstr "组织角色" -#: users/serializers/user.py:89 +#: users/serializers/user.py:90 msgid "Password strategy" msgstr "密码策略" -#: users/serializers/user.py:91 +#: users/serializers/user.py:92 msgid "MFA enabled" msgstr "MFA 已启用" -#: users/serializers/user.py:93 +#: users/serializers/user.py:94 msgid "MFA force enabled" msgstr "强制 MFA" -#: users/serializers/user.py:95 +#: users/serializers/user.py:96 msgid "Login blocked" msgstr "登录被锁定" -#: users/serializers/user.py:98 users/serializers/user.py:177 +#: users/serializers/user.py:99 users/serializers/user.py:178 msgid "Is OTP bound" msgstr "是否绑定了虚拟 MFA" -#: users/serializers/user.py:100 +#: users/serializers/user.py:101 msgid "Can public key authentication" msgstr "可以使用公钥认证" -#: users/serializers/user.py:172 +#: users/serializers/user.py:173 msgid "Is org admin" msgstr "组织管理员" -#: users/serializers/user.py:174 +#: users/serializers/user.py:175 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:178 +#: users/serializers/user.py:179 msgid "MFA level" msgstr "MFA 级别" -#: users/serializers/user.py:284 +#: users/serializers/user.py:285 msgid "Select users" msgstr "选择用户" -#: users/serializers/user.py:285 +#: users/serializers/user.py:286 msgid "For security, only list several users" msgstr "为了安全，仅列出几个用户" -#: users/serializers/user.py:318 +#: users/serializers/user.py:319 msgid "name not unique" msgstr "名称重复" -#: users/signal_handlers.py:27 +#: users/signal_handlers.py:32 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -7174,23 +7445,23 @@ msgid "" msgstr "" "管理员已开启'仅允许已存在用户登录'，当前用户不在用户列表中，请联系管理员。" -#: users/tasks.py:24 +#: users/tasks.py:23 msgid "Check password expired" msgstr "校验密码已过期" -#: users/tasks.py:38 +#: users/tasks.py:37 msgid "Periodic check password expired" msgstr "周期校验密码过期" -#: users/tasks.py:52 +#: users/tasks.py:51 msgid "Check user expired" msgstr "校验用户已过期" -#: users/tasks.py:69 +#: users/tasks.py:68 msgid "Periodic check user expired" msgstr "周期检测用户过期" -#: users/tasks.py:83 +#: users/tasks.py:82 msgid "Check unused users" msgstr "校验用户已过期" @@ -7588,7 +7859,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151 msgid "Regions" msgstr "地域" @@ -7597,17 +7868,17 @@ msgid "Hostname strategy" msgstr "主机名策略" #: xpack/plugins/cloud/models.py:100 -#: xpack/plugins/cloud/serializers/task.py:150 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "IP network segment group" msgstr "IP网段组" #: xpack/plugins/cloud/models.py:103 -#: xpack/plugins/cloud/serializers/task.py:155 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同步IP类型" #: xpack/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/serializers/task.py:173 +#: xpack/plugins/cloud/serializers/task.py:177 msgid "Always update" msgstr "总是更新" @@ -7700,9 +7971,9 @@ msgstr "规则匹配" msgid "Rule value" msgstr "规则值" -#: xpack/plugins/cloud/models.py:317 +#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70 msgid "Strategy rule" -msgstr "策略规则" +msgstr "条件" #: xpack/plugins/cloud/models.py:332 msgid "Action attr" @@ -7712,9 +7983,9 @@ msgstr "动作属性" msgid "Action value" msgstr "动作值" -#: xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73 msgid "Strategy action" -msgstr "策略动作" +msgstr "动作" #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" @@ -7999,7 +8270,7 @@ msgstr "测试超时时间" msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:139 +#: xpack/plugins/cloud/serializers/task.py:143 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 " @@ -8011,11 +8282,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:145 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "Instance count" msgstr "实例个数" @@ -8071,22 +8342,25 @@ msgstr "许可证导入成功" msgid "License is invalid" msgstr "无效的许可证" -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:138 +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:140 msgid "License" msgstr "许可证" #: xpack/plugins/license/models.py:80 -msgid "Standard edition" -msgstr "标准版" +msgid "Basic edition" +msgstr "企业基础版" #: xpack/plugins/license/models.py:82 -msgid "Enterprise edition" -msgstr "企业版" +msgid "Standard edition" +msgstr "企业标准版" #: xpack/plugins/license/models.py:84 -msgid "Ultimate edition" -msgstr "旗舰版" +msgid "Professional edition" +msgstr "企业专业版" #: xpack/plugins/license/models.py:86 -msgid "Community edition" -msgstr "社区版" +msgid "Ultimate edition" +msgstr "企业旗舰版" + +#~ msgid "Random" +#~ msgstr "随机" diff --git a/apps/notifications/api/notifications.py b/apps/notifications/api/notifications.py index 827cb9d19..9f641ee70 100644 --- a/apps/notifications/api/notifications.py +++ b/apps/notifications/api/notifications.py @@ -96,6 +96,8 @@ def get_all_test_messages(request): import textwrap from ..notifications import Message from django.shortcuts import HttpResponse + if not request.user.is_superuser: + return HttpResponse('没有权限', status=401) msgs_cls = Message.get_all_sub_messages() html_data = '
HTML 格式
' diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index a650b158e..b07876224 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -163,13 +163,16 @@ class JMSInventory: protocol = self.get_primary_protocol(ansible_config, protocols) + tp, category = asset.type, asset.category + name = asset.name.replace(' ', '_').replace('[', '_').replace(']', '_') + secret_info = {k: v for k, v in asset.secret_info.items() if v} host = { - 'name': '{}'.format(asset.name.replace(' ', '_')), + 'name': name, 'jms_asset': { 'id': str(asset.id), 'name': asset.name, 'address': asset.address, - 'type': asset.type, 'category': asset.category, + 'type': tp, 'category': category, 'protocol': protocol.name, 'port': protocol.port, - 'spec_info': asset.spec_info, 'secret_info': asset.secret_info, + 'spec_info': asset.spec_info, 'secret_info': secret_info, 'protocols': [{'name': p.name, 'port': p.port} for p in protocols], }, 'jms_account': { @@ -179,7 +182,7 @@ class JMSInventory: } if account else None } - if host['jms_account'] and asset.platform.type == 'oracle': + if host['jms_account'] and tp == 'oracle': host['jms_account']['mode'] = 'sysdba' if account.privileged else None ansible_config = self.fill_ansible_config(ansible_config, protocol) @@ -281,7 +284,6 @@ class JMSInventory: data = {'all': {'hosts': {}}} for host in hosts: name = host.pop('name') - name = name.replace('[', '_').replace(']', '_') data['all']['hosts'][name] = host if not self.exclude_localhost: data['all']['hosts'].update({ diff --git a/apps/ops/api/celery.py b/apps/ops/api/celery.py index 67f4d4dda..a7baaf6e4 100644 --- a/apps/ops/api/celery.py +++ b/apps/ops/api/celery.py @@ -9,10 +9,12 @@ from django.utils.translation import gettext as _ from django_celery_beat.models import PeriodicTask 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.exceptions import JMSException from common.permissions import IsValidUser +from common.drf.filters import BaseFilterSet from ops.celery import app from ..ansible.utils import get_ansible_task_log_path from ..celery.utils import get_celery_task_log_path @@ -102,13 +104,35 @@ class CelerySummaryAPIView(generics.RetrieveAPIView): pass +class CeleryTaskFilterSet(BaseFilterSet): + id = drf_filters.CharFilter(field_name='id', lookup_expr='exact') + name = drf_filters.CharFilter(method='filter_name') + + @staticmethod + def filter_name(queryset, name, value): + _ids = [] + for task in queryset: + comment = task.meta.get('comment') + if not comment: + continue + if value not in comment: + continue + _ids.append(task.id) + queryset = queryset.filter(id__in=_ids) + return queryset + + class Meta: + model = CeleryTask + fields = ['id', 'name'] + + class CeleryTaskViewSet( CommonApiMixin, mixins.RetrieveModelMixin, mixins.ListModelMixin, mixins.DestroyModelMixin, viewsets.GenericViewSet ): - filterset_fields = ('id', 'name') - search_fields = filterset_fields + search_fields = ('id', 'name') + filterset_class = CeleryTaskFilterSet serializer_class = CeleryTaskSerializer def get_queryset(self): diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py index 6fac1bc95..f2bf92cae 100644 --- a/apps/ops/api/job.py +++ b/apps/ops/api/job.py @@ -1,4 +1,5 @@ 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 @@ -25,9 +26,9 @@ from perms.models import PermNode from perms.utils import UserPermAssetUtil -def set_task_to_serializer_data(serializer, task): +def set_task_to_serializer_data(serializer, task_id): data = getattr(serializer, "_data", {}) - data["task_id"] = task.id + data["task_id"] = task_id setattr(serializer, "_data", data) @@ -85,8 +86,10 @@ class JobViewSet(OrgBulkModelViewSet): execution = job.create_execution() execution.creator = self.request.user execution.save() - task = run_ops_job_execution.delay(str(execution.id)) - set_task_to_serializer_data(serializer, task) + + set_task_to_serializer_data(serializer, execution.id) + transaction.on_commit( + lambda: run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id))) class JobExecutionViewSet(OrgBulkModelViewSet): @@ -96,7 +99,10 @@ class JobExecutionViewSet(OrgBulkModelViewSet): search_fields = ('material',) filterset_fields = ['status', 'job_id'] - @atomic + @staticmethod + def start_deploy(instance, serializer): + task = run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)) + def perform_create(self, serializer): instance = serializer.save() instance.job_version = instance.job.version @@ -104,8 +110,10 @@ class JobExecutionViewSet(OrgBulkModelViewSet): instance.job_type = Types[instance.job.type].value instance.creator = self.request.user instance.save() - task = run_ops_job_execution.delay(str(instance.id)) - set_task_to_serializer_data(serializer, task) + + 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))) def get_queryset(self): queryset = super().get_queryset() diff --git a/apps/ops/api/playbook.py b/apps/ops/api/playbook.py index 72e62cb82..2bf52132c 100644 --- a/apps/ops/api/playbook.py +++ b/apps/ops/api/playbook.py @@ -3,6 +3,7 @@ import shutil import zipfile from django.conf import settings +from django.core.exceptions import SuspiciousFileOperation from django.shortcuts import get_object_or_404 from django.utils.translation import gettext_lazy as _ from rest_framework import status @@ -18,6 +19,7 @@ __all__ = ["PlaybookViewSet", "PlaybookFileBrowserAPIView"] from rest_framework.views import APIView from rest_framework.response import Response +from django.utils._os import safe_join def unzip_playbook(src, dist): @@ -37,7 +39,7 @@ class PlaybookViewSet(OrgBulkModelViewSet): raise JMSException(code='playbook_has_job', detail={"msg": _("Currently playbook is being used in a job")}) instance_id = instance.id super().perform_destroy(instance) - dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance_id.__str__()) + dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance_id.__str__()) shutil.rmtree(dest_path) def get_queryset(self): @@ -48,8 +50,8 @@ class PlaybookViewSet(OrgBulkModelViewSet): def perform_create(self, serializer): instance = serializer.save() if 'multipart/form-data' in self.request.headers['Content-Type']: - src_path = os.path.join(settings.MEDIA_ROOT, instance.path.name) - dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__()) + src_path = safe_join(settings.MEDIA_ROOT, instance.path.name) + dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__()) try: unzip_playbook(src_path, dest_path) except RuntimeError as e: @@ -60,9 +62,9 @@ class PlaybookViewSet(OrgBulkModelViewSet): else: if instance.create_method == 'blank': - dest_path = os.path.join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__()) + dest_path = safe_join(settings.DATA_DIR, "ops", "playbook", instance.id.__str__()) os.makedirs(dest_path) - with open(os.path.join(dest_path, 'main.yml'), 'w') as f: + with open(safe_join(dest_path, 'main.yml'), 'w') as f: f.write('## write your playbook here') @@ -83,13 +85,15 @@ class PlaybookFileBrowserAPIView(APIView): work_path = playbook.work_dir file_key = request.query_params.get('key', '') if file_key: - file_path = os.path.join(work_path, file_key) - with open(file_path, 'r') as f: - try: + try: + file_path = safe_join(work_path, file_key) + with open(file_path, 'r') as f: content = f.read() - except UnicodeDecodeError: - content = _('Unsupported file content') - return Response({'content': content}) + except UnicodeDecodeError: + content = _('Unsupported file content') + except SuspiciousFileOperation: + raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")}) + return Response({'content': content}) else: expand_key = request.query_params.get('expand', '') nodes = self.generate_tree(playbook, work_path, expand_key) @@ -105,7 +109,8 @@ class PlaybookFileBrowserAPIView(APIView): parent_key = '' if os.path.dirname(parent_key) == 'root': parent_key = os.path.basename(parent_key) - full_path = os.path.join(work_path, parent_key) + + full_path = safe_join(work_path, parent_key) is_directory = request.data.get('is_directory', False) content = request.data.get('content', '') @@ -117,27 +122,30 @@ class PlaybookFileBrowserAPIView(APIView): p = 'new_file.yml' else: p = 'new_dir' - np = os.path.join(full_path, p) + np = safe_join(full_path, p) n = 0 while os.path.exists(np): n += 1 - np = os.path.join(full_path, '{}({})'.format(p, n)) + np = safe_join(full_path, '{}({})'.format(p, n)) return np - if is_directory: - new_file_path = find_new_name(name) - os.makedirs(new_file_path) - else: - new_file_path = find_new_name(name, True) - with open(new_file_path, 'w') as f: - f.write(content) + try: + if is_directory: + new_file_path = find_new_name(name) + os.makedirs(new_file_path) + else: + new_file_path = find_new_name(name, True) + with open(new_file_path, 'w') as f: + f.write(content) + except SuspiciousFileOperation: + raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")}) relative_path = os.path.relpath(os.path.dirname(new_file_path), work_path) new_node = { "name": os.path.basename(new_file_path), "title": os.path.basename(new_file_path), - "id": os.path.join(relative_path, os.path.basename(new_file_path)) - if not os.path.join(relative_path, os.path.basename(new_file_path)).startswith('.') + "id": safe_join(relative_path, os.path.basename(new_file_path)) + if not safe_join(relative_path, os.path.basename(new_file_path)).startswith('.') else os.path.basename(new_file_path), "isParent": is_directory, "pId": relative_path if not relative_path.startswith('.') else 'root', @@ -156,7 +164,7 @@ class PlaybookFileBrowserAPIView(APIView): new_name = request.data.get('new_name', '') if file_key in self.protected_files and new_name: - return Response({'msg': '{} can not be rename'.format(file_key)}, status=status.HTTP_400_BAD_REQUEST) + raise JMSException(code='this_file_can_not_be_rename', detail={"msg": _("This file can not be rename")}) if os.path.dirname(file_key) == 'root': file_key = os.path.basename(file_key) @@ -166,16 +174,20 @@ class PlaybookFileBrowserAPIView(APIView): if not file_key or file_key == 'root': return Response(status=status.HTTP_400_BAD_REQUEST) - file_path = os.path.join(work_path, file_key) + file_path = safe_join(work_path, file_key) # rename if new_name: - new_file_path = os.path.join(os.path.dirname(file_path), new_name) - if new_file_path == file_path: - return Response(status=status.HTTP_200_OK) - if os.path.exists(new_file_path): - return Response({'msg': '{} already exists'.format(new_name)}, status=status.HTTP_400_BAD_REQUEST) - os.rename(file_path, new_file_path) + try: + new_file_path = safe_join(os.path.dirname(file_path), new_name) + if new_file_path == file_path: + return Response(status=status.HTTP_200_OK) + if os.path.exists(new_file_path): + raise JMSException(code='file_already exists', detail={"msg": _("File already exists")}) + os.rename(file_path, new_file_path) + except SuspiciousFileOperation: + raise JMSException(code='invalid_file_path', detail={"msg": _("Invalid file path")}) + # edit content else: if not is_directory: @@ -189,10 +201,11 @@ class PlaybookFileBrowserAPIView(APIView): work_path = playbook.work_dir file_key = request.query_params.get('key', '') if not file_key: - return Response({'msg': 'key is required'}, status=status.HTTP_400_BAD_REQUEST) + raise JMSException(code='file_key_is_required', detail={"msg": _("File key is required")}) + if file_key in self.protected_files: - return Response({'msg': ' {} can not be delete'.format(file_key)}, status=status.HTTP_400_BAD_REQUEST) - file_path = os.path.join(work_path, file_key) + raise JMSException(code='This file can not be delete', detail={"msg": _("This file can not be delete")}) + file_path = safe_join(work_path, file_key) if os.path.isdir(file_path): shutil.rmtree(file_path) else: @@ -216,11 +229,12 @@ class PlaybookFileBrowserAPIView(APIView): relative_path = os.path.relpath(path, root_path) for d in dirs: + dir_id = os.path.relpath(safe_join(path, d), root_path) + node = { "name": d, "title": d, - "id": os.path.join(relative_path, d) if not os.path.join(relative_path, d).startswith( - '.') else d, + "id": dir_id, "isParent": True, "open": True, "pId": relative_path if not relative_path.startswith('.') else 'root', @@ -230,12 +244,12 @@ class PlaybookFileBrowserAPIView(APIView): node['open'] = True nodes.append(node) for f in files: + file_id = os.path.relpath(safe_join(path, f), root_path) node = { "name": f, "title": f, "iconSkin": 'file', - "id": os.path.join(relative_path, f) if not os.path.join(relative_path, f).startswith( - '.') else f, + "id": file_id, "isParent": False, "open": False, "pId": relative_path if not relative_path.startswith('.') else 'root', diff --git a/apps/ops/const.py b/apps/ops/const.py index 01889a4b2..7fa636a0f 100644 --- a/apps/ops/const.py +++ b/apps/ops/const.py @@ -45,13 +45,26 @@ class RunasPolicies(models.TextChoices): skip = 'skip', _('Skip') -class Modules(models.TextChoices): +class JobModules(models.TextChoices): shell = 'shell', _('Shell') winshell = 'win_shell', _('Powershell') python = 'python', _('Python') mysql = 'mysql', _('MySQL') postgresql = 'postgresql', _('PostgreSQL') sqlserver = 'sqlserver', _('SQLServer') + raw = 'raw', _('Raw') + + +class AdHocModules(models.TextChoices): + shell = 'shell', _('Shell') + winshell = 'win_shell', _('Powershell') + python = 'python', _('Python') + mysql = 'mysql', _('MySQL') + mariadb = 'mariadb', _('MariaDB') + postgresql = 'postgresql', _('PostgreSQL') + sqlserver = 'sqlserver', _('SQLServer') + oracle = 'oracle', _('Oracle') + raw = 'raw', _('Raw') class JobStatus(models.TextChoices): diff --git a/apps/ops/migrations/0026_auto_20230810_1039.py b/apps/ops/migrations/0026_auto_20230810_1039.py index f9bd966a8..99ffdf7d5 100644 --- a/apps/ops/migrations/0026_auto_20230810_1039.py +++ b/apps/ops/migrations/0026_auto_20230810_1039.py @@ -14,17 +14,17 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='adhoc', name='module', - field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, verbose_name='Module'), + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, verbose_name='Module'), ), migrations.AlterField( model_name='historicaljob', name='module', - field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'), + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, null=True, verbose_name='Module'), ), migrations.AlterField( model_name='job', name='module', - field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer')], default='shell', max_length=128, null=True, verbose_name='Module'), + field=models.CharField(choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('raw', 'Raw')], default='shell', max_length=128, null=True, verbose_name='Module'), ), migrations.AlterField( model_name='jobexecution', @@ -36,4 +36,12 @@ class Migration(migrations.Migration): name='summary', field=models.JSONField(default=dict, encoder=common.db.encoder.ModelJSONFieldEncoder, verbose_name='Summary'), ), + migrations.AlterField( + model_name='adhoc', + name='module', + field=models.CharField( + choices=[('shell', 'Shell'), ('win_shell', 'Powershell'), ('python', 'Python'), ('mysql', 'MySQL'), + ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), + ('oracle', 'Oracle'), ('raw', 'Raw')], default='shell', max_length=128, verbose_name='Module'), + ), ] diff --git a/apps/ops/mixin.py b/apps/ops/mixin.py index 05d1e297d..549e422ee 100644 --- a/apps/ops/mixin.py +++ b/apps/ops/mixin.py @@ -48,7 +48,8 @@ class PeriodTaskModelMixin(models.Model): def set_period_schedule(self): name, task, args, kwargs = self.get_register_task() - if not self.is_periodic: + is_active = self.is_active if hasattr(self, 'is_active') else True + if not self.is_periodic or not is_active: disable_celery_periodic_task(name) return diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py index 18b1e5cba..f55b6f3d0 100644 --- a/apps/ops/models/adhoc.py +++ b/apps/ops/models/adhoc.py @@ -8,7 +8,7 @@ from common.utils import get_logger __all__ = ["AdHoc"] -from ops.const import Modules +from ops.const import AdHocModules from orgs.mixins.models import JMSOrgBaseModel @@ -19,7 +19,7 @@ class AdHoc(JMSOrgBaseModel): id = models.UUIDField(default=uuid.uuid4, primary_key=True) name = models.CharField(max_length=128, verbose_name=_('Name')) pattern = models.CharField(max_length=1024, verbose_name=_("Pattern"), default='all') - module = models.CharField(max_length=128, choices=Modules.choices, default=Modules.shell, + module = models.CharField(max_length=128, choices=AdHocModules.choices, default=AdHocModules.shell, verbose_name=_('Module')) args = models.CharField(max_length=8192, default='', verbose_name=_('Args')) creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True) diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index f27e6b309..6dcbcc467 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -23,7 +23,7 @@ from common.db.encoder import ModelJSONFieldEncoder from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner, CommandInBlackListException from ops.mixin import PeriodTaskModelMixin from ops.variables import * -from ops.const import Types, Modules, RunasPolicies, JobStatus +from ops.const import Types, RunasPolicies, JobStatus, JobModules from orgs.mixins.models import JMSOrgBaseModel from perms.models import AssetPermission from perms.utils import UserPermAssetUtil @@ -64,7 +64,7 @@ class JMSPermedInventory(JMSInventory): 'mysql': ['mysql'], 'postgresql': ['postgresql'], 'sqlserver': ['sqlserver'], - 'ssh': ['shell', 'python', 'win_shell'], + 'ssh': ['shell', 'python', 'win_shell', 'raw'], } if self.module not in protocol_supported_modules_mapping.get(protocol.name, []): @@ -127,7 +127,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin): 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=Modules.choices, default=Modules.shell, verbose_name=_('Module'), + module = models.CharField(max_length=128, choices=JobModules.choices, default=JobModules.shell, 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)')) diff --git a/apps/ops/tasks.py b/apps/ops/tasks.py index 045c8f1b9..01250c2bc 100644 --- a/apps/ops/tasks.py +++ b/apps/ops/tasks.py @@ -35,7 +35,12 @@ def job_task_activity_callback(self, job_id, *args, **kwargs): activity_callback=job_task_activity_callback ) def run_ops_job(job_id): - job = get_object_or_none(Job, id=job_id) + with tmp_to_root_org(): + job = get_object_or_none(Job, id=job_id) + if not job: + logger.error("Did not get the execution: {}".format(job_id)) + return + with tmp_to_org(job.org): execution = job.create_execution() execution.creator = job.creator diff --git a/apps/ops/views.py b/apps/ops/views.py index ccff2aa21..b35fdb764 100644 --- a/apps/ops/views.py +++ b/apps/ops/views.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # -from django.views.generic import TemplateView from django.conf import settings +from django.http import HttpResponse +from django.views.generic import TemplateView from common.views.mixins import PermissionsMixin from rbac.permissions import RBACPermission @@ -16,6 +17,11 @@ class CeleryTaskLogView(PermissionsMixin, TemplateView): 'GET': 'ops.view_celerytaskexecution' } + def get(self, request, *args, **kwargs): + if not request.user.is_authenticated: + return HttpResponse(status=401) + return super().get(request, *args, **kwargs) + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context.update({ diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py index ceed23907..583bd2e7c 100644 --- a/apps/orgs/utils.py +++ b/apps/orgs/utils.py @@ -87,7 +87,8 @@ def tmp_to_root_org(): @contextmanager def tmp_to_org(org): ori_org = get_current_org() - set_current_org(org) + if org: + set_current_org(org) yield if ori_org is not None: set_current_org(ori_org) diff --git a/apps/perms/utils/account.py b/apps/perms/utils/account.py index 303e3ad22..d66338a2c 100644 --- a/apps/perms/utils/account.py +++ b/apps/perms/utils/account.py @@ -41,7 +41,6 @@ class PermAccountUtil(AssetPermissionUtil): alias_date_expired_mapper[alias].append(perm.date_expired) asset_accounts = asset.accounts.all().active() - # username_accounts_mapper = {account.username: account for account in asset_accounts} username_accounts_mapper = defaultdict(list) for account in asset_accounts: username_accounts_mapper[account.username].append(account) diff --git a/apps/rbac/builtin.py b/apps/rbac/builtin.py index a16944d47..8498f7776 100644 --- a/apps/rbac/builtin.py +++ b/apps/rbac/builtin.py @@ -29,6 +29,7 @@ system_user_perms = ( ('authentication', 'connectiontoken', 'add,view,reuse,expire', 'connectiontoken'), ('authentication', 'temptoken', 'add,change,view', 'temptoken'), ('authentication', 'accesskey', '*', '*'), + ('authentication', 'passkey', '*', '*'), ('tickets', 'ticket', 'view', 'ticket'), ) system_user_perms += (user_perms + _view_all_joined_org_perms) diff --git a/apps/rbac/const.py b/apps/rbac/const.py index 20f469611..fac97b5db 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -92,6 +92,7 @@ exclude_permissions = ( ('audits', 'activitylog', 'add,delete,change', 'activitylog'), ('audits', 'passwordchangelog', 'add,change,delete', 'passwordchangelog'), ('audits', 'userloginlog', 'add,change,delete,change', 'userloginlog'), + ('audits', 'usersession', 'add,delete,change', 'usersession'), ('audits', 'ftplog', 'delete', 'ftplog'), ('tickets', 'ticketassignee', '*', 'ticketassignee'), ('tickets', 'ticketflow', 'add,delete', 'ticketflow'), @@ -147,6 +148,7 @@ only_system_permissions = ( ('authentication', 'accesskey', '*', '*'), ('authentication', 'superconnectiontoken', '*', '*'), ('authentication', 'temptoken', '*', '*'), + ('authentication', 'passkey', '*', '*'), ('tickets', '*', '*', '*'), ('orgs', 'organization', 'view', 'rootorg'), ('terminal', 'applet', '*', '*'), diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py index 5bbedbbf0..d608a869f 100644 --- a/apps/rbac/tree.py +++ b/apps/rbac/tree.py @@ -112,6 +112,7 @@ special_pid_mapper = { "settings.view_setting": "view_setting", "rbac.view_console": "view_console", "rbac.view_audit": "view_audit", + 'audits.usersession': 'view_audit', "rbac.view_workbench": "view_workbench", "rbac.view_webterminal": "view_workbench", "rbac.view_filemanager": "view_workbench", diff --git a/apps/settings/api/__init__.py b/apps/settings/api/__init__.py index 13f4a2b18..510925590 100644 --- a/apps/settings/api/__init__.py +++ b/apps/settings/api/__init__.py @@ -3,6 +3,7 @@ from .email import * from .feishu import * from .ldap import * from .public import * +from .security import * from .settings import * from .sms import * from .vault import * diff --git a/apps/settings/api/security.py b/apps/settings/api/security.py new file mode 100644 index 000000000..85de822f9 --- /dev/null +++ b/apps/settings/api/security.py @@ -0,0 +1,58 @@ +from uuid import uuid4 + +from django.conf import settings +from django.core.cache import cache +from rest_framework.generics import ListAPIView, CreateAPIView +from rest_framework.views import Response + +from users.utils import LoginIpBlockUtil +from ..serializers import SecurityBlockIPSerializer + + +class BlockIPSecurityAPI(ListAPIView): + serializer_class = SecurityBlockIPSerializer + rbac_perms = { + 'GET': 'settings.change_security', + 'unlock': 'settings.change_security', + } + + @staticmethod + def get_ips(): + ips = [] + prefix = LoginIpBlockUtil.BLOCK_KEY_TMPL.replace('{}', '') + keys = cache.keys(f'{prefix}*') + for key in keys: + ips.append(key.replace(prefix, '')) + + white_list = settings.SECURITY_LOGIN_IP_WHITE_LIST + ips = list(set(ips) - set(white_list)) + ips = [ip for ip in ips if ip != '*'] + return ips + + def get_page_offset_and_limit(self): + get_params = self.request.GET + offset = get_params.get('offset', 0) + limit = get_params.get('limit', 15) + return int(offset), int(limit) + + def list(self, request, *args, **kwargs): + ips = self.get_ips() + offset, limit = self.get_page_offset_and_limit() + slice_ips = ips[offset:offset + limit] + data = [{'id': str(uuid4()), 'ip': ip} for ip in slice_ips] + ser = self.get_serializer(data, many=True) + data = {'count': len(ips), 'results': ser.data} + return Response(data=data, status=200) + + +class UnlockIPSecurityAPI(CreateAPIView): + serializer_class = SecurityBlockIPSerializer + rbac_perms = { + 'POST': 'settings.change_security', + } + + def create(self, request, *args, **kwargs): + ips = request.data.get('ips') + for ip in ips: + LoginIpBlockUtil(ip).clean_block_if_need() + return Response(status=200) diff --git a/apps/settings/api/settings.py b/apps/settings/api/settings.py index bb55dc453..4a8f6cc3d 100644 --- a/apps/settings/api/settings.py +++ b/apps/settings/api/settings.py @@ -46,6 +46,7 @@ class SettingsApi(generics.RetrieveUpdateAPIView): 'cas': serializers.CASSettingSerializer, 'saml2': serializers.SAML2SettingSerializer, 'oauth2': serializers.OAuth2SettingSerializer, + 'passkey': serializers.PasskeySettingSerializer, 'clean': serializers.CleaningSerializer, 'other': serializers.OtherSettingSerializer, 'sms': serializers.SMSSettingSerializer, diff --git a/apps/settings/migrations/0009_alter_cas_username_attribute.py b/apps/settings/migrations/0009_alter_cas_username_attribute.py new file mode 100644 index 000000000..7e5ba7428 --- /dev/null +++ b/apps/settings/migrations/0009_alter_cas_username_attribute.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.19 on 2023-06-30 10:37 +import json + +from django.db import migrations + + +def migrate_cas_setting(apps, schema_editor): + setting_model = apps.get_model('settings', 'Setting') + obj = setting_model.objects.filter(name='CAS_RENAME_ATTRIBUTES').first() + if obj: + try: + value = json.loads(obj.value) + except Exception: + print("Invalid CAS_RENAME_ATTRIBUTES setting, skip") + return + + if value.pop('uid', None): + setting_model.objects.filter(name='CAS_USERNAME_ATTRIBUTE').update(value='"cas:user"') + value['cas:user'] = 'username' + obj.value = json.dumps(value) + obj.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('settings', '0008_alter_setting_options'), + ] + + operations = [ + migrations.RunPython(migrate_cas_setting), + ] diff --git a/apps/settings/serializers/auth/__init__.py b/apps/settings/serializers/auth/__init__.py index 1f9f360f9..aeca390ac 100644 --- a/apps/settings/serializers/auth/__init__.py +++ b/apps/settings/serializers/auth/__init__.py @@ -1,12 +1,13 @@ +from .base import * from .cas import * -from .ldap import * -from .oidc import * -from .radius import * from .dingtalk import * from .feishu import * -from .wecom import * -from .sso import * -from .base import * -from .sms import * -from .saml2 import * +from .ldap import * from .oauth2 import * +from .oidc import * +from .passkey import * +from .radius import * +from .saml2 import * +from .sms import * +from .sso import * +from .wecom import * diff --git a/apps/settings/serializers/auth/base.py b/apps/settings/serializers/auth/base.py index 16cf535b4..57034e730 100644 --- a/apps/settings/serializers/auth/base.py +++ b/apps/settings/serializers/auth/base.py @@ -19,13 +19,11 @@ class AuthSettingSerializer(serializers.Serializer): AUTH_FEISHU = serializers.BooleanField(default=False, label=_('FeiShu Auth')) AUTH_WECOM = 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( required=False, allow_blank=True, max_length=1024, label=_("Forgot password url") ) - # HEALTH_CHECK_TOKEN = serializers.CharField( - # required=False, max_length=1024, label=_("Health check token") - # ) LOGIN_REDIRECT_MSG_ENABLED = serializers.BooleanField( required=False, label=_("Enable login redirect msg") ) diff --git a/apps/settings/serializers/auth/passkey.py b/apps/settings/serializers/auth/passkey.py new file mode 100644 index 000000000..6d65da26b --- /dev/null +++ b/apps/settings/serializers/auth/passkey.py @@ -0,0 +1,22 @@ +from django.utils.translation import gettext_lazy as _ +from rest_framework import serializers + +__all__ = ['PasskeySettingSerializer'] + + +class PasskeySettingSerializer(serializers.Serializer): + PREFIX_TITLE = _('Passkey') + + AUTH_PASSKEY = serializers.BooleanField( + default=False, label=_('Enable passkey Auth'), + help_text=_('Only SSL domain can use passkey auth') + ) + FIDO_SERVER_ID = serializers.CharField( + max_length=255, label=_('FIDO server ID'), required=False, allow_blank=True, + help_text=_( + 'The hostname can using passkey auth, If not set, ' + 'will use request host and the request host in DOMAINS, ' + 'If multiple domains, use comma to separate' + ) + ) + FIDO_SERVER_NAME = serializers.CharField(max_length=255, label=_('FIDO server name')) diff --git a/apps/settings/serializers/basic.py b/apps/settings/serializers/basic.py index baa5edb68..ad1c2f8e3 100644 --- a/apps/settings/serializers/basic.py +++ b/apps/settings/serializers/basic.py @@ -7,7 +7,10 @@ class BasicSettingSerializer(serializers.Serializer): SITE_URL = serializers.URLField( required=True, label=_("Site url"), - help_text=_('Email links or other system callbacks are used to access it, eg: http://dev.jumpserver.org:8080') + help_text=_( + 'External URL, email links or other system callbacks are used to access it, ' + 'eg: http://dev.jumpserver.org:8080' + ) ) USER_GUIDE_URL = serializers.URLField( required=False, allow_blank=True, allow_null=True, label=_("User guide url"), diff --git a/apps/settings/serializers/public.py b/apps/settings/serializers/public.py index 02f900d5f..1b5c78609 100644 --- a/apps/settings/serializers/public.py +++ b/apps/settings/serializers/public.py @@ -35,6 +35,7 @@ class PrivateSettingSerializer(PublicSettingSerializer): HELP_DOCUMENT_URL = serializers.CharField() HELP_SUPPORT_URL = serializers.CharField() + AUTH_PASSKEY = serializers.BooleanField() AUTH_WECOM = serializers.BooleanField() AUTH_DINGTALK = serializers.BooleanField() AUTH_FEISHU = serializers.BooleanField() @@ -45,8 +46,6 @@ class PrivateSettingSerializer(PublicSettingSerializer): TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField() TERMINAL_OMNIDB_ENABLED = serializers.BooleanField() - TERMINAL_GRAPHICAL_RESOLUTION = serializers.CharField() - ANNOUNCEMENT_ENABLED = serializers.BooleanField() ANNOUNCEMENT = serializers.DictField() diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py index a5c27f1a1..7c9bf676a 100644 --- a/apps/settings/serializers/security.py +++ b/apps/settings/serializers/security.py @@ -7,6 +7,7 @@ __all__ = [ 'SecurityPasswordRuleSerializer', 'SecuritySessionSerializer', 'SecurityAuthSerializer', 'SecuritySettingSerializer', 'SecurityLoginLimitSerializer', 'SecurityBasicSerializer', + 'SecurityBlockIPSerializer' ] @@ -225,3 +226,8 @@ class SecuritySettingSerializer( SecurityLoginLimitSerializer, ): PREFIX_TITLE = _('Security') + + +class SecurityBlockIPSerializer(serializers.Serializer): + id = serializers.UUIDField(required=False) + ip = serializers.CharField(max_length=1024, required=False, allow_blank=True) diff --git a/apps/settings/serializers/settings.py b/apps/settings/serializers/settings.py index 2d38ed74a..743f7cc60 100644 --- a/apps/settings/serializers/settings.py +++ b/apps/settings/serializers/settings.py @@ -9,7 +9,7 @@ from .auth import ( CASSettingSerializer, RadiusSettingSerializer, FeiShuSettingSerializer, WeComSettingSerializer, DingTalkSettingSerializer, AlibabaSMSSettingSerializer, TencentSMSSettingSerializer, CMPP2SMSSettingSerializer, AuthSettingSerializer, - SAML2SettingSerializer, OAuth2SettingSerializer, + SAML2SettingSerializer, OAuth2SettingSerializer, PasskeySettingSerializer, CustomSMSSettingSerializer, ) from .basic import BasicSettingSerializer @@ -47,6 +47,7 @@ class SettingsSerializer( TencentSMSSettingSerializer, CMPP2SMSSettingSerializer, CustomSMSSettingSerializer, + PasskeySettingSerializer ): CACHE_KEY = 'SETTING_FIELDS_MAPPING' diff --git a/apps/settings/serializers/terminal.py b/apps/settings/serializers/terminal.py index 17782a2e0..42e03eeb7 100644 --- a/apps/settings/serializers/terminal.py +++ b/apps/settings/serializers/terminal.py @@ -39,16 +39,3 @@ class TerminalSettingSerializer(serializers.Serializer): TERMINAL_MAGNUS_ENABLED = serializers.BooleanField(label=_("Enable database proxy")) TERMINAL_RAZOR_ENABLED = serializers.BooleanField(label=_("Enable Razor")) TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField(label=_("Enable SSH Client")) - - RESOLUTION_CHOICES = ( - ('Auto', 'Auto'), - ('1024x768', '1024x768'), - ('1366x768', '1366x768'), - ('1600x900', '1600x900'), - ('1920x1080', '1920x1080') - ) - TERMINAL_GRAPHICAL_RESOLUTION = serializers.ChoiceField( - default='Auto', choices=RESOLUTION_CHOICES, required=False, - label=_('Default graphics resolution'), - help_text=_('Tip: Default resolution to use when connecting graphical assets in Luna pages') - ) diff --git a/apps/settings/tools/__init__.py b/apps/settings/tools/__init__.py index 09154d4b2..993b7bca2 100644 --- a/apps/settings/tools/__init__.py +++ b/apps/settings/tools/__init__.py @@ -4,3 +4,4 @@ from .ping import * from .telnet import * from .nmap import * from .tcpdump import * +from .traceroute import * diff --git a/apps/settings/tools/ping.py b/apps/settings/tools/ping.py index 556bb9e5b..4af375a4f 100644 --- a/apps/settings/tools/ping.py +++ b/apps/settings/tools/ping.py @@ -8,6 +8,7 @@ import struct import time from common.utils import lookup_domain +from settings.utils import generate_ips # From /usr/include/linux/icmp.h; your milage may vary. ICMP_ECHO_REQUEST = 8 # Seems to be the same on Solaris. @@ -128,7 +129,7 @@ def ping(dest_addr, timeout, psize, flag=0): return delay -async def verbose_ping(dest_ip, timeout=2, count=5, psize=64, display=None): +async def verbose_ping(dest_ips, timeout=2, count=5, psize=64, display=None): """ Send `count' ping with `psize' size to `dest_addr' with the given `timeout' and display the result. @@ -136,34 +137,38 @@ async def verbose_ping(dest_ip, timeout=2, count=5, psize=64, display=None): if not display: return - ip, err = lookup_domain(dest_ip) - if not ip: - await display(err) - return + result = {} + ips = generate_ips(dest_ips) + await display(f'Total valid address: {len(ips)}\r\n') + for dest_ip in ips: + await display(f'PING {dest_ip}: 56 data bytes') + # 切换异步协程 + await asyncio.sleep(0.01) + error_count = 0 + for i in range(count): + try: + delay = ping(dest_ip, timeout, psize) + except socket.gaierror as e: + await display("Failed (socket error: '%s')" % str(e)) + error_count += 1 + break - await display("PING %s (%s): 56 data bytes" % (dest_ip, ip)) - await asyncio.sleep(0.1) - error_count = 0 - for i in range(count): - try: - delay = ping(dest_ip, timeout, psize) - except socket.gaierror as e: - await display("Failed (socket error: '%s')" % str(e)) - error_count += 1 - break + if delay is None: + await display("Request timeout for icmp_seq %i" % i) + error_count += 1 + else: + delay *= 1000 + await display("64 bytes from %s: time=%.3f ms" % (dest_ip, delay)) + await asyncio.sleep(1) + # 只要有包通过，就认为address是通的 + result[dest_ip] = 'failed' if error_count == count else 'ok' + await display(f'{count} packets transmitted, ' + f'{count - error_count} packets received, ' + f'{(error_count / count) * 100}% packet loss\r\n') - if delay is None: - await display("Request timeout for icmp_seq %i" % i) - error_count += 1 - else: - delay *= 1000 - await display("64 bytes from %s: icmp_seq=0 ttl=115 time=%.3f ms" % (ip, delay)) - await asyncio.sleep(1) - - await display(f'--- {dest_ip} ping statistics ---') - await display(f'{count} packets transmitted, ' - f'{count - error_count} packets received, ' - f'{(error_count / count) * 100}% packet loss') + await display(f'----- Ping statistics -----') + for k, v in result.items(): + await display(f'{k}: {v}') if __name__ == "__main__": diff --git a/apps/settings/tools/telnet.py b/apps/settings/tools/telnet.py index b54a393d8..796118383 100644 --- a/apps/settings/tools/telnet.py +++ b/apps/settings/tools/telnet.py @@ -1,57 +1,53 @@ # -*- coding: utf-8 -*- # import asyncio +import socket +import telnetlib -from common.utils import lookup_domain +from settings.utils import generate_ips PROMPT_REGEX = r'[\<|\[](.*)[\>|\]]' async def telnet(dest_addr, port_number=23, timeout=10): + loop = asyncio.get_running_loop() try: - reader, writer = await asyncio.wait_for( - asyncio.open_connection(dest_addr, port_number), timeout - ) + connection = await loop.run_in_executor(None, telnetlib.Telnet, dest_addr, port_number, timeout) except asyncio.TimeoutError: return False, 'Timeout' - except (ConnectionRefusedError, OSError) as e: + except (ConnectionRefusedError, socket.timeout, socket.gaierror) as e: return False, str(e) - try: - # 发送命令 - writer.write(b"command\r\n") - await writer.drain() - # 读取响应 - response = await reader.readuntil() - except asyncio.TimeoutError: - writer.close() - await writer.wait_closed() - return False, 'Timeout' - writer.close() - await writer.wait_closed() - return True, response.decode('utf-8', 'ignore') + expected_regexes = [bytes(PROMPT_REGEX, encoding='ascii')] + __, __, output = connection.expect(expected_regexes, timeout=3) + return True, output.decode('utf-8', 'ignore') -async def verbose_telnet(dest_ip, dest_port=23, timeout=10, display=None): +async def verbose_telnet(dest_ips, dest_port=23, timeout=10, display=None): if not display: return - ip, err = lookup_domain(dest_ip) - if not ip: - await display(err) - return + result = {} + ips = generate_ips(dest_ips) + await display(f'Total valid address: {len(ips)}\r\n') + for dest_ip in ips: + await display(f'Trying ({dest_ip}:{dest_port})') + try: + is_connective, resp = await telnet(dest_ip, dest_port, timeout) + if is_connective: + result[dest_ip] = 'ok' + msg = f'Connected to {dest_ip} {dest_port} {resp}.\r\n' \ + f'Connection closed by foreign host.' + else: + result[dest_ip] = 'failed' + msg = f'Unable to connect to remote host\r\n' \ + f'Reason: {resp}' + except Exception as e: + msg = 'Error: %s' % e + await display(f'{msg}\r\n') - await display(f'Trying {dest_ip} ({ip}:{dest_port})') - try: - is_connective, resp = await telnet(dest_ip, dest_port, timeout) - if is_connective: - msg = f'Connected to {dest_ip} {dest_port} {resp}.\r\n' \ - f'Connection closed by foreign host.' - else: - msg = f'Unable to connect to remote host\r\n' \ - f'Reason: {resp}' - except Exception as e: - msg = 'Error: %s' % e - await display(msg) + await display(f'----- Telnet statistics -----') + for k, v in result.items(): + await display(f'{k}: {v}') if __name__ == "__main__": diff --git a/apps/settings/tools/traceroute.py b/apps/settings/tools/traceroute.py new file mode 100644 index 000000000..726f3a07d --- /dev/null +++ b/apps/settings/tools/traceroute.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +# +import asyncio +import socket +import struct +import time + +from settings.utils import generate_ips + + +def calculate_checksum(data): + # 计算 ICMP 校验和 + checksum = 0 + if len(data) % 2 == 1: + data += b'\x00' + for i in range(0, len(data), 2): + w = (data[i] << 8) + data[i+1] + checksum += w + checksum = (checksum >> 16) + (checksum & 0xffff) + checksum = ~checksum & 0xffff + return checksum + + +async def once_traceroute(target, display, max_hops=30, timeout=3): + loop = asyncio.get_event_loop() + icmp = socket.getprotobyname('icmp') + sock_fd = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp) + for ttl in range(1, max_hops+1): + # 设置 TTL + sock_fd.setsockopt(socket.IPPROTO_IP, socket.IP_TTL, ttl) + # 设置超时时间 + sock_fd.settimeout(timeout) + # 发送 ICMP Echo 请求数据包 + packet = struct.pack('!BBHHH', 8, 0, 0, 12345, ttl) + checksum = calculate_checksum(packet) + packet = struct.pack('!BBHHH', 8, 0, checksum, 12345, ttl) + start_time = time.time() + sock_fd.sendto(packet, (target, 0)) + await asyncio.sleep(0.01) + try: + # 接收 ICMP Echo Reply 数据包 + recv_packet, addr = await loop.sock_recvfrom(sock_fd, 1024) + end_time = time.time() + # 解析目标地址 + dest_ip = addr[0] + # 获取跃点信息 + hop_info = f'{ttl} {dest_ip} ({dest_ip})' + # 获取延迟时间信息 + delay_info = f'{(end_time - start_time) * 1000:.3f} ms' + # 打印跃点信息和延迟时间 + await display(f'{hop_info:<4} {delay_info}') + if dest_ip == target: + return + except socket.timeout: + # 发生超时，跳出循环 + await display(f'{ttl} *') + sock_fd.close() + + +async def verbose_traceroute(dest_ips, timeout=10, display=None): + if not display: + return + + ips = generate_ips(dest_ips) + await display(f'Total valid address: {len(ips)}\r\n') + for dest_ip in ips: + await display(f'traceroute to {dest_ip}, 30 hops max, 60 byte packets') + msg = '' + try: + await once_traceroute(dest_ip, display) + except Exception as e: + msg = f'Error: {e}' + await display(msg) diff --git a/apps/settings/urls/api_urls.py b/apps/settings/urls/api_urls.py index ba074d4ee..97055bc83 100644 --- a/apps/settings/urls/api_urls.py +++ b/apps/settings/urls/api_urls.py @@ -20,6 +20,8 @@ urlpatterns = [ path('sms/backend/', api.SMSBackendAPI.as_view(), name='sms-backend'), path('vault/testing/', api.VaultTestingAPI.as_view(), name='vault-testing'), path('vault/sync/', api.VaultSyncDataAPI.as_view(), name='vault-sync'), + path('security/block-ip/', api.BlockIPSecurityAPI.as_view(), name='block-ip'), + path('security/unlock-ip/', api.UnlockIPSecurityAPI.as_view(), name='unlock-ip'), path('setting/', api.SettingsApi.as_view(), name='settings-setting'), path('logo/', api.SettingsLogoApi.as_view(), name='settings-logo'), diff --git a/apps/settings/utils/common.py b/apps/settings/utils/common.py index e549f9b8c..826b19cd8 100644 --- a/apps/settings/utils/common.py +++ b/apps/settings/utils/common.py @@ -3,6 +3,8 @@ from jumpserver.context_processor import default_interface from django.conf import settings from IPy import IP +from common.utils import lookup_domain + def get_interface_setting_or_default(): if not settings.XPACK_ENABLED: @@ -15,21 +17,25 @@ def get_login_title(): return get_interface_setting_or_default()['login_title'] -def generate_ips(ip_string): +def generate_ips(address_string): + def transform(_ip): + real_ip, err_msg = lookup_domain(_ip) + return _ip if err_msg else real_ip # 支持的格式 # 192.168.1.1,192.168.1.2 # 192.168.1.1-12 | 192.168.1.1-192.168.1.12 | 192.168.1.0/30 | 192.168.1.1 ips = [] - ip_list = ip_string.split(',') - if len(ip_list) > 1: + ip_list = address_string.split(',') + if len(ip_list) >= 1: for ip in ip_list: try: - ips.append(str(IP(ip))) + ips.append(str(IP(transform(ip)))) except ValueError: pass - return ips + if ips: + return ips - ip_list = ip_string.split('-') + ip_list = address_string.split('-') try: if len(ip_list) == 2: start_ip, end_ip = ip_list @@ -54,6 +60,7 @@ def is_valid_port(port): valid = False return valid + def generate_ports(ports): port_list = [] if isinstance(ports, int): diff --git a/apps/settings/ws.py b/apps/settings/ws.py index b15d61ea7..a8ae2c398 100644 --- a/apps/settings/ws.py +++ b/apps/settings/ws.py @@ -6,7 +6,10 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer from common.db.utils import close_old_connections from common.utils import get_logger -from .tools import verbose_ping, verbose_telnet, verbose_nmap, verbose_tcpdump +from .tools import ( + verbose_ping, verbose_telnet, verbose_nmap, + verbose_tcpdump, verbose_traceroute +) logger = get_logger(__name__) @@ -22,19 +25,19 @@ class ToolsWebsocket(AsyncJsonWebsocketConsumer): await self.close() async def send_msg(self, msg=''): - await self.send_json({'msg': msg + '\r\n'}) + await self.send_json({'msg': f'{msg}\r\n'}) - async def imitate_ping(self, dest_ip, timeout=3, count=5, psize=64): + async def imitate_ping(self, dest_ips, timeout=3, count=5, psize=64): params = { - 'dest_ip': dest_ip, 'timeout': timeout, + 'dest_ips': dest_ips, 'timeout': timeout, 'count': count, 'psize': psize } logger.info(f'Receive request ping: {params}') await verbose_ping(display=self.send_msg, **params) - async def imitate_telnet(self, dest_ip, dest_port=23, timeout=10): + async def imitate_telnet(self, dest_ips, dest_port=23, timeout=10): params = { - 'dest_ip': dest_ip, 'dest_port': dest_port, 'timeout': timeout, + 'dest_ips': dest_ips, 'dest_port': dest_port, 'timeout': timeout, } logger.info(f'Receive request telnet: {params}') await verbose_telnet(display=self.send_msg, **params) @@ -57,6 +60,10 @@ class ToolsWebsocket(AsyncJsonWebsocketConsumer): logger.info(f'Receive request tcpdump: {params}') await verbose_tcpdump(display=self.send_msg, **params) + async def imitate_traceroute(self,dest_ips): + params = {'dest_ips': dest_ips} + await verbose_traceroute(display=self.send_msg, **params) + async def receive(self, text_data=None, bytes_data=None, **kwargs): data = json.loads(text_data) tool_type = data.pop('tool_type', 'Ping') diff --git a/apps/static/img/login_passkey.png b/apps/static/img/login_passkey.png new file mode 100644 index 000000000..23d2b7d89 Binary files /dev/null and b/apps/static/img/login_passkey.png differ diff --git a/apps/static/js/plugins/qrcode/qrcode.js b/apps/static/js/plugins/qrcode/qrcode.js new file mode 100644 index 000000000..3b1186491 --- /dev/null +++ b/apps/static/js/plugins/qrcode/qrcode.js @@ -0,0 +1,618 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);} + return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row| '); + } + + aHTML.push(' |
| ');g.push(" |
- - + {% trans 'Docs' %}
- - + {% trans 'Commercial support' %} @@ -32,11 +34,11 @@
-
- {% ifequal request.COOKIES.django_language 'en' %}
+ {% if request.COOKIES.django_language == 'en' %}
English
{% else %}
中文
- {% endifequal %}
+ {% endif %}
-
@@ -64,7 +66,7 @@
-
{% if request.user.is_authenticated %}
-
+
-
-
- {% trans 'Profile' %} - {% if request.user.can_admin_or_audit_current_org %} - {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %} -
- {% trans 'Admin page' %} - {% else %} -
- {% trans 'User page' %} +
- {% trans 'Profile' %} + {% if request.user.can_admin_or_audit_current_org %} + {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %} +
- {% trans 'Admin page' %} + {% else %} +
- {% trans 'User page' %} + {% endif %} {% endif %} - {% endif %} -
- {% trans 'API Key' %} +
- {% trans 'API Key' %}
- {% trans 'Logout' %}
- +
- {{ app }} {% endif %} {% if action %} -
- +
- {{ action }} {% endif %} @@ -116,20 +122,19 @@ diff --git a/apps/templates/_without_nav_base.html b/apps/templates/_without_nav_base.html index 6e1c34484..a9ed54abd 100644 --- a/apps/templates/_without_nav_base.html +++ b/apps/templates/_without_nav_base.html @@ -11,7 +11,7 @@ - + diff --git a/apps/templates/flash_message_standalone.html b/apps/templates/flash_message_standalone.html index ad81c1141..fd3308f00 100644 --- a/apps/templates/flash_message_standalone.html +++ b/apps/templates/flash_message_standalone.html @@ -12,7 +12,7 @@
-
+
-
{% if app %}
-
-
+{% if error %} {{ error }} {% else %} @@ -44,6 +44,7 @@ {% block custom_foot_js %}
-
{% if request.user.is_authenticated %}
-
+