paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

corporate: Parse Accept header instead of X-Requested-With.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2025-03-26 17:31:47 -07:00
committed by Tim Abbott
parent 721f804736
commit 13bd8771f9
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
corporate/lib/decorator.py
View File

@@ -16,6 +16,7 @@ from corporate.lib.remote_billing_util import (
get_remote_server_and_user_from_session, get_remote_server_and_user_from_session,
) )
from zerver.lib.exceptions import RemoteBillingAuthenticationError from zerver.lib.exceptions import RemoteBillingAuthenticationError
from zerver.lib.request import get_preferred_type
from zerver.lib.subdomains import get_subdomain from zerver.lib.subdomains import get_subdomain
from zerver.lib.url_encoding import append_url_query_string from zerver.lib.url_encoding import append_url_query_string
from zilencer.models import RemoteRealm from zilencer.models import RemoteRealm
@@ -123,7 +124,9 @@ def authenticated_remote_realm_management_endpoint(
url = append_url_query_string(url, query) url = append_url_query_string(url, query)
# Return error for AJAX requests with url. # Return error for AJAX requests with url.
if request.headers.get("x-requested-with") == "XMLHttpRequest": # nocoverage if (
get_preferred_type(request, ["application/json", "text/html"]) != "text/html"
): # nocoverage
return session_expired_ajax_response(url) return session_expired_ajax_response(url)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -207,7 +210,9 @@ def authenticated_remote_server_management_endpoint(
url = append_url_query_string(url, query) url = append_url_query_string(url, query)
# Return error for AJAX requests with url. # Return error for AJAX requests with url.
if request.headers.get("x-requested-with") == "XMLHttpRequest": # nocoverage if (
get_preferred_type(request, ["application/json", "text/html"]) != "text/html"
): # nocoverage
return session_expired_ajax_response(url) return session_expired_ajax_response(url)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)

22
corporate/tests/test_remote_billing.py
View File

@@ -500,7 +500,9 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
now + timedelta(seconds=REMOTE_BILLING_SESSION_VALIDITY_SECONDS + 1), now + timedelta(seconds=REMOTE_BILLING_SESSION_VALIDITY_SECONDS + 1),
tick=False, tick=False,
): ):
result = self.client_get(final_url, subdomain="selfhosting") result = self.client_get(
final_url, subdomain="selfhosting", HTTP_ACCEPT="text/html, */*;q=0.8"
)
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
self.assertEqual( self.assertEqual(
@@ -1510,7 +1512,11 @@ class LegacyServerLoginTest(RemoteServerTestCase):
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")
now = timezone_now() now = timezone_now()
# Try to open a page with no auth at all. # Try to open a page with no auth at all.
result = self.client_get(f"/server/{self.uuid}/billing/", subdomain="selfhosting") result = self.client_get(
f"/server/{self.uuid}/billing/",
subdomain="selfhosting",
HTTP_ACCEPT="text/html, */*;q=0.8",
)
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
# Redirects to the login form with appropriate next_page value. # Redirects to the login form with appropriate next_page value.
self.assertEqual(result["Location"], "/serverlogin/?next_page=billing") self.assertEqual(result["Location"], "/serverlogin/?next_page=billing")
@@ -1534,7 +1540,11 @@ class LegacyServerLoginTest(RemoteServerTestCase):
next_page="upgrade", next_page="upgrade",
return_without_clicking_confirmation_link=True, return_without_clicking_confirmation_link=True,
) )
result = self.client_get(f"/server/{self.uuid}/billing/", subdomain="selfhosting") result = self.client_get(
f"/server/{self.uuid}/billing/",
subdomain="selfhosting",
HTTP_ACCEPT="text/html, */*;q=0.8",
)
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
# Redirects to the login form with appropriate next_page value. # Redirects to the login form with appropriate next_page value.
self.assertEqual(result["Location"], "/serverlogin/?next_page=billing") self.assertEqual(result["Location"], "/serverlogin/?next_page=billing")
@@ -1561,7 +1571,11 @@ class LegacyServerLoginTest(RemoteServerTestCase):
now + timedelta(seconds=REMOTE_BILLING_SESSION_VALIDITY_SECONDS + 30), now + timedelta(seconds=REMOTE_BILLING_SESSION_VALIDITY_SECONDS + 30),
tick=False, tick=False,
): ):
result = self.client_get(f"/server/{self.uuid}/upgrade/", subdomain="selfhosting") result = self.client_get(
f"/server/{self.uuid}/upgrade/",
subdomain="selfhosting",
HTTP_ACCEPT="text/html, */*;q=0.8",
)
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
self.assertEqual(result["Location"], "/serverlogin/?next_page=upgrade") self.assertEqual(result["Location"], "/serverlogin/?next_page=upgrade")