modelcontextprotocol/access
Watch
1
0
Fork
You've already forked access
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Declare allowExternalMembers on managed groups so deploys stop re-arming the external-member purge (#140)

Browse source 
* Declare allowExternalMembers on managed group settings

Every pulumi up was resetting the Google Workspace per-group setting
ALLOW_EXTERNAL_MEMBERS to false on all managed groups, because the
GroupSettings resources never declared allowExternalMembers and the
provider (SamuZad/googleworkspace 0.11.1) defaults the field to false.
Google then silently purges external-email members from affected groups
roughly 1-2 days after each apply, with no audit events.

Pin the setting to true for all managed groups. External membership
itself remains governed exclusively by config/users.ts entries; this
setting only permits it.

Part of the #133 incident.

* Scope allowExternalMembers per group, derived from membership config

Instead of permitting external members on every managed group, derive
allowExternalMembers per group: true only for groups whose membership
config (config/users.ts) resolves at least one member to a
non-@modelcontextprotocol.io email. Email resolution is factored into
resolveGoogleMemberEmail and shared with GroupMember creation so the
two cannot drift. The field stays declared on every group because the
provider defaults it to false on each apply, after which Google
silently purges external members (#133 incident).

With current config, exactly these groups derive true: maintainers,
registry-wg, antitrust, catch-all. A config test pins this set so
changes to it are always deliberate.

* Make allowExternalMembers an explicit per-role opt-in with config validation

Replace the derived per-group allowExternalMembers (computed from
membership config) with an explicit opt-in: group owners set
allowExternalMembers: true on the role's google config in
src/config/roles.ts, and src/google.ts passes it straight through to
GroupSettings (defaulting to false). The field stays declared on every
group because the provider resets an omitted field to false on each
apply, after which Google silently purges external members (#133).

Roles opting in, matching current membership: maintainers,
registry-maintainers (registry-wg), antitrust, catch-all.

A validate-config check replaces the old pinned-set test: it fails with
an actionable error whenever a group has a member resolving to a
non-@modelcontextprotocol.io email but its role does not opt in, naming
the group, the member email, and the exact config line to add.

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
claude[bot] 2026-07-03 01:19:16 +00:00 • committed by GitHub
commit 5917af2589
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/google.ts
View file

@ -5,6 +5,7 @@ import * as random from '@pulumi/random';
import { ROLES, type Role, buildRoleLookup } from './config/roles';
import { MEMBERS } from './config/users';
import type { RoleId } from './config/roleIds';
import { resolveGoogleMemberEmail } from './config/utils';
const roleLookup = buildRoleLookup();
// Groups keyed by Google group name
@ -25,6 +26,15 @@ ROLES.forEach((role: Role) => {
{
email: groups[role.google.group].email,
// Permit external (non-workspace) members only on groups whose role
// explicitly opts in via allowExternalMembers in config/roles.ts.
// Who is actually a member is still governed entirely by config/users.ts;
// validate-config enforces that every external member's role opts in.
// This field must stay DECLARED: when omitted, the provider defaults it
// to false on every `pulumi up`, and Google then silently purges
// external-email members ~1-2 days later (#133 incident).
allowExternalMembers: role.google.allowExternalMembers ?? false,
// Maximise visibility of group. It's visible in GitHub anyway
whoCanViewMembership: 'ALL_IN_DOMAIN_CAN_VIEW',
@ -154,12 +164,11 @@ MEMBERS.forEach((member) => {
// Create group memberships for users
MEMBERS.forEach((member) => {
// Prefer the provisioned GWS email over the personal email for group memberships
const gwsEmail = member.googleEmailPrefix
? `${member.googleEmailPrefix}@modelcontextprotocol.io`
: undefined;
const memberEmail = gwsEmail || member.email;
const memberEmail = resolveGoogleMemberEmail(member);
if (!memberEmail) return;
const provisionedUser = gwsEmail ? provisionedUsersByEmail[gwsEmail] : undefined;
const provisionedUser = member.googleEmailPrefix
? provisionedUsersByEmail[memberEmail]
: undefined;
member.memberOf.forEach((roleId: RoleId) => {
const role = roleLookup.get(roleId);