awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved organization secret sharing failing in suborg

Browse Source
This commit is contained in:
=
2025-10-21 15:02:57 +05:30
parent 4afe1034bd
commit 229f6fb305
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-sharing/secret-sharing-service.ts
+14 -6
View File
@@ -92,8 +92,10 @@ export const secretSharingServiceFactory = ({
if (!permission) throw new ForbiddenRequestError({ name: "User is not a part of the specified organization" }); if (!permission) throw new ForbiddenRequestError({ name: "User is not a part of the specified organization" });
$validateSharedSecretExpiry(expiresAt); $validateSharedSecretExpiry(expiresAt);
const org = await orgDAL.findOrgById(orgId); const rootOrg = await orgDAL.findRootOrgDetails(orgId);
if (!org.allowSecretSharingOutsideOrganization && accessType === SecretSharingAccessType.Anyone) { if (!rootOrg) throw new BadRequestError({ message: `Organization with id ${orgId} not found` });
if (!rootOrg.allowSecretSharingOutsideOrganization && accessType === SecretSharingAccessType.Anyone) {
throw new BadRequestError({ throw new BadRequestError({
message: "Organization does not allow sharing secrets to members outside of this organization" message: "Organization does not allow sharing secrets to members outside of this organization"
}); });
@@ -107,13 +109,16 @@ export const secretSharingServiceFactory = ({
const expiresAtTimestamp = new Date(expiresAt).getTime(); const expiresAtTimestamp = new Date(expiresAt).getTime();
const lifetime = expiresAtTimestamp - new Date().getTime(); const lifetime = expiresAtTimestamp - new Date().getTime();
// org.maxSharedSecretLifetime is in seconds // rootOrg.maxSharedSecretLifetime is in seconds
if (org.maxSharedSecretLifetime && lifetime / 1000 > org.maxSharedSecretLifetime) { if (rootOrg.maxSharedSecretLifetime && lifetime / 1000 > rootOrg.maxSharedSecretLifetime) {
throw new BadRequestError({ message: "Secret lifetime exceeds organization limit" }); throw new BadRequestError({ message: "Secret lifetime exceeds organization limit" });
} }
// Check max view count is within org allowance // Check max view count is within org allowance
if (org.maxSharedSecretViewLimit && (!expiresAfterViews || expiresAfterViews > org.maxSharedSecretViewLimit)) { if (
rootOrg.maxSharedSecretViewLimit &&
(!expiresAfterViews || expiresAfterViews > rootOrg.maxSharedSecretViewLimit)
) {
throw new BadRequestError({ message: "Secret max views parameter exceeds organization limit" }); throw new BadRequestError({ message: "Secret max views parameter exceeds organization limit" });
} }
@@ -129,7 +134,10 @@ export const secretSharingServiceFactory = ({
if (allOrgMembers.some((v) => v.user.email === email)) { if (allOrgMembers.some((v) => v.user.email === email)) {
orgEmails.push(email); orgEmails.push(email);
// If the email is not part of the org, but access type / org settings require it // If the email is not part of the org, but access type / org settings require it
} else if (!org.allowSecretSharingOutsideOrganization || accessType === SecretSharingAccessType.Organization) { } else if (
!rootOrg.allowSecretSharingOutsideOrganization ||
accessType === SecretSharingAccessType.Organization
) {
throw new BadRequestError({ throw new BadRequestError({
message: "Organization does not allow sharing secrets to members outside of this organization" message: "Organization does not allow sharing secrets to members outside of this organization"
}); });