Merge pull request #14032 from DefectDojo/bugfix

Release 2.54.0: Merge Bugfix into Dev

Author: rossops

.dryrunsecurity.yaml

@@ -52,7 +52,6 @@ sensitiveCodepaths:
   - 'docker/entrypoint-celery-beat.sh'
   - 'docker/entrypoint-celery-worker.sh'
   - 'docker/entrypoint-initializer.sh'
-  - 'docker/entrypoint-first-boot.sh'
   - 'docker/entrypoint-nginx.sh'
   - 'docker/entrypoint-uwsgi.sh'
   - 'docker/wait-for-it.sh'

.github/workflows/validate_docs_build.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - 'docs/**'
+      - '.github/workflows/*'
 
 jobs:
   deploy:

Dockerfile.django-alpine

@@ -69,7 +69,6 @@ COPY \
   docker/entrypoint-celery-beat.sh \
   docker/entrypoint-celery-worker.sh \
   docker/entrypoint-initializer.sh \
-  docker/entrypoint-first-boot.sh \
   docker/entrypoint-uwsgi.sh \
   docker/wait-for-it.sh \
   docker/secret-file-loader.sh \

Dockerfile.django-debian

@@ -72,7 +72,6 @@ COPY \
   docker/entrypoint-celery-beat.sh \
   docker/entrypoint-celery-worker.sh \
   docker/entrypoint-initializer.sh \
-  docker/entrypoint-first-boot.sh \
   docker/entrypoint-uwsgi.sh \
   docker/wait-for-it.sh \
   docker/secret-file-loader.sh \

docker-compose.override.dev.yml

@@ -3,7 +3,7 @@ services:
   uwsgi:
     build:
       context: .
-      dockerfile: Dockerfile.django-debian
+      dockerfile: Dockerfile.django-${DEFECT_DOJO_OS:-debian}
       target: development
     entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/entrypoint-uwsgi-dev.sh']
     volumes:

docker/entrypoint-initializer.sh

@@ -5,42 +5,6 @@ set -e  # needed to handle "exit" correctly
 . /secret-file-loader.sh
 . /reach_database.sh
 
