bugsink 2.1.2__tar.gz → 2.2.0__tar.gz

{bugsink-2.1.2 → bugsink-2.2.0}/CHANGELOG.md

@@ -1,5 +1,72 @@
 # Changes
 
+## 2.2.0 (19 May 2026)
+
+### Security
+
+Fix: scope issue actions and event lookups to the authorized project/issue.
+
+A project member who knew UUIDs from another project could use some issue-list
+bulk actions and issue event views through a project or issue they were allowed
+to access. These views now require the selected issues/events to belong to the
+authorized parent. See:
+
+https://github.com/bugsink/bugsink/security/advisories/GHSA-g5vc-q7qc-v939
+https://github.com/bugsink/bugsink/security/advisories/GHSA-vx2f-6m6h-9frf
+
+Fix: scope sourcemap and minidump debug-file metadata to projects.
+
+Sourcemap and debug-file IDs are client-provided and were previously resolved
+globally. That could let events in one project use uploaded debug metadata from
+another project. Newly uploaded files now store project information and lookup
+prefers project-scoped metadata. Already-uploaded legacy sourcemaps/debug files
+keep working through a fallback. See:
+
+https://github.com/bugsink/bugsink/security/advisories/GHSA-5389-f7vh-wxj8
+
+### Smaller fixes
+
+* Generate an `event_id` on `/store/` when the SDK does not send one, see #383.
+* Refresh issue title fields on every event digest, see #378.
+* Include ingest-dir cleanup in the `vacuum` command and warn about stale ingest-dir files, see 772fb1a9bff6 and
+  1ee34c574b7d.
+* Add more verbose output to file vacuuming, see #372.
+* Broaden phonehome triggers and avoid unnecessary queueing, see 2f76eacfbf68.
+* Fix API catch-all logging for non-JSON bodies, see d13e5eff132b.
+* Ensure `release` is a string before ingesting, see 374914c96f62.
+* Fix direct minidump endpoint calls, see 5324d802cc50.
+
+### Upgrading
+
+Sourcemap uploads should include a meaningful project slug. Existing unscoped
+sourcemaps keep working, but installations that prefer to remove that fallback
+can run `delete_legacy_sourcemaps` and re-upload sourcemaps with project slugs.
+
+## 2.1.3 (2 May 2026)
+
+### Security
+
+Fix: harden webhook URL validation parsing and reject non-RFC characters.
+
+In some malformed URLs, Python’s standard URL parser (urllib) and the HTTP
+client stack (requests / urllib3) do not agree on which host is actually being
+targeted. That could allow a webhook URL to pass Bugsink’s outbound-host checks
+while the actual HTTP request is sent somewhere else. See:
+
+https://github.com/bugsink/bugsink/security/advisories/GHSA-fp53-qcf8-2xx2
+
+### Smaller fixes
+
+* Add issue-level markdown, see #334.
+* Fix installation quota counting across projects, see #359.
+* When vacuuming files, don't load them in memory, and allow long-running totals queries, see #363, #373 and #372.
+* Refuse to send email as something@bugsink.com for self-hosters, see 3ff3a6fbeb6d.
+* Fix `MultipleObjectsReturned` when user has unaccepted project memberships, see 653be6968f6e.
+* Cleanup lingering files for `MAX_EVENT_SIZE` overshoots, see #370.
+* Fix some `.get(context, {})` usages and an exception-path double-exception, see #369.
+* Upgrade `gunicorn` requirement from `==25.1.*` to `==25.3.*`, see 2d5e0071cf66.
+* Upgrade monofy, see #367.
+
 ## 2.1.2 (11 April 2026)
 
 * Add stored file count and byte caps, see #355

