github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-19 17:26:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9080 from jumpserver/dev

Browse Source 
v2.28.0-rc4
This commit is contained in:
Jiangjie.Bai 2022-11-16 21:05:05 +08:00 committed by GitHub
commit b179264127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 141 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/applications/serializers/attrs/application_type/clickhouse.py
View File

@ -7,4 +7,10 @@ __all__ = ['ClickHouseSerializer']
class ClickHouseSerializer(DBSerializer): class ClickHouseSerializer(DBSerializer):
port = serializers.IntegerField(default=9000, label=_('Port'), allow_null=True) port = serializers.IntegerField(
default=9000, label=_('Port'), allow_null=True,
help_text=_(
'Typically, the port is 9000，'
'the HTTP interface and the native interface use different ports'
),
)

1
apps/jumpserver/conf.py
View File

@ -520,6 +520,7 @@ class Config(dict):
'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False, 'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False,
'TICKET_AUTHORIZE_DEFAULT_TIME': 7, 'TICKET_AUTHORIZE_DEFAULT_TIME': 7,
'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT': 'day',
'WINDOWS_SSH_DEFAULT_SHELL': 'cmd', 'WINDOWS_SSH_DEFAULT_SHELL': 'cmd',
'PERIOD_TASK_ENABLED': True, 'PERIOD_TASK_ENABLED': True,

1
apps/jumpserver/settings/custom.py
View File

@ -89,6 +89,7 @@ BACKEND_ASSET_USER_AUTH_VAULT = False
PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE
TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME
TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME_UNIT
PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC
WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL
FLOWER_URL = CONFIG.FLOWER_URL FLOWER_URL = CONFIG.FLOWER_URL

4
apps/locale/ja/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b21e8af3ad29606b9ff36bbf5da8dd03a041b25e046c3cedabb8650390c0a4c7 oid sha256:7db985efdf818137dafe489f339955f4d71a245ffd6becc8f6efac539a625682
size 132358 size 133463

