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

Optimize token cleanup job

Browse Source
This commit is contained in:
x032205
2025-07-11 22:05:32 -04:00
parent 6df6f44b50
commit 218408493a
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/identity-access-token/identity-access-token-dal.ts
+19 -24
View File
@@ -31,9 +31,10 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
logger.info(`${QueueName.DailyResourceCleanUp}: remove expired access token started`); logger.info(`${QueueName.DailyResourceCleanUp}: remove expired access token started`);
const MAX_TTL = 315_360_000; // Maximum TTL value in seconds (10 years) const MAX_TTL = 315_360_000; // Maximum TTL value in seconds (10 years)
const QUERY_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
try { const performDelete = (dbClient: Knex | Knex.Transaction) =>
const docs = (tx || db)(TableName.IdentityAccessToken) dbClient(TableName.IdentityAccessToken)
.where({ .where({
isAccessTokenRevoked: true isAccessTokenRevoked: true
}) })
@@ -47,30 +48,24 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
); );
}) })
.orWhere((qb) => { .orWhere((qb) => {
void qb.where("accessTokenTTL", ">", 0).andWhere((qb2) => { void qb
void qb2 .where("accessTokenTTL", ">", 0)
.where((qb3) => { .andWhereRaw(
void qb3 `COALESCE("${TableName.IdentityAccessToken}"."accessTokenLastRenewedAt", "${TableName.IdentityAccessToken}"."createdAt") + make_interval(secs => LEAST("${TableName.IdentityAccessToken}"."accessTokenTTL", ?)) < NOW()`,
.whereNotNull("accessTokenLastRenewedAt") [MAX_TTL]
// accessTokenLastRenewedAt + convert_integer_to_seconds(accessTokenTTL) < present_date );
.andWhereRaw(
`"${TableName.IdentityAccessToken}"."accessTokenLastRenewedAt" + make_interval(secs => LEAST("${TableName.IdentityAccessToken}"."accessTokenTTL", ?)) < NOW()`,
[MAX_TTL]
);
})
.orWhere((qb3) => {
void qb3
.whereNull("accessTokenLastRenewedAt")
// created + convert_integer_to_seconds(accessTokenTTL) < present_date
.andWhereRaw(
`"${TableName.IdentityAccessToken}"."createdAt" + make_interval(secs => LEAST("${TableName.IdentityAccessToken}"."accessTokenTTL", ?)) < NOW()`,
[MAX_TTL]
);
});
});
}) })
.delete(); .delete();
await docs;
try {
if (tx) {
await performDelete(tx);
} else {
await db.transaction(async (trx) => {
await trx.raw(`SET statement_timeout = ${QUERY_TIMEOUT_MS}`);
await performDelete(trx);
});
}
logger.info(`${QueueName.DailyResourceCleanUp}: remove expired access token completed`); logger.info(`${QueueName.DailyResourceCleanUp}: remove expired access token completed`);
} catch (error) { } catch (error) {
throw new DatabaseError({ error, name: "IdentityAccessTokenPrune" }); throw new DatabaseError({ error, name: "IdentityAccessTokenPrune" });