{bugsink-2.1.2 → bugsink-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugsink
-Version: 2.1.2
+Version: 2.2.0
 Summary: Self-hosted Error Tracking
 Author-email: "Bugsink B.V." <info@bugsink.com>
 Project-URL: homepage, https://www.bugsink.com/
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: gunicorn==25.1.*
+Requires-Dist: gunicorn==26.0.*
 Requires-Dist: Django==5.2.*
 Requires-Dist: verbose_csrf_middleware==5.2.*
 Requires-Dist: sentry-sdk==2.*
@@ -29,8 +29,8 @@ Requires-Dist: inotify_simple==2.0.*
 Requires-Dist: Brotli==1.2.*
 Requires-Dist: python-dateutil==2.9.*
 Requires-Dist: whitenoise==6.12.*
-Requires-Dist: requests==2.33.*
-Requires-Dist: monofy==1.1.*
+Requires-Dist: requests==2.34.*
+Requires-Dist: monofy==1.2.*
 Requires-Dist: user-agents==2.2.*
 Requires-Dist: fastjsonschema==2.21.*
 Requires-Dist: ecma426>=0.2.0

{bugsink-2.1.2 → bugsink-2.2.0}/alerts/service_backends/webhook_security.py

@@ -1,10 +1,25 @@
 import ipaddress
 import socket
-from urllib.parse import urlparse
+
+import requests
+from requests import RequestException
+from urllib3.exceptions import LocationParseError
+
+from urllib3.util import parse_url as parse_url_from_urllib3
 
 from bugsink.app_settings import get_settings
 
 
+_URL_ALLOWED_CHARACTERS = set(
+    "abcdefghijklmnopqrstuvwxyz" +
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +  # ASCII letters
+    "0123456789" +  # ASCII digits
+    "-._~" +  # RFC 3986 unreserved marks
+    ":/?#[]@" +  # RFC 3986 gen-delims
+    "!$&'()*+,;=" +  # RFC 3986 sub-delims
+    "%"  # Percent-encoding marker
+)
+
 def _parse_hosts_and_networks(entries, setting_name):
     hosts = set()
     networks = []
@@ -41,14 +56,57 @@ def _match_entries(target_hostname, resolved_ips, hosts, networks):
     return False
 
 
+def _validate_raw_url_characters(webhook_url):
+    # There's no need to be user-friendly in accepting malformed URLs in code that is security-sensitive; we just want
+    # to be strict and reject anything that isn't a valid URL character. People will be able to set up their webhooks
+    # without the "friendlyness" of a browser's URL bar.
+    for char in webhook_url:
+        if char in _URL_ALLOWED_CHARACTERS:
+            continue
+        raise ValueError("Webhook URL must contain only ASCII URL characters.")
+
+def _prepare_webhook_url(webhook_url):
+    try:
+        return requests.Request("POST", webhook_url).prepare().url
+    except RequestException as e:
+        raise ValueError("Webhook URL is malformed.") from e
+
+
 def validate_webhook_url(webhook_url):
-    parsed = urlparse(webhook_url)
+    _validate_raw_url_characters(webhook_url)
+
+    # Both requests and urllib3 make some attempts to normalize malformed URLs. We must apply the
+    # same normalization before our own parsing and checks, to avoid discrepancies between what we
+    # check and what then actually happens.
+    prepared_webhook_url = _prepare_webhook_url(webhook_url)
+
+    try:
+        # NOTE: requests uses urllib3's URL parsing logic, so we must use the same to ensure consistency; do not change
+        # this import to something else, doing so may have security implications if the URL parsing logic differs in how
+        # it normalizes or rejects certain inputs.
+        parsed = parse_url_from_urllib3(prepared_webhook_url)
+    except LocationParseError as e:
+        raise ValueError("Webhook URL is malformed.") from e
+
     if parsed.scheme not in {"http", "https"}:
         raise ValueError("Webhook URL must use http:// or https://.")
     if parsed.hostname is None:
         raise ValueError("Webhook URL must include a hostname.")
 
     hostname = parsed.hostname.lower()
+    if hostname.startswith("[") and hostname.endswith("]"):
+        # In URL authority syntax, brackets are only used for IP literals. urllib3 keeps those brackets in `hostname`,
+        # but the rest of this function expects the plain host value so we must strip them back out.
+        inner_hostname = hostname[1:-1]
+        try:
+            # Rather than "just strip brackets if present", we verify that the inner value is actually a valid IP
+            # address; we don't want to "just generally strip stuff" in security-sentitive code.
+            ipaddress.ip_address(inner_hostname)
+        except ValueError:
+            pass
+        else:
+            hostname = inner_hostname
+
     settings = get_settings()
     mode = settings.ALERTS_WEBHOOK_OUTBOUND_MODE
 
@@ -63,9 +121,9 @@ def validate_webhook_url(webhook_url):
 
     # Resolve on every send to defend against DNS changes after configuration time.
     try:
-        resolved_ips = {ipaddress.ip_address(ip) for ip in _resolve_ip_addresses(parsed.hostname, port)}
+        resolved_ips = {ipaddress.ip_address(ip) for ip in _resolve_ip_addresses(hostname, port)}
     except OSError as e:
-        raise ValueError(f"Webhook hostname could not be resolved: {parsed.hostname}") from e
+        raise ValueError(f"Webhook hostname could not be resolved: {hostname}") from e
 
     allow_match = _match_entries(hostname, resolved_ips, allow_hosts, allow_networks)
     deny_match = _match_entries(hostname, resolved_ips, deny_hosts, deny_networks)

{bugsink-2.1.2 → bugsink-2.2.0}/alerts/tests.py

@@ -527,6 +527,27 @@ class TestWebhookSecurityValidation(DjangoTestCase):
         mock_resolve.return_value = {"93.184.216.34"}
         validate_webhook_url("https://hooks.example.com/webhook")
 
+    @patch("alerts.service_backends.webhook_security._validate_raw_url_characters")
+    def test_rejects_backslash_exploit_that_tries_to_bypass_allowlist(self, mock_validate_raw_characters):
+        # We can't think of an exploit that would exploit discrepancies between requests' parser and other parsers but
+        # not already be caught by our raw character validation. Hence we need to turn off raw character validation in
+        # the test to test against the case of mismatch-exploiting that we do know to exist.
+        mock_validate_raw_characters.return_value = None
+
+        with override_bugsink_settings(
+                ALERTS_WEBHOOK_OUTBOUND_MODE="allowlist_only",
+                ALERTS_WEBHOOK_ALLOW_LIST=["whitelist.com"]):
+            with self.assertRaisesRegex(ValueError, "not allowlisted"):
+                validate_webhook_url(r"http://127.0.0.1:6666\@whitelist.com")
+
+    def test_rejects_raw_unicode_character(self):
+        with self.assertRaisesRegex(ValueError, "must contain only ASCII URL characters"):
+            validate_webhook_url("https://hooks.example.com/caf\xe9")
+
+    def test_rejects_raw_backslash_character(self):
+        with self.assertRaisesRegex(ValueError, "must contain only ASCII URL characters"):
+            validate_webhook_url(r"https://hooks.example.com\path")
+
     @patch("alerts.service_backends.webhook_security._resolve_ip_addresses")
     def test_denied_when_allow_and_deny_both_match(self, mock_resolve):
         mock_resolve.return_value = {"93.184.216.34"}

{bugsink-2.1.2 → bugsink-2.2.0}/bsmain/__init__.py

@@ -5,6 +5,7 @@ from django.core.checks import Warning, register
 from django.conf import settings
 
 from bugsink.app_settings import get_settings
+from bugsink.utils import sends_email_as_bugsink_but_is_not_hosted_on_bugsink
 from events.storage_registry import get_write_storage
 from files.storage_registry import get_write_storage as get_object_write_storage
 
@@ -91,3 +92,23 @@ def check_proxy_env_vars_consistency(app_configs, **kwargs):
         )]
 
     return []
