diff --git a/apps/assets/migrations/0100_auto_20220430_2126.py b/apps/assets/migrations/0100_auto_20220430_2126.py index 17f6d6da1..78ede0501 100644 --- a/apps/assets/migrations/0100_auto_20220430_2126.py +++ b/apps/assets/migrations/0100_auto_20220430_2126.py @@ -32,8 +32,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='platform', - name='protocols_default', - field=models.JSONField(blank=True, default=list, max_length=128, verbose_name='Protocols default'), + name='protocols_enabled', + field=models.BooleanField(default=True, verbose_name='Protocols enabled'), ), migrations.AddField( model_name='platform', diff --git a/apps/assets/migrations/0112_auto_20220819_1526.py b/apps/assets/migrations/0112_auto_20220819_1526.py deleted file mode 100644 index 14e7d7765..000000000 --- a/apps/assets/migrations/0112_auto_20220819_1526.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.13 on 2022-08-19 07:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0111_auto_20220819_1523'), - ] - - operations = [ - migrations.RemoveField( - model_name='platform', - name='protocols_default', - ), - migrations.AddField( - model_name='platform', - name='protocols_enabled', - field=models.BooleanField(default=True, verbose_name='Protocols enabled'), - ), - ] diff --git a/apps/common/utils/common.py b/apps/common/utils/common.py index 5b2180ec0..854f9f488 100644 --- a/apps/common/utils/common.py +++ b/apps/common/utils/common.py @@ -12,6 +12,7 @@ import ipaddress import psutil import platform import os +import socket from django.conf import settings @@ -365,3 +366,18 @@ def pretty_string(data: str, max_length=128, ellipsis_str='...'): def group_by_count(it, count): return [it[i:i+count] for i in range(0, len(it), count)] + + +def test_ip_connectivity(host, port, timeout=0.5): + """ + timeout: seconds + """ + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.settimeout(timeout) + result = sock.connect_ex((host, int(port))) + sock.close() + if result == 0: + connectivity = True + else: + connectivity = False + return connectivity diff --git a/apps/jumpserver/settings/_xpack.py b/apps/jumpserver/settings/_xpack.py index 7a2f34c8d..9f4319a35 100644 --- a/apps/jumpserver/settings/_xpack.py +++ b/apps/jumpserver/settings/_xpack.py @@ -6,8 +6,7 @@ from .. import const from .base import INSTALLED_APPS, TEMPLATES XPACK_DIR = os.path.join(const.BASE_DIR, 'xpack') -XPACK_ENABLED = False -# XPACK_ENABLED = os.path.isdir(XPACK_DIR) +XPACK_ENABLED = os.path.isdir(XPACK_DIR) XPACK_TEMPLATES_DIR = [] XPACK_CONTEXT_PROCESSOR = []