calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-08 00:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull things in proper order

Browse Source
This commit is contained in:
Owen
2026-06-03 14:52:36 -07:00
parent 2b402f8fec
commit 40125c717c
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/db/queries/verifySessionQueries.ts
View File

@@ -199,12 +199,20 @@ export async function getResourceByDomain(
return null; return null;
} }
const effectivePolicyPincode = // If a shared (custom) policy is assigned to the resource, use ONLY
result.sharedPolicyPincode ?? result.defaultPolicyPincode ?? null; // its values — do not fall back to the default policy. The default
const effectivePolicyPassword = // policy is only consulted when no shared policy is assigned at all.
result.sharedPolicyPassword ?? result.defaultPolicyPassword ?? null; const hasSharedPolicy = result.sharedPolicy !== null;
const effectivePolicyHeaderAuth =
result.sharedPolicyHeaderAuth ?? result.defaultPolicyHeaderAuth ?? null; const effectivePolicyPincode = hasSharedPolicy
? result.sharedPolicyPincode
: (result.defaultPolicyPincode ?? null);
const effectivePolicyPassword = hasSharedPolicy
? result.sharedPolicyPassword
: (result.defaultPolicyPassword ?? null);
const effectivePolicyHeaderAuth = hasSharedPolicy
? result.sharedPolicyHeaderAuth
: (result.defaultPolicyHeaderAuth ?? null);
return { return {
resource: result.resources, resource: result.resources,

29
server/routers/resource/getResourceAuthInfo.ts
View File

@@ -180,19 +180,24 @@ export async function getResourceAuthInfo(
); );
} }
// Shared (custom) policy takes precedence over the default policy. // If a shared (custom) policy is assigned to the resource, use ONLY
// For boolean fields (sso, whitelist), only fall back to defaultPolicy // its values — do not fall back to the default policy. The default
// when there is no shared policy at all. // policy is only consulted when no shared policy is assigned at all.
const effectivePolicyPincode = const hasSharedPolicy = result.sharedPolicy !== null;
result.sharedPolicyPincode ?? result.defaultPolicyPincode ?? null;
const effectivePolicyPassword =
result.sharedPolicyPassword ?? result.defaultPolicyPassword ?? null;
const effectivePolicyHeaderAuth =
result.sharedPolicyHeaderAuth ??
result.defaultPolicyHeaderAuth ??
null;
const effectivePolicy = result.sharedPolicy ?? result.defaultPolicy; const effectivePolicyPincode = hasSharedPolicy
? result.sharedPolicyPincode
: (result.defaultPolicyPincode ?? null);
const effectivePolicyPassword = hasSharedPolicy
? result.sharedPolicyPassword
: (result.defaultPolicyPassword ?? null);
const effectivePolicyHeaderAuth = hasSharedPolicy
? result.sharedPolicyHeaderAuth
: (result.defaultPolicyHeaderAuth ?? null);
const effectivePolicy = hasSharedPolicy
? result.sharedPolicy
: result.defaultPolicy;
const pincode = effectivePolicyPincode ?? result.resourcePincode; const pincode = effectivePolicyPincode ?? result.resourcePincode;
const password = effectivePolicyPassword ?? result.resourcePassword; const password = effectivePolicyPassword ?? result.resourcePassword;