+
+
+@register("bsmain")
+def check_email_sender_domain(app_configs, **kwargs):
+    errors = []
+
+    for setting_name in ["DEFAULT_FROM_EMAIL", "SERVER_EMAIL"]:
+        if sends_email_as_bugsink_but_is_not_hosted_on_bugsink(
+            getattr(settings, setting_name),
+            settings.ALLOWED_HOSTS,
+        ):
+            errors.append(Warning(
+                f"{setting_name} uses the bugsink.com domain, but ALLOWED_HOSTS does not. This looks like a "
+                f"self-hosted Bugsink sending email as bugsink.com. That is effectively spam, deliverability will "
+                f"suffer badly, and those messages show up in Bugsink's DKIM reports. Configure your own sender "
+                f"address instead.",
+                id="bsmain.W006",
+            ))
+
+    return errors

{bugsink-2.1.2 → bugsink-2.2.0}/bsmain/management/commands/prestart.py

@@ -34,7 +34,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         self._create_superuser_if_needed()
 
-        # Similar considerations apply here as those which are documented in bugsink.views._phone_home().
+        # Similar considerations apply here as those which are documented in phonehome.utils.phone_home().
         # By putting this in prestart, we add one more location to the list of kick-off locations; with the added
         # benefit that this particular location also gives some signal for (Docker) installations that are prematurely
         # aborted (i.e. we get a ping even if 'home' is never even reached).

