如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运"
+"
Luna是单独部署的一个程序，你需要部署luna，koko,
如果你看到了"
+"这个页面，证明你访问的不是nginx监听的端口，祝你好运
"
#: ops/api/celery.py:54
msgid "Waiting task start"
@@ -3916,7 +3915,7 @@ msgstr "您确定删除吗?"
msgid "Search no entry matched in ou {}"
msgstr "在ou:{}中没有匹配条目"
-#: settings/utils.py:120
+#: settings/utils.py:122
msgid "The user source is not LDAP"
msgstr "用户来源不是LDAP"
diff --git a/apps/ops/inventory.py b/apps/ops/inventory.py
index 694957b14..ffd7e8619 100644
--- a/apps/ops/inventory.py
+++ b/apps/ops/inventory.py
@@ -15,7 +15,7 @@ logger = get_logger(__file__)
class JMSBaseInventory(BaseInventory):
- windows_ssh_default_ssh = settings.WINDOWS_SSH_DEFAULT_SHELL
+ windows_ssh_default_shell = settings.WINDOWS_SSH_DEFAULT_SHELL
def convert_to_ansible(self, asset, run_as_admin=False):
info = {
@@ -35,7 +35,7 @@ class JMSBaseInventory(BaseInventory):
if asset.is_windows():
info["vars"].update({
"ansible_connection": "ssh",
- "ansible_shell_type": self.windows_ssh_default_ssh,
+ "ansible_shell_type": self.windows_ssh_default_shell,
})
for label in asset.labels.all():
info["vars"].update({
diff --git a/apps/perms/api/user_permission/mixin.py b/apps/perms/api/user_permission/mixin.py
index a25e49251..8d65a884c 100644
--- a/apps/perms/api/user_permission/mixin.py
+++ b/apps/perms/api/user_permission/mixin.py
@@ -36,7 +36,7 @@ class UserNodeTreeMixin:
assets_amount = self.tree.assets_amount(node.key)
if assets_amount == 0 and node.key != Node.empty_key:
continue
- node._assets_amount = assets_amount
+ node.assets_amount = assets_amount
data = ParserNode.parse_node_to_tree_node(node)
_queryset.append(data)
return _queryset
diff --git a/apps/settings/utils.py b/apps/settings/utils.py
index 232224dcc..f9fa7ba96 100644
--- a/apps/settings/utils.py
+++ b/apps/settings/utils.py
@@ -93,6 +93,8 @@ class LDAPUtil:
user_item = self._ldap_entry_to_user_item(entry)
user = self.get_user_by_username(user_item['username'])
user_item['existing'] = bool(user)
+ if user_item in user_items:
+ continue
user_items.append(user_item)
return user_items
diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py
index 5303bbdb2..7071ddd33 100644
--- a/apps/terminal/api/session.py
+++ b/apps/terminal/api/session.py
@@ -26,7 +26,7 @@ logger = get_logger(__name__)
class SessionViewSet(OrgBulkModelViewSet):
queryset = Session.objects.all()
serializer_class = serializers.SessionSerializer
- permission_classes = (IsOrgAdminOrAppUser | IsOrgAuditor, )
+ permission_classes = (IsOrgAdminOrAppUser, )
filter_fields = [
"user", "asset", "system_user", "remote_addr",
"protocol", "terminal", "is_finished",
@@ -53,6 +53,11 @@ class SessionViewSet(OrgBulkModelViewSet):
serializer.validated_data["system_user"] = _system_user.name
return super().perform_create(serializer)
+ def get_permissions(self):
+ if self.request.method.lower() in ['get']:
+ self.permission_classes = (IsOrgAdminOrAppUser | IsOrgAuditor, )
+ return super().get_permissions()
+
class SessionReplayViewSet(viewsets.ViewSet):
serializer_class = serializers.ReplaySerializer
diff --git a/apps/terminal/models.py b/apps/terminal/models.py
index 8cfd5ef87..f7f2994ed 100644
--- a/apps/terminal/models.py
+++ b/apps/terminal/models.py
@@ -4,6 +4,7 @@ import os
import uuid
from django.db import models
+from django.db.models.signals import post_save
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
from django.conf import settings
@@ -267,7 +268,16 @@ class Task(models.Model):
db_table = "terminal_task"
+class CommandManager(models.Manager):
+ def bulk_create(self, objs, **kwargs):
+ resp = super().bulk_create(objs, **kwargs)
+ for i in objs:
+ post_save.send(i.__class__, instance=i, created=True)
+ return resp
+
+
class Command(AbstractSessionCommand):
+ objects = CommandManager()
class Meta:
db_table = "terminal_command"
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index 6ac9b7bd8..d23d9be02 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -41,7 +41,7 @@
- {% if type == "online" %}
+ {% if type == "online" and request.user.can_admin_current_org %}