71
apps/locale/ja/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-14 17:07+0800\n" "POT-Creation-Date: 2022-11-16 20:24+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -398,7 +398,7 @@ msgid "Host"
msgstr "ホスト" msgstr "ホスト"
#: applications/serializers/attrs/application_category/db.py:12 #: applications/serializers/attrs/application_category/db.py:12
#: applications/serializers/attrs/application_type/clickhouse.py:10 #: applications/serializers/attrs/application_type/clickhouse.py:11
#: applications/serializers/attrs/application_type/mongodb.py:10 #: applications/serializers/attrs/application_type/mongodb.py:10
#: applications/serializers/attrs/application_type/mysql.py:10 #: applications/serializers/attrs/application_type/mysql.py:10
#: applications/serializers/attrs/application_type/mysql_workbench.py:22 #: applications/serializers/attrs/application_type/mysql_workbench.py:22
@ -470,6 +470,14 @@ msgstr "Chromeユーザー名"
msgid "Chrome password" msgid "Chrome password"
msgstr "Chromeパスワード" msgstr "Chromeパスワード"
#: applications/serializers/attrs/application_type/clickhouse.py:13
msgid ""
"Typically, the port is 9000，the HTTP interface and the native interface use "
"different ports"
msgstr ""
"デフォルトポートは9000で、HTTPインタフェースとネイティブインタフェースは異な"
"るポートを使用する"
#: applications/serializers/attrs/application_type/custom.py:12 #: applications/serializers/attrs/application_type/custom.py:12
msgid "Operating parameter" msgid "Operating parameter"
msgstr "操作パラメータ" msgstr "操作パラメータ"
@ -1436,11 +1444,11 @@ msgstr "文章の内容が長すぎる。Elasticsearchで操作履歴を保存
msgid "Tips" msgid "Tips"
msgstr "謎々" msgstr "謎々"
#: audits/handler.py:126 #: audits/handler.py:134
msgid "Yes" msgid "Yes"
msgstr "是" msgstr "是"
#: audits/handler.py:126 #: audits/handler.py:134
msgid "No" msgid "No"
msgstr "否" msgstr "否"
@ -1683,7 +1691,7 @@ msgstr "現在のユーザーはmfaタイプをサポートしていません: {
msgid "User does not exist: {}" msgid "User does not exist: {}"
msgstr "ユーザーが存在しない: {}" msgstr "ユーザーが存在しない: {}"
#: authentication/api/password.py:31 users/views/profile/reset.py:122 #: authentication/api/password.py:31 users/views/profile/reset.py:127
msgid "No user matched" msgid "No user matched"
msgstr "ユーザーにマッチしなかった" msgstr "ユーザーにマッチしなかった"
@ -2020,7 +2028,7 @@ msgstr "メッセージ検証コードが無効"
#: authentication/serializers/password_mfa.py:24 #: authentication/serializers/password_mfa.py:24
#: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 #: settings/serializers/auth/sms.py:27 users/forms/profile.py:103
#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 #: users/forms/profile.py:106 users/templates/users/forgot_password.html:111
#: users/views/profile/reset.py:74 #: users/views/profile/reset.py:79
msgid "SMS" msgid "SMS"
msgstr "メッセージ" msgstr "メッセージ"
@ -2159,7 +2167,7 @@ msgstr "アセットまたはアプリが必要"
#: settings/serializers/email.py:50 users/forms/profile.py:102 #: settings/serializers/email.py:50 users/forms/profile.py:102
#: users/forms/profile.py:106 users/models/user.py:675 #: users/forms/profile.py:106 users/models/user.py:675
#: users/templates/users/forgot_password.html:116 #: users/templates/users/forgot_password.html:116
#: users/views/profile/reset.py:68 #: users/views/profile/reset.py:73
msgid "Email" msgid "Email"
msgstr "メール" msgstr "メール"
@ -4007,7 +4015,7 @@ msgstr "ログインログは日数を保持します"
#: settings/serializers/cleaning.py:12 settings/serializers/cleaning.py:16 #: settings/serializers/cleaning.py:12 settings/serializers/cleaning.py:16
#: settings/serializers/cleaning.py:20 settings/serializers/cleaning.py:24 #: settings/serializers/cleaning.py:20 settings/serializers/cleaning.py:24
#: settings/serializers/cleaning.py:28 settings/serializers/other.py:37 #: settings/serializers/cleaning.py:28
msgid "Unit: day" msgid "Unit: day"
msgstr "単位: 日" msgstr "単位: 日"
@ -4184,19 +4192,31 @@ msgstr ""
msgid "Ticket authorize default time" msgid "Ticket authorize default time"
msgstr "デフォルト製造オーダ承認時間" msgstr "デフォルト製造オーダ承認時間"
#: settings/serializers/other.py:40
msgid "day"
msgstr "日"
#: settings/serializers/other.py:40
msgid "hour"
msgstr "時"
#: settings/serializers/other.py:41 #: settings/serializers/other.py:41
msgid "Ticket authorize default time unit"
msgstr "デフォルト製造オーダ承認時間単位"
#: settings/serializers/other.py:44
msgid "Help Docs URL" msgid "Help Docs URL"
msgstr "ドキュメントリンク" msgstr "ドキュメントリンク"
#: settings/serializers/other.py:42 #: settings/serializers/other.py:45
msgid "default: http://docs.jumpserver.org" msgid "default: http://docs.jumpserver.org"
msgstr "デフォルト: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org"
#: settings/serializers/other.py:46 #: settings/serializers/other.py:49
msgid "Help Support URL" msgid "Help Support URL"
msgstr "サポートリンク" msgstr "サポートリンク"
#: settings/serializers/other.py:47 #: settings/serializers/other.py:50
msgid "default: http://www.jumpserver.org/support/" msgid "default: http://www.jumpserver.org/support/"
msgstr "デフォルト: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/"
@ -4520,7 +4540,9 @@ msgstr "デフォルトのグラフィック解像度"
#: settings/serializers/terminal.py:52 #: settings/serializers/terminal.py:52
msgid "" msgid ""
"Tip: Default resolution to use when connecting graphical assets in Luna pages" "Tip: Default resolution to use when connecting graphical assets in Luna pages"
msgstr "ヒント: Luna ページでグラフィック アセットを接続するときに使用するデフォルトの解像度" msgstr ""
"ヒント: Luna ページでグラフィック アセットを接続するときに使用するデフォルト"
"の解像度"
#: settings/utils/ldap.py:467 #: settings/utils/ldap.py:467
msgid "ldap:// or ldaps:// protocol is used." msgid "ldap:// or ldaps:// protocol is used."
@ -5887,7 +5909,7 @@ msgstr "ユーザーパスワード履歴"
msgid "Reset password" msgid "Reset password"
msgstr "パスワードのリセット" msgstr "パスワードのリセット"
#: users/notifications.py:85 users/views/profile/reset.py:189 #: users/notifications.py:85 users/views/profile/reset.py:194
msgid "Reset password success" msgid "Reset password success"
msgstr "パスワードのリセット成功" msgstr "パスワードのリセット成功"
@ -6081,16 +6103,16 @@ msgstr "ここをクリックしてパスワードを設定してください"
#: users/templates/users/forgot_password.html:32 #: users/templates/users/forgot_password.html:32
msgid "Input your email account, that will send a email to your" msgid "Input your email account, that will send a email to your"
msgstr "電子メールアカウントを入力し、メールをメールアドレスに送信します" msgstr "あなたのメールを入力し、それはあなたにメールを送信します"
#: users/templates/users/forgot_password.html:35 #: users/templates/users/forgot_password.html:35
msgid "" msgid ""
"Enter your mobile number and a verification code will be sent to your phone" "Enter your mobile number and a verification code will be sent to your phone"
msgstr "携帯電話番号を入力すると認証コードが送信されます" msgstr "携帯電話番号を入力すると、認証コードが携帯電話に送信されます"
#: users/templates/users/forgot_password.html:57 #: users/templates/users/forgot_password.html:57
msgid "Email account" msgid "Email account"
msgstr "メールアドレスアカウント" msgstr "メールアドレス"
#: users/templates/users/forgot_password.html:61 #: users/templates/users/forgot_password.html:61
msgid "Mobile number" msgid "Mobile number"
@ -6251,23 +6273,30 @@ msgstr "OTP無効化成功、ログインページを返す"
msgid "Password invalid" msgid "Password invalid"
msgstr "パスワード無効" msgstr "パスワード無効"
#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 #: users/views/profile/reset.py:47
msgid ""
"Non-local users can log in only from third-party platforms and cannot change "
"their passwords: {}"
msgstr "ローカル以外のユーザーは、サードパーティ プラットフォームからのログインのみが許可され、"
"パスワードの変更はサポートされていません: {}"
#: users/views/profile/reset.py:149 users/views/profile/reset.py:160
msgid "Token invalid or expired" msgid "Token invalid or expired"
msgstr "トークンが無効または期限切れ" msgstr "トークンが無効または期限切れ"
#: users/views/profile/reset.py:160 #: users/views/profile/reset.py:165
msgid "User auth from {}, go there change password" msgid "User auth from {}, go there change password"
msgstr "ユーザー認証ソース {}, 対応するシステムにパスワードを変更してください" msgstr "ユーザー認証ソース {}, 対応するシステムにパスワードを変更してください"
#: users/views/profile/reset.py:167 #: users/views/profile/reset.py:172
msgid "* Your password does not meet the requirements" msgid "* Your password does not meet the requirements"
msgstr "* パスワードが要件を満たしていない" msgstr "* パスワードが要件を満たしていない"
#: users/views/profile/reset.py:173 #: users/views/profile/reset.py:178
msgid "* The new password cannot be the last {} passwords" msgid "* The new password cannot be the last {} passwords"
msgstr "* 新しいパスワードを最後の {} パスワードにすることはできません" msgstr "* 新しいパスワードを最後の {} パスワードにすることはできません"
#: users/views/profile/reset.py:190 #: users/views/profile/reset.py:195
msgid "Reset password success, return to login page" msgid "Reset password success, return to login page"
msgstr "パスワードの成功をリセットし、ログインページに戻る" msgstr "パスワードの成功をリセットし、ログインページに戻る"