{bugsink-2.1.2 → bugsink-2.2.0}/bsmain/management/commands/vacuum.py

@@ -6,6 +6,7 @@ from django.utils import timezone
 from bugsink.app_settings import get_settings
 from events.tasks import delete_events_older_than_sync
 from files.tasks import vacuum_files_sync
+from ingest.management.commands.vacuum_ingest_dir import vacuum_ingest_dir_sync
 from tags.tasks import vacuum_eventless_issuetags_sync, vacuum_tags_sync
 
 
@@ -33,6 +34,11 @@ class Command(BaseCommand):
             action='store_true',
             help="Delete events older than the configured maximum age.",
         )
+        parser.add_argument(
+            '--ingest-dir',
+            action='store_true',
+            help="Clean up stale files from the ingest directory.",
+        )
         parser.add_argument(
             '--chunk-max-days',
             type=int,
@@ -60,30 +66,41 @@ class Command(BaseCommand):
             type=int,
             help="Keep at most this many bytes across stored File objects. Defaults to MAX_STORED_FILE_BYTES.",
         )
+        parser.add_argument(
+            '--ingest-max-days',
+            type=int,
+            default=7,
+            help="Delete ingest-dir files older than this many days (default: 7).",
+        )
 
     def handle(self, *args, **options):
         run_files = options['files']
         run_tags = options['tags']
         run_eventless_issuetags = options['eventless_issuetags']
         run_old_events = options['old_events']
+        run_ingest_dir = options['ingest_dir']
 
-        if not any([run_files, run_tags, run_eventless_issuetags, run_old_events]):
+        if not any([run_files, run_tags, run_eventless_issuetags, run_old_events, run_ingest_dir]):
             # If no specific options were provided, run all vacuum tasks by default.
             run_files = True
             run_tags = True
             run_eventless_issuetags = True
             run_old_events = True
+            run_ingest_dir = True
 
         if run_files:
             settings = get_settings()
             max_file_count = options['max_file_count']
             max_file_bytes = options['max_file_bytes']
             self.stdout.write("Vacuuming files...")
+
+            log_progress = self.stdout.write if options["verbosity"] >= 2 else lambda _message: None
             vacuum_files_sync(
                 chunk_max_days=options['chunk_max_days'],
                 file_max_days=options['file_max_days'],
                 max_file_count=settings.MAX_STORED_FILE_COUNT if max_file_count is None else max_file_count,
                 max_file_bytes=settings.MAX_STORED_FILE_BYTES if max_file_bytes is None else max_file_bytes,
+                log_progress=log_progress,
             )
 
         if run_eventless_issuetags:
@@ -107,4 +124,8 @@ class Command(BaseCommand):
                     cutoff=timezone.now() - timedelta(days=days),
                 )
 
+        if run_ingest_dir:
+            self.stdout.write("Vacuuming ingest dir...")
+            vacuum_ingest_dir_sync(days=options["ingest_max_days"], stdout=self.stdout, stderr=self.stderr)
+
         self.stdout.write(self.style.SUCCESS("Vacuum complete."))

{bugsink-2.1.2 → bugsink-2.2.0}/bsmain/test_vacuum.py

@@ -217,8 +217,9 @@ class VacuumFilesBatchTestCase(TransactionTestCase):
         File.objects.filter(id=recent.id).update(accessed_at=now - timedelta(days=2))
         File.objects.filter(id=newest.id).update(accessed_at=now - timedelta(days=1))
 
-        has_more_work = vacuum_files_batch(file_max_days=90, max_file_count=1)
+        has_more_work, num_deleted = vacuum_files_batch(file_max_days=90, max_file_count=1)
 
         self.assertFalse(has_more_work)
+        self.assertEqual(3, num_deleted)
         self.assertEqual([newest.id], list(File.objects.values_list("id", flat=True)))
         self.assertEqual([newest.id], list(FileMetadata.objects.values_list("file_id", flat=True)))

bugsink-2.2.0/bsmain/tests.py

