Skip to content
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.

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

feat: Allow autoswapping projects via token #21214

Merged
merged 9 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 33 additions & 10 deletions posthog/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from ipaddress import ip_address, ip_network
from typing import Any, Callable, List, Optional, cast

from django.shortcuts import redirect
import structlog
from corsheaders.middleware import CorsMiddleware
from django.conf import settings
Expand Down Expand Up @@ -155,8 +156,26 @@ def __call__(self, request: HttpRequest):
if request.user.is_authenticated:
path_parts = request.path.strip("/").split("/")
project_id_in_url = None
user = cast(User, request.user)

if len(path_parts) >= 2 and path_parts[0] == "project" and path_parts[1].startswith("phc_"):
try:
new_team = Team.objects.get(api_token=path_parts[1])

if not self.can_switch_to_team(new_team, request):
raise Team.DoesNotExist

path_parts[1] = str(new_team.pk)
return redirect("/" + "/".join(path_parts))

except Team.DoesNotExist:
if user.team:
path_parts[1] = str(user.team.pk)
return redirect("/" + "/".join(path_parts))

if len(path_parts) >= 2 and path_parts[0] == "project" and path_parts[1].isdigit():
project_id_in_url = int(path_parts[1])

elif (
len(path_parts) >= 3
and path_parts[0] == "api"
Expand All @@ -165,11 +184,7 @@ def __call__(self, request: HttpRequest):
):
project_id_in_url = int(path_parts[2])