4
apps/locale/zh/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f9dbc8ef62e3746cebd07177934c7d68c373ff0ecceff4a83aeeb9e96829359b oid sha256:b143c62843946c3e18b623d05065f12e9d3c578efe5cd0d2016056d2b8448ae8
size 108613 size 109495

60
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-14 17:07+0800\n" "POT-Creation-Date: 2022-11-16 20:24+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -393,7 +393,7 @@ msgid "Host"
msgstr "主机" msgstr "主机"
#: applications/serializers/attrs/application_category/db.py:12 #: applications/serializers/attrs/application_category/db.py:12
#: applications/serializers/attrs/application_type/clickhouse.py:10 #: applications/serializers/attrs/application_type/clickhouse.py:11
#: applications/serializers/attrs/application_type/mongodb.py:10 #: applications/serializers/attrs/application_type/mongodb.py:10
#: applications/serializers/attrs/application_type/mysql.py:10 #: applications/serializers/attrs/application_type/mysql.py:10
#: applications/serializers/attrs/application_type/mysql_workbench.py:22 #: applications/serializers/attrs/application_type/mysql_workbench.py:22
@ -465,6 +465,12 @@ msgstr "Chrome 用户名"
msgid "Chrome password" msgid "Chrome password"
msgstr "Chrome 密码" msgstr "Chrome 密码"
#: applications/serializers/attrs/application_type/clickhouse.py:13
msgid ""
"Typically, the port is 9000，the HTTP interface and the native interface use "
"different ports"
msgstr "默认端口为9000, HTTP接口和本机接口使用不同的端口"
#: applications/serializers/attrs/application_type/custom.py:12 #: applications/serializers/attrs/application_type/custom.py:12
msgid "Operating parameter" msgid "Operating parameter"
msgstr "运行参数" msgstr "运行参数"
@ -1424,11 +1430,11 @@ msgstr "文字内容太长。请使用 Elasticsearch 存储操作日志"
msgid "Tips" msgid "Tips"
msgstr "提示" msgstr "提示"
#: audits/handler.py:126 #: audits/handler.py:134
msgid "Yes" msgid "Yes"
msgstr "是" msgstr "是"
#: audits/handler.py:126 #: audits/handler.py:134
msgid "No" msgid "No"
msgstr "否" msgstr "否"
@ -1671,7 +1677,7 @@ msgstr "当前用户不支持 MFA 类型: {}"
msgid "User does not exist: {}" msgid "User does not exist: {}"
msgstr "用户不存在: {}" msgstr "用户不存在: {}"
#: authentication/api/password.py:31 users/views/profile/reset.py:122 #: authentication/api/password.py:31 users/views/profile/reset.py:127
msgid "No user matched" msgid "No user matched"
msgstr "没有匹配到用户" msgstr "没有匹配到用户"
@ -1996,7 +2002,7 @@ msgstr "短信验证码校验失败"
#: authentication/serializers/password_mfa.py:24 #: authentication/serializers/password_mfa.py:24
#: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 #: settings/serializers/auth/sms.py:27 users/forms/profile.py:103
#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 #: users/forms/profile.py:106 users/templates/users/forgot_password.html:111
#: users/views/profile/reset.py:74 #: users/views/profile/reset.py:79
msgid "SMS" msgid "SMS"
msgstr "短信" msgstr "短信"
@ -2131,7 +2137,7 @@ msgstr "资产或应用必填"
#: settings/serializers/email.py:50 users/forms/profile.py:102 #: settings/serializers/email.py:50 users/forms/profile.py:102
#: users/forms/profile.py:106 users/models/user.py:675 #: users/forms/profile.py:106 users/models/user.py:675
#: users/templates/users/forgot_password.html:116 #: users/templates/users/forgot_password.html:116
#: users/views/profile/reset.py:68 #: users/views/profile/reset.py:73
msgid "Email" msgid "Email"
msgstr "邮箱" msgstr "邮箱"
@ -3959,7 +3965,7 @@ msgstr "登录日志"
#: settings/serializers/cleaning.py:12 settings/serializers/cleaning.py:16 #: settings/serializers/cleaning.py:12 settings/serializers/cleaning.py:16
#: settings/serializers/cleaning.py:20 settings/serializers/cleaning.py:24 #: settings/serializers/cleaning.py:20 settings/serializers/cleaning.py:24
#: settings/serializers/cleaning.py:28 settings/serializers/other.py:37 #: settings/serializers/cleaning.py:28
msgid "Unit: day" msgid "Unit: day"
msgstr "单位: 天" msgstr "单位: 天"
@ -4128,19 +4134,31 @@ msgstr ""
msgid "Ticket authorize default time" msgid "Ticket authorize default time"
msgstr "默认工单授权时间" msgstr "默认工单授权时间"
#: settings/serializers/other.py:40
msgid "day"
msgstr "天"
#: settings/serializers/other.py:40
msgid "hour"
msgstr "时"
#: settings/serializers/other.py:41 #: settings/serializers/other.py:41
msgid "Ticket authorize default time unit"
msgstr "默认工单授权时间单位"
#: settings/serializers/other.py:44
msgid "Help Docs URL" msgid "Help Docs URL"
msgstr "文档链接" msgstr "文档链接"
#: settings/serializers/other.py:42 #: settings/serializers/other.py:45
msgid "default: http://docs.jumpserver.org" msgid "default: http://docs.jumpserver.org"
msgstr "默认: http://dev.jumpserver.org:8080" msgstr "默认: http://dev.jumpserver.org:8080"
#: settings/serializers/other.py:46 #: settings/serializers/other.py:49
msgid "Help Support URL" msgid "Help Support URL"
msgstr "支持链接" msgstr "支持链接"
#: settings/serializers/other.py:47 #: settings/serializers/other.py:50
msgid "default: http://www.jumpserver.org/support/" msgid "default: http://www.jumpserver.org/support/"
msgstr "默认: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/"
@ -5796,7 +5814,7 @@ msgstr "用户密码历史"
msgid "Reset password" msgid "Reset password"
msgstr "重置密码" msgstr "重置密码"
#: users/notifications.py:85 users/views/profile/reset.py:189 #: users/notifications.py:85 users/views/profile/reset.py:194
msgid "Reset password success" msgid "Reset password success"
msgstr "重置密码成功" msgstr "重置密码成功"
@ -5988,7 +6006,7 @@ msgstr "点击这里设置密码"
#: users/templates/users/forgot_password.html:32 #: users/templates/users/forgot_password.html:32
msgid "Input your email account, that will send a email to your" msgid "Input your email account, that will send a email to your"
msgstr "输入您的邮箱账号, 将会发一封重置邮件到您的邮箱中" msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中"
#: users/templates/users/forgot_password.html:35 #: users/templates/users/forgot_password.html:35
msgid "" msgid ""
@ -6150,23 +6168,29 @@ msgstr "MFA(OTP) 禁用成功，返回登录页面"
msgid "Password invalid" msgid "Password invalid"
msgstr "用户名或密码无效" msgstr "用户名或密码无效"
#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 #: users/views/profile/reset.py:47
msgid ""
"Non-local users can log in only from third-party platforms and cannot change "
"their passwords: {}"
msgstr "非本地用户仅允许从第三方平台登录，不支持修改密码: {}"
#: users/views/profile/reset.py:149 users/views/profile/reset.py:160
msgid "Token invalid or expired" msgid "Token invalid or expired"
msgstr "Token错误或失效" msgstr "Token错误或失效"
#: users/views/profile/reset.py:160 #: users/views/profile/reset.py:165
msgid "User auth from {}, go there change password" msgid "User auth from {}, go there change password"
msgstr "用户认证源来自 {}, 请去相应系统修改密码" msgstr "用户认证源来自 {}, 请去相应系统修改密码"
#: users/views/profile/reset.py:167 #: users/views/profile/reset.py:172
msgid "* Your password does not meet the requirements" msgid "* Your password does not meet the requirements"
msgstr "* 您的密码不符合要求" msgstr "* 您的密码不符合要求"
#: users/views/profile/reset.py:173 #: users/views/profile/reset.py:178
msgid "* The new password cannot be the last {} passwords" msgid "* The new password cannot be the last {} passwords"
msgstr "* 新密码不能是最近 {} 次的密码" msgstr "* 新密码不能是最近 {} 次的密码"
#: users/views/profile/reset.py:190 #: users/views/profile/reset.py:195
msgid "Reset password success, return to login page" msgid "Reset password success, return to login page"
msgstr "重置密码成功，返回到登录页面" msgstr "重置密码成功，返回到登录页面"