@@ -0,0 +1,45 @@
+from django.core.checks import run_checks
+from django.test import SimpleTestCase, override_settings
+
+
+class SystemChecksTestCase(SimpleTestCase):
+    def _warnings(self):
+        return [warning for warning in run_checks(tags=["bsmain"]) if warning.id == "bsmain.W006"]
+
+    @override_settings(DEFAULT_FROM_EMAIL="Bugsink <bugsink@example.org>", SERVER_EMAIL="server@example.org")
+    def test_email_sender_domain_check_allows_non_bugsink_domain(self):
+        self.assertEqual([], self._warnings())
+
+    @override_settings(DEFAULT_FROM_EMAIL="Bugsink <alerts@bugsink.com>", SERVER_EMAIL="server@example.org")
+    def test_email_sender_domain_check_warns_for_default_from_email(self):
+        warnings = self._warnings()
+
+        self.assertEqual(1, len(warnings))
+        self.assertEqual(
+            "DEFAULT_FROM_EMAIL uses the bugsink.com domain, but ALLOWED_HOSTS does not. This looks like a "
+            "self-hosted Bugsink sending email as bugsink.com. That is effectively spam, deliverability will "
+            "suffer badly, and those messages show up in Bugsink's DKIM reports. Configure your own sender "
+            "address instead.",
+            warnings[0].msg,
+        )
+
+    @override_settings(DEFAULT_FROM_EMAIL="Bugsink <bugsink@example.org>", SERVER_EMAIL="server@bugsink.com")
+    def test_email_sender_domain_check_warns_for_server_email(self):
+        warnings = self._warnings()
+
+        self.assertEqual(1, len(warnings))
+        self.assertEqual(
+            "SERVER_EMAIL uses the bugsink.com domain, but ALLOWED_HOSTS does not. This looks like a "
+            "self-hosted Bugsink sending email as bugsink.com. That is effectively spam, deliverability will "
+            "suffer badly, and those messages show up in Bugsink's DKIM reports. Configure your own sender "
+            "address instead.",
+            warnings[0].msg,
+        )
+
+    @override_settings(
+        DEFAULT_FROM_EMAIL="alerts@bugsink.com",
+        SERVER_EMAIL="server@example.org",
+        ALLOWED_HOSTS=["selfhosted.bugsink.com"],
+    )
+    def test_email_sender_domain_check_allows_bugsink_domain_when_allowed_hosts_match(self):
+        self.assertEqual([], self._warnings())

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.1.2'
-__version_tuple__ = version_tuple = (2, 1, 2)
+__version__ = version = '2.2.0'
+__version_tuple__ = version_tuple = (2, 2, 0)
 
-__commit_id__ = commit_id = 'ge1114c9fa'
+__commit_id__ = commit_id = 'gdac28a708'

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/conf_templates/local.py.template

@@ -52,7 +52,7 @@ EMAIL_BACKEND = "bugsink.email_backends.QuietConsoleEmailBackend"  # instead of
 # EMAIL_PORT = ...
 # EMAIL_USE_TLS = ...
 # EMAIL_USE_SSL = ...
-# SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink <bugsink@example.org>"
+# SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink <bugsink@example.org>"  # don't use ...@bugsink.com if you're not bugsink
 
 # constants for "create by" (user/team/project) settings
 CB_ANYBODY = "CB_ANYBODY"

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/conf_templates/singleserver.py.template

@@ -77,8 +77,7 @@ EMAIL_BACKEND = "bugsink.email_backends.QuietConsoleEmailBackend"  # instead of
 # Uncomment the line below to show all sent emails in the logs
 # LOGGING['loggers']['bugsink.email']['level'] = "INFO"
 
-
-SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink <bugsink@example.org>"
+SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink <bugsink@example.org>"  # don't use ...@bugsink.com if you're not bugsink
 
 # constants for "create by" (user/team/project) settings
 CB_ANYBODY = "CB_ANYBODY"

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/settings/development.py

@@ -79,7 +79,7 @@ EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
 
