github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

feat: Support playbook, adhoc share

Browse Source
This commit is contained in:
wangruidong
2024-09-06 17:41:09 +08:00
committed by Bryan
parent b6f3c23787
commit f55869a449
13 changed files with 128 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/ops/models/adhoc.py
View File

@@ -8,14 +8,13 @@ from common.utils import get_logger
__all__ = ["AdHoc"]
from ops.const import AdHocModules
from orgs.mixins.models import JMSOrgBaseModel
from common.db.models import JMSBaseModel
from ops.const import AdHocModules, Scope
logger = get_logger(__file__)
class AdHoc(JMSOrgBaseModel):
class AdHoc(JMSBaseModel):
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')
@@ -24,6 +23,7 @@ class AdHoc(JMSOrgBaseModel):
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)
comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
scope = models.CharField(max_length=64, default=Scope.public, verbose_name=_('Scope'))
@property
def row_count(self):
@@ -40,5 +40,5 @@ class AdHoc(JMSOrgBaseModel):
return "{}: {}".format(self.module, self.args)
class Meta:
unique_together = [('name', 'org_id', 'creator')]
unique_together = [('name', 'creator')]
verbose_name = _("Adhoc")

11
apps/ops/models/playbook.py
View File

@@ -6,9 +6,9 @@ from django.db import models
from django.utils.translation import gettext_lazy as _
from private_storage.fields import PrivateFileField
from ops.const import CreateMethods
from common.db.models import JMSBaseModel
from ops.const import CreateMethods, Scope
from ops.exception import PlaybookNoValidEntry
from orgs.mixins.models import JMSOrgBaseModel
dangerous_keywords = (
'hosts:localhost',
@@ -23,7 +23,9 @@ dangerous_keywords = (
)
class Playbook(JMSOrgBaseModel):
class Playbook(JMSBaseModel):
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
name = models.CharField(max_length=128, verbose_name=_('Name'), null=True)
path = PrivateFileField(upload_to='playbooks/')
@@ -31,6 +33,7 @@ class Playbook(JMSOrgBaseModel):
comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
create_method = models.CharField(max_length=128, choices=CreateMethods.choices, default=CreateMethods.blank,
verbose_name=_('CreateMethod'))
scope = models.CharField(max_length=64, default=Scope.public, verbose_name=_('Scope'))
vcs_url = models.CharField(max_length=1024, default='', verbose_name=_('VCS URL'), null=True, blank=True)
def __str__(self):
@@ -84,6 +87,6 @@ class Playbook(JMSOrgBaseModel):
return work_dir
class Meta:
unique_together = [('name', 'org_id', 'creator')]
unique_together = [('name', 'creator')]
verbose_name = _("Playbook")
ordering = ['date_created']