if (
project_id_in_url is not None
and request.user.team is not None
and request.user.team.pk != project_id_in_url
):
if project_id_in_url and user.team and user.team.pk != project_id_in_url:
try:
new_team = Team.objects.get(pk=project_id_in_url)
self.switch_team_if_allowed(new_team, request)
Expand Down Expand Up @@ -220,11 +235,8 @@ def switch_team_if_needed_and_allowed(self, request: HttpRequest, target_queryse

def switch_team_if_allowed(self, new_team: Team, request: HttpRequest):
user = cast(User, request.user)
user_permissions = UserPermissions(user)
# :KLUDGE: This is more inefficient than needed, doing several expensive lookups
# However this should be a rare operation!
if user_permissions.team(new_team).effective_membership_level is None:
# Do something to indicate that they don't have access to the team...

if not self.can_switch_to_team(new_team, request):
return

old_team_id = user.current_team_id
Expand All @@ -235,6 +247,17 @@ def switch_team_if_allowed(self, new_team: Team, request: HttpRequest):
# Information for POSTHOG_APP_CONTEXT
request.switched_team = old_team_id # type: ignore

def can_switch_to_team(self, new_team: Team, request: HttpRequest):
user = cast(User, request.user)
user_permissions = UserPermissions(user)
# :KLUDGE: This is more inefficient than needed, doing several expensive lookups
# However this should be a rare operation!
if user_permissions.team(new_team).effective_membership_level is None:
# Do something to indicate that they don't have access to the team...
return False

return True


class CHQueries:
def __init__(self, get_response):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,30 @@
AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_get_session_recordings.36
'''
SELECT "posthog_persondistinctid"."id",
"posthog_persondistinctid"."team_id",
"posthog_persondistinctid"."person_id",
"posthog_persondistinctid"."distinct_id",
"posthog_persondistinctid"."version",
"posthog_person"."id",
"posthog_person"."created_at",
"posthog_person"."properties_last_updated_at",
"posthog_person"."properties_last_operation",
"posthog_person"."team_id",
"posthog_person"."properties",
"posthog_person"."is_user_id",
"posthog_person"."is_identified",
"posthog_person"."uuid",
"posthog_person"."version"
FROM "posthog_persondistinctid"
INNER JOIN "posthog_person" ON ("posthog_persondistinctid"."person_id" = "posthog_person"."id")
WHERE ("posthog_persondistinctid"."distinct_id" IN ('user2',
'user_one_0')
AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_get_session_recordings.4
'''
SELECT "posthog_team"."id",
Expand Down Expand Up @@ -4275,6 +4299,130 @@
AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.251
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.252
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:RECORDINGS_TTL_WEEKS'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.253
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.254
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.255
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.256
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.257
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.258
'''
SELECT "posthog_instancesetting"."id",
"posthog_instancesetting"."key",
"posthog_instancesetting"."raw_value"
FROM "posthog_instancesetting"
WHERE "posthog_instancesetting"."key" = 'constance:posthog:AGGREGATE_BY_DISTINCT_IDS_TEAMS'
ORDER BY "posthog_instancesetting"."id" ASC
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.259
'''
SELECT "posthog_sessionrecording"."id",
"posthog_sessionrecording"."session_id",
"posthog_sessionrecording"."team_id",
"posthog_sessionrecording"."created_at",
"posthog_sessionrecording"."deleted",
"posthog_sessionrecording"."object_storage_path",
"posthog_sessionrecording"."distinct_id",
"posthog_sessionrecording"."duration",
"posthog_sessionrecording"."active_seconds",
"posthog_sessionrecording"."inactive_seconds",
"posthog_sessionrecording"."start_time",
"posthog_sessionrecording"."end_time",
"posthog_sessionrecording"."click_count",
"posthog_sessionrecording"."keypress_count",
"posthog_sessionrecording"."mouse_activity_count",
"posthog_sessionrecording"."console_log_count",
"posthog_sessionrecording"."console_warn_count",
"posthog_sessionrecording"."console_error_count",
"posthog_sessionrecording"."start_url",
"posthog_sessionrecording"."storage_version"
FROM "posthog_sessionrecording"
WHERE ("posthog_sessionrecording"."session_id" IN ('1',
'10',
'2',
'3',
'4',
'5',
'6',
'7',
'8',
'9')
AND "posthog_sessionrecording"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.26
'''
SELECT "posthog_instancesetting"."id",
Expand All @@ -4286,6 +4434,46 @@
LIMIT 1 /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.260
'''
SELECT "posthog_sessionrecordingviewed"."session_id"
FROM "posthog_sessionrecordingviewed"
WHERE ("posthog_sessionrecordingviewed"."team_id" = 2
AND "posthog_sessionrecordingviewed"."user_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.261
'''
SELECT "posthog_persondistinctid"."id",
"posthog_persondistinctid"."team_id",
"posthog_persondistinctid"."person_id",
"posthog_persondistinctid"."distinct_id",
"posthog_persondistinctid"."version",
"posthog_person"."id",
"posthog_person"."created_at",
"posthog_person"."properties_last_updated_at",
"posthog_person"."properties_last_operation",
"posthog_person"."team_id",
"posthog_person"."properties",
"posthog_person"."is_user_id",
"posthog_person"."is_identified",
"posthog_person"."uuid",
"posthog_person"."version"
FROM "posthog_persondistinctid"
INNER JOIN "posthog_person" ON ("posthog_persondistinctid"."person_id" = "posthog_person"."id")
WHERE ("posthog_persondistinctid"."distinct_id" IN ('user1',
'user10',
'user2',
'user3',
'user4',
'user5',
'user6',
'user7',
'user8',
'user9')
AND "posthog_persondistinctid"."team_id" = 2) /*controller='project_session_recordings-list',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/session_recordings/%3F%24'*/
'''
# ---
# name: TestSessionRecordings.test_listing_recordings_is_not_nplus1_for_persons.27
'''
SELECT "posthog_instancesetting"."id",
Expand Down
15 changes: 15 additions & 0 deletions posthog/test/test_middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,21 @@ def test_project_unchanged_when_accessing_missing_project_by_id(self):
assert project_2_request.status_code == 200
assert response_users_api.json().get("team", {}).get("id") == self.team.id

def test_project_redirects_to_new_team_when_accessing_project_by_token(self):
res = self.client.get(f"/project/{self.second_team.api_token}/home")
assert res.status_code == 302
assert res.headers["Location"] == f"/project/{self.second_team.pk}/home"

def test_project_redirects_to_current_team_when_accessing_missing_project_by_token(self):
res = self.client.get(f"/project/phc_123/home")
assert res.status_code == 302
assert res.headers["Location"] == f"/project/{self.team.pk}/home"

def test_project_redirects_to_current_team_when_accessing_inaccessible_project_by_token(self):
res = self.client.get(f"/project/{self.no_access_team.api_token}/home")
assert res.status_code == 302
assert res.headers["Location"] == f"/project/{self.team.pk}/home"


@override_settings(CLOUD_DEPLOYMENT="US") # As PostHog Cloud
class TestPostHogTokenCookieMiddleware(APIBaseTest):
Expand Down
Loading