-SERVER_EMAIL = DEFAULT_FROM_EMAIL = 'Klaas van Schelven <klaas@bugsink.com>'
+SERVER_EMAIL = DEFAULT_FROM_EMAIL = 'Bugsink Development Server <bugsink@example.org>'
 
 
 BUGSINK = {

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/tests.py

@@ -4,9 +4,12 @@ import re
 import brotli
 
 from unittest import TestCase as RegularTestCase
+from unittest.mock import patch
 from django.test import TestCase as DjangoTestCase
+from django.test import SimpleTestCase
 from django.test import override_settings
 from django.core.exceptions import SuspiciousOperation
+from django.core import mail
 from django.contrib.auth import get_user_model
 from django.test.utils import CaptureQueriesContext
 from django.db import connection
@@ -15,6 +18,7 @@ from .wsgi import allowed_hosts_error_message
 from .test_utils import TransactionTestCase25251 as TransactionTestCase
 from .transaction import immediate_atomic
 from .volume_based_condition import VolumeBasedCondition
+from .utils import send_rendered_email
 from .streams import (
     compress_with_zlib, GeneratorReader, WBITS_PARAM_FOR_GZIP, WBITS_PARAM_FOR_DEFLATE, MaxDataReader,
     MaxDataWriter, zlib_generator, brotli_generator, BrotliError)
@@ -38,6 +42,37 @@ class VolumeBasedConditionTestCase(RegularTestCase):
         self.assertEqual(vbc, vbc2)
 
 
+@override_settings(EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend")
+class SendRenderedEmailTestCase(SimpleTestCase):
+    def setUp(self):
+        mail.outbox = []
+
+    @override_settings(DEFAULT_FROM_EMAIL="Bugsink <alerts@bugsink.com>", ALLOWED_HOSTS=["selfhosted.example.com"])
+    def test_send_rendered_email_refuses_self_hosted_bugsink_sender_domain(self):
+        with self.assertLogs("bugsink.email", level="ERROR") as logs:
+            send_rendered_email(
+                "Subject",
+                "mails/welcome_email",
+                ["user@example.com"],
+                {"reason": "Reason", "reset_url": "https://example.com/reset"},
+            )
+
+        self.assertEqual([], mail.outbox)
+        self.assertIn("Refusing to send email with subject 'Subject'", logs.output[0])
+
+    @override_settings(DEFAULT_FROM_EMAIL="Bugsink <alerts@bugsink.com>", ALLOWED_HOSTS=["tenant.bugsink.com"])
+    @patch("phonehome.models.Installation.check_and_inc_email_quota", return_value=True)
+    def test_send_rendered_email_allows_bugsink_sender_domain_when_hosted_on_bugsink_domain(self, _quota_ok):
+        send_rendered_email(
+            "Subject",
+            "mails/welcome_email",
+            ["user@example.com"],
+            {"reason": "Reason", "reset_url": "https://example.com/reset"},
+        )
+
+        self.assertEqual(1, len(mail.outbox))
+
+
 class StreamsTestCase(RegularTestCase):
 
     def test_compress_decompress_gzip(self):

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/utils.py

@@ -5,6 +5,7 @@ from collections import defaultdict
 from django.utils import timezone
 from django.utils.http import url_has_allowed_host_and_scheme
 from django.core.mail import EmailMultiAlternatives
+from django.conf import settings
 from django.template.loader import get_template
 from django.apps import apps
 from django.db.models import ForeignKey, F
@@ -33,6 +34,20 @@ def is_safe_next_url(url, request):
     )
 
 
+def sends_email_as_bugsink_but_is_not_hosted_on_bugsink(from_email, allowed_hosts):
+    if from_email is None:
+        return False
+
+    normalized_from_email = str(from_email).strip().lower()
+    if not (
+        normalized_from_email.endswith("@bugsink.com") or
+        normalized_from_email.endswith("@bugsink.com>")
+    ):
+        return False
+
+    return not any(str(host).strip().lower().lstrip(".").endswith("bugsink.com") for host in allowed_hosts)
+
+
 def send_rendered_email(subject, base_template_name, recipient_list, context=None):
     from phonehome.models import Installation
 
@@ -42,6 +57,17 @@ def send_rendered_email(subject, base_template_name, recipient_list, context=Non
     if not recipient_list:
         return
 
+    if sends_email_as_bugsink_but_is_not_hosted_on_bugsink(settings.DEFAULT_FROM_EMAIL, settings.ALLOWED_HOSTS):
+        logger.error(
+            "Refusing to send email with subject '%s' to %s because DEFAULT_FROM_EMAIL=%r uses bugsink.com while "
+            "ALLOWED_HOSTS=%r does not. This looks like a self-hosted Bugsink trying to send as bugsink.com.",
+            subject,
+            recipient_list,
+            settings.DEFAULT_FROM_EMAIL,
+            settings.ALLOWED_HOSTS,
+        )
+        return
+
     if not Installation.check_and_inc_email_quota(timezone.now()):
         logger.warning(
             "Email quota exceeded; not sending email with subject '%s' to %s",

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/views.py

@@ -31,7 +31,7 @@ from bugsink.decorators import atomic_for_request_method
 from bugsink.timed_sqlite_backend.base import different_runtime_limit
 from bugsink.utils import is_safe_next_url
 
-from phonehome.tasks import send_if_due
+from phonehome.utils import phone_home
 from phonehome.models import Installation
 
 from ingest.views import BaseIngestAPIView
@@ -58,31 +58,12 @@ debug.technical_404_response = cors_for_api_view(debug.technical_404_response)
 debug.technical_500_response = cors_for_api_view(debug.technical_500_response)
 
 
-def _phone_home():
-    # I need a way to cron-like run tasks that works for the setup with and without snappea. With snappea it's straight-
-    # forward (though not part of snappea _yet_). Without snappea, you'd need _some_ location to do a "poor man's cron"
-    # check. Server-start would be the first thing to consider, but how to do this across gunicorn, debugserver, and
-    # possibly even non-standard (for Bugsink) wsgi servers? Better go the "just pick some request to do the check"
-    # route. I've picked "home", because [a] it's assumed to be somewhat regularly visited [b] there's no transaction
-    # logic in it, which leaves space for transaction-logic in the phone-home task itself and [c] some alternatives are
-    # a no-go (ingestion: on a tight budget; login: not visited when a long-lived session is active).
-    #
-    # having chosen the solution for the non-snappea case, I got the crazy idea of using it for the snappea case too,
-    # i.e. just put a .delay() here and let the config choose. Not so crazy though, because [a] saves us from new
-    # features in snappea, [b] we introduce a certain symmetry of measurement between the 2 setups, i.e. the choice of
-    # lazyness does not influence counting and [c] do I really want to get pings for sites where nobody visits home()?
-
-    # NOTE: each time this function is called, it will schedule a new task, even when the task would quickly return
-    # (nothing due, or configured to never send). We _could_ improve that, but doesn't seem performance-critical enough.
-    send_if_due.delay()  # _phone_home() wrapper serves as a place for the comment above
-
-
+@phone_home
 def home(request):
-    _phone_home()
-
-    if request.user.project_set.filter(projectmembership__accepted=True).distinct().count() == 1:
+    accepted_projects = request.user.project_set.filter(projectmembership__accepted=True).distinct()
+    if accepted_projects.count() == 1:
         # if the user has exactly one project, we redirect them to that project
-        project = request.user.project_set.get()
+        project = accepted_projects.get()
         return redirect("issue_list_open", project_pk=project.id)
 
     if request.user.project_set.all().distinct().count() > 0:

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink/wsgi.py

@@ -94,7 +94,7 @@ class CustomWSGIRequest(WSGIRequest):
         We're leaking a bit of information here, but I don't think it's too much TBH -- especially in the light of ssl
         certificates being specifically tied to the domain name.
         """
-        if self.path.startswith == "/health/":
+        if self.path.startswith("/health/"):
             # For /health/ endpoints, we skip the ALLOWED_HOSTS validation (see #140).
             return self._get_raw_host()
 

{bugsink-2.1.2 → bugsink-2.2.0}/bugsink.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugsink
-Version: 2.1.2
+Version: 2.2.0
 Summary: Self-hosted Error Tracking
 Author-email: "Bugsink B.V." <info@bugsink.com>
 Project-URL: homepage, https://www.bugsink.com/
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: gunicorn==25.1.*
+Requires-Dist: gunicorn==26.0.*
 Requires-Dist: Django==5.2.*
 Requires-Dist: verbose_csrf_middleware==5.2.*
 Requires-Dist: sentry-sdk==2.*
@@ -29,8 +29,8 @@ Requires-Dist: inotify_simple==2.0.*
 Requires-Dist: Brotli==1.2.*
 Requires-Dist: python-dateutil==2.9.*
 Requires-Dist: whitenoise==6.12.*
-Requires-Dist: requests==2.33.*
-Requires-Dist: monofy==1.1.*
+Requires-Dist: requests==2.34.*
+Requires-Dist: monofy==1.2.*
 Requires-Dist: user-agents==2.2.*
 Requires-Dist: fastjsonschema==2.21.*
 Requires-Dist: ecma426>=0.2.0