github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 去掉debug

pull/2889/head
ibuler 2019-07-05 18:28:56 +08:00
parent a412864c80
commit aac5eed9fc
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/migrations/0034_auto_20190705_1348.py
View File

@ -32,7 +32,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='asset', model_name='asset',
name='protocols', name='protocols',
field=CharField(blank=True, max_length=128, null=True, verbose_name='Protocols'), field=CharField(blank=True, default='ssh/22', max_length=128, verbose_name='Protocols'),
), ),
migrations.RunPython(migrate_assets_protocol), migrations.RunPython(migrate_assets_protocol),
migrations.DeleteModel(name='Protocol'), migrations.DeleteModel(name='Protocol'),

2
apps/assets/models/asset.py
View File

@ -116,7 +116,7 @@ class Asset(ProtocolsMixin, OrgModelMixin):
verbose_name=_('Protocol')) verbose_name=_('Protocol'))
port = models.IntegerField(default=22, verbose_name=_('Port')) port = models.IntegerField(default=22, verbose_name=_('Port'))
protocols = models.CharField(max_length=128, null=True, blank=True, verbose_name=_("Protocols")) protocols = models.CharField(max_length=128, default='ssh/22', blank=True, verbose_name=_("Protocols"))
platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform')) platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform'))
domain = models.ForeignKey("assets.Domain", null=True, blank=True, related_name='assets', verbose_name=_("Domain"), on_delete=models.SET_NULL) domain = models.ForeignKey("assets.Domain", null=True, blank=True, related_name='assets', verbose_name=_("Domain"), on_delete=models.SET_NULL)
nodes = models.ManyToManyField('assets.Node', default=default_node, related_name='assets', verbose_name=_("Nodes")) nodes = models.ManyToManyField('assets.Node', default=default_node, related_name='assets', verbose_name=_("Nodes"))

9
apps/perms/utils/asset_permission.py
View File

@ -492,21 +492,14 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
for node in nodes: for node in nodes:
pattern.add(r'^{0}$|^{0}:'.format(node.key)) pattern.add(r'^{0}$|^{0}:'.format(node.key))
pattern = '|'.join(list(pattern)) pattern = '|'.join(list(pattern))
print(self.object.username)
print(pattern)
print("Start get nodes assets")
clock1 = time.clock()
if pattern: if pattern:
assets = Asset.objects.filter(nodes__key__regex=pattern) \ assets = Asset.objects.filter(nodes__key__regex=pattern) \
.prefetch_related('nodes')\
.only(*self.assets_only)\ .only(*self.assets_only)\
.distinct() .distinct()
# .prefetch_related('nodes')\
else: else:
assets = [] assets = []
assets = list(assets) assets = list(assets)
print("get nodes assets using: {}".format(time.clock() - clock1))
print(len(assets))
return []
self.tree.add_assets_without_system_users(assets) self.tree.add_assets_without_system_users(assets)
assets = self.tree.get_assets() assets = self.tree.get_assets()
self._assets = assets self._assets = assets