Skip to content

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

Merge remote-tracking branch 'origin/main' into chore/deprecate-gateway-v1

Sheen Capadnganb61416d887b4
diff --cc backend/src/ee/services/gateway-v2/gateway-v2-fns.ts
index 4fb88ecb46,f3fc665404..e1c5750abd
--- a/backend/src/ee/services/gateway-v2/gateway-v2-fns.ts
+++ b/backend/src/ee/services/gateway-v2/gateway-v2-fns.ts
@@@ -1,6 -1,8 +1,8 @@@
+ import { BadRequestError } from "@app/lib/errors";
-import { GatewayProxyProtocol } from "@app/lib/gateway";
import { withGatewayV2Proxy } from "@app/lib/gateway-v2/gateway-v2";
+ import { callSqlRotateCredential, TSqlRpcResponse } from "@app/lib/gateway-v2/sql-rpc";
import { callTestConnection, TestConnectionResponse } from "@app/lib/gateway-v2/test-connection-rpc";
+import { GatewayProxyProtocol } from "@app/lib/gateway-v2/types";
import { verifyHostInputValidity } from "../dynamic-secret/dynamic-secret-fns";
import { TGatewayV2ServiceFactory } from "./gateway-v2-service";
diff --cc backend/src/lib/gateway-v2/types.ts
index ab0aac9cb6,0000000000..36f323a896
mode 100644,000000..100644
--- a/backend/src/lib/gateway-v2/types.ts
+++ b/backend/src/lib/gateway-v2/types.ts
@@@ -1,19 -1,0 +1,20 @@@
+export enum GatewayProxyProtocol {
+ Http = "http",
+ Tcp = "tcp",
+ Ping = "ping",
+ Health = "health",
+ Pam = "pam",
+ PamRdpBrowser = "pam-rdp-browser",
+ PamSessionCancellation = "pam-session-cancellation",
+ Pkcs11 = "pkcs11",
+ Adcs = "adcs",
+ Discovery = "discovery",
+ ConnectionTest = "connection-test",
- WinRm = "winrm"
++ WinRm = "winrm",
++ Sql = "sql"
+}
+
+export enum GatewayHttpProxyActions {
+ InjectGatewayK8sServiceAccountToken = "inject-k8s-sa-auth-token",
+ UseGatewayK8sServiceAccount = "use-k8s-sa"
+}
diff --cc backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts
index 898c94085d,f6fb7fa050..ab73ff3a8b
--- a/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts
+++ b/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts
@@@ -38,16 -36,9 +34,10 @@@ import { ProjectPermissionIdentityActio
import { TKeyStoreFactory } from "@app/keystore/keystore";
import { getConfig } from "@app/lib/config/env";
import { request } from "@app/lib/config/request";
- import {
- BadRequestError,
- ForbiddenRequestError,
- NotFoundError,
- PermissionBoundaryError,
- UnauthorizedError
- } from "@app/lib/errors";
+ import { BadRequestError, ForbiddenRequestError, NotFoundError, UnauthorizedError } from "@app/lib/errors";
-import { GatewayHttpProxyActions, GatewayProxyProtocol, withGatewayProxy } from "@app/lib/gateway";
+import { getMissingGatewayMessage, getRetiredGatewayMessage } from "@app/lib/gateway-v2/gateway-errors";
import { withGatewayV2Proxy } from "@app/lib/gateway-v2/gateway-v2";
+import { GatewayHttpProxyActions, GatewayProxyProtocol } from "@app/lib/gateway-v2/types";
import { extractIPDetails, isValidIpOrCidr, TIp } from "@app/lib/ip";
import { logger } from "@app/lib/logger";
import { requestMemoKeys } from "@app/lib/request-context/memo-keys";
@@@ -112,10 -104,15 +103,13 @@@ type TIdentityKubernetesAuthServiceFact
identityAuthTemplateDAL: Pick<TIdentityAuthTemplateDALFactory, "findByIdAndOrgId">;
membershipIdentityDAL: Pick<TMembershipIdentityDALFactory, "findOne" | "update" | "getIdentityById">;
keyStore: Pick<TKeyStoreFactory, "setItemWithExpiryNX">;
- permissionService: Pick<TPermissionServiceFactory, "getOrgPermission" | "getProjectPermission">;
+ permissionService: Pick<
+ TPermissionServiceFactory,
+ "getOrgPermission" | "getProjectPermission" | "getActorGrantAbilities"
+ >;
licenseService: Pick<TLicenseServiceFactory, "getPlan">;
kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
- gatewayService: TGatewayServiceFactory;
gatewayV2Service: TGatewayV2ServiceFactory;
- gatewayDAL: Pick<TGatewayDALFactory, "find">;
gatewayV2DAL: Pick<TGatewayV2DALFactory, "find">;
gatewayPoolService: Pick<TGatewayPoolServiceFactory, "pickHealthyGateway" | "runWithPoolFailover">;
gatewayPoolDAL: Pick<TGatewayPoolDALFactory, "findById">;