Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge branch 'main' into feat/adilsitos/eng-4966-stack-1

adilson87ac5f8237dc
diff --cc backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
index 01510be0c0,f9bc641b10..3d95308392
--- a/backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
+++ b/backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts
@@@ -376,7 -381,7 +385,8 @@@ const SanitizedAppConnectionSchema = z.
...SanitizedStripeConnectionSchema.options,
...SanitizedKeeperConnectionSchema.options,
...SanitizedHpeIloConnectionSchema.options,
- ...SanitizedServiceNowConnectionSchema.options
++ ...SanitizedServiceNowConnectionSchema.options,
+ ...SanitizedS3CompatibleConnectionSchema.options
]);
const AppConnectionOptionsSchema = z.discriminatedUnion("app", [
@@@ -470,7 -476,7 +481,8 @@@
StripeConnectionListItemSchema,
KeeperConnectionListItemSchema,
HpeIloConnectionListItemSchema,
- ServiceNowConnectionListItemSchema
++ ServiceNowConnectionListItemSchema,
+ S3CompatibleConnectionListItemSchema
]);
export const registerAppConnectionRouter = async (server: FastifyZodProvider) => {
diff --cc backend/src/server/routes/v1/app-connection-routers/index.ts
index 80816a5839,9fe44eb3a9..75dbe43ed0
--- a/backend/src/server/routes/v1/app-connection-routers/index.ts
+++ b/backend/src/server/routes/v1/app-connection-routers/index.ts
@@@ -72,8 -73,8 +73,9 @@@ import { registerRailwayConnectionRoute
import { registerRedisConnectionRouter } from "./redis-connection-router";
import { registerRenderConnectionRouter } from "./render-connection-router";
import { registerRundeckConnectionRouter } from "./rundeck-connection-router";
+ import { registerS3CompatibleConnectionRouter } from "./s3-compatible-connection-router";
import { registerSalesforceConnectionRouter } from "./salesforce-connection-router";
+import { registerServiceNowConnectionRouter } from "./servicenow-connection-router";
import { registerSmbConnectionRouter } from "./smb-connection-router";
import { registerSnowflakeConnectionRouter } from "./snowflake-connection-router";
import { registerSpaceliftConnectionRouter } from "./spacelift-connection-router";
@@@ -186,5 -188,5 +189,6 @@@ export const APP_CONNECTION_REGISTER_RO
[AppConnection.Stripe]: registerStripeConnectionRouter,
[AppConnection.Keeper]: registerKeeperConnectionRouter,
[AppConnection.HpeIloRedFish]: registerHpeIloConnectionRouter,
- [AppConnection.ServiceNow]: registerServiceNowConnectionRouter
++ [AppConnection.ServiceNow]: registerServiceNowConnectionRouter,
+ [AppConnection.S3Compatible]: registerS3CompatibleConnectionRouter
};
diff --cc backend/src/services/app-connection/app-connection-enums.ts
index f83b5951d0,c82b36cb5d..aced5bbbee
--- a/backend/src/services/app-connection/app-connection-enums.ts
+++ b/backend/src/services/app-connection/app-connection-enums.ts
@@@ -89,7 -90,7 +90,8 @@@ export enum AppConnection
Stripe = "stripe",
Keeper = "keeper",
HpeIloRedFish = "hpe-ilo",
- ServiceNow = "servicenow"
++ ServiceNow = "servicenow",
+ S3Compatible = "s3-compatible"
}
export enum AWSRegion {
diff --cc backend/src/services/app-connection/app-connection-fns.ts
index 499027e92c,b478032815..4e3dd9010b
--- a/backend/src/services/app-connection/app-connection-fns.ts
+++ b/backend/src/services/app-connection/app-connection-fns.ts
@@@ -495,7 -496,7 +506,8 @@@ export const listAppConnectionOptions
getStripeConnectionListItem(),
getKeeperConnectionListItem(),
getHpeIloConnectionListItem(),
- getServiceNowConnectionListItem()
++ getServiceNowConnectionListItem(),
+ getS3CompatibleConnectionListItem()
]
.filter((option) => isAppConnectionAllowedInProject(option.app, projectType))
.sort((a, b) => a.name.localeCompare(b.name));
@@@ -737,7 -739,7 +750,8 @@@ export const validateAppConnectionCrede
[AppConnection.Stripe]: validateStripeConnectionCredentials as TAppConnectionCredentialsValidator,
[AppConnection.Keeper]: validateKeeperConnectionCredentials as TAppConnectionCredentialsValidator,
[AppConnection.HpeIloRedFish]: validateHpeIloConnectionCredentials as TAppConnectionCredentialsValidator,
- [AppConnection.ServiceNow]: validateServiceNowConnectionCredentials as TAppConnectionCredentialsValidator
++ [AppConnection.ServiceNow]: validateServiceNowConnectionCredentials as TAppConnectionCredentialsValidator,
+ [AppConnection.S3Compatible]: validateS3CompatibleConnectionCredentials as TAppConnectionCredentialsValidator
};
return VALIDATE_APP_CONNECTION_CREDENTIALS_MAP[appConnection.app](appConnection, gatewayV2Service);
@@@ -1023,7 -1027,7 +1040,8 @@@ export const TRANSITION_CONNECTION_CRED
[AppConnection.Stripe]: platformManagedCredentialsNotSupported,
[AppConnection.Keeper]: platformManagedCredentialsNotSupported,
[AppConnection.HpeIloRedFish]: platformManagedCredentialsNotSupported,
- [AppConnection.ServiceNow]: platformManagedCredentialsNotSupported
++ [AppConnection.ServiceNow]: platformManagedCredentialsNotSupported,
+ [AppConnection.S3Compatible]: platformManagedCredentialsNotSupported
};
export const enterpriseAppCheck = async (
diff --cc backend/src/services/app-connection/app-connection-maps.ts
index 2d61c7f473,5a5711e181..9c970b68ab
--- a/backend/src/services/app-connection/app-connection-maps.ts
+++ b/backend/src/services/app-connection/app-connection-maps.ts
@@@ -91,7 -92,7 +92,8 @@@ export const APP_CONNECTION_NAME_MAP: R
[AppConnection.Stripe]: "Stripe",
[AppConnection.Keeper]: "Keeper",
[AppConnection.HpeIloRedFish]: "HPE iLO",
- [AppConnection.ServiceNow]: "ServiceNow"
++ [AppConnection.ServiceNow]: "ServiceNow",
+ [AppConnection.S3Compatible]: "S3-Compatible Storage"
};
export const APP_CONNECTION_PLAN_MAP: Record<AppConnection, AppConnectionPlanType> = {
@@@ -185,5 -187,5 +188,6 @@@
[AppConnection.Stripe]: AppConnectionPlanType.Regular,
[AppConnection.Keeper]: AppConnectionPlanType.Regular,
[AppConnection.HpeIloRedFish]: AppConnectionPlanType.Regular,
- [AppConnection.ServiceNow]: AppConnectionPlanType.Enterprise
++ [AppConnection.ServiceNow]: AppConnectionPlanType.Enterprise,
+ [AppConnection.S3Compatible]: AppConnectionPlanType.Regular
};
diff --cc backend/src/services/app-connection/app-connection-service.ts
index 7b5b7cdf05,6d4fcbd59f..14ab65dcea
--- a/backend/src/services/app-connection/app-connection-service.ts
+++ b/backend/src/services/app-connection/app-connection-service.ts
@@@ -186,9 -188,9 +188,10 @@@ import { ValidateRenderConnectionCreden
import { renderConnectionService } from "./render/render-connection-service";
import { ValidateRundeckConnectionCredentialsSchema } from "./rundeck";
import { rundeckConnectionService } from "./rundeck/rundeck-connection-service";
+ import { ValidateS3CompatibleConnectionCredentialsSchema } from "./s3-compatible";
import { ValidateSalesforceConnectionCredentialsSchema } from "./salesforce";
import { salesforceConnectionService } from "./salesforce/salesforce-connection-service";
+import { ValidateServiceNowConnectionCredentialsSchema } from "./servicenow";
import { ValidateSmbConnectionCredentialsSchema } from "./smb";
import { ValidateSnowflakeConnectionCredentialsSchema } from "./snowflake";
import { snowflakeConnectionService } from "./snowflake/snowflake-connection-service";
@@@ -334,7 -337,7 +338,8 @@@ const VALIDATE_APP_CONNECTION_CREDENTIA
[AppConnection.Stripe]: ValidateStripeConnectionCredentialsSchema,
[AppConnection.Keeper]: ValidateKeeperConnectionCredentialsSchema,
[AppConnection.HpeIloRedFish]: ValidateHpeIloConnectionCredentialsSchema,
- [AppConnection.ServiceNow]: ValidateServiceNowConnectionCredentialsSchema
++ [AppConnection.ServiceNow]: ValidateServiceNowConnectionCredentialsSchema,
+ [AppConnection.S3Compatible]: ValidateS3CompatibleConnectionCredentialsSchema
};
export const appConnectionServiceFactory = ({
diff --cc backend/src/services/app-connection/app-connection-types.ts
index 300d9fe468,1cf2e45315..18c15e658d
--- a/backend/src/services/app-connection/app-connection-types.ts
+++ b/backend/src/services/app-connection/app-connection-types.ts
@@@ -632,7 -639,7 +645,8 @@@ export type TAppConnection = { id: stri
| TStripeConnection
| TKeeperConnection
| THpeIloConnection
+ | TServiceNowConnection
+ | TS3CompatibleConnection
);
export type TAppConnectionRaw = NonNullable<Awaited<ReturnType<TAppConnectionDALFactory["findById"]>>>;
@@@ -734,7 -742,7 +749,8 @@@ export type TAppConnectionInput = { id
| TStripeConnectionInput
| TKeeperConnectionInput
| THpeIloConnectionInput
+ | TServiceNowConnectionInput
+ | TS3CompatibleConnectionInput
);
export type TSqlConnectionInput =
@@@ -870,7 -879,7 +887,8 @@@ export type TAppConnectionConfig
| TStripeConnectionConfig
| TKeeperConnectionConfig
| THpeIloConnectionConfig
- | TServiceNowConnectionConfig;
++ | TServiceNowConnectionConfig
+ | TS3CompatibleConnectionConfig;
export type TValidateAppConnectionCredentialsSchema =
| TValidateAwsConnectionCredentialsSchema
@@@ -963,7 -973,7 +982,8 @@@
| TValidateStripeConnectionCredentialsSchema
| TValidateKeeperConnectionCredentialsSchema
| TValidateHpeIloConnectionCredentialsSchema
- | TValidateServiceNowConnectionCredentialsSchema;
++ | TValidateServiceNowConnectionCredentialsSchema
+ | TValidateS3CompatibleConnectionCredentialsSchema;
export type TListAwsConnectionKmsKeys = {
connectionId: string;
diff --cc frontend/src/helpers/appConnections.ts
index b0faa25a83,567f20409f..0453ed1512
--- a/frontend/src/helpers/appConnections.ts
+++ b/frontend/src/helpers/appConnections.ts
@@@ -93,8 -94,8 +94,9 @@@ import { PowerDnsConnectionMethod } fro
import { RailwayConnectionMethod } from "@app/hooks/api/appConnections/types/railway-connection";
import { RenderConnectionMethod } from "@app/hooks/api/appConnections/types/render-connection";
import { RundeckConnectionMethod } from "@app/hooks/api/appConnections/types/rundeck-connection";
+ import { S3CompatibleConnectionMethod } from "@app/hooks/api/appConnections/types/s3-compatible-connection";
import { SalesforceConnectionMethod } from "@app/hooks/api/appConnections/types/salesforce-connection";
+import { ServiceNowConnectionMethod } from "@app/hooks/api/appConnections/types/servicenow-connection";
import { SmbConnectionMethod } from "@app/hooks/api/appConnections/types/smb-connection";
import { SnowflakeConnectionMethod } from "@app/hooks/api/appConnections/types/snowflake-connection";
import { SpaceliftConnectionMethod } from "@app/hooks/api/appConnections/types/spacelift-connection";
@@@ -675,12 -682,34 +683,41 @@@ export const APP_CONNECTION_MAP: Record
category: "PLATFORM",
description: "Organization secret access for Daytona sandboxes."
},
+ [AppConnection.ServiceNow]: {
+ name: "ServiceNow",
+ image: "ServiceNow.png",
+ category: "PLATFORM",
+ description: "Route access requests through ServiceNow approvals.",
+ enterprise: true
++ },
+ [AppConnection.S3Compatible]: {
+ name: "S3-Compatible Storage",
+ image: "S3 Compatible.svg",
+ aliases: ["aws s3", "cloudflare r2", "google cloud storage", "gcs", "oracle", "oci"],
+ category: "STORAGE",
+ description: "Connect to AWS S3, Cloudflare R2, Google Cloud Storage or OCI Object Storage."
+ }
+ };
+
+ const S3_COMPATIBLE_PROVIDERS = [
+ { name: "AWS S3", hostname: /^s3\.[a-z0-9-]+\.amazonaws\.com$/ },
+ { name: "Cloudflare R2", hostname: /^[a-f0-9]{32}(\.[a-z]+)?\.r2\.cloudflarestorage\.com$/ },
+ { name: "Google Cloud Storage", hostname: /^storage\.googleapis\.com$/ },
+ {
+ name: "OCI Object Storage",
+ hostname:
+ /^[a-z0-9-]+\.compat\.objectstorage\.[a-z0-9-]+\.(oraclecloud\.com|oci\.customer-oci\.com)$/
+ }
+ ];
+
+ const STORAGE_HOSTNAME_REGEX = /^[a-z0-9]([a-z0-9.-]*[a-z0-9])?(:[0-9]{1,5})?$/;
+
+ export const isStorageHostname = (hostname: string) => {
+ if (!STORAGE_HOSTNAME_REGEX.test(hostname)) return false;
+ try {
+ return new URL(`https://${hostname}`).host === hostname;
+ } catch {
+ return false;
}
};
diff --cc frontend/src/hooks/api/appConnections/enums.ts
index ba8f3c9d19,f95ab21072..ee786e8484
--- a/frontend/src/hooks/api/appConnections/enums.ts
+++ b/frontend/src/hooks/api/appConnections/enums.ts
@@@ -89,5 -90,5 +90,6 @@@ export enum AppConnection
Stripe = "stripe",
Keeper = "keeper",
HpeIloRedFish = "hpe-ilo",
- ServiceNow = "servicenow"
++ ServiceNow = "servicenow",
+ S3Compatible = "s3-compatible"
}
diff --cc frontend/src/hooks/api/appConnections/types/app-options.ts
index 801f893d66,b9a68945ca..1ff19b7289
--- a/frontend/src/hooks/api/appConnections/types/app-options.ts
+++ b/frontend/src/hooks/api/appConnections/types/app-options.ts
@@@ -375,10 -379,10 +379,14 @@@ export type TDaytonaConnectionOption =
app: AppConnection.Daytona;
};
+export type TServiceNowConnectionOption = TAppConnectionOptionBase & {
+ app: AppConnection.ServiceNow;
+};
+
+ export type TS3CompatibleConnectionOption = TAppConnectionOptionBase & {
+ app: AppConnection.S3Compatible;
+ };
+
export type TAppConnectionOption =
| TAwsConnectionOption
| TGitHubConnectionOption
@@@ -470,7 -475,7 +479,8 @@@
| TNutanixPrismCentralConnectionOption
| TSpaceliftConnectionOption
| TDaytonaConnectionOption
- | TServiceNowConnectionOption;
++ | TServiceNowConnectionOption
+ | TS3CompatibleConnectionOption;
export type TAppConnectionOptionMap = {
[AppConnection.AWS]: TAwsConnectionOption;
@@@ -563,5 -569,5 +574,6 @@@
[AppConnection.NutanixPrismCentral]: TNutanixPrismCentralConnectionOption;
[AppConnection.Spacelift]: TSpaceliftConnectionOption;
[AppConnection.Daytona]: TDaytonaConnectionOption;
+ [AppConnection.ServiceNow]: TServiceNowConnectionOption;
+ [AppConnection.S3Compatible]: TS3CompatibleConnectionOption;
};
diff --cc frontend/src/hooks/api/appConnections/types/index.ts
index 81b23cf96a,be91e16be3..a1fb115ffc
--- a/frontend/src/hooks/api/appConnections/types/index.ts
+++ b/frontend/src/hooks/api/appConnections/types/index.ts
@@@ -72,8 -73,8 +73,9 @@@ import { TRailwayConnection } from "./r
import { TRedisConnection } from "./redis-connection";
import { TRenderConnection } from "./render-connection";
import { TRundeckConnection } from "./rundeck-connection";
+ import { TS3CompatibleConnection } from "./s3-compatible-connection";
import { TSalesforceConnection } from "./salesforce-connection";
+import { TServiceNowConnection } from "./servicenow-connection";
import { TSmbConnection } from "./smb-connection";
import { TSnowflakeConnection } from "./snowflake-connection";
import { TSpaceliftConnection } from "./spacelift-connection";
@@@ -161,8 -163,8 +164,9 @@@ export * from "./railway-connection"
export * from "./redis-connection";
export * from "./render-connection";
export * from "./rundeck-connection";
+ export * from "./s3-compatible-connection";
export * from "./salesforce-connection";
+export * from "./servicenow-connection";
export * from "./smb-connection";
export * from "./snowflake-connection";
export * from "./spacelift-connection";
@@@ -272,7 -275,7 +277,8 @@@ export type TAppConnection
| TStripeConnection
| TKeeperConnection
| THpeIloConnection
- | TServiceNowConnection;
++ | TServiceNowConnection
+ | TS3CompatibleConnection;
export type TAvailableAppConnection = Pick<TAppConnection, "name" | "id" | "projectId">;
diff --cc frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx
index 1ee8e5584b,fd15440010..9a04eb70f4
--- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx
+++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx
@@@ -87,8 -88,8 +88,9 @@@ import { RailwayConnectionForm } from "
import { RedisConnectionForm } from "./RedisConnectionForm";
import { RenderConnectionForm } from "./RenderConnectionForm";
import { RundeckConnectionForm } from "./RundeckConnectionForm";
+ import { S3CompatibleConnectionForm } from "./S3CompatibleConnectionForm";
import { SalesforceConnectionForm } from "./SalesforceConnectionForm";
+import { ServiceNowConnectionForm } from "./ServiceNowConnectionForm";
import { SmbConnectionForm } from "./SmbConnectionForm";
import { SnowflakeConnectionForm } from "./SnowflakeConnectionForm";
import { SpaceliftConnectionForm } from "./SpaceliftConnectionForm";