mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 16:27:40 +00:00
Merge pull request #4981 from Infisical/PAM-12-add-k8s-for-pam
feature: add k8s for PAM
This commit is contained in:
@@ -3,6 +3,11 @@ import {
|
|||||||
SanitizedAwsIamAccountWithResourceSchema,
|
SanitizedAwsIamAccountWithResourceSchema,
|
||||||
UpdateAwsIamAccountSchema
|
UpdateAwsIamAccountSchema
|
||||||
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
||||||
|
import {
|
||||||
|
CreateKubernetesAccountSchema,
|
||||||
|
SanitizedKubernetesAccountWithResourceSchema,
|
||||||
|
UpdateKubernetesAccountSchema
|
||||||
|
} from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
|
||||||
import {
|
import {
|
||||||
CreateMySQLAccountSchema,
|
CreateMySQLAccountSchema,
|
||||||
SanitizedMySQLAccountWithResourceSchema,
|
SanitizedMySQLAccountWithResourceSchema,
|
||||||
@@ -50,6 +55,15 @@ export const PAM_ACCOUNT_REGISTER_ROUTER_MAP: Record<PamResource, (server: Fasti
|
|||||||
updateAccountSchema: UpdateSSHAccountSchema
|
updateAccountSchema: UpdateSSHAccountSchema
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
[PamResource.Kubernetes]: async (server: FastifyZodProvider) => {
|
||||||
|
registerPamResourceEndpoints({
|
||||||
|
server,
|
||||||
|
resourceType: PamResource.Kubernetes,
|
||||||
|
accountResponseSchema: SanitizedKubernetesAccountWithResourceSchema,
|
||||||
|
createAccountSchema: CreateKubernetesAccountSchema,
|
||||||
|
updateAccountSchema: UpdateKubernetesAccountSchema
|
||||||
|
});
|
||||||
|
},
|
||||||
[PamResource.AwsIam]: async (server: FastifyZodProvider) => {
|
[PamResource.AwsIam]: async (server: FastifyZodProvider) => {
|
||||||
registerPamResourceEndpoints({
|
registerPamResourceEndpoints({
|
||||||
server,
|
server,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { PamFoldersSchema } from "@app/db/schemas";
|
|||||||
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
|
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
|
||||||
import { PamAccountOrderBy, PamAccountView } from "@app/ee/services/pam-account/pam-account-enums";
|
import { PamAccountOrderBy, PamAccountView } from "@app/ee/services/pam-account/pam-account-enums";
|
||||||
import { SanitizedAwsIamAccountWithResourceSchema } from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
import { SanitizedAwsIamAccountWithResourceSchema } from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
||||||
|
import { SanitizedKubernetesAccountWithResourceSchema } from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
|
||||||
import { SanitizedMySQLAccountWithResourceSchema } from "@app/ee/services/pam-resource/mysql/mysql-resource-schemas";
|
import { SanitizedMySQLAccountWithResourceSchema } from "@app/ee/services/pam-resource/mysql/mysql-resource-schemas";
|
||||||
import { PamResource } from "@app/ee/services/pam-resource/pam-resource-enums";
|
import { PamResource } from "@app/ee/services/pam-resource/pam-resource-enums";
|
||||||
import { GatewayAccessResponseSchema } from "@app/ee/services/pam-resource/pam-resource-schemas";
|
import { GatewayAccessResponseSchema } from "@app/ee/services/pam-resource/pam-resource-schemas";
|
||||||
@@ -21,10 +22,17 @@ const SanitizedAccountSchema = z.union([
|
|||||||
SanitizedSSHAccountWithResourceSchema, // ORDER MATTERS
|
SanitizedSSHAccountWithResourceSchema, // ORDER MATTERS
|
||||||
SanitizedPostgresAccountWithResourceSchema,
|
SanitizedPostgresAccountWithResourceSchema,
|
||||||
SanitizedMySQLAccountWithResourceSchema,
|
SanitizedMySQLAccountWithResourceSchema,
|
||||||
|
SanitizedKubernetesAccountWithResourceSchema,
|
||||||
SanitizedAwsIamAccountWithResourceSchema
|
SanitizedAwsIamAccountWithResourceSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
type TSanitizedAccount = z.infer<typeof SanitizedAccountSchema>;
|
const ListPamAccountsResponseSchema = z.object({
|
||||||
|
accounts: SanitizedAccountSchema.array(),
|
||||||
|
folders: PamFoldersSchema.array(),
|
||||||
|
totalCount: z.number().default(0),
|
||||||
|
folderId: z.string().optional(),
|
||||||
|
folderPaths: z.record(z.string(), z.string())
|
||||||
|
});
|
||||||
|
|
||||||
export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
|
export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
|
||||||
server.route({
|
server.route({
|
||||||
@@ -55,13 +63,7 @@ export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
|
|||||||
.optional()
|
.optional()
|
||||||
}),
|
}),
|
||||||
response: {
|
response: {
|
||||||
200: z.object({
|
200: ListPamAccountsResponseSchema
|
||||||
accounts: SanitizedAccountSchema.array(),
|
|
||||||
folders: PamFoldersSchema.array(),
|
|
||||||
totalCount: z.number().default(0),
|
|
||||||
folderId: z.string().optional(),
|
|
||||||
folderPaths: z.record(z.string(), z.string())
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onRequest: verifyAuth([AuthMode.JWT]),
|
onRequest: verifyAuth([AuthMode.JWT]),
|
||||||
@@ -98,7 +100,7 @@ export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return { accounts: accounts as TSanitizedAccount[], folders, totalCount, folderId, folderPaths };
|
return { accounts, folders, totalCount, folderId, folderPaths } as z.infer<typeof ListPamAccountsResponseSchema>;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -135,6 +137,7 @@ export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
|
|||||||
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.Postgres) }),
|
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.Postgres) }),
|
||||||
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.MySQL) }),
|
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.MySQL) }),
|
||||||
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.SSH) }),
|
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.SSH) }),
|
||||||
|
GatewayAccessResponseSchema.extend({ resourceType: z.literal(PamResource.Kubernetes) }),
|
||||||
// AWS IAM (no gateway, returns console URL)
|
// AWS IAM (no gateway, returns console URL)
|
||||||
z.object({
|
z.object({
|
||||||
sessionId: z.string(),
|
sessionId: z.string(),
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ import {
|
|||||||
SanitizedAwsIamResourceSchema,
|
SanitizedAwsIamResourceSchema,
|
||||||
UpdateAwsIamResourceSchema
|
UpdateAwsIamResourceSchema
|
||||||
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
||||||
|
import {
|
||||||
|
CreateKubernetesResourceSchema,
|
||||||
|
SanitizedKubernetesResourceSchema,
|
||||||
|
UpdateKubernetesResourceSchema
|
||||||
|
} from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
|
||||||
import {
|
import {
|
||||||
CreateMySQLResourceSchema,
|
CreateMySQLResourceSchema,
|
||||||
MySQLResourceSchema,
|
MySQLResourceSchema,
|
||||||
@@ -50,6 +55,15 @@ export const PAM_RESOURCE_REGISTER_ROUTER_MAP: Record<PamResource, (server: Fast
|
|||||||
updateResourceSchema: UpdateSSHResourceSchema
|
updateResourceSchema: UpdateSSHResourceSchema
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
[PamResource.Kubernetes]: async (server: FastifyZodProvider) => {
|
||||||
|
registerPamResourceEndpoints({
|
||||||
|
server,
|
||||||
|
resourceType: PamResource.Kubernetes,
|
||||||
|
resourceResponseSchema: SanitizedKubernetesResourceSchema,
|
||||||
|
createResourceSchema: CreateKubernetesResourceSchema,
|
||||||
|
updateResourceSchema: UpdateKubernetesResourceSchema
|
||||||
|
});
|
||||||
|
},
|
||||||
[PamResource.AwsIam]: async (server: FastifyZodProvider) => {
|
[PamResource.AwsIam]: async (server: FastifyZodProvider) => {
|
||||||
registerPamResourceEndpoints({
|
registerPamResourceEndpoints({
|
||||||
server,
|
server,
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ import {
|
|||||||
AwsIamResourceListItemSchema,
|
AwsIamResourceListItemSchema,
|
||||||
SanitizedAwsIamResourceSchema
|
SanitizedAwsIamResourceSchema
|
||||||
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
} from "@app/ee/services/pam-resource/aws-iam/aws-iam-resource-schemas";
|
||||||
|
import {
|
||||||
|
KubernetesResourceListItemSchema,
|
||||||
|
SanitizedKubernetesResourceSchema
|
||||||
|
} from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
|
||||||
import {
|
import {
|
||||||
MySQLResourceListItemSchema,
|
MySQLResourceListItemSchema,
|
||||||
SanitizedMySQLResourceSchema
|
SanitizedMySQLResourceSchema
|
||||||
@@ -27,6 +31,7 @@ const SanitizedResourceSchema = z.union([
|
|||||||
SanitizedPostgresResourceSchema,
|
SanitizedPostgresResourceSchema,
|
||||||
SanitizedMySQLResourceSchema,
|
SanitizedMySQLResourceSchema,
|
||||||
SanitizedSSHResourceSchema,
|
SanitizedSSHResourceSchema,
|
||||||
|
SanitizedKubernetesResourceSchema,
|
||||||
SanitizedAwsIamResourceSchema
|
SanitizedAwsIamResourceSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -34,6 +39,7 @@ const ResourceOptionsSchema = z.discriminatedUnion("resource", [
|
|||||||
PostgresResourceListItemSchema,
|
PostgresResourceListItemSchema,
|
||||||
MySQLResourceListItemSchema,
|
MySQLResourceListItemSchema,
|
||||||
SSHResourceListItemSchema,
|
SSHResourceListItemSchema,
|
||||||
|
KubernetesResourceListItemSchema,
|
||||||
AwsIamResourceListItemSchema
|
AwsIamResourceListItemSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ import { z } from "zod";
|
|||||||
|
|
||||||
import { PamSessionsSchema } from "@app/db/schemas";
|
import { PamSessionsSchema } from "@app/db/schemas";
|
||||||
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
|
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
|
||||||
|
import { KubernetesSessionCredentialsSchema } from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
|
||||||
import { MySQLSessionCredentialsSchema } from "@app/ee/services/pam-resource/mysql/mysql-resource-schemas";
|
import { MySQLSessionCredentialsSchema } from "@app/ee/services/pam-resource/mysql/mysql-resource-schemas";
|
||||||
import { PostgresSessionCredentialsSchema } from "@app/ee/services/pam-resource/postgres/postgres-resource-schemas";
|
import { PostgresSessionCredentialsSchema } from "@app/ee/services/pam-resource/postgres/postgres-resource-schemas";
|
||||||
import { SSHSessionCredentialsSchema } from "@app/ee/services/pam-resource/ssh/ssh-resource-schemas";
|
import { SSHSessionCredentialsSchema } from "@app/ee/services/pam-resource/ssh/ssh-resource-schemas";
|
||||||
import {
|
import {
|
||||||
|
HttpEventSchema,
|
||||||
PamSessionCommandLogSchema,
|
PamSessionCommandLogSchema,
|
||||||
SanitizedSessionSchema,
|
SanitizedSessionSchema,
|
||||||
TerminalEventSchema
|
TerminalEventSchema
|
||||||
@@ -17,7 +19,8 @@ import { AuthMode } from "@app/services/auth/auth-type";
|
|||||||
const SessionCredentialsSchema = z.union([
|
const SessionCredentialsSchema = z.union([
|
||||||
SSHSessionCredentialsSchema,
|
SSHSessionCredentialsSchema,
|
||||||
PostgresSessionCredentialsSchema,
|
PostgresSessionCredentialsSchema,
|
||||||
MySQLSessionCredentialsSchema
|
MySQLSessionCredentialsSchema,
|
||||||
|
KubernetesSessionCredentialsSchema
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export const registerPamSessionRouter = async (server: FastifyZodProvider) => {
|
export const registerPamSessionRouter = async (server: FastifyZodProvider) => {
|
||||||
@@ -89,7 +92,7 @@ export const registerPamSessionRouter = async (server: FastifyZodProvider) => {
|
|||||||
sessionId: z.string().uuid()
|
sessionId: z.string().uuid()
|
||||||
}),
|
}),
|
||||||
body: z.object({
|
body: z.object({
|
||||||
logs: z.array(z.union([PamSessionCommandLogSchema, TerminalEventSchema]))
|
logs: z.array(z.union([PamSessionCommandLogSchema, TerminalEventSchema, HttpEventSchema]))
|
||||||
}),
|
}),
|
||||||
response: {
|
response: {
|
||||||
200: z.object({
|
200: z.object({
|
||||||
|
|||||||
@@ -689,13 +689,30 @@ export const pamAccountServiceFactory = ({
|
|||||||
throw new BadRequestError({ message: "Gateway ID is required for this resource type" });
|
throw new BadRequestError({ message: "Gateway ID is required for this resource type" });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const { host, port } =
|
||||||
|
resourceType !== PamResource.Kubernetes
|
||||||
|
? connectionDetails
|
||||||
|
: (() => {
|
||||||
|
const url = new URL(connectionDetails.url);
|
||||||
|
let portNumber: number | undefined;
|
||||||
|
if (url.port) {
|
||||||
|
portNumber = Number(url.port);
|
||||||
|
} else {
|
||||||
|
portNumber = url.protocol === "https:" ? 443 : 80;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
host: url.hostname,
|
||||||
|
port: portNumber
|
||||||
|
};
|
||||||
|
})();
|
||||||
|
|
||||||
const gatewayConnectionDetails = await gatewayV2Service.getPAMConnectionDetails({
|
const gatewayConnectionDetails = await gatewayV2Service.getPAMConnectionDetails({
|
||||||
gatewayId,
|
gatewayId,
|
||||||
duration,
|
duration,
|
||||||
sessionId: session.id,
|
sessionId: session.id,
|
||||||
resourceType: resource.resourceType as PamResource,
|
resourceType: resource.resourceType as PamResource,
|
||||||
host: (connectionDetails as TSqlResourceConnectionDetails).host,
|
host,
|
||||||
port: (connectionDetails as TSqlResourceConnectionDetails).port,
|
port,
|
||||||
actorMetadata: {
|
actorMetadata: {
|
||||||
id: actor.id,
|
id: actor.id,
|
||||||
type: actor.type,
|
type: actor.type,
|
||||||
@@ -746,6 +763,13 @@ export const pamAccountServiceFactory = ({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case PamResource.Kubernetes:
|
||||||
|
metadata = {
|
||||||
|
resourceName: resource.name,
|
||||||
|
accountName: account.name,
|
||||||
|
accountPath
|
||||||
|
};
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export enum KubernetesAuthMethod {
|
||||||
|
ServiceAccountToken = "service-account-token"
|
||||||
|
}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
import axios, { AxiosError } from "axios";
|
||||||
|
import https from "https";
|
||||||
|
|
||||||
|
import { BadRequestError } from "@app/lib/errors";
|
||||||
|
import { GatewayProxyProtocol } from "@app/lib/gateway/types";
|
||||||
|
import { withGatewayV2Proxy } from "@app/lib/gateway-v2/gateway-v2";
|
||||||
|
import { logger } from "@app/lib/logger";
|
||||||
|
|
||||||
|
import { verifyHostInputValidity } from "../../dynamic-secret/dynamic-secret-fns";
|
||||||
|
import { TGatewayV2ServiceFactory } from "../../gateway-v2/gateway-v2-service";
|
||||||
|
import { PamResource } from "../pam-resource-enums";
|
||||||
|
import {
|
||||||
|
TPamResourceFactory,
|
||||||
|
TPamResourceFactoryRotateAccountCredentials,
|
||||||
|
TPamResourceFactoryValidateAccountCredentials
|
||||||
|
} from "../pam-resource-types";
|
||||||
|
import { KubernetesAuthMethod } from "./kubernetes-resource-enums";
|
||||||
|
import { TKubernetesAccountCredentials, TKubernetesResourceConnectionDetails } from "./kubernetes-resource-types";
|
||||||
|
|
||||||
|
const EXTERNAL_REQUEST_TIMEOUT = 10 * 1000;
|
||||||
|
|
||||||
|
export const executeWithGateway = async <T>(
|
||||||
|
config: {
|
||||||
|
connectionDetails: TKubernetesResourceConnectionDetails;
|
||||||
|
resourceType: PamResource;
|
||||||
|
gatewayId: string;
|
||||||
|
},
|
||||||
|
gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPlatformConnectionDetailsByGatewayId">,
|
||||||
|
operation: (baseUrl: string, httpsAgent: https.Agent) => Promise<T>
|
||||||
|
): Promise<T> => {
|
||||||
|
const { connectionDetails, gatewayId } = config;
|
||||||
|
const url = new URL(connectionDetails.url);
|
||||||
|
const [targetHost] = await verifyHostInputValidity(url.hostname, true);
|
||||||
|
|
||||||
|
let targetPort: number;
|
||||||
|
if (url.port) {
|
||||||
|
targetPort = Number(url.port);
|
||||||
|
} else if (url.protocol === "https:") {
|
||||||
|
targetPort = 443;
|
||||||
|
} else {
|
||||||
|
targetPort = 80;
|
||||||
|
}
|
||||||
|
|
||||||
|
const platformConnectionDetails = await gatewayV2Service.getPlatformConnectionDetailsByGatewayId({
|
||||||
|
gatewayId,
|
||||||
|
targetHost,
|
||||||
|
targetPort
|
||||||
|
});
|
||||||
|
if (!platformConnectionDetails) {
|
||||||
|
throw new BadRequestError({ message: "Unable to connect to gateway, no platform connection details found" });
|
||||||
|
}
|
||||||
|
const httpsAgent = new https.Agent({
|
||||||
|
ca: connectionDetails.sslCertificate,
|
||||||
|
rejectUnauthorized: connectionDetails.sslRejectUnauthorized,
|
||||||
|
servername: targetHost
|
||||||
|
});
|
||||||
|
return withGatewayV2Proxy(
|
||||||
|
async (proxyPort) => {
|
||||||
|
const protocol = url.protocol === "https:" ? "https" : "http";
|
||||||
|
const baseUrl = `${protocol}://localhost:${proxyPort}`;
|
||||||
|
return operation(baseUrl, httpsAgent);
|
||||||
|
},
|
||||||
|
{
|
||||||
|
protocol: GatewayProxyProtocol.Tcp,
|
||||||
|
relayHost: platformConnectionDetails.relayHost,
|
||||||
|
gateway: platformConnectionDetails.gateway,
|
||||||
|
relay: platformConnectionDetails.relay,
|
||||||
|
httpsAgent
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const kubernetesResourceFactory: TPamResourceFactory<
|
||||||
|
TKubernetesResourceConnectionDetails,
|
||||||
|
TKubernetesAccountCredentials
|
||||||
|
> = (resourceType, connectionDetails, gatewayId, gatewayV2Service) => {
|
||||||
|
const validateConnection = async () => {
|
||||||
|
if (!gatewayId) {
|
||||||
|
throw new BadRequestError({ message: "Gateway ID is required" });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await executeWithGateway(
|
||||||
|
{ connectionDetails, gatewayId, resourceType },
|
||||||
|
gatewayV2Service,
|
||||||
|
async (baseUrl, httpsAgent) => {
|
||||||
|
// Validate connection by checking API server version
|
||||||
|
try {
|
||||||
|
await axios.get(`${baseUrl}/version`, {
|
||||||
|
...(httpsAgent ? { httpsAgent } : {}),
|
||||||
|
signal: AbortSignal.timeout(EXTERNAL_REQUEST_TIMEOUT),
|
||||||
|
timeout: EXTERNAL_REQUEST_TIMEOUT
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof AxiosError) {
|
||||||
|
// If we get a 401/403, it means we reached the API server but need auth - that's fine for connection validation
|
||||||
|
if (error.response?.status === 401 || error.response?.status === 403) {
|
||||||
|
logger.info(
|
||||||
|
{ status: error.response.status },
|
||||||
|
"[Kubernetes Resource Factory] Kubernetes connection validation succeeded (auth required)"
|
||||||
|
);
|
||||||
|
return connectionDetails;
|
||||||
|
}
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unable to connect to Kubernetes API server: ${error.response?.statusText || error.message}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info("[Kubernetes Resource Factory] Kubernetes connection validation succeeded");
|
||||||
|
return connectionDetails;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return connectionDetails;
|
||||||
|
} catch (error) {
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unable to validate connection to ${resourceType}: ${(error as Error).message || String(error)}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const validateAccountCredentials: TPamResourceFactoryValidateAccountCredentials<
|
||||||
|
TKubernetesAccountCredentials
|
||||||
|
> = async (credentials) => {
|
||||||
|
if (!gatewayId) {
|
||||||
|
throw new BadRequestError({ message: "Gateway ID is required" });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await executeWithGateway(
|
||||||
|
{ connectionDetails, gatewayId, resourceType },
|
||||||
|
gatewayV2Service,
|
||||||
|
async (baseUrl, httpsAgent) => {
|
||||||
|
const { authMethod } = credentials;
|
||||||
|
if (authMethod === KubernetesAuthMethod.ServiceAccountToken) {
|
||||||
|
// Validate service account token using SelfSubjectReview API (whoami)
|
||||||
|
// This endpoint doesn't require any special permissions from the service account
|
||||||
|
try {
|
||||||
|
await axios.post(
|
||||||
|
`${baseUrl}/apis/authentication.k8s.io/v1/selfsubjectreviews`,
|
||||||
|
{
|
||||||
|
apiVersion: "authentication.k8s.io/v1",
|
||||||
|
kind: "SelfSubjectReview"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${credentials.serviceAccountToken}`
|
||||||
|
},
|
||||||
|
...(httpsAgent ? { httpsAgent } : {}),
|
||||||
|
signal: AbortSignal.timeout(EXTERNAL_REQUEST_TIMEOUT),
|
||||||
|
timeout: EXTERNAL_REQUEST_TIMEOUT
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
logger.info("[Kubernetes Resource Factory] Kubernetes service account token authentication successful");
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof AxiosError) {
|
||||||
|
if (error.response?.status === 401 || error.response?.status === 403) {
|
||||||
|
throw new BadRequestError({
|
||||||
|
message:
|
||||||
|
"Account credentials invalid. Service account token is not valid or does not have required permissions."
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unable to validate account credentials: ${error.response?.statusText || error.message}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unsupported Kubernetes auth method: ${authMethod as string}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return credentials;
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof BadRequestError) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unable to validate account credentials for ${resourceType}: ${(error as Error).message || String(error)}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const rotateAccountCredentials: TPamResourceFactoryRotateAccountCredentials<
|
||||||
|
TKubernetesAccountCredentials
|
||||||
|
> = async () => {
|
||||||
|
throw new BadRequestError({
|
||||||
|
message: `Unable to rotate account credentials for ${resourceType}: not implemented`
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleOverwritePreventionForCensoredValues = async (
|
||||||
|
updatedAccountCredentials: TKubernetesAccountCredentials,
|
||||||
|
currentCredentials: TKubernetesAccountCredentials
|
||||||
|
) => {
|
||||||
|
if (updatedAccountCredentials.authMethod !== currentCredentials.authMethod) {
|
||||||
|
return updatedAccountCredentials;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
updatedAccountCredentials.authMethod === KubernetesAuthMethod.ServiceAccountToken &&
|
||||||
|
currentCredentials.authMethod === KubernetesAuthMethod.ServiceAccountToken
|
||||||
|
) {
|
||||||
|
if (updatedAccountCredentials.serviceAccountToken === "__INFISICAL_UNCHANGED__") {
|
||||||
|
return {
|
||||||
|
...updatedAccountCredentials,
|
||||||
|
serviceAccountToken: currentCredentials.serviceAccountToken
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return updatedAccountCredentials;
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
validateConnection,
|
||||||
|
validateAccountCredentials,
|
||||||
|
rotateAccountCredentials,
|
||||||
|
handleOverwritePreventionForCensoredValues
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import { KubernetesResourceListItemSchema } from "./kubernetes-resource-schemas";
|
||||||
|
|
||||||
|
export const getKubernetesResourceListItem = () => {
|
||||||
|
return {
|
||||||
|
name: KubernetesResourceListItemSchema.shape.name.value,
|
||||||
|
resource: KubernetesResourceListItemSchema.shape.resource.value
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { PamResource } from "../pam-resource-enums";
|
||||||
|
import {
|
||||||
|
BaseCreatePamAccountSchema,
|
||||||
|
BaseCreatePamResourceSchema,
|
||||||
|
BasePamAccountSchema,
|
||||||
|
BasePamAccountSchemaWithResource,
|
||||||
|
BasePamResourceSchema,
|
||||||
|
BaseUpdatePamAccountSchema,
|
||||||
|
BaseUpdatePamResourceSchema
|
||||||
|
} from "../pam-resource-schemas";
|
||||||
|
import { KubernetesAuthMethod } from "./kubernetes-resource-enums";
|
||||||
|
|
||||||
|
export const BaseKubernetesResourceSchema = BasePamResourceSchema.extend({
|
||||||
|
resourceType: z.literal(PamResource.Kubernetes)
|
||||||
|
});
|
||||||
|
|
||||||
|
export const KubernetesResourceListItemSchema = z.object({
|
||||||
|
name: z.literal("Kubernetes"),
|
||||||
|
resource: z.literal(PamResource.Kubernetes)
|
||||||
|
});
|
||||||
|
|
||||||
|
export const KubernetesResourceConnectionDetailsSchema = z.object({
|
||||||
|
url: z.string().url().trim().max(500),
|
||||||
|
sslRejectUnauthorized: z.boolean(),
|
||||||
|
sslCertificate: z
|
||||||
|
.string()
|
||||||
|
.trim()
|
||||||
|
.transform((value) => value || undefined)
|
||||||
|
.optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const KubernetesServiceAccountTokenCredentialsSchema = z.object({
|
||||||
|
authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
|
||||||
|
serviceAccountToken: z.string().trim().max(10000)
|
||||||
|
});
|
||||||
|
|
||||||
|
export const KubernetesAccountCredentialsSchema = z.discriminatedUnion("authMethod", [
|
||||||
|
KubernetesServiceAccountTokenCredentialsSchema
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const KubernetesResourceSchema = BaseKubernetesResourceSchema.extend({
|
||||||
|
connectionDetails: KubernetesResourceConnectionDetailsSchema,
|
||||||
|
rotationAccountCredentials: KubernetesAccountCredentialsSchema.nullable().optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const SanitizedKubernetesResourceSchema = BaseKubernetesResourceSchema.extend({
|
||||||
|
connectionDetails: KubernetesResourceConnectionDetailsSchema,
|
||||||
|
rotationAccountCredentials: z
|
||||||
|
.discriminatedUnion("authMethod", [
|
||||||
|
z.object({
|
||||||
|
authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken)
|
||||||
|
})
|
||||||
|
])
|
||||||
|
.nullable()
|
||||||
|
.optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const CreateKubernetesResourceSchema = BaseCreatePamResourceSchema.extend({
|
||||||
|
connectionDetails: KubernetesResourceConnectionDetailsSchema,
|
||||||
|
rotationAccountCredentials: KubernetesAccountCredentialsSchema.nullable().optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const UpdateKubernetesResourceSchema = BaseUpdatePamResourceSchema.extend({
|
||||||
|
connectionDetails: KubernetesResourceConnectionDetailsSchema.optional(),
|
||||||
|
rotationAccountCredentials: KubernetesAccountCredentialsSchema.nullable().optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
// Accounts
|
||||||
|
export const KubernetesAccountSchema = BasePamAccountSchema.extend({
|
||||||
|
credentials: KubernetesAccountCredentialsSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export const CreateKubernetesAccountSchema = BaseCreatePamAccountSchema.extend({
|
||||||
|
credentials: KubernetesAccountCredentialsSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export const UpdateKubernetesAccountSchema = BaseUpdatePamAccountSchema.extend({
|
||||||
|
credentials: KubernetesAccountCredentialsSchema.optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const SanitizedKubernetesAccountWithResourceSchema = BasePamAccountSchemaWithResource.extend({
|
||||||
|
credentials: z.discriminatedUnion("authMethod", [
|
||||||
|
z.object({
|
||||||
|
authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken)
|
||||||
|
})
|
||||||
|
])
|
||||||
|
});
|
||||||
|
|
||||||
|
// Sessions
|
||||||
|
export const KubernetesSessionCredentialsSchema = KubernetesResourceConnectionDetailsSchema.and(
|
||||||
|
KubernetesAccountCredentialsSchema
|
||||||
|
);
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import {
|
||||||
|
KubernetesAccountCredentialsSchema,
|
||||||
|
KubernetesAccountSchema,
|
||||||
|
KubernetesResourceConnectionDetailsSchema,
|
||||||
|
KubernetesResourceSchema
|
||||||
|
} from "./kubernetes-resource-schemas";
|
||||||
|
|
||||||
|
// Resources
|
||||||
|
export type TKubernetesResource = z.infer<typeof KubernetesResourceSchema>;
|
||||||
|
export type TKubernetesResourceConnectionDetails = z.infer<typeof KubernetesResourceConnectionDetailsSchema>;
|
||||||
|
|
||||||
|
// Accounts
|
||||||
|
export type TKubernetesAccount = z.infer<typeof KubernetesAccountSchema>;
|
||||||
|
export type TKubernetesAccountCredentials = z.infer<typeof KubernetesAccountCredentialsSchema>;
|
||||||
@@ -2,6 +2,7 @@ export enum PamResource {
|
|||||||
Postgres = "postgres",
|
Postgres = "postgres",
|
||||||
MySQL = "mysql",
|
MySQL = "mysql",
|
||||||
SSH = "ssh",
|
SSH = "ssh",
|
||||||
|
Kubernetes = "kubernetes",
|
||||||
AwsIam = "aws-iam"
|
AwsIam = "aws-iam"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { awsIamResourceFactory } from "./aws-iam/aws-iam-resource-factory";
|
import { awsIamResourceFactory } from "./aws-iam/aws-iam-resource-factory";
|
||||||
|
import { kubernetesResourceFactory } from "./kubernetes/kubernetes-resource-factory";
|
||||||
import { PamResource } from "./pam-resource-enums";
|
import { PamResource } from "./pam-resource-enums";
|
||||||
import { TPamAccountCredentials, TPamResourceConnectionDetails, TPamResourceFactory } from "./pam-resource-types";
|
import { TPamAccountCredentials, TPamResourceConnectionDetails, TPamResourceFactory } from "./pam-resource-types";
|
||||||
import { sqlResourceFactory } from "./shared/sql/sql-resource-factory";
|
import { sqlResourceFactory } from "./shared/sql/sql-resource-factory";
|
||||||
@@ -10,5 +11,6 @@ export const PAM_RESOURCE_FACTORY_MAP: Record<PamResource, TPamResourceFactoryIm
|
|||||||
[PamResource.Postgres]: sqlResourceFactory as TPamResourceFactoryImplementation,
|
[PamResource.Postgres]: sqlResourceFactory as TPamResourceFactoryImplementation,
|
||||||
[PamResource.MySQL]: sqlResourceFactory as TPamResourceFactoryImplementation,
|
[PamResource.MySQL]: sqlResourceFactory as TPamResourceFactoryImplementation,
|
||||||
[PamResource.SSH]: sshResourceFactory as TPamResourceFactoryImplementation,
|
[PamResource.SSH]: sshResourceFactory as TPamResourceFactoryImplementation,
|
||||||
|
[PamResource.Kubernetes]: kubernetesResourceFactory as TPamResourceFactoryImplementation,
|
||||||
[PamResource.AwsIam]: awsIamResourceFactory as TPamResourceFactoryImplementation
|
[PamResource.AwsIam]: awsIamResourceFactory as TPamResourceFactoryImplementation
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,14 +4,18 @@ import { KmsDataKey } from "@app/services/kms/kms-types";
|
|||||||
|
|
||||||
import { decryptAccountCredentials } from "../pam-account/pam-account-fns";
|
import { decryptAccountCredentials } from "../pam-account/pam-account-fns";
|
||||||
import { getAwsIamResourceListItem } from "./aws-iam/aws-iam-resource-fns";
|
import { getAwsIamResourceListItem } from "./aws-iam/aws-iam-resource-fns";
|
||||||
|
import { getKubernetesResourceListItem } from "./kubernetes/kubernetes-resource-fns";
|
||||||
import { getMySQLResourceListItem } from "./mysql/mysql-resource-fns";
|
import { getMySQLResourceListItem } from "./mysql/mysql-resource-fns";
|
||||||
import { TPamResource, TPamResourceConnectionDetails } from "./pam-resource-types";
|
import { TPamResource, TPamResourceConnectionDetails } from "./pam-resource-types";
|
||||||
import { getPostgresResourceListItem } from "./postgres/postgres-resource-fns";
|
import { getPostgresResourceListItem } from "./postgres/postgres-resource-fns";
|
||||||
|
|
||||||
export const listResourceOptions = () => {
|
export const listResourceOptions = () => {
|
||||||
return [getPostgresResourceListItem(), getMySQLResourceListItem(), getAwsIamResourceListItem()].sort((a, b) =>
|
return [
|
||||||
a.name.localeCompare(b.name)
|
getPostgresResourceListItem(),
|
||||||
);
|
getMySQLResourceListItem(),
|
||||||
|
getAwsIamResourceListItem(),
|
||||||
|
getKubernetesResourceListItem()
|
||||||
|
].sort((a, b) => a.name.localeCompare(b.name));
|
||||||
};
|
};
|
||||||
|
|
||||||
// Resource
|
// Resource
|
||||||
|
|||||||
@@ -7,6 +7,12 @@ import {
|
|||||||
TAwsIamResource,
|
TAwsIamResource,
|
||||||
TAwsIamResourceConnectionDetails
|
TAwsIamResourceConnectionDetails
|
||||||
} from "./aws-iam/aws-iam-resource-types";
|
} from "./aws-iam/aws-iam-resource-types";
|
||||||
|
import {
|
||||||
|
TKubernetesAccount,
|
||||||
|
TKubernetesAccountCredentials,
|
||||||
|
TKubernetesResource,
|
||||||
|
TKubernetesResourceConnectionDetails
|
||||||
|
} from "./kubernetes/kubernetes-resource-types";
|
||||||
import {
|
import {
|
||||||
TMySQLAccount,
|
TMySQLAccount,
|
||||||
TMySQLAccountCredentials,
|
TMySQLAccountCredentials,
|
||||||
@@ -28,21 +34,23 @@ import {
|
|||||||
} from "./ssh/ssh-resource-types";
|
} from "./ssh/ssh-resource-types";
|
||||||
|
|
||||||
// Resource types
|
// Resource types
|
||||||
export type TPamResource = TPostgresResource | TMySQLResource | TSSHResource | TAwsIamResource;
|
export type TPamResource = TPostgresResource | TMySQLResource | TSSHResource | TAwsIamResource | TKubernetesResource;
|
||||||
export type TPamResourceConnectionDetails =
|
export type TPamResourceConnectionDetails =
|
||||||
| TPostgresResourceConnectionDetails
|
| TPostgresResourceConnectionDetails
|
||||||
| TMySQLResourceConnectionDetails
|
| TMySQLResourceConnectionDetails
|
||||||
| TSSHResourceConnectionDetails
|
| TSSHResourceConnectionDetails
|
||||||
|
| TKubernetesResourceConnectionDetails
|
||||||
| TAwsIamResourceConnectionDetails;
|
| TAwsIamResourceConnectionDetails;
|
||||||
|
|
||||||
// Account types
|
// Account types
|
||||||
export type TPamAccount = TPostgresAccount | TMySQLAccount | TSSHAccount | TAwsIamAccount;
|
export type TPamAccount = TPostgresAccount | TMySQLAccount | TSSHAccount | TAwsIamAccount | TKubernetesAccount;
|
||||||
|
|
||||||
export type TPamAccountCredentials =
|
export type TPamAccountCredentials =
|
||||||
| TPostgresAccountCredentials
|
| TPostgresAccountCredentials
|
||||||
// eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
|
// eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
|
||||||
| TMySQLAccountCredentials
|
| TMySQLAccountCredentials
|
||||||
| TSSHAccountCredentials
|
| TSSHAccountCredentials
|
||||||
|
| TKubernetesAccountCredentials
|
||||||
| TAwsIamAccountCredentials;
|
| TAwsIamAccountCredentials;
|
||||||
|
|
||||||
// Resource DTOs
|
// Resource DTOs
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ export const PamSessionCommandLogSchema = z.object({
|
|||||||
// SSH Terminal Event schemas
|
// SSH Terminal Event schemas
|
||||||
export const TerminalEventTypeSchema = z.enum(["input", "output", "resize", "error"]);
|
export const TerminalEventTypeSchema = z.enum(["input", "output", "resize", "error"]);
|
||||||
|
|
||||||
|
export const HttpEventTypeSchema = z.enum(["request", "response"]);
|
||||||
|
|
||||||
export const TerminalEventSchema = z.object({
|
export const TerminalEventSchema = z.object({
|
||||||
timestamp: z.coerce.date(),
|
timestamp: z.coerce.date(),
|
||||||
eventType: TerminalEventTypeSchema,
|
eventType: TerminalEventTypeSchema,
|
||||||
@@ -18,8 +20,29 @@ export const TerminalEventSchema = z.object({
|
|||||||
elapsedTime: z.number() // Seconds since session start (for replay)
|
elapsedTime: z.number() // Seconds since session start (for replay)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const HttpBaseEventSchema = z.object({
|
||||||
|
timestamp: z.coerce.date(),
|
||||||
|
requestId: z.string(),
|
||||||
|
eventType: TerminalEventTypeSchema,
|
||||||
|
headers: z.record(z.string(), z.array(z.string())),
|
||||||
|
body: z.string().optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const HttpRequestEventSchema = HttpBaseEventSchema.extend({
|
||||||
|
eventType: z.literal(HttpEventTypeSchema.Values.request),
|
||||||
|
method: z.string(),
|
||||||
|
url: z.string()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const HttpResponseEventSchema = HttpBaseEventSchema.extend({
|
||||||
|
eventType: z.literal(HttpEventTypeSchema.Values.response),
|
||||||
|
status: z.string()
|
||||||
|
});
|
||||||
|
|
||||||
|
export const HttpEventSchema = z.discriminatedUnion("eventType", [HttpRequestEventSchema, HttpResponseEventSchema]);
|
||||||
|
|
||||||
export const SanitizedSessionSchema = PamSessionsSchema.omit({
|
export const SanitizedSessionSchema = PamSessionsSchema.omit({
|
||||||
encryptedLogsBlob: true
|
encryptedLogsBlob: true
|
||||||
}).extend({
|
}).extend({
|
||||||
logs: z.array(z.union([PamSessionCommandLogSchema, TerminalEventSchema]))
|
logs: z.array(z.union([PamSessionCommandLogSchema, HttpEventSchema, TerminalEventSchema]))
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,13 +1,19 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
import { PamSessionCommandLogSchema, SanitizedSessionSchema, TerminalEventSchema } from "./pam-session-schemas";
|
import {
|
||||||
|
HttpEventSchema,
|
||||||
|
PamSessionCommandLogSchema,
|
||||||
|
SanitizedSessionSchema,
|
||||||
|
TerminalEventSchema
|
||||||
|
} from "./pam-session-schemas";
|
||||||
|
|
||||||
export type TPamSessionCommandLog = z.infer<typeof PamSessionCommandLogSchema>;
|
export type TPamSessionCommandLog = z.infer<typeof PamSessionCommandLogSchema>;
|
||||||
export type TTerminalEvent = z.infer<typeof TerminalEventSchema>;
|
export type TTerminalEvent = z.infer<typeof TerminalEventSchema>;
|
||||||
|
export type THttpEvent = z.infer<typeof HttpEventSchema>;
|
||||||
export type TPamSanitizedSession = z.infer<typeof SanitizedSessionSchema>;
|
export type TPamSanitizedSession = z.infer<typeof SanitizedSessionSchema>;
|
||||||
|
|
||||||
// DTOs
|
// DTOs
|
||||||
export type TUpdateSessionLogsDTO = {
|
export type TUpdateSessionLogsDTO = {
|
||||||
sessionId: string;
|
sessionId: string;
|
||||||
logs: (TPamSessionCommandLog | TTerminalEvent)[];
|
logs: (TPamSessionCommandLog | TTerminalEvent | THttpEvent)[];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,18 +7,30 @@ import {
|
|||||||
PamSessionStatus
|
PamSessionStatus
|
||||||
} from "../enums";
|
} from "../enums";
|
||||||
import { TAwsIamAccount, TAwsIamResource } from "./aws-iam-resource";
|
import { TAwsIamAccount, TAwsIamResource } from "./aws-iam-resource";
|
||||||
|
import { TKubernetesAccount, TKubernetesResource } from "./kubernetes-resource";
|
||||||
import { TMySQLAccount, TMySQLResource } from "./mysql-resource";
|
import { TMySQLAccount, TMySQLResource } from "./mysql-resource";
|
||||||
import { TPostgresAccount, TPostgresResource } from "./postgres-resource";
|
import { TPostgresAccount, TPostgresResource } from "./postgres-resource";
|
||||||
import { TSSHAccount, TSSHResource } from "./ssh-resource";
|
import { TSSHAccount, TSSHResource } from "./ssh-resource";
|
||||||
|
|
||||||
export * from "./aws-iam-resource";
|
export * from "./aws-iam-resource";
|
||||||
|
export * from "./kubernetes-resource";
|
||||||
export * from "./mysql-resource";
|
export * from "./mysql-resource";
|
||||||
export * from "./postgres-resource";
|
export * from "./postgres-resource";
|
||||||
export * from "./ssh-resource";
|
export * from "./ssh-resource";
|
||||||
|
|
||||||
export type TPamResource = TPostgresResource | TMySQLResource | TSSHResource | TAwsIamResource;
|
export type TPamResource =
|
||||||
|
| TPostgresResource
|
||||||
|
| TMySQLResource
|
||||||
|
| TSSHResource
|
||||||
|
| TAwsIamResource
|
||||||
|
| TKubernetesResource;
|
||||||
|
|
||||||
export type TPamAccount = TPostgresAccount | TMySQLAccount | TSSHAccount | TAwsIamAccount;
|
export type TPamAccount =
|
||||||
|
| TPostgresAccount
|
||||||
|
| TMySQLAccount
|
||||||
|
| TSSHAccount
|
||||||
|
| TAwsIamAccount
|
||||||
|
| TKubernetesAccount;
|
||||||
|
|
||||||
export type TPamFolder = {
|
export type TPamFolder = {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -44,7 +56,28 @@ export type TTerminalEvent = {
|
|||||||
elapsedTime: number; // Seconds since session start (for replay)
|
elapsedTime: number; // Seconds since session start (for replay)
|
||||||
};
|
};
|
||||||
|
|
||||||
export type TPamSessionLog = TPamCommandLog | TTerminalEvent;
|
export type THttpRequestEvent = {
|
||||||
|
timestamp: string;
|
||||||
|
requestId: string;
|
||||||
|
eventType: "request";
|
||||||
|
headers: Record<string, string[]>;
|
||||||
|
method: string;
|
||||||
|
url: string;
|
||||||
|
body?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type THttpResponseEvent = {
|
||||||
|
timestamp: string;
|
||||||
|
requestId: string;
|
||||||
|
eventType: "response";
|
||||||
|
headers: Record<string, string[]>;
|
||||||
|
status: string;
|
||||||
|
body?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type THttpEvent = THttpRequestEvent | THttpResponseEvent;
|
||||||
|
|
||||||
|
export type TPamSessionLog = TPamCommandLog | TTerminalEvent | THttpEvent;
|
||||||
|
|
||||||
export type TPamSession = {
|
export type TPamSession = {
|
||||||
id: string;
|
id: string;
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import { PamResourceType } from "../enums";
|
||||||
|
import { TBasePamAccount } from "./base-account";
|
||||||
|
import { TBasePamResource } from "./base-resource";
|
||||||
|
|
||||||
|
export enum KubernetesAuthMethod {
|
||||||
|
ServiceAccountToken = "service-account-token"
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TKubernetesConnectionDetails = {
|
||||||
|
url: string;
|
||||||
|
sslRejectUnauthorized: boolean;
|
||||||
|
sslCertificate?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type TKubernetesServiceAccountTokenCredentials = {
|
||||||
|
authMethod: KubernetesAuthMethod.ServiceAccountToken;
|
||||||
|
serviceAccountToken: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type TKubernetesCredentials = TKubernetesServiceAccountTokenCredentials;
|
||||||
|
|
||||||
|
// Resources
|
||||||
|
export type TKubernetesResource = TBasePamResource & {
|
||||||
|
resourceType: PamResourceType.Kubernetes;
|
||||||
|
} & {
|
||||||
|
connectionDetails: TKubernetesConnectionDetails;
|
||||||
|
rotationAccountCredentials?: TKubernetesCredentials | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Accounts
|
||||||
|
export type TKubernetesAccount = TBasePamAccount & {
|
||||||
|
credentials: TKubernetesCredentials;
|
||||||
|
};
|
||||||
@@ -85,6 +85,8 @@ export const PamAccessAccountModal = ({
|
|||||||
return `infisical pam db access-account ${fullAccountPath} --project-id ${projectId} --duration ${cliDuration} --domain ${siteURL}`;
|
return `infisical pam db access-account ${fullAccountPath} --project-id ${projectId} --duration ${cliDuration} --domain ${siteURL}`;
|
||||||
case PamResourceType.SSH:
|
case PamResourceType.SSH:
|
||||||
return `infisical pam ssh access-account ${fullAccountPath} --project-id ${projectId} --duration ${cliDuration} --domain ${siteURL}`;
|
return `infisical pam ssh access-account ${fullAccountPath} --project-id ${projectId} --duration ${cliDuration} --domain ${siteURL}`;
|
||||||
|
case PamResourceType.Kubernetes:
|
||||||
|
return `infisical pam kubernetes access-account ${fullAccountPath} --project-id ${projectId} --duration ${cliDuration} --domain ${siteURL}`;
|
||||||
default:
|
default:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
+121
@@ -0,0 +1,121 @@
|
|||||||
|
import { Controller, FormProvider, useForm, useFormContext } from "react-hook-form";
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { Button, FormControl, ModalClose, TextArea } from "@app/components/v2";
|
||||||
|
import { KubernetesAuthMethod, PamResourceType, TKubernetesAccount } from "@app/hooks/api/pam";
|
||||||
|
import { UNCHANGED_PASSWORD_SENTINEL } from "@app/hooks/api/pam/constants";
|
||||||
|
|
||||||
|
import { GenericAccountFields, genericAccountFieldsSchema } from "./GenericAccountFields";
|
||||||
|
import { rotateAccountFieldsSchema } from "./RotateAccountFields";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
account?: TKubernetesAccount;
|
||||||
|
resourceId?: string;
|
||||||
|
resourceType?: PamResourceType;
|
||||||
|
onSubmit: (formData: FormData) => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const KubernetesServiceAccountTokenCredentialsSchema = z.object({
|
||||||
|
authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
|
||||||
|
serviceAccountToken: z.string().trim().min(1, "Service account token is required")
|
||||||
|
});
|
||||||
|
|
||||||
|
const formSchema = genericAccountFieldsSchema.extend(rotateAccountFieldsSchema.shape).extend({
|
||||||
|
credentials: KubernetesServiceAccountTokenCredentialsSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
type FormData = z.infer<typeof formSchema>;
|
||||||
|
|
||||||
|
const KubernetesAccountFields = ({ isUpdate }: { isUpdate: boolean }) => {
|
||||||
|
const { control } = useFormContext<FormData>();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mb-4 rounded-sm border border-mineshaft-600 bg-mineshaft-700/70 p-3">
|
||||||
|
<Controller
|
||||||
|
name="credentials.serviceAccountToken"
|
||||||
|
control={control}
|
||||||
|
render={({ field, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
className="mb-0"
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="Service Account Token"
|
||||||
|
helperText="The bearer token for the service account"
|
||||||
|
>
|
||||||
|
<TextArea
|
||||||
|
{...field}
|
||||||
|
value={field.value === UNCHANGED_PASSWORD_SENTINEL ? "" : field.value || ""}
|
||||||
|
className="min-h-32 resize-y font-mono text-xs"
|
||||||
|
placeholder={
|
||||||
|
isUpdate && field.value === UNCHANGED_PASSWORD_SENTINEL
|
||||||
|
? "Token unchanged - click to update"
|
||||||
|
: "eyJhbGciOiJSUzI1NiIsImtpZCI6..."
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const KubernetesAccountForm = ({ account, onSubmit }: Props) => {
|
||||||
|
const isUpdate = Boolean(account);
|
||||||
|
|
||||||
|
const form = useForm<FormData>({
|
||||||
|
resolver: zodResolver(formSchema),
|
||||||
|
defaultValues: account
|
||||||
|
? {
|
||||||
|
...account,
|
||||||
|
credentials: {
|
||||||
|
...account.credentials,
|
||||||
|
serviceAccountToken: UNCHANGED_PASSWORD_SENTINEL
|
||||||
|
}
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
name: "",
|
||||||
|
description: "",
|
||||||
|
credentials: {
|
||||||
|
authMethod: KubernetesAuthMethod.ServiceAccountToken,
|
||||||
|
serviceAccountToken: ""
|
||||||
|
},
|
||||||
|
rotationEnabled: false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
formState: { isSubmitting, isDirty }
|
||||||
|
} = form;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormProvider {...form}>
|
||||||
|
<form
|
||||||
|
onSubmit={(e) => {
|
||||||
|
handleSubmit(onSubmit)(e);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<GenericAccountFields />
|
||||||
|
<KubernetesAccountFields isUpdate={isUpdate} />
|
||||||
|
<div className="mt-6 flex items-center">
|
||||||
|
<Button
|
||||||
|
className="mr-4"
|
||||||
|
size="sm"
|
||||||
|
type="submit"
|
||||||
|
colorSchema="secondary"
|
||||||
|
isLoading={isSubmitting}
|
||||||
|
isDisabled={isSubmitting || !isDirty}
|
||||||
|
>
|
||||||
|
{isUpdate ? "Update Account" : "Create Account"}
|
||||||
|
</Button>
|
||||||
|
<ModalClose asChild>
|
||||||
|
<Button colorSchema="secondary" variant="plain">
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
</ModalClose>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</FormProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -9,6 +9,7 @@ import { DiscriminativePick } from "@app/types";
|
|||||||
|
|
||||||
import { PamAccountHeader } from "../PamAccountHeader";
|
import { PamAccountHeader } from "../PamAccountHeader";
|
||||||
import { AwsIamAccountForm } from "./AwsIamAccountForm";
|
import { AwsIamAccountForm } from "./AwsIamAccountForm";
|
||||||
|
import { KubernetesAccountForm } from "./KubernetesAccountForm";
|
||||||
import { MySQLAccountForm } from "./MySQLAccountForm";
|
import { MySQLAccountForm } from "./MySQLAccountForm";
|
||||||
import { PostgresAccountForm } from "./PostgresAccountForm";
|
import { PostgresAccountForm } from "./PostgresAccountForm";
|
||||||
import { SshAccountForm } from "./SshAccountForm";
|
import { SshAccountForm } from "./SshAccountForm";
|
||||||
@@ -71,6 +72,14 @@ const CreateForm = ({
|
|||||||
return (
|
return (
|
||||||
<SshAccountForm onSubmit={onSubmit} resourceId={resourceId} resourceType={resourceType} />
|
<SshAccountForm onSubmit={onSubmit} resourceId={resourceId} resourceType={resourceType} />
|
||||||
);
|
);
|
||||||
|
case PamResourceType.Kubernetes:
|
||||||
|
return (
|
||||||
|
<KubernetesAccountForm
|
||||||
|
onSubmit={onSubmit}
|
||||||
|
resourceId={resourceId}
|
||||||
|
resourceType={resourceType}
|
||||||
|
/>
|
||||||
|
);
|
||||||
case PamResourceType.AwsIam:
|
case PamResourceType.AwsIam:
|
||||||
return (
|
return (
|
||||||
<AwsIamAccountForm
|
<AwsIamAccountForm
|
||||||
@@ -109,6 +118,8 @@ const UpdateForm = ({ account, onComplete }: UpdateFormProps) => {
|
|||||||
return <MySQLAccountForm account={account as any} onSubmit={onSubmit} />;
|
return <MySQLAccountForm account={account as any} onSubmit={onSubmit} />;
|
||||||
case PamResourceType.SSH:
|
case PamResourceType.SSH:
|
||||||
return <SshAccountForm account={account as any} onSubmit={onSubmit} />;
|
return <SshAccountForm account={account as any} onSubmit={onSubmit} />;
|
||||||
|
case PamResourceType.Kubernetes:
|
||||||
|
return <KubernetesAccountForm account={account as any} onSubmit={onSubmit} />;
|
||||||
case PamResourceType.AwsIam:
|
case PamResourceType.AwsIam:
|
||||||
return <AwsIamAccountForm account={account as any} onSubmit={onSubmit} />;
|
return <AwsIamAccountForm account={account as any} onSubmit={onSubmit} />;
|
||||||
default:
|
default:
|
||||||
|
|||||||
+80
@@ -0,0 +1,80 @@
|
|||||||
|
import { FormProvider, useForm } from "react-hook-form";
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { Button, ModalClose } from "@app/components/v2";
|
||||||
|
import { KubernetesAuthMethod, PamResourceType, TKubernetesResource } from "@app/hooks/api/pam";
|
||||||
|
|
||||||
|
import { KubernetesResourceFields } from "./shared/KubernetesResourceFields";
|
||||||
|
import { GenericResourceFields, genericResourceFieldsSchema } from "./GenericResourceFields";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
resource?: TKubernetesResource;
|
||||||
|
onSubmit: (formData: FormData) => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const KubernetesConnectionDetailsSchema = z.object({
|
||||||
|
url: z.string().url().trim().max(500),
|
||||||
|
sslRejectUnauthorized: z.boolean(),
|
||||||
|
sslCertificate: z.string().trim().max(10000).optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
const KubernetesServiceAccountTokenCredentialsSchema = z.object({
|
||||||
|
authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
|
||||||
|
serviceAccountToken: z.string().trim().max(10000)
|
||||||
|
});
|
||||||
|
|
||||||
|
const formSchema = genericResourceFieldsSchema.extend({
|
||||||
|
resourceType: z.literal(PamResourceType.Kubernetes),
|
||||||
|
connectionDetails: KubernetesConnectionDetailsSchema,
|
||||||
|
rotationAccountCredentials: KubernetesServiceAccountTokenCredentialsSchema.nullable().optional()
|
||||||
|
});
|
||||||
|
|
||||||
|
type FormData = z.infer<typeof formSchema>;
|
||||||
|
|
||||||
|
export const KubernetesResourceForm = ({ resource, onSubmit }: Props) => {
|
||||||
|
const isUpdate = Boolean(resource);
|
||||||
|
|
||||||
|
const form = useForm<FormData>({
|
||||||
|
resolver: zodResolver(formSchema),
|
||||||
|
defaultValues: resource ?? {
|
||||||
|
resourceType: PamResourceType.Kubernetes,
|
||||||
|
connectionDetails: {
|
||||||
|
url: "",
|
||||||
|
sslRejectUnauthorized: true,
|
||||||
|
sslCertificate: undefined
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
formState: { isSubmitting, isDirty }
|
||||||
|
} = form;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormProvider {...form}>
|
||||||
|
<form onSubmit={handleSubmit(onSubmit)}>
|
||||||
|
<GenericResourceFields />
|
||||||
|
<KubernetesResourceFields />
|
||||||
|
<div className="mt-6 flex items-center">
|
||||||
|
<Button
|
||||||
|
className="mr-4"
|
||||||
|
size="sm"
|
||||||
|
type="submit"
|
||||||
|
colorSchema="secondary"
|
||||||
|
isLoading={isSubmitting}
|
||||||
|
isDisabled={isSubmitting || !isDirty}
|
||||||
|
>
|
||||||
|
{isUpdate ? "Update Details" : "Create Resource"}
|
||||||
|
</Button>
|
||||||
|
<ModalClose asChild>
|
||||||
|
<Button colorSchema="secondary" variant="plain">
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
</ModalClose>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</FormProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -10,6 +10,7 @@ import { DiscriminativePick } from "@app/types";
|
|||||||
|
|
||||||
import { PamResourceHeader } from "../PamResourceHeader";
|
import { PamResourceHeader } from "../PamResourceHeader";
|
||||||
import { AwsIamResourceForm } from "./AwsIamResourceForm";
|
import { AwsIamResourceForm } from "./AwsIamResourceForm";
|
||||||
|
import { KubernetesResourceForm } from "./KubernetesResourceForm";
|
||||||
import { MySQLResourceForm } from "./MySQLResourceForm";
|
import { MySQLResourceForm } from "./MySQLResourceForm";
|
||||||
import { PostgresResourceForm } from "./PostgresResourceForm";
|
import { PostgresResourceForm } from "./PostgresResourceForm";
|
||||||
import { SSHResourceForm } from "./SSHResourceForm";
|
import { SSHResourceForm } from "./SSHResourceForm";
|
||||||
@@ -55,6 +56,8 @@ const CreateForm = ({ resourceType, onComplete, projectId }: CreateFormProps) =>
|
|||||||
return <MySQLResourceForm onSubmit={onSubmit} />;
|
return <MySQLResourceForm onSubmit={onSubmit} />;
|
||||||
case PamResourceType.SSH:
|
case PamResourceType.SSH:
|
||||||
return <SSHResourceForm onSubmit={onSubmit} />;
|
return <SSHResourceForm onSubmit={onSubmit} />;
|
||||||
|
case PamResourceType.Kubernetes:
|
||||||
|
return <KubernetesResourceForm onSubmit={onSubmit} />;
|
||||||
case PamResourceType.AwsIam:
|
case PamResourceType.AwsIam:
|
||||||
return <AwsIamResourceForm onSubmit={onSubmit} />;
|
return <AwsIamResourceForm onSubmit={onSubmit} />;
|
||||||
default:
|
default:
|
||||||
@@ -87,6 +90,8 @@ const UpdateForm = ({ resource, onComplete }: UpdateFormProps) => {
|
|||||||
return <MySQLResourceForm resource={resource} onSubmit={onSubmit} />;
|
return <MySQLResourceForm resource={resource} onSubmit={onSubmit} />;
|
||||||
case PamResourceType.SSH:
|
case PamResourceType.SSH:
|
||||||
return <SSHResourceForm resource={resource} onSubmit={onSubmit} />;
|
return <SSHResourceForm resource={resource} onSubmit={onSubmit} />;
|
||||||
|
case PamResourceType.Kubernetes:
|
||||||
|
return <KubernetesResourceForm resource={resource} onSubmit={onSubmit} />;
|
||||||
case PamResourceType.AwsIam:
|
case PamResourceType.AwsIam:
|
||||||
return <AwsIamResourceForm resource={resource} onSubmit={onSubmit} />;
|
return <AwsIamResourceForm resource={resource} onSubmit={onSubmit} />;
|
||||||
default:
|
default:
|
||||||
|
|||||||
+77
@@ -0,0 +1,77 @@
|
|||||||
|
import { Controller, useFormContext } from "react-hook-form";
|
||||||
|
import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
|
||||||
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
|
|
||||||
|
import { FormControl, Input, Switch, TextArea, Tooltip } from "@app/components/v2";
|
||||||
|
|
||||||
|
export const KubernetesResourceFields = () => {
|
||||||
|
const { control } = useFormContext();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mb-4 rounded-sm border border-mineshaft-600 bg-mineshaft-700/70 p-3">
|
||||||
|
<div className="mt-[0.675rem] flex flex-col gap-4">
|
||||||
|
<Controller
|
||||||
|
name="connectionDetails.url"
|
||||||
|
control={control}
|
||||||
|
render={({ field, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="Kubernetes API URL"
|
||||||
|
>
|
||||||
|
<Input placeholder="https://kubernetes.example.com:6443" {...field} />
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="connectionDetails.sslCertificate"
|
||||||
|
control={control}
|
||||||
|
render={({ field, fieldState: { error } }) => (
|
||||||
|
<FormControl
|
||||||
|
errorText={error?.message}
|
||||||
|
isError={Boolean(error?.message)}
|
||||||
|
label="CA Certificate"
|
||||||
|
isOptional
|
||||||
|
>
|
||||||
|
<TextArea
|
||||||
|
className="h-14 resize-none!"
|
||||||
|
{...field}
|
||||||
|
placeholder="-----BEGIN CERTIFICATE-----..."
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Controller
|
||||||
|
name="connectionDetails.sslRejectUnauthorized"
|
||||||
|
control={control}
|
||||||
|
render={({ field: { value, onChange }, fieldState: { error } }) => (
|
||||||
|
<FormControl isError={Boolean(error?.message)} errorText={error?.message}>
|
||||||
|
<Switch
|
||||||
|
className="bg-mineshaft-400/50 shadow-inner data-[state=checked]:bg-green/80"
|
||||||
|
id="ssl-reject-unauthorized"
|
||||||
|
thumbClassName="bg-mineshaft-800"
|
||||||
|
isChecked={value}
|
||||||
|
onCheckedChange={onChange}
|
||||||
|
>
|
||||||
|
<p className="w-38">
|
||||||
|
Reject Unauthorized
|
||||||
|
<Tooltip
|
||||||
|
className="max-w-md"
|
||||||
|
content={
|
||||||
|
<p>
|
||||||
|
If enabled, Infisical will only connect to the server if it has a valid,
|
||||||
|
trusted SSL certificate.
|
||||||
|
</p>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<FontAwesomeIcon icon={faQuestionCircle} size="sm" className="ml-1" />
|
||||||
|
</Tooltip>
|
||||||
|
</p>
|
||||||
|
</Switch>
|
||||||
|
</FormControl>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -38,7 +38,6 @@ export const ResourceTypeSelect = ({ onSelect }: Props) => {
|
|||||||
{ name: "Redis", resource: PamResourceType.Redis },
|
{ name: "Redis", resource: PamResourceType.Redis },
|
||||||
{ name: "RDP", resource: PamResourceType.RDP },
|
{ name: "RDP", resource: PamResourceType.RDP },
|
||||||
{ name: "SSH", resource: PamResourceType.SSH },
|
{ name: "SSH", resource: PamResourceType.SSH },
|
||||||
{ name: "Kubernetes", resource: PamResourceType.Kubernetes },
|
|
||||||
{ name: "MCP", resource: PamResourceType.MCP },
|
{ name: "MCP", resource: PamResourceType.MCP },
|
||||||
{ name: "Web Application", resource: PamResourceType.WebApp }
|
{ name: "Web Application", resource: PamResourceType.WebApp }
|
||||||
];
|
];
|
||||||
@@ -78,7 +77,6 @@ export const ResourceTypeSelect = ({ onSelect }: Props) => {
|
|||||||
// We temporarily show a special license modal for these because we will have to write some code to complete the integration
|
// We temporarily show a special license modal for these because we will have to write some code to complete the integration
|
||||||
if (
|
if (
|
||||||
resource === PamResourceType.RDP ||
|
resource === PamResourceType.RDP ||
|
||||||
resource === PamResourceType.Kubernetes ||
|
|
||||||
resource === PamResourceType.MCP ||
|
resource === PamResourceType.MCP ||
|
||||||
resource === PamResourceType.Redis ||
|
resource === PamResourceType.Redis ||
|
||||||
resource === PamResourceType.MongoDB ||
|
resource === PamResourceType.MongoDB ||
|
||||||
|
|||||||
@@ -0,0 +1,310 @@
|
|||||||
|
import { useMemo, useState } from "react";
|
||||||
|
import { faChevronDown, faChevronUp, faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
|
||||||
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
|
|
||||||
|
import { Input } from "@app/components/v2";
|
||||||
|
import { HighlightText } from "@app/components/v2/HighlightText";
|
||||||
|
import { THttpEvent } from "@app/hooks/api/pam";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
events: THttpEvent[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const HttpEventView = ({ events }: Props) => {
|
||||||
|
const [search, setSearch] = useState("");
|
||||||
|
const [expandedEvents, setExpandedEvents] = useState<Record<string, boolean>>({});
|
||||||
|
const [expandedSections, setExpandedSections] = useState<
|
||||||
|
Record<string, { headers: boolean; body: boolean }>
|
||||||
|
>({});
|
||||||
|
|
||||||
|
const getContentType = (headers: Record<string, string[]>): string | undefined => {
|
||||||
|
const contentTypeKey = Object.keys(headers).find((key) => key.toLowerCase() === "content-type");
|
||||||
|
return contentTypeKey ? headers[contentTypeKey]?.[0] : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
const decodeBase64Body = (body: string): string => {
|
||||||
|
try {
|
||||||
|
return atob(body);
|
||||||
|
} catch {
|
||||||
|
// If base64 decoding fails, return original body
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const parseBodyForSearch = (
|
||||||
|
body: string | undefined,
|
||||||
|
headers: Record<string, string[]>
|
||||||
|
): string => {
|
||||||
|
if (!body) return "";
|
||||||
|
|
||||||
|
// Decode base64 first
|
||||||
|
const decodedBody = decodeBase64Body(body);
|
||||||
|
|
||||||
|
const contentType = getContentType(headers);
|
||||||
|
const isJson = contentType?.toLowerCase().includes("application/json");
|
||||||
|
|
||||||
|
if (isJson) {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(decodedBody);
|
||||||
|
return JSON.stringify(parsed);
|
||||||
|
} catch {
|
||||||
|
// If JSON parsing fails, fall back to decoded body
|
||||||
|
return decodedBody;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return decodedBody;
|
||||||
|
};
|
||||||
|
|
||||||
|
const filteredEvents = useMemo(
|
||||||
|
() =>
|
||||||
|
events.filter((event) => {
|
||||||
|
const searchValue = search.trim().toLowerCase();
|
||||||
|
if (!searchValue) return true;
|
||||||
|
|
||||||
|
if (event.eventType === "request") {
|
||||||
|
const bodyForSearch = parseBodyForSearch(event.body, event.headers);
|
||||||
|
return (
|
||||||
|
event.method.toLowerCase().includes(searchValue) ||
|
||||||
|
event.url.toLowerCase().includes(searchValue) ||
|
||||||
|
event.requestId.toLowerCase().includes(searchValue) ||
|
||||||
|
Object.keys(event.headers).some((key) => key.toLowerCase().includes(searchValue)) ||
|
||||||
|
Object.values(event.headers).some((values) =>
|
||||||
|
values.some((value) => value.toLowerCase().includes(searchValue))
|
||||||
|
) ||
|
||||||
|
bodyForSearch.toLowerCase().includes(searchValue)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
event.status.toLowerCase().includes(searchValue) ||
|
||||||
|
event.requestId.toLowerCase().includes(searchValue) ||
|
||||||
|
Object.keys(event.headers).some((key) => key.toLowerCase().includes(searchValue)) ||
|
||||||
|
Object.values(event.headers).some((values) =>
|
||||||
|
values.some((value) => value.toLowerCase().includes(searchValue))
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
[events, search]
|
||||||
|
);
|
||||||
|
|
||||||
|
const formatHeaders = (headers: Record<string, string[]>) => {
|
||||||
|
return Object.entries(headers)
|
||||||
|
.map(([key, values]) => `${key}: ${values.join(", ")}`)
|
||||||
|
.join("\n");
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatBody = (body: string | undefined, headers: Record<string, string[]>): string => {
|
||||||
|
if (!body) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decode base64 first
|
||||||
|
const decodedBody = decodeBase64Body(body);
|
||||||
|
|
||||||
|
const contentType = getContentType(headers);
|
||||||
|
const isJson = contentType?.toLowerCase().includes("application/json");
|
||||||
|
|
||||||
|
if (isJson) {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(decodedBody);
|
||||||
|
return JSON.stringify(parsed, null, 2);
|
||||||
|
} catch {
|
||||||
|
// If JSON parsing fails, return decoded body
|
||||||
|
return decodedBody;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// For non-JSON content, return decoded body
|
||||||
|
return decodedBody;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getKubectlCommand = (headers: Record<string, string[]>) => {
|
||||||
|
const headerKey = Object.keys(headers).find((key) => key.toLowerCase() === "kubectl-command");
|
||||||
|
return headerKey ? headers[headerKey]?.[0] : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleEvent = (eventKey: string) => {
|
||||||
|
const willBeExpanded = !expandedEvents[eventKey];
|
||||||
|
setExpandedEvents((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[eventKey]: willBeExpanded
|
||||||
|
}));
|
||||||
|
// When expanding, show headers by default (but keep body collapsed)
|
||||||
|
if (willBeExpanded) {
|
||||||
|
setExpandedSections((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[eventKey]: {
|
||||||
|
headers: true,
|
||||||
|
body: prev[eventKey]?.body ?? false
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleSection = (eventKey: string, section: "headers" | "body") => {
|
||||||
|
setExpandedSections((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[eventKey]: {
|
||||||
|
...prev[eventKey],
|
||||||
|
[section]: !prev[eventKey]?.[section]
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
const isEventExpanded = (eventKey: string) => {
|
||||||
|
return expandedEvents[eventKey] ?? false;
|
||||||
|
};
|
||||||
|
|
||||||
|
const isSectionExpanded = (eventKey: string, section: "headers" | "body") => {
|
||||||
|
return expandedSections[eventKey]?.[section] ?? false;
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
value={search}
|
||||||
|
onChange={(e) => setSearch(e.target.value)}
|
||||||
|
leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
|
||||||
|
placeholder="Search HTTP events..."
|
||||||
|
className="flex-1 bg-mineshaft-800"
|
||||||
|
containerClassName="bg-transparent"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex grow flex-col gap-2 overflow-y-auto text-xs">
|
||||||
|
{filteredEvents.length > 0 ? (
|
||||||
|
filteredEvents.map((event, index) => {
|
||||||
|
const eventKey = `${event.timestamp}-${event.requestId}-${index}`;
|
||||||
|
const isRequest = event.eventType === "request";
|
||||||
|
const kubectlCommand = getKubectlCommand(event.headers);
|
||||||
|
|
||||||
|
const isExpanded = isEventExpanded(eventKey);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={eventKey}
|
||||||
|
className="flex w-full flex-col rounded-md border border-mineshaft-700 bg-mineshaft-800 p-3"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => toggleEvent(eventKey)}
|
||||||
|
className="flex items-center justify-between text-bunker-400 transition-colors hover:text-bunker-300"
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-2 text-xs">
|
||||||
|
<FontAwesomeIcon
|
||||||
|
icon={isExpanded ? faChevronUp : faChevronDown}
|
||||||
|
className="text-xs"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
className={`rounded px-2 py-0.5 ${
|
||||||
|
isRequest
|
||||||
|
? "bg-blue-500/20 text-blue-400"
|
||||||
|
: "bg-green-500/20 text-green-400"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{isRequest ? "REQUEST" : "RESPONSE"}
|
||||||
|
</span>
|
||||||
|
{kubectlCommand && (
|
||||||
|
<span
|
||||||
|
className="rounded bg-purple-500/20 px-2 py-0.5 text-purple-400"
|
||||||
|
title="Kubectl Command"
|
||||||
|
>
|
||||||
|
kubectl: {kubectlCommand}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<span>{new Date(event.timestamp).toLocaleString()}</span>
|
||||||
|
<span className="text-bunker-500">•</span>
|
||||||
|
<span className="font-mono text-xs">{event.requestId}</span>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div className="mt-2">
|
||||||
|
{isRequest ? (
|
||||||
|
<div className="font-mono text-bunker-100">
|
||||||
|
<span className="font-semibold text-bunker-200">{event.method}</span>{" "}
|
||||||
|
<HighlightText text={event.url} highlight={search} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="font-mono text-bunker-100">
|
||||||
|
<span className="font-semibold text-bunker-200">Status:</span>{" "}
|
||||||
|
<HighlightText text={event.status} highlight={search} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{isExpanded && (
|
||||||
|
<div className="mt-2 ml-4 space-y-2 border-l-2 border-mineshaft-600 pl-3">
|
||||||
|
{Object.keys(event.headers).length > 0 && (
|
||||||
|
<div className="mt-2 border-t border-mineshaft-700 pt-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => toggleSection(eventKey, "headers")}
|
||||||
|
className="mb-1 flex w-full items-center gap-2 text-left text-xs text-bunker-400 transition-colors hover:text-bunker-300"
|
||||||
|
>
|
||||||
|
<FontAwesomeIcon
|
||||||
|
icon={
|
||||||
|
isSectionExpanded(eventKey, "headers") ? faChevronUp : faChevronDown
|
||||||
|
}
|
||||||
|
className="text-xs"
|
||||||
|
/>
|
||||||
|
<span>Headers:</span>
|
||||||
|
</button>
|
||||||
|
{isSectionExpanded(eventKey, "headers") && (
|
||||||
|
<div className="font-mono text-xs whitespace-pre-wrap text-bunker-300">
|
||||||
|
<HighlightText text={formatHeaders(event.headers)} highlight={search} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{event.body && (
|
||||||
|
<div className="mt-2 border-t border-mineshaft-700 pt-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => toggleSection(eventKey, "body")}
|
||||||
|
className="mb-1 flex w-full items-center gap-2 text-left text-xs text-bunker-400 transition-colors hover:text-bunker-300"
|
||||||
|
>
|
||||||
|
<FontAwesomeIcon
|
||||||
|
icon={isSectionExpanded(eventKey, "body") ? faChevronUp : faChevronDown}
|
||||||
|
className="text-xs"
|
||||||
|
/>
|
||||||
|
<span>Body:</span>
|
||||||
|
</button>
|
||||||
|
{isSectionExpanded(eventKey, "body") && (
|
||||||
|
<div className="font-mono text-xs whitespace-pre-wrap text-bunker-300">
|
||||||
|
<HighlightText
|
||||||
|
text={formatBody(event.body, event.headers)}
|
||||||
|
highlight={search}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
<div className="flex grow items-center justify-center text-bunker-300">
|
||||||
|
{search.length ? (
|
||||||
|
<div className="text-center">
|
||||||
|
<div className="mb-2">No HTTP events match search criteria</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="text-center">
|
||||||
|
<div className="mb-2">HTTP session logs are not yet available</div>
|
||||||
|
<div className="text-xs text-bunker-400">
|
||||||
|
Logs will be uploaded after the session duration has elapsed.
|
||||||
|
<br />
|
||||||
|
If logs do not appear after some time, please contact your Gateway administrators.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
import { faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
|
import { faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
|
||||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
|
|
||||||
import { PamResourceType, TPamCommandLog, TPamSession, TTerminalEvent } from "@app/hooks/api/pam";
|
import {
|
||||||
|
PamResourceType,
|
||||||
|
THttpEvent,
|
||||||
|
TPamCommandLog,
|
||||||
|
TPamSession,
|
||||||
|
TTerminalEvent
|
||||||
|
} from "@app/hooks/api/pam";
|
||||||
|
|
||||||
import { CommandLogView } from "./CommandLogView";
|
import { CommandLogView } from "./CommandLogView";
|
||||||
|
import { HttpEventView } from "./HttpEventView";
|
||||||
import { TerminalEventView } from "./TerminalEventView";
|
import { TerminalEventView } from "./TerminalEventView";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -16,29 +23,31 @@ export const PamSessionLogsSection = ({ session }: Props) => {
|
|||||||
const isDatabaseSession =
|
const isDatabaseSession =
|
||||||
session.resourceType === PamResourceType.Postgres ||
|
session.resourceType === PamResourceType.Postgres ||
|
||||||
session.resourceType === PamResourceType.MySQL;
|
session.resourceType === PamResourceType.MySQL;
|
||||||
|
const isHttpSession = session.resourceType === PamResourceType.Kubernetes;
|
||||||
const isAwsIamSession = session.resourceType === PamResourceType.AwsIam;
|
const isAwsIamSession = session.resourceType === PamResourceType.AwsIam;
|
||||||
const hasLogs = session.logs.length > 0;
|
const hasLogs = session.logs.length > 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full w-full flex-col gap-4 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
|
<div className="border-mineshaft-600 bg-mineshaft-900 flex h-full w-full flex-col gap-4 rounded-lg border p-4">
|
||||||
<div className="flex items-center border-b border-mineshaft-400 pb-4">
|
<div className="border-mineshaft-400 flex items-center border-b pb-4">
|
||||||
<h3 className="text-lg font-medium text-mineshaft-100">Session Logs</h3>
|
<h3 className="text-mineshaft-100 text-lg font-medium">Session Logs</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{isDatabaseSession && hasLogs && <CommandLogView logs={session.logs as TPamCommandLog[]} />}
|
{isDatabaseSession && hasLogs && <CommandLogView logs={session.logs as TPamCommandLog[]} />}
|
||||||
{isSSHSession && hasLogs && <TerminalEventView events={session.logs as TTerminalEvent[]} />}
|
{isSSHSession && hasLogs && <TerminalEventView events={session.logs as TTerminalEvent[]} />}
|
||||||
|
{isHttpSession && hasLogs && <HttpEventView events={session.logs as THttpEvent[]} />}
|
||||||
{isAwsIamSession && (
|
{isAwsIamSession && (
|
||||||
<div className="flex grow items-center justify-center text-bunker-300">
|
<div className="text-bunker-300 flex grow items-center justify-center">
|
||||||
<div className="text-center">
|
<div className="text-center">
|
||||||
<div className="mb-2">AWS Console session activity is logged in AWS CloudTrail</div>
|
<div className="mb-2">AWS Console session activity is logged in AWS CloudTrail</div>
|
||||||
<div className="text-xs text-bunker-400">
|
<div className="text-bunker-400 text-xs">
|
||||||
View detailed activity logs for this session in your AWS CloudTrail console.
|
View detailed activity logs for this session in your AWS CloudTrail console.
|
||||||
<br />
|
<br />
|
||||||
<a
|
<a
|
||||||
href="https://console.aws.amazon.com/cloudtrail"
|
href="https://console.aws.amazon.com/cloudtrail"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="mt-2 inline-flex items-center gap-1 text-primary-400 hover:text-primary-300"
|
className="text-primary-400 hover:text-primary-300 mt-2 inline-flex items-center gap-1"
|
||||||
>
|
>
|
||||||
Open AWS CloudTrail
|
Open AWS CloudTrail
|
||||||
<FontAwesomeIcon icon={faUpRightFromSquare} className="size-3" />
|
<FontAwesomeIcon icon={faUpRightFromSquare} className="size-3" />
|
||||||
@@ -47,11 +56,11 @@ export const PamSessionLogsSection = ({ session }: Props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{!hasLogs && !isAwsIamSession && (
|
{!hasLogs && (
|
||||||
<div className="flex grow items-center justify-center text-bunker-300">
|
<div className="text-bunker-300 flex grow items-center justify-center">
|
||||||
<div className="text-center">
|
<div className="text-center">
|
||||||
<div className="mb-2">Session logs are not yet available</div>
|
<div className="mb-2">Session logs are not yet available</div>
|
||||||
<div className="text-xs text-bunker-400">
|
<div className="text-bunker-400 text-xs">
|
||||||
Logs will be uploaded after the session duration has elapsed.
|
Logs will be uploaded after the session duration has elapsed.
|
||||||
<br />
|
<br />
|
||||||
If logs do not appear after some time, please contact your Gateway administrators.
|
If logs do not appear after some time, please contact your Gateway administrators.
|
||||||
|
|||||||
Reference in New Issue
Block a user