Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ weight: 8
exclude_search: true
---

**Please note - the Google Sheets feature has been deprecated as of DefectDojo version 2.21.0 - these documents are for reference only.**
**Please note - the Google Sheets feature has been removed in DefectDojo version 2.21.0 - these documents are for reference only.**

With the Google Sheets sync feature, DefectDojo allow the users to
export all the finding details of each test into a separate Google
Expand Down
12 changes: 1 addition & 11 deletions dojo/management/commands/initialize_permissions.py

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this whole file could be deleted now

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I wasn't sure if I should remove it or leave it in place for if we need it in the future

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging

from django.contrib.auth.models import Permission
from django.contrib.contenttypes.models import ContentType
from django.core.management.base import BaseCommand

Expand All @@ -15,16 +14,7 @@ class Command(BaseCommand):

def handle(self, *args, **options):
try:
content_type_system_settings = ContentType.objects.get(app_label="dojo", model="system_settings")
google_permission = Permission.objects.filter(content_type=content_type_system_settings,
codename="change_google_sheet").count()
if google_permission == 0:
Permission.objects.create(
name="Can change Google Sheet",
content_type=content_type_system_settings,
codename="change_google_sheet",
)

# nothing left here after google sheets removal
logger.info("Non-standard permissions have been created")
except ContentType.DoesNotExist:
logger.warning("No content type found for dojo.system_settings")
Expand Down
8 changes: 0 additions & 8 deletions dojo/user/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ def get_configuration_permissions_fields():
else:
github_permissions = []

if get_system_setting("enable_google_sheets"):
google_sheet_permissions = [
Permission_Helper(name="google sheet", app="dojo", change=True),
]
else:
google_sheet_permissions = []

if get_system_setting("enable_jira"):
jira_permissions = [
Permission_Helper(name="jira instance", app="dojo", view=True, add=True, change=True, delete=True),
Expand All @@ -95,7 +88,6 @@ def get_configuration_permissions_fields():
Permission_Helper(name="development environment", app="dojo", add=True, change=True, delete=True),
Permission_Helper(name="finding template", app="dojo", view=True, add=True, change=True, delete=True),
*github_permissions,
*google_sheet_permissions,
Permission_Helper(name="group", app="auth", view=True, add=True),
*jira_permissions,
Permission_Helper(name="language type", app="dojo", view=True, add=True, change=True, delete=True),
Expand Down
6 changes: 0 additions & 6 deletions tests/base_test_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,6 @@ def goto_component_overview(self, driver):
driver.get(self.base_url + "components")
return driver

def goto_google_sheets_configuration_form(self, driver):
# if something is terribly wrong, it may still fail, even if system_settings is disabled.
# See https://github.com/DefectDojo/django-DefectDojo/issues/3742 for reference.
driver.get(self.base_url + "configure_google_sheets")
return driver

def goto_active_engagements_overview(self, driver):
driver.get(self.base_url + "engagement/active")
return driver
Expand Down

This file was deleted.

Loading