10
apps/settings/serializers/other.py
View File

@ -33,10 +33,13 @@ class OtherSettingSerializer(serializers.Serializer):
) )
TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField( TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField(
min_value=7, max_value=9999, required=False, min_value=1, max_value=999999, required=False,
label=_("Ticket authorize default time"), help_text=_("Unit: day") label=_("Ticket authorize default time")
)
TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = serializers.ChoiceField(
choices=[('day', _("day")), ('hour', _("hour"))],
label=_("Ticket authorize default time unit"), required=False,
) )
HELP_DOCUMENT_URL = serializers.URLField( HELP_DOCUMENT_URL = serializers.URLField(
required=False, allow_blank=True, allow_null=True, label=_("Help Docs URL"), required=False, allow_blank=True, allow_null=True, label=_("Help Docs URL"),
help_text=_('default: http://docs.jumpserver.org') help_text=_('default: http://docs.jumpserver.org')
@ -51,4 +54,3 @@ class OtherSettingSerializer(serializers.Serializer):
# PERIOD_TASK_ENABLED = serializers.BooleanField( # PERIOD_TASK_ENABLED = serializers.BooleanField(
# required=False, label=_("Enable period task") # required=False, label=_("Enable period task")
# ) # )

1
apps/settings/serializers/public.py
View File

@ -15,6 +15,7 @@ class PrivateSettingSerializer(PublicSettingSerializer):
WINDOWS_SKIP_ALL_MANUAL_PASSWORD = serializers.BooleanField() WINDOWS_SKIP_ALL_MANUAL_PASSWORD = serializers.BooleanField()
OLD_PASSWORD_HISTORY_LIMIT_COUNT = serializers.IntegerField() OLD_PASSWORD_HISTORY_LIMIT_COUNT = serializers.IntegerField()
TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField() TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField()
TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = serializers.CharField()
SECURITY_MAX_IDLE_TIME = serializers.IntegerField() SECURITY_MAX_IDLE_TIME = serializers.IntegerField()
SECURITY_VIEW_AUTH_NEED_MFA = serializers.BooleanField() SECURITY_VIEW_AUTH_NEED_MFA = serializers.BooleanField()
SECURITY_MFA_VERIFY_TTL = serializers.IntegerField() SECURITY_MFA_VERIFY_TTL = serializers.IntegerField()

5
apps/terminal/utils/db_port_mapper.py
View File

@ -51,15 +51,16 @@ class DBPortManager(object):
def pop(self, db: Application): def pop(self, db: Application):
mapper = self.get_mapper() mapper = self.get_mapper()
to_delete_port = self.get_port_by_db(db) to_delete_port = self.get_port_by_db(db, raise_exception=False)
mapper.pop(to_delete_port, None) mapper.pop(to_delete_port, None)
self.set_mapper(mapper) self.set_mapper(mapper)
def get_port_by_db(self, db): def get_port_by_db(self, db, raise_exception=True):
mapper = self.get_mapper() mapper = self.get_mapper()
for port, db_id in mapper.items(): for port, db_id in mapper.items():
if db_id == str(db.id): if db_id == str(db.id):
return port return port
if raise_exception:
error = _( error = _(
'No available port is matched. ' 'No available port is matched. '
'The number of databases may have exceeded the number of ports ' 'The number of databases may have exceeded the number of ports '

2
apps/tickets/api/ticket.py
View File

@ -63,8 +63,6 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
def perform_create(self, serializer): def perform_create(self, serializer):
instance = serializer.save() instance = serializer.save()
instance.applicant = self.request.user
instance.save(update_fields=['applicant'])
instance.open() instance.open()
@action(detail=False, methods=[POST], permission_classes=[RBACPermission, ]) @action(detail=False, methods=[POST], permission_classes=[RBACPermission, ])

13
apps/tickets/serializers/ticket/ticket.py
View File

@ -3,6 +3,7 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from users.models import User
from orgs.models import Organization from orgs.models import Organization
from orgs.mixins.serializers import OrgResourceModelSerializerMixin from orgs.mixins.serializers import OrgResourceModelSerializerMixin
from tickets.models import Ticket, TicketFlow from tickets.models import Ticket, TicketFlow
@ -70,6 +71,7 @@ class TicketApplySerializer(TicketSerializer):
org_id = serializers.CharField( org_id = serializers.CharField(
required=True, max_length=36, allow_blank=True, label=_("Organization") required=True, max_length=36, allow_blank=True, label=_("Organization")
) )
applicant = serializers.CharField(required=False, allow_blank=True)
class Meta: class Meta:
model = Ticket model = Ticket
@ -78,6 +80,15 @@ class TicketApplySerializer(TicketSerializer):
'type': {'required': True} 'type': {'required': True}
} }
def get_applicant(self, applicant_id):
current_user = self.context['request'].user
want_applicant = User.objects.filter(id=applicant_id).first()
if want_applicant and current_user.has_perm('tickets.add_superticket'):
applicant = want_applicant
else:
applicant = current_user
return applicant
@staticmethod @staticmethod
def validate_org_id(org_id): def validate_org_id(org_id):
org = Organization.get_instance(org_id) org = Organization.get_instance(org_id)
@ -98,4 +109,6 @@ class TicketApplySerializer(TicketSerializer):
else: else:
error = _('The ticket flow `{}` does not exist'.format(ticket_type)) error = _('The ticket flow `{}` does not exist'.format(ticket_type))
raise serializers.ValidationError(error) raise serializers.ValidationError(error)
attrs['applicant'] = self.get_applicant(attrs.get('applicant'))
return attrs return attrs

2
apps/users/migrations/0002_auto_20171225_1157_squashed_0019_auto_20190304_1459.py
View File

@ -49,7 +49,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='user', model_name='user',
name='is_first_login', name='is_first_login',
field=models.BooleanField(default=True), field=models.BooleanField(default=True, verbose_name='Is first login'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='usergroup', model_name='usergroup',

5
apps/users/views/profile/reset.py
View File

@ -43,6 +43,11 @@ class UserForgotPasswordPreviewingView(FormView):
if not user: if not user:
form.add_error('username', _('User does not exist: {}').format(username)) form.add_error('username', _('User does not exist: {}').format(username))
return super().form_invalid(form) return super().form_invalid(form)
if settings.ONLY_ALLOW_AUTH_FROM_SOURCE and not user.is_local:
error = _('Non-local users can log in only from third-party platforms '
'and cannot change their passwords: {}').format(username)
form.add_error('username', error)
return super().form_invalid(form)
token = random_string(36) token = random_string(36)
user_map = {'username': user.username, 'phone': user.phone, 'email': user.email} user_map = {'username': user.username, 'phone': user.phone, 'email': user.email}