Skip to content

Commit

Permalink
chg: update models and settings with new env variables and conditiona…
Browse files Browse the repository at this point in the history
…ls to keep local working
  • Loading branch information
larry6point6 committed Feb 27, 2025
1 parent 842c3d0 commit 1792b6a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions django_app/redbox_app/redbox_core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from django.core import validators
from django.db import models
from django.db.models import Max, Min, Prefetch, UniqueConstraint
from django_chunk_upload_handlers.clam_av import validate_virus_check_result
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from yarl import URL
Expand Down Expand Up @@ -530,6 +531,7 @@ class Status(models.TextChoices):
original_file = models.FileField(
storage=settings.STORAGES["default"]["BACKEND"],
upload_to=build_s3_key,
validators=[validate_virus_check_result] if settings.USE_CLAM_AV else []
)
user = models.ForeignKey(User, on_delete=models.CASCADE)
original_file_name = models.TextField(max_length=2048, blank=True, null=True) # delete me
Expand Down
15 changes: 11 additions & 4 deletions django_app/redbox_app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
ENVIRONMENT = Environment[env.str("ENVIRONMENT").upper()]
WEBSOCKET_SCHEME = "ws" if ENVIRONMENT.is_test else "wss"
LOGIN_METHOD = env.str("LOGIN_METHOD", None)
USE_CLAM_AV = env.bool("USE_CLAM_AV")

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = env.bool("DEBUG")
Expand Down Expand Up @@ -75,10 +76,11 @@
"django_chunk_upload_handlers",
]

FILE_UPLOAD_HANDLERS = (
"django_chunk_upload_handlers.clam_av.ClamAVFileUploadHandler",
"django_chunk_upload_handlers.s3.S3FileUploadHandler",
)
if USE_CLAM_AV:
FILE_UPLOAD_HANDLERS = (
"django_chunk_upload_handlers.clam_av.ClamAVFileUploadHandler",
"django_chunk_upload_handlers.s3.S3FileUploadHandler",
)

if LOGIN_METHOD == "sso":
INSTALLED_APPS.append("authbroker_client")
Expand Down Expand Up @@ -457,3 +459,8 @@ def filter_transactions(event, _hint):
REDBOX_API_KEY = env.str("REDBOX_API_KEY")

ENABLE_METADATA_EXTRACTION = env.str("ENABLE_METADATA_EXTRACTION")

CLAM_AV_USERNAME=env.str("CLAM_AV_USERNAME", " ")
CLAM_AV_PASSWORD=env.str("CLAM_AV_PASSWORD", " ")
CLAM_AV_DOMAIN=env.str("CLAM_AV_DOMAIN", " ")
USE_CLAM_AV=env.str("USE_CLAM_AV")

0 comments on commit 1792b6a

Please sign in to comment.