add support osx payload and handler

FunnyWolf · Sep 24, 2023 · 3d41f2b · 3d41f2b
1 parent e9caf6d
commit 3d41f2b
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 0 deletions.
diff --git a/Msgrpc/Handle/payload.py b/Msgrpc/Handle/payload.py
@@ -96,6 +96,8 @@ def create(mname=None, opts=None):
                 opts["Format"] = 'raw'
             elif "android" in mname:
                 opts["Format"] = 'raw'
+            elif "osx" in mname:
+                opts["Format"] = 'macho'
             else:
                 context = data_return(306, {}, Payload_MSG_ZH.get(306), Payload_MSG_EN.get(306))
                 return context

diff --git a/WebDatabase/migrations/0002_targetmodel_webinfomationmodel_and_more.py b/WebDatabase/migrations/0002_targetmodel_webinfomationmodel_and_more.py
@@ -0,0 +1,73 @@
+# Generated by Django 4.2 on 2023-09-14 03:05
+
+from django.db import migrations, models
+
+import Core.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('WebDatabase', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TargetModel',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ipdomain', models.CharField(blank=True, max_length=100, null=True)),
+                ('name', models.TextField(blank=True, null=True)),
+                ('desc', models.TextField(blank=True, null=True)),
+                ('source', models.CharField(blank=True, max_length=100, null=True)),
+                ('data', Core.models.DiyDictField(default={})),
+                ('update_time', models.IntegerField(default=0)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='WebInfomationModel',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ipdomain', models.CharField(blank=True, max_length=100, null=True)),
+                ('port', models.IntegerField(default=0)),
+                ('title', models.CharField(blank=True, max_length=100, null=True)),
+                ('code', models.IntegerField(default=0)),
+                ('html', models.TextField(blank=True, null=True)),
+                ('source', models.CharField(blank=True, max_length=100, null=True)),
+                ('data', Core.models.DiyDictField(default={})),
+                ('update_time', models.IntegerField(default=0)),
+            ],
+        ),
+        migrations.RenameField(
+            model_name='webfingerprintmodel',
+            old_name='title',
+            new_name='plugin',
+        ),
+        migrations.RemoveField(
+            model_name='webfingerprintmodel',
+            name='code',
+        ),
+        migrations.RemoveField(
+            model_name='webfingerprintmodel',
+            name='fingerprint',
+        ),
+        migrations.AddField(
+            model_name='ipdomainmodel',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='portservicemodel',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='vulnerabilitymodel',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='webfingerprintmodel',
+            name='source',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]
diff --git a/WebDatabase/models.py b/WebDatabase/models.py
@@ -32,6 +32,8 @@ class WebInfomationModel(models.Model):
     title = models.CharField(blank=True, null=True, max_length=100)
     code = models.IntegerField(default=0)
     html = models.TextField(blank=True, null=True)
+    screenshot = models.CharField(blank=True, null=True, max_length=100)
+    sslfile = models.CharField(blank=True, null=True, max_length=100)
     source = models.CharField(blank=True, null=True, max_length=100)  # 信息来源
     data = DiyDictField(default={})
     update_time = models.IntegerField(default=0)
@@ -56,6 +58,16 @@ class VulnerabilityModel(models.Model):
     update_time = models.IntegerField(default=0)
 
 
+class DNSRecordModel(models.Model):
+    ip = models.CharField(blank=True, null=True, max_length=100)
+    domain = models.CharField(blank=True, null=True, max_length=100)
+    type = models.CharField(blank=True, null=True, max_length=100)
+    value = models.CharField(blank=True, null=True, max_length=100)
+    source = models.CharField(blank=True, null=True, max_length=100)  # 信息来源
+    data = DiyDictField(default={})
+    update_time = models.IntegerField(default=0)
+
+
 class TargetModel(models.Model):
     ipdomain = models.CharField(blank=True, null=True, max_length=100)
     name = models.TextField(blank=True, null=True)