-initialize_data()
-{
-    # Test types shall be initialized every time by the initializer, to make sure test types are complete
-    # when new parsers have been implemented
-    echo "Initialization of test_types"
-    python3 manage.py initialize_test_types
-
-    # Non-standard permissions cannot be created with a database migration, because the content type will only
-    # be available after the dojo migrations
-    echo "Creation of non-standard permissions"
-    python3 manage.py initialize_permissions
-}
-
-create_announcement_banner()
-{
-# Load the announcement banner
-if [ -z "$DD_CREATE_CLOUD_BANNER" ]; then
-echo "Creating Announcement Banner"
-cat <<EOD | python3 manage.py shell
-from dojo.models import Announcement, UserAnnouncement, Dojo_User
-announcement, created = Announcement.objects.get_or_create(id=1)
-announcement.message = '<a href="https://cloud.defectdojo.com/accounts/onboarding/plg_step_1" target="_blank">DefectDojo Pro Cloud and On-Premise Subscriptions Now Available! Create an account to try Pro for free!</a>'
-announcement.dismissable = True
-announcement.save()
-for dojo_user in Dojo_User.objects.all():
-    user_announcments = UserAnnouncement.objects.filter(
-        user=dojo_user,
-        announcement=announcement)
-    if user_announcments.count() == 0:
-        UserAnnouncement.objects.get_or_create(
-            user=dojo_user,
-            announcement=announcement)
-EOD
-fi
-}
-
 # Allow for bind-mount multiple settings.py overrides
 FILES=$(ls /app/docker/extra_settings/* 2>/dev/null || true)
 NUM_FILES=$(echo "$FILES" | wc -w)
@@ -56,122 +20,7 @@ fi
 
 umask 0002
 
-if [ "${DD_INITIALIZE}" = false ]
-then
-  echo "Echo initialization skipped. Exiting."
-  exit
-fi
-echo "Initializing."
-
 wait_for_database_to_be_reachable
-echo
-
-echo "Checking ENABLE_AUDITLOG"
-cat <<EOD | if ! python manage.py shell
-from django.db import connections, DEFAULT_DB_ALIAS
-from django.db.utils import ProgrammingError
-from dojo.settings import settings
-def dictfetchall(cursor):
-    columns = [col[0] for col in cursor.description]
-    return [dict(zip(columns, row)) for row in cursor.fetchall()]
-with connections[DEFAULT_DB_ALIAS].cursor() as c:
-    try:
-        c.execute('select * from dojo_system_settings limit 1')
-    except ProgrammingError as e:
-        err_msg = str(e)
-        if "does not exist" in err_msg or "doesn't exist" in err_msg:
-            print('Django has not been initialized. Nothing to check.')
-            exit(0)
-        else:
-            raise
-    raw_row = dictfetchall(c)[0]
-if 'enable_auditlog' in raw_row:  # db is not migrated yet
-    print("Database has not been migrated yet. Good we can check the latest values.")
-    if not raw_row['enable_auditlog']:
-        print("Auditlog has been disabled. Ok, let's check setting of environmental variable DD_ENABLE_AUDITLOG.")
-        if settings.ENABLE_AUDITLOG:
-            print("Misconfiguration detected")
-            exit(47)
-        else:
-            print("It was disabled as well so we are good.")
-    else:
-        print("Auditlog has not been disabled. Good, we can continue.")
-else:
-    print("Database has been already migrated. Nothing to check.")
-EOD
-then
-  echo "You have set 'enable_auditlog' to False in the past. It is not possible to manage auditlog in System settings anymore. If you would like to keep auditlog disabled, you need to set environmental variable DD_ENABLE_AUDITLOG to False for all Django containers (uwsgi, celeryworker & initializer)."
-  echo "Or there is some other error in checking script. Check logs of this container."
-  exit 47
-fi
-
-
-python3 manage.py makemigrations --no-input --check --dry-run --verbosity 3 || {
-    cat <<-EOF
-
-********************************************************************************
-WARNING: Missing Database Migrations Detected
-********************************************************************************
-
-You made changes to the models without creating a DB migration for them.
-
-**NEVER** change existing migrations, create a new one.
-
-If you're not familiar with migrations in Django, please read the
-great documentation thoroughly:
-https://docs.djangoproject.com/en/5.0/topics/migrations/
+python manage.py complete_initialization
 
-This is now a WARNING and the container will continue to start.
-However, you should create the necessary migrations as soon as possible using:
-docker compose exec uwsgi bash -c 'python manage.py makemigrations -v2'
-
-********************************************************************************
-
-EOF
-    echo "WARNING: Continuing startup despite missing migrations..."
-}
-
-echo "Migrating"
-python3 manage.py migrate
-
-echo "Configuring pghistory triggers based on audit settings"
-cat <<EOD | python3 manage.py shell
-from dojo.auditlog import configure_pghistory_triggers
-configure_pghistory_triggers()
-EOD
-
-echo "Admin user: ${DD_ADMIN_USER}"
-ADMIN_EXISTS=$(echo "SELECT * from auth_user;" | python manage.py dbshell | grep "${DD_ADMIN_USER}" || true)
-# Abort if the admin user already exists, instead of giving a new fake password that won't work
-if [ -n "$ADMIN_EXISTS" ]
-then
-    echo "Admin password: Initialization detected that the admin user ${DD_ADMIN_USER} already exists in your database."
-    echo "If you don't remember the ${DD_ADMIN_USER} password, you can create a new superuser with:"
-    echo "$ docker compose exec uwsgi /bin/bash -c 'python manage.py createsuperuser'"
-    create_announcement_banner
-    initialize_data
-    exit
-fi
-
-if [ -z "${DD_ADMIN_PASSWORD}" ]
-then
-  DD_ADMIN_PASSWORD="$(LC_ALL=C tr -dc a-zA-Z0-9 < /dev/urandom | \
-    head -c 22)"
-  export DD_ADMIN_PASSWORD
-  echo "Admin password: ${DD_ADMIN_PASSWORD}"
-fi
-
-if [ -z "${DD_JIRA_WEBHOOK_SECRET}" ]
-then
-  DD_JIRA_WEBHOOK_SECRET="$(uuidgen)"
-  export DD_JIRA_WEBHOOK_SECRET
-  echo "JIRA Webhook Secret: ${DD_JIRA_WEBHOOK_SECRET}"
-fi
-
-if [ -z "${ADMIN_EXISTS}" ]
-then
-  . /entrypoint-first-boot.sh
-
-  create_announcement_banner
-  initialize_data
-fi
+exec "$@"

docs/assets/images/asset-hierarchy-2.53.4.png

@@ -22,7 +22,7 @@ copyRight = "Copyright (c) 2020-2024 Thulite"
   enable = true
 
 [outputs]
-  home = ["HTML", "RSS", "searchIndex"]
+  home = ["HTML", "RSS", "searchIndex", "SITEMAP"]
   section = ["HTML", "RSS", "SITEMAP"]
 
 [outputFormats.searchIndex]
@@ -41,7 +41,7 @@ copyRight = "Copyright (c) 2020-2024 Thulite"
   rel  = "sitemap"
 
 [sitemap]
-  changefreq = "monthly"
+  changefreq = "weekly"
   filename = "sitemap.xml"
   priority = 0.5
 

docs/assets/images/pro_tablepreferences.png

@@ -0,0 +1,5 @@
+---
+title: "DefectDojo Documentation"
+date: 2021-02-02T20:46:29+01:00
+draft: false
+---