From accf42de2e158b859aedc7418e61985b04304d83 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 27 Mar 2025 00:32:42 +0530 Subject: [PATCH] feat: updated by review comment --- .../services/audit-log-stream/audit-log-stream-service.ts | 8 +++++--- .../services/integration-auth/integration-sync-secret.ts | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/src/ee/services/audit-log-stream/audit-log-stream-service.ts b/backend/src/ee/services/audit-log-stream/audit-log-stream-service.ts index b5f20f0da..c5a562a18 100644 --- a/backend/src/ee/services/audit-log-stream/audit-log-stream-service.ts +++ b/backend/src/ee/services/audit-log-stream/audit-log-stream-service.ts @@ -2,6 +2,7 @@ import { ForbiddenError } from "@casl/ability"; import { RawAxiosRequestHeaders } from "axios"; import { SecretKeyEncoding } from "@app/db/schemas"; +import { getConfig } from "@app/lib/config/env"; import { request } from "@app/lib/config/request"; import { infisicalSymmetricDecrypt, infisicalSymmetricEncypt } from "@app/lib/crypto/encryption"; import { BadRequestError, NotFoundError, UnauthorizedError } from "@app/lib/errors"; @@ -60,7 +61,8 @@ export const auditLogStreamServiceFactory = ({ ); ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Create, OrgPermissionSubjects.Settings); - await blockLocalAndPrivateIpAddresses(url); + const appCfg = getConfig(); + if (appCfg.isCloud) await blockLocalAndPrivateIpAddresses(url); const totalStreams = await auditLogStreamDAL.find({ orgId: actorOrgId }); if (totalStreams.length >= plan.auditLogStreamLimit) { @@ -131,8 +133,8 @@ export const auditLogStreamServiceFactory = ({ const { orgId } = logStream; const { permission } = await permissionService.getOrgPermission(actor, actorId, orgId, actorAuthMethod, actorOrgId); ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Settings); - - if (url) await blockLocalAndPrivateIpAddresses(url); + const appCfg = getConfig(); + if (url && appCfg.isCloud) await blockLocalAndPrivateIpAddresses(url); // testing connection first const streamHeaders: RawAxiosRequestHeaders = { "Content-Type": "application/json" }; diff --git a/backend/src/services/integration-auth/integration-sync-secret.ts b/backend/src/services/integration-auth/integration-sync-secret.ts index 4947b85f5..e5c9d4eb0 100644 --- a/backend/src/services/integration-auth/integration-sync-secret.ts +++ b/backend/src/services/integration-auth/integration-sync-secret.ts @@ -3578,7 +3578,7 @@ const syncSecretsTeamCity = async ({ .filter((parameter) => !parameter.inherited) .reduce( (obj, secret) => { - const secretName = secret.name.replace("env.", ""); + const secretName = secret.name.startsWith(".env") ? secret.name.slice(4) : secret.name; return { ...obj, [secretName]: secret.value @@ -3635,7 +3635,7 @@ const syncSecretsTeamCity = async ({ ) ).data.property.reduce( (obj, secret) => { - const secretName = secret.name.replace("env.", ""); + const secretName = secret.name.startsWith("env.") ? secret.name.slice(4) : secret.name; return { ...obj, [secretName]: secret.value