Skip to content

fix: allow read-only admins through resolveSite admin gates #2465

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.

Sign up for GitHub

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

Open
ravverma wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −14
Open

fix: allow read-only admins through resolveSite admin gates #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6636d7
fix: allow read-only admins through resolveSite admin gates
ravverma May 22, 2026
d453f0f
Merge branch 'main' into fix/resolve-site-admin-read-access
ravverma May 22, 2026
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
6 changes: 3 additions & 3 deletions src/controllers/sites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export async function resolveOrgDefaultSite(org, productCode, context, ctx, acce
}

const isVisibleTier = CUSTOMER_VISIBLE_TIERS.includes(entitlement.getTier());
if (!isVisibleTier && !accessControlUtil.hasAdminAccess()) {
if (!isVisibleTier && !accessControlUtil.hasAdminReadAccess()) {
return null;
}

Expand Down Expand Up @@ -1318,13 +1318,13 @@ function SitesController(ctx, log, env) {
}

if (!CUSTOMER_VISIBLE_TIERS.includes(entitlement.getTier())) {
if (!callerIsInternal && !accessControlUtil.hasAdminAccess()) {
if (!callerIsInternal && !accessControlUtil.hasAdminReadAccess()) {
return resolveFailure('No site found for the provided parameters', 'aso_pre_onboard', failureDetails);
}
log.info(`[resolveSite] Internal or admin caller (callerImsOrg=${callerImsOrg}): skipping tier check (tier=${entitlement.getTier()})`, failureDetails);
}

if (enrolledSite && (accessControlUtil.hasAdminAccess()
if (enrolledSite && (accessControlUtil.hasAdminReadAccess()
|| CUSTOMER_VISIBLE_TIERS.includes(entitlement.getTier()))) {
return ok({ data: await buildResolveData(org, enrolledSite, context) });
}
Expand Down
22 changes: 11 additions & 11 deletions test/controllers/sites.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4966,7 +4966,7 @@ describe('Sites Controller', () => {
});

it('should return 200 via imsOrg path when non-admin has visible entitlement and enrolled site', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(false);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(false);
context.data = { imsOrg: testOrganizations[2].getImsOrgId() };
mockDataAccess.Organization.findByImsOrgId.resolves(testOrganizations[2]);
mockTierClientStub.getFirstEnrollment.resolves({
Expand Down Expand Up @@ -5250,7 +5250,7 @@ describe('Sites Controller', () => {
});

it('should return 404 with aso_pre_onboard for PRE_ONBOARD-tier site via organizationId path for non-admin', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(false);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(false);
context.data = { organizationId: testOrganizations[0].getId() };
mockDataAccess.Organization.findById.resolves(testOrganizations[0]);

Expand All @@ -5272,7 +5272,7 @@ describe('Sites Controller', () => {
});

it('should return 200 for PRE_ONBOARD-tier site via organizationId path for admin', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = { organizationId: testOrganizations[0].getId() };
mockDataAccess.Organization.findById.resolves(testOrganizations[0]);

Expand All @@ -5295,7 +5295,7 @@ describe('Sites Controller', () => {
});

it('should return 404 for PRE_ONBOARD-tier site via imsOrg path for non-admin', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(false);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(false);
context.data = { imsOrg: testOrganizations[2].getImsOrgId() };
mockDataAccess.Organization.findByImsOrgId.resolves(testOrganizations[2]);

Expand All @@ -5319,7 +5319,7 @@ describe('Sites Controller', () => {
});

it('should return 200 for PRE_ONBOARD-tier site via imsOrg path for admin', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = { imsOrg: testOrganizations[2].getImsOrgId() };
mockDataAccess.Organization.findByImsOrgId.resolves(testOrganizations[2]);

Expand All @@ -5345,7 +5345,7 @@ describe('Sites Controller', () => {
});

it('should return 404 with no_entitlement_for_product for admin when organizationId path has no entitlement', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = { organizationId: testOrganizations[0].getId() };
mockDataAccess.Organization.findById.resolves(testOrganizations[0]);

Expand All @@ -5364,7 +5364,7 @@ describe('Sites Controller', () => {
});

it('should return 404 for admin when imsOrg path has no enrolled site', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = { imsOrg: testOrganizations[2].getImsOrgId() };
mockDataAccess.Organization.findByImsOrgId.resolves(testOrganizations[2]);

Expand Down Expand Up @@ -5449,7 +5449,7 @@ describe('Sites Controller', () => {
beforeEach(() => {
[org] = testOrganizations;
mockCtx = { dataAccess: mockDataAccess, log: { warn: sandbox.stub() } };
mockAccessControlUtil = { hasAdminAccess: sandbox.stub().returns(false) };
mockAccessControlUtil = { hasAdminReadAccess: sandbox.stub().returns(false) };
sandbox.stub(org, 'getConfig').returns(makeConfigWithDefault(SITE_IDS[0]));
mockDataAccess.Site.findById.resolves(testSites[0]);
mockTierClientStub.getAllEnrollment.resolves({
Expand Down Expand Up @@ -5510,7 +5510,7 @@ describe('Sites Controller', () => {
});

it('returns data when the configured site is on a non-customer-visible tier for admin', async () => {
mockAccessControlUtil.hasAdminAccess.returns(true);
mockAccessControlUtil.hasAdminReadAccess.returns(true);
mockTierClientStub.getAllEnrollment.resolves({
entitlement: { getTier: () => 'PRE_ONBOARD' },
enrollments: [{ getId: () => 'enrollment-1' }],
Expand Down Expand Up @@ -5697,7 +5697,7 @@ describe('Sites Controller', () => {
it('internal caller accessing CUSTOMER site (admin) with PRE_ONBOARD + not enrolled → 404 site_not_enrolled', async () => {
// Caller-based check: bypass fires even when the site lives in a customer org.
// PRE_ONBOARD tier check skipped for internal caller; no enrollment → site_not_enrolled.
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = {
siteId: SITE_IDS[1],
imsOrg: CUSTOMER_ORG_IMS_ID,
Expand All @@ -5718,7 +5718,7 @@ describe('Sites Controller', () => {
});

it('internal caller accessing CUSTOMER site (admin) with PRE_ONBOARD + enrolled → 200', async () => {
sandbox.stub(AccessControlUtil.prototype, 'hasAdminAccess').returns(true);
sandbox.stub(AccessControlUtil.prototype, 'hasAdminReadAccess').returns(true);
context.data = {
siteId: SITE_IDS[1],
imsOrg: CUSTOMER_ORG_IMS_ID,
Expand Down
Loading