awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-13 21:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: check if secret is expired before checking if secret has password

Browse Source
This commit is contained in:
lemmyMwaura
2024-08-07 20:55:37 +03:00
parent 69fe5bf71d
commit b0a5023723
6 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/routes/v1/secret-sharing-router.ts
+1 -1
View File
@@ -80,7 +80,7 @@ export const registerSecretSharingRouter = async (server: FastifyZodProvider) =>
orgId: req.permission?.orgId
});
// only return secret if it exists and has no password set
// return undefined if it does not exist, has password set or has no more views allowed.
if (!sharedSecret || sharedSecret.password) return undefined;
return {
backend/src/services/secret-sharing/secret-sharing-service.ts
+14 -9
View File
@@ -179,10 +179,12 @@ export const secretSharingServiceFactory = ({
if (accessType === SecretSharingAccessType.Organization && orgId !== sharedSecret.orgId)
throw new UnauthorizedError();
if (sharedSecret.password) return undefined;
await checkIfExpired(sharedSecret, sharedSecretId);
if (sharedSecret.password !== null) return undefined;
// we only update the view count when secret has no password, when password is set view count is updated when we validate the password.
manageSecretViewCount(sharedSecret, sharedSecretId);
// decrement when we are sure the user will view secret.
await decrementSecretViewCount(sharedSecret, sharedSecretId);
return {
...sharedSecret,
@@ -215,13 +217,11 @@ export const secretSharingServiceFactory = ({
if (accessType === SecretSharingAccessType.Organization && orgId !== sharedSecret.orgId)
throw new UnauthorizedError();
if (!sharedSecret.password) return undefined;
const isMatch = await bcrypt.compare(password, sharedSecret.password);
if (!isMatch) return undefined;
if (!isMatch) return undefined
// reduce view count when we are sure the password matches.
manageSecretViewCount(sharedSecret, sharedSecretId)
// we reduce the view count when we are sure the password matches.
await decrementSecretViewCount(sharedSecret, sharedSecretId);
return {
...sharedSecret,
@@ -240,7 +240,8 @@ export const secretSharingServiceFactory = ({
return deletedSharedSecret;
};
const manageSecretViewCount = async (sharedSecret: any, sharedSecretId: string) => {
/** Checks if secret is expired and throws error if true */
const checkIfExpired = async (sharedSecret: any, sharedSecretId: string) => {
const { expiresAt, expiresAfterViews } = sharedSecret;
if (expiresAt !== null && expiresAt < new Date()) {
@@ -258,6 +259,10 @@ export const secretSharingServiceFactory = ({
message: "Access denied: Secret has expired by view count"
});
}
}
const decrementSecretViewCount = async (sharedSecret: any, sharedSecretId: string) => {
const { expiresAfterViews } = sharedSecret;
if (expiresAfterViews) {
// decrement view count if view count expiry set