From 3ceeb1125ed7b4ce78d7cd9f7f8f73ab47890553 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Fri, 26 Jul 2024 10:35:53 +0530 Subject: [PATCH 1/8] Hide API keys in vault --- .../templates/scanEngine/settings/api.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/web/scanEngine/templates/scanEngine/settings/api.html b/web/scanEngine/templates/scanEngine/settings/api.html index 150e912a0..a98a9306b 100644 --- a/web/scanEngine/templates/scanEngine/settings/api.html +++ b/web/scanEngine/templates/scanEngine/settings/api.html @@ -29,21 +29,31 @@

OpenAI keys will be used to generate vulnerability description, remediation, impact and vulnerability report writing using GPT.

+
{% if openai_key %} - + {% else %} {% endif %} +
+ +
+
This is optional but recommended.

Netlas keys will be used to get whois information and other OSINT related data.

+
{% if netlas_key %} - + {% else %} {% endif %} +
+ +
+
This is optional
From 928af18ef6e7bca40c5f0b1429a48a9e46a5989f Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Fri, 26 Jul 2024 11:25:20 +0530 Subject: [PATCH 2/8] hide hackerone api key --- web/scanEngine/admin.py | 1 + web/scanEngine/forms.py | 6 ++++-- web/scanEngine/templates/scanEngine/settings/hackerone.html | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/scanEngine/admin.py b/web/scanEngine/admin.py index b2f2e0c10..edca16621 100644 --- a/web/scanEngine/admin.py +++ b/web/scanEngine/admin.py @@ -9,3 +9,4 @@ admin.site.register(Notification) admin.site.register(VulnerabilityReportSetting) admin.site.register(InstalledExternalTool) +admin.site.register(Hackerone) \ No newline at end of file diff --git a/web/scanEngine/forms.py b/web/scanEngine/forms.py index 4eddf0d92..3f6431b54 100644 --- a/web/scanEngine/forms.py +++ b/web/scanEngine/forms.py @@ -399,12 +399,14 @@ class Meta: api_key = forms.CharField( required=True, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ "class": "form-control form-control-lg", "id": "api_key", "placeholder": "Hackerone API Token", - })) + }, + render_value=True + )) send_critical = forms.BooleanField( required=False, diff --git a/web/scanEngine/templates/scanEngine/settings/hackerone.html b/web/scanEngine/templates/scanEngine/settings/hackerone.html index 1cbd18142..bb1288042 100644 --- a/web/scanEngine/templates/scanEngine/settings/hackerone.html +++ b/web/scanEngine/templates/scanEngine/settings/hackerone.html @@ -47,7 +47,12 @@

Hackerone Automatic Vulnerability Report Settings

+
{{form.api_key}} +
+ +
+
From d11adc29db9463754e6b8a984a944fcaf46ed5eb Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:03:00 +0530 Subject: [PATCH 3/8] fix slack url hide --- web/scanEngine/forms.py | 32 ++++++++++++------- .../scanEngine/settings/notification.html | 19 +++++++---- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/web/scanEngine/forms.py b/web/scanEngine/forms.py index 3f6431b54..dd8151e9e 100644 --- a/web/scanEngine/forms.py +++ b/web/scanEngine/forms.py @@ -176,12 +176,14 @@ class Meta: slack_hook_url = forms.CharField( required=False, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ - "class": "form-control", + "class": "form-control h-100", "id": "slack_hook_url", "placeholder": "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", - })) + }, + render_value=True + )) send_to_lark = forms.BooleanField( required=False, @@ -193,12 +195,14 @@ class Meta: lark_hook_url = forms.CharField( required=False, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ "class": "form-control", "id": "lark_hook_url", "placeholder": "https://open.larksuite.com/open-apis/bot/v2/hook/XXXXXXXXXXXXXXXXXXXXXXXX", - })) + }, + render_value=True + )) send_to_discord = forms.BooleanField( required=False, @@ -210,12 +214,14 @@ class Meta: discord_hook_url = forms.CharField( required=False, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ "class": "form-control", "id": "discord_hook_url", "placeholder": "https://discord.com/api/webhooks/000000000000000000/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", - })) + }, + render_value=True + )) send_to_telegram = forms.BooleanField( required=False, @@ -227,21 +233,25 @@ class Meta: telegram_bot_token = forms.CharField( required=False, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ "class": "form-control", "id": "telegram_bot_token", "placeholder": "Bot Token", - })) + }, + render_value=True + )) telegram_bot_chat_id = forms.CharField( required=False, - widget=forms.TextInput( + widget=forms.PasswordInput( attrs={ "class": "form-control", "id": "telegram_bot_chat_id", "placeholder": "Bot Chat ID", - })) + }, + render_value=True + )) send_scan_status_notif = forms.BooleanField( required=False, diff --git a/web/scanEngine/templates/scanEngine/settings/notification.html b/web/scanEngine/templates/scanEngine/settings/notification.html index cffc23511..6f02519e4 100644 --- a/web/scanEngine/templates/scanEngine/settings/notification.html +++ b/web/scanEngine/templates/scanEngine/settings/notification.html @@ -31,19 +31,24 @@

Send Notifications to:

-
+
- +
- {{form.send_to_slack}} + {{ form.send_to_slack }}
- +
+
+
+ {{ form.slack_hook_url }} +
+ +
- {{form.slack_hook_url}}
- +
- +
From d13d694149e5f69ee0e6f02926fbc53ce8891b56 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:05:30 +0530 Subject: [PATCH 4/8] added hide icon for lark --- web/scanEngine/forms.py | 4 ++-- .../scanEngine/settings/notification.html | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/web/scanEngine/forms.py b/web/scanEngine/forms.py index dd8151e9e..0f3e0d411 100644 --- a/web/scanEngine/forms.py +++ b/web/scanEngine/forms.py @@ -197,7 +197,7 @@ class Meta: required=False, widget=forms.PasswordInput( attrs={ - "class": "form-control", + "class": "form-control h-100", "id": "lark_hook_url", "placeholder": "https://open.larksuite.com/open-apis/bot/v2/hook/XXXXXXXXXXXXXXXXXXXXXXXX", }, @@ -216,7 +216,7 @@ class Meta: required=False, widget=forms.PasswordInput( attrs={ - "class": "form-control", + "class": "form-control h-100", "id": "discord_hook_url", "placeholder": "https://discord.com/api/webhooks/000000000000000000/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", }, diff --git a/web/scanEngine/templates/scanEngine/settings/notification.html b/web/scanEngine/templates/scanEngine/settings/notification.html index 6f02519e4..6be78ef68 100644 --- a/web/scanEngine/templates/scanEngine/settings/notification.html +++ b/web/scanEngine/templates/scanEngine/settings/notification.html @@ -59,19 +59,24 @@

Send Notifications to:

-
+
- +
- {{form.send_to_lark}} + {{ form.send_to_lark }}
- +
+
+
+ {{ form.lark_hook_url }} +
+ +
- {{form.lark_hook_url}}
- +
- +
From 11aad079f9856a51159b7abe4f1b849f69b687c1 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:07:59 +0530 Subject: [PATCH 5/8] hide icon for discord --- .../scanEngine/settings/notification.html | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/web/scanEngine/templates/scanEngine/settings/notification.html b/web/scanEngine/templates/scanEngine/settings/notification.html index 6be78ef68..7410c9936 100644 --- a/web/scanEngine/templates/scanEngine/settings/notification.html +++ b/web/scanEngine/templates/scanEngine/settings/notification.html @@ -87,19 +87,24 @@

Send Notifications to:

-
+
- +
- {{form.send_to_discord}} + {{ form.send_to_discord }}
- +
+
+
+ {{ form.discord_hook_url }} +
+ +
- {{form.discord_hook_url}}
- +
- +
From cbc71167e8b31525199d8e11903a9bdb2a886751 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:13:21 +0530 Subject: [PATCH 6/8] fix telegram input box hide icon --- web/scanEngine/forms.py | 4 +-- .../scanEngine/settings/notification.html | 34 +++++++++++++------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/web/scanEngine/forms.py b/web/scanEngine/forms.py index 0f3e0d411..e55744621 100644 --- a/web/scanEngine/forms.py +++ b/web/scanEngine/forms.py @@ -235,7 +235,7 @@ class Meta: required=False, widget=forms.PasswordInput( attrs={ - "class": "form-control", + "class": "form-control h-100", "id": "telegram_bot_token", "placeholder": "Bot Token", }, @@ -246,7 +246,7 @@ class Meta: required=False, widget=forms.PasswordInput( attrs={ - "class": "form-control", + "class": "form-control h-100", "id": "telegram_bot_chat_id", "placeholder": "Bot Chat ID", }, diff --git a/web/scanEngine/templates/scanEngine/settings/notification.html b/web/scanEngine/templates/scanEngine/settings/notification.html index 7410c9936..d5b9aa4b5 100644 --- a/web/scanEngine/templates/scanEngine/settings/notification.html +++ b/web/scanEngine/templates/scanEngine/settings/notification.html @@ -57,7 +57,7 @@

Send Notifications to:

- +
@@ -85,7 +85,7 @@

Send Notifications to:

- +
@@ -113,24 +113,36 @@

Send Notifications to:

- +
-
+
- +
- {{form.send_to_telegram}} + {{ form.send_to_telegram }} +
+
+
+
+
+ {{ form.telegram_bot_token }} +
+
- +
+
+ {{ form.telegram_bot_chat_id }} +
+ +
+
- {{form.telegram_bot_token}} - {{form.telegram_bot_chat_id}}
- +
- +
From b64692030e2bc0e46df96432e9c0c693b6849909 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:20:11 +0530 Subject: [PATCH 7/8] use new eye icon inside input box for api --- web/scanEngine/templates/scanEngine/settings/api.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/scanEngine/templates/scanEngine/settings/api.html b/web/scanEngine/templates/scanEngine/settings/api.html index a98a9306b..9f57f1a6d 100644 --- a/web/scanEngine/templates/scanEngine/settings/api.html +++ b/web/scanEngine/templates/scanEngine/settings/api.html @@ -29,13 +29,13 @@

OpenAI keys will be used to generate vulnerability description, remediation, impact and vulnerability report writing using GPT.

-
+
{% if openai_key %} {% else %} {% endif %} -
+
@@ -44,13 +44,13 @@

Netlas keys will be used to get whois information and other OSINT related data.

-
+
{% if netlas_key %} {% else %} {% endif %} -
+
From 2e04e2ec1c9147afb6ffa63ff51a722d7a104d8f Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 28 Jul 2024 07:23:15 +0530 Subject: [PATCH 8/8] hackerone hide icon fix --- .../templates/scanEngine/settings/hackerone.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/scanEngine/templates/scanEngine/settings/hackerone.html b/web/scanEngine/templates/scanEngine/settings/hackerone.html index bb1288042..eec049813 100644 --- a/web/scanEngine/templates/scanEngine/settings/hackerone.html +++ b/web/scanEngine/templates/scanEngine/settings/hackerone.html @@ -43,15 +43,15 @@

Hackerone Automatic Vulnerability Report Settings

- {{form.username}} + {{ form.username }}
-
- {{form.api_key}} -
- -
+
+ {{ form.api_key }} +
+ +