mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #13786 from appwrite/fix/membership-privacy-self
fix(teams): exempt a member's own membership from the privacy policy
This commit is contained in:
4 files changed
+128
-42
No files matched your search
@@ -88,8 +88,12 @@ class Get extends Action
|
||||
$isPrivilegedUser = $user->isPrivileged($roles);
|
||||
$isAppUser = $user->isKey($roles);
|
||||
|
||||
$membershipsPrivacy = array_map(function ($privacy) use ($isPrivilegedUser, $isAppUser) {
|
||||
return $privacy || $isPrivilegedUser || $isAppUser;
|
||||
// The policy only hides other members, a member always sees their own details
|
||||
$isSelf = $user->getSequence() !== null
|
||||
&& $membership->getAttribute('userInternalId') === $user->getSequence();
|
||||
|
||||
$membershipsPrivacy = array_map(function ($privacy) use ($isPrivilegedUser, $isAppUser, $isSelf) {
|
||||
return $privacy || $isPrivilegedUser || $isAppUser || $isSelf;
|
||||
}, $membershipsPrivacy);
|
||||
|
||||
$memberUser = !empty(array_filter($membershipsPrivacy))
|
||||
|
||||
@@ -141,7 +141,14 @@ class XList extends Action
|
||||
return $privacy || $isPrivilegedUser || $isAppUser;
|
||||
}, $membershipsPrivacy);
|
||||
|
||||
$memberships = array_map(function ($membership) use ($dbForProject, $team, $membershipsPrivacy) {
|
||||
// The policy only hides other members, a member always sees their own details
|
||||
$selfPrivacy = array_fill_keys(array_keys($membershipsPrivacy), true);
|
||||
$userSequence = $user->getSequence();
|
||||
|
||||
$memberships = array_map(function ($membership) use ($dbForProject, $team, $membershipsPrivacy, $selfPrivacy, $userSequence) {
|
||||
$isSelf = $userSequence !== null && $membership->getAttribute('userInternalId') === $userSequence;
|
||||
$membershipsPrivacy = $isSelf ? $selfPrivacy : $membershipsPrivacy;
|
||||
|
||||
$memberUser = !empty(array_filter($membershipsPrivacy))
|
||||
? $dbForProject->getDocument('users', $membership->getAttribute('userId'))
|
||||
: new Document();
|
||||
|
||||
@@ -144,22 +144,32 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
'cookie' => 'a_session_' . $projectId . '=' . $user2Session,
|
||||
];
|
||||
|
||||
// Make a request as user2 to ensure accessedAt is updated
|
||||
// Make a request as each user to ensure accessedAt is updated
|
||||
$this->client->call(Client::METHOD_GET, '/account', $client2Headers);
|
||||
$this->client->call(Client::METHOD_GET, '/account', $clientHeaders);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamId . '/memberships', $clientHeaders);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertSame(2, $response['body']['total']);
|
||||
$this->assertCount(2, $response['body']['memberships']);
|
||||
|
||||
foreach ($response['body']['memberships'] as $membership) {
|
||||
$this->assertSame('', $membership['userName']);
|
||||
$this->assertSame('', $membership['userEmail']);
|
||||
$this->assertSame('', $membership['userPhone']);
|
||||
$this->assertSame('', $membership['userId']);
|
||||
$this->assertFalse($membership['mfa']);
|
||||
$this->assertSame('', $membership['userAccessedAt']);
|
||||
}
|
||||
// The policy hides user2 from user1
|
||||
$other = $this->findMembership($response['body']['memberships'], $membership2['body']['$id']);
|
||||
$this->assertSame('', $other['userName']);
|
||||
$this->assertSame('', $other['userEmail']);
|
||||
$this->assertSame('', $other['userPhone']);
|
||||
$this->assertSame('', $other['userId']);
|
||||
$this->assertFalse($other['mfa']);
|
||||
$this->assertSame('', $other['userAccessedAt']);
|
||||
|
||||
// The policy never hides user1 from themselves
|
||||
$own = $this->findMembership($response['body']['memberships'], $membership1['body']['$id']);
|
||||
$this->assertSame($user1Name, $own['userName']);
|
||||
$this->assertSame($user1Email, $own['userEmail']);
|
||||
$this->assertSame($user1Phone, $own['userPhone']);
|
||||
$this->assertSame($user1Id, $own['userId']);
|
||||
$this->assertFalse($own['mfa']);
|
||||
$this->assertNotEmpty($own['userAccessedAt']);
|
||||
|
||||
// Step 5: Update privacy to true
|
||||
$response = $this->client->call(Client::METHOD_PATCH, '/project/policies/membership-privacy', $serverHeaders, [
|
||||
@@ -226,15 +236,22 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships', $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertCount(1, $response['body']['memberships']);
|
||||
$this->assertSame('', $response['body']['memberships'][0]['userAccessedAt']);
|
||||
$this->assertCount(2, $response['body']['memberships']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['membershipId'], $member['clientHeaders']);
|
||||
$this->assertSame('', $this->findMembership($response['body']['memberships'], $member['otherMembershipId'])['userAccessedAt']);
|
||||
// A member always sees their own last access time
|
||||
$this->assertNotEmpty($this->findMembership($response['body']['memberships'], $member['membershipId'])['userAccessedAt']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['otherMembershipId'], $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertSame('', $response['body']['userAccessedAt']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['membershipId'], $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertNotEmpty($response['body']['userAccessedAt']);
|
||||
|
||||
// The policy only applies to client requests, an API key still sees it
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['membershipId'], $serverHeaders);
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['otherMembershipId'], $serverHeaders);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertNotEmpty($response['body']['userAccessedAt']);
|
||||
}
|
||||
@@ -293,7 +310,7 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
$policy = $readPolicy();
|
||||
$this->assertFalse($policy['userAccessedAt']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['membershipId'], $member['clientHeaders']);
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['otherMembershipId'], $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertSame('', $response['body']['userAccessedAt']);
|
||||
|
||||
@@ -307,15 +324,15 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
$this->assertTrue($policy['userName']);
|
||||
$this->assertTrue($policy['userMFA']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['membershipId'], $member['clientHeaders']);
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships/' . $member['otherMembershipId'], $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertNotEmpty($response['body']['userAccessedAt']);
|
||||
$this->assertNotFalse(\strtotime($response['body']['userAccessedAt']));
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships', $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertCount(1, $response['body']['memberships']);
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['userAccessedAt']);
|
||||
$this->assertCount(2, $response['body']['memberships']);
|
||||
$this->assertNotEmpty($this->findMembership($response['body']['memberships'], $member['otherMembershipId'])['userAccessedAt']);
|
||||
|
||||
$setAccessedAt(false);
|
||||
|
||||
@@ -323,19 +340,57 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, '/teams/' . $member['teamId'] . '/memberships', $member['clientHeaders']);
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
$this->assertSame('', $response['body']['memberships'][0]['userAccessedAt']);
|
||||
$this->assertSame('', $this->findMembership($response['body']['memberships'], $member['otherMembershipId'])['userAccessedAt']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a team with a single member, signed in, whose accessedAt is populated.
|
||||
* @param array<int, array<string, mixed>> $memberships
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private function findMembership(array $memberships, string $membershipId): array
|
||||
{
|
||||
$membershipsById = array_column($memberships, null, '$id');
|
||||
$this->assertArrayHasKey($membershipId, $membershipsById);
|
||||
|
||||
return $membershipsById[$membershipId];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a team with a signed-in viewer and one other member, both with accessedAt populated.
|
||||
*
|
||||
* @param array<string, string> $serverHeaders
|
||||
* @return array{teamId: string, membershipId: string, clientHeaders: array<string, string>}
|
||||
* @return array{teamId: string, membershipId: string, otherMembershipId: string, clientHeaders: array<string, string>}
|
||||
*/
|
||||
private function createTeamWithMember(string $projectId, array $serverHeaders): array
|
||||
{
|
||||
$team = $this->client->call(Client::METHOD_POST, '/teams', $serverHeaders, [
|
||||
'teamId' => ID::unique(),
|
||||
'name' => 'Access Team',
|
||||
'roles' => ['member'],
|
||||
]);
|
||||
$this->assertSame(201, $team['headers']['status-code']);
|
||||
$teamId = $team['body']['$id'];
|
||||
|
||||
$viewer = $this->addTeamMember($projectId, $serverHeaders, $teamId, 'Casey Carter');
|
||||
$other = $this->addTeamMember($projectId, $serverHeaders, $teamId, 'Dana Dean');
|
||||
|
||||
return [
|
||||
'teamId' => $teamId,
|
||||
'membershipId' => $viewer['membershipId'],
|
||||
'otherMembershipId' => $other['membershipId'],
|
||||
'clientHeaders' => $viewer['clientHeaders'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a user, add them to the team and sign them in so their accessedAt is populated.
|
||||
*
|
||||
* @param array<string, string> $serverHeaders
|
||||
* @return array{membershipId: string, clientHeaders: array<string, string>}
|
||||
*/
|
||||
private function addTeamMember(string $projectId, array $serverHeaders, string $teamId, string $name): array
|
||||
{
|
||||
$email = 'member_' . uniqid() . '@localhost.test';
|
||||
$name = 'Casey Carter';
|
||||
$password = 'password1234';
|
||||
|
||||
$user = $this->client->call(Client::METHOD_POST, '/users', $serverHeaders, [
|
||||
@@ -346,14 +401,7 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
]);
|
||||
$this->assertSame(201, $user['headers']['status-code']);
|
||||
|
||||
$team = $this->client->call(Client::METHOD_POST, '/teams', $serverHeaders, [
|
||||
'teamId' => ID::unique(),
|
||||
'name' => 'Access Team',
|
||||
'roles' => ['member'],
|
||||
]);
|
||||
$this->assertSame(201, $team['headers']['status-code']);
|
||||
|
||||
$membership = $this->client->call(Client::METHOD_POST, '/teams/' . $team['body']['$id'] . '/memberships', $serverHeaders, [
|
||||
$membership = $this->client->call(Client::METHOD_POST, '/teams/' . $teamId . '/memberships', $serverHeaders, [
|
||||
'userId' => $user['body']['$id'],
|
||||
'roles' => ['member'],
|
||||
]);
|
||||
@@ -381,7 +429,6 @@ final class PoliciesMembershipPrivacyIntegrationTest extends Scope
|
||||
$this->assertSame(200, $response['headers']['status-code']);
|
||||
|
||||
return [
|
||||
'teamId' => $team['body']['$id'],
|
||||
'membershipId' => $membership['body']['$id'],
|
||||
'clientHeaders' => $clientHeaders,
|
||||
];
|
||||
|
||||
@@ -95,6 +95,23 @@ final class TeamsCustomClientTest extends Scope
|
||||
|
||||
$projectId = $this->getProject()['$id'];
|
||||
|
||||
// The policy only governs other members, so the team needs one
|
||||
$otherEmail = uniqid() . 'foe@localhost.test';
|
||||
$otherName = 'Privacy Foe';
|
||||
|
||||
$invite = $this->client->call(Client::METHOD_POST, '/teams/' . $teamUid . '/memberships', array_merge([
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $projectId,
|
||||
], $this->getHeaders()), [
|
||||
'email' => $otherEmail,
|
||||
'name' => $otherName,
|
||||
'roles' => ['developer'],
|
||||
'url' => 'http://localhost:5000/join-us#title',
|
||||
]);
|
||||
|
||||
$this->assertEquals(201, $invite['headers']['status-code']);
|
||||
$otherUid = $invite['body']['$id'];
|
||||
|
||||
$response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $projectId . '/auth/memberships-privacy', array_merge([
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => 'console',
|
||||
@@ -120,9 +137,18 @@ final class TeamsCustomClientTest extends Scope
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['$id']);
|
||||
|
||||
// Assert that sensitive fields are not present
|
||||
$this->assertEmpty($response['body']['memberships'][0]['userName']);
|
||||
$this->assertEmpty($response['body']['memberships'][0]['userEmail']);
|
||||
$this->assertFalse($response['body']['memberships'][0]['mfa']);
|
||||
$memberships = array_column($response['body']['memberships'], null, '$id');
|
||||
$other = $memberships[$otherUid];
|
||||
$this->assertEmpty($other['userName']);
|
||||
$this->assertEmpty($other['userEmail']);
|
||||
$this->assertFalse($other['mfa']);
|
||||
|
||||
// Assert that the member still sees their own details
|
||||
unset($memberships[$otherUid]);
|
||||
$own = reset($memberships);
|
||||
$this->assertNotEmpty($own['userId']);
|
||||
$this->assertNotEmpty($own['userName']);
|
||||
$this->assertNotEmpty($own['userEmail']);
|
||||
|
||||
/**
|
||||
* Update project settings to show sensitive fields
|
||||
@@ -152,9 +178,10 @@ final class TeamsCustomClientTest extends Scope
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['$id']);
|
||||
|
||||
// Assert that sensitive fields are present
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['userName']);
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['userEmail']);
|
||||
$this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
|
||||
$other = array_column($response['body']['memberships'], null, '$id')[$otherUid];
|
||||
$this->assertNotEmpty($other['userName']);
|
||||
$this->assertNotEmpty($other['userEmail']);
|
||||
$this->assertArrayHasKey('mfa', $other);
|
||||
|
||||
/**
|
||||
* Update project settings to show only MFA
|
||||
@@ -184,9 +211,10 @@ final class TeamsCustomClientTest extends Scope
|
||||
$this->assertNotEmpty($response['body']['memberships'][0]['$id']);
|
||||
|
||||
// Assert that sensitive fields are present
|
||||
$this->assertEmpty($response['body']['memberships'][0]['userName']);
|
||||
$this->assertEmpty($response['body']['memberships'][0]['userEmail']);
|
||||
$this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
|
||||
$other = array_column($response['body']['memberships'], null, '$id')[$otherUid];
|
||||
$this->assertEmpty($other['userName']);
|
||||
$this->assertEmpty($other['userEmail']);
|
||||
$this->assertArrayHasKey('mfa', $other);
|
||||
}
|
||||
|
||||
public function testTeamsInviteHTMLInjection(): void
|
||||
|
||||
Reference in new issue
Block a user