Skip to content

Commit 28e4ddf

Browse files
authored
db cleanup (#2644)
1 parent 746be3f commit 28e4ddf

38 files changed

+245
-492
lines changed

conf/default/web.conf.default

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ enabled = no
150150
[display_office_martians]
151151
enabled = no
152152

153-
[display_shrike]
154-
enabled = no
155-
156153
[display_task_tags]
157154
# displays custom tags, if set during sample submission
158155
enabled = no

lib/cuckoo/common/web_utils.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -799,10 +799,6 @@ def download_file(**kwargs):
799799
memory,
800800
clock,
801801
enforce_timeout,
802-
shrike_url,
803-
shrike_msg,
804-
shrike_sid,
805-
shrike_refer,
806802
unique,
807803
referrer,
808804
tlp,
@@ -959,18 +955,13 @@ def download_file(**kwargs):
959955
enforce_timeout=enforce_timeout,
960956
clock=clock,
961957
static=static,
962-
shrike_url=shrike_url,
963-
shrike_msg=shrike_msg,
964-
shrike_sid=shrike_sid,
965-
shrike_refer=shrike_refer,
966958
tlp=tlp,
967959
tags_tasks=tags_tasks,
968960
route=route,
969961
cape=cape,
970962
user_id=kwargs.get("user_id"),
971963
username=username,
972964
source_url=kwargs.get("source_url", False),
973-
# parent_id=kwargs.get("parent_id"),
974965
)
975966

976967
try:
@@ -1248,10 +1239,6 @@ def validate_task_by_path(tid):
12481239
"machinename": "info.machine.name",
12491240
"machinelabel": "info.machine.label",
12501241
"comment": "info.comments.Data",
1251-
"shrikemsg": "info.shrike_msg",
1252-
"shrikeurl": "info.shrike_url",
1253-
"shrikerefer": "info.shrike_refer",
1254-
"shrikesid": "info.shrike_sid",
12551242
"custom": "info.custom",
12561243
# initial binary
12571244
"target_sha256": f"target.file.{FILE_REF_KEY}",
@@ -1521,10 +1508,6 @@ def parse_request_arguments(request, keyword="POST"):
15211508
- memory (bool): Memory argument.
15221509
- clock (str): Clock argument.
15231510
- enforce_timeout (bool): Enforce timeout argument.
1524-
- shrike_url (str): Shrike URL argument.
1525-
- shrike_msg (str): Shrike message argument.
1526-
- shrike_sid (str): Shrike SID argument.
1527-
- shrike_refer (str): Shrike refer argument.
15281511
- unique (bool): Unique argument.
15291512
- referrer (str): Referrer argument.
15301513
- tlp (str): TLP argument.
@@ -1551,10 +1534,6 @@ def parse_request_arguments(request, keyword="POST"):
15511534
if "1970" in clock:
15521535
clock = datetime.now().strftime("%m-%d-%Y %H:%M:%S")
15531536
enforce_timeout = force_bool(getattr(request, keyword).get("enforce_timeout", False))
1554-
shrike_url = getattr(request, keyword).get("shrike_url")
1555-
shrike_msg = getattr(request, keyword).get("shrike_msg")
1556-
shrike_sid = getattr(request, keyword).get("shrike_sid")
1557-
shrike_refer = getattr(request, keyword).get("shrike_refer")
15581537
unique = force_bool(getattr(request, keyword).get("unique", False))
15591538
tlp = getattr(request, keyword).get("tlp")
15601539
lin_options = getattr(request, keyword).get("lin_options", "")
@@ -1583,10 +1562,6 @@ def parse_request_arguments(request, keyword="POST"):
15831562
memory,
15841563
clock,
15851564
enforce_timeout,
1586-
shrike_url,
1587-
shrike_msg,
1588-
shrike_sid,
1589-
shrike_refer,
15901565
unique,
15911566
referrer,
15921567
tlp,

0 commit comments

Comments
 (0)