Skip to content

Regex validate query title and remove exception text from email. #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Regex validate query title and remove exception text from email. #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion explorer/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from django.db import DatabaseError, models, transaction
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.core.validators import RegexValidator

from explorer import app_settings
from explorer.telemetry import Stat, StatNames
Expand All @@ -27,7 +28,13 @@


class Query(models.Model):
title = models.CharField(max_length=255)
title = models.CharField(max_length=255, validators=[
RegexValidator(
r"^[a-zA-Z0-9\s\.\-\_]+$",
"Title contains invalid characters. "
"Only alphanumeric characters, spaces, periods, hyphens, and underscores are allowed."
)
])
sql = models.TextField(blank=False, null=False)
description = models.TextField(blank=True)
created_by_user = models.ForeignKey(
Expand Down
2 changes: 1 addition & 1 deletion explorer/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def execute_query(query_id, email_address):
msg = f"Download results:\n\r{url}"
except Exception as e:
subj = f"[SQL Explorer] Error running report {q.title}"
msg = f"Error: {e}\nPlease contact an administrator"
msg = "Please contact an administrator."
logger.exception(f"{subj}: {e}")
send_mail(subj, msg, app_settings.FROM_EMAIL, [email_address])

Expand Down