mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-02 18:25:45 +00:00
split audit logs into two: - get session credentials - start session
This commit is contained in:
@@ -41,17 +41,15 @@ export const registerPamSessionRouter = async (server: FastifyZodProvider) => {
|
|||||||
},
|
},
|
||||||
onRequest: verifyAuth([AuthMode.IDENTITY_ACCESS_TOKEN]),
|
onRequest: verifyAuth([AuthMode.IDENTITY_ACCESS_TOKEN]),
|
||||||
handler: async (req) => {
|
handler: async (req) => {
|
||||||
const { credentials, projectId, account } = await server.services.pamAccount.getSessionCredentials(
|
const { credentials, projectId, account, sessionStarted } =
|
||||||
req.params.sessionId,
|
await server.services.pamAccount.getSessionCredentials(req.params.sessionId, req.permission);
|
||||||
req.permission
|
|
||||||
);
|
|
||||||
|
|
||||||
await server.services.auditLog.createAuditLog({
|
await server.services.auditLog.createAuditLog({
|
||||||
...req.auditLogInfo,
|
...req.auditLogInfo,
|
||||||
orgId: req.permission.orgId,
|
orgId: req.permission.orgId,
|
||||||
projectId,
|
projectId,
|
||||||
event: {
|
event: {
|
||||||
type: EventType.PAM_SESSION_START,
|
type: EventType.PAM_SESSION_CREDENTIALS_GET,
|
||||||
metadata: {
|
metadata: {
|
||||||
sessionId: req.params.sessionId,
|
sessionId: req.params.sessionId,
|
||||||
accountName: account.name
|
accountName: account.name
|
||||||
@@ -59,6 +57,21 @@ export const registerPamSessionRouter = async (server: FastifyZodProvider) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (sessionStarted) {
|
||||||
|
await server.services.auditLog.createAuditLog({
|
||||||
|
...req.auditLogInfo,
|
||||||
|
orgId: req.permission.orgId,
|
||||||
|
projectId,
|
||||||
|
event: {
|
||||||
|
type: EventType.PAM_SESSION_START,
|
||||||
|
metadata: {
|
||||||
|
sessionId: req.params.sessionId,
|
||||||
|
accountName: account.name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return { credentials: credentials as z.infer<typeof SessionCredentialsSchema> };
|
return { credentials: credentials as z.infer<typeof SessionCredentialsSchema> };
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -535,6 +535,7 @@ export enum EventType {
|
|||||||
DASHBOARD_GET_SECRET_VALUE = "dashboard-get-secret-value",
|
DASHBOARD_GET_SECRET_VALUE = "dashboard-get-secret-value",
|
||||||
DASHBOARD_GET_SECRET_VERSION_VALUE = "dashboard-get-secret-version-value",
|
DASHBOARD_GET_SECRET_VERSION_VALUE = "dashboard-get-secret-version-value",
|
||||||
|
|
||||||
|
PAM_SESSION_CREDENTIALS_GET = "pam-session-credentials-get",
|
||||||
PAM_SESSION_START = "pam-session-start",
|
PAM_SESSION_START = "pam-session-start",
|
||||||
PAM_SESSION_LOGS_UPDATE = "pam-session-logs-update",
|
PAM_SESSION_LOGS_UPDATE = "pam-session-logs-update",
|
||||||
PAM_SESSION_END = "pam-session-end",
|
PAM_SESSION_END = "pam-session-end",
|
||||||
@@ -3978,6 +3979,14 @@ interface OrgRoleDeleteEvent {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface PamSessionCredentialsGetEvent {
|
||||||
|
type: EventType.PAM_SESSION_CREDENTIALS_GET;
|
||||||
|
metadata: {
|
||||||
|
sessionId: string;
|
||||||
|
accountName: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
interface PamSessionStartEvent {
|
interface PamSessionStartEvent {
|
||||||
type: EventType.PAM_SESSION_START;
|
type: EventType.PAM_SESSION_START;
|
||||||
metadata: {
|
metadata: {
|
||||||
@@ -4531,6 +4540,7 @@ export type Event =
|
|||||||
| OrgRoleCreateEvent
|
| OrgRoleCreateEvent
|
||||||
| OrgRoleUpdateEvent
|
| OrgRoleUpdateEvent
|
||||||
| OrgRoleDeleteEvent
|
| OrgRoleDeleteEvent
|
||||||
|
| PamSessionCredentialsGetEvent
|
||||||
| PamSessionStartEvent
|
| PamSessionStartEvent
|
||||||
| PamSessionLogsUpdateEvent
|
| PamSessionLogsUpdateEvent
|
||||||
| PamSessionEndEvent
|
| PamSessionEndEvent
|
||||||
|
|||||||
@@ -684,12 +684,15 @@ export const pamAccountServiceFactory = ({
|
|||||||
|
|
||||||
const decryptedResource = await decryptResource(resource, session.projectId, kmsService);
|
const decryptedResource = await decryptResource(resource, session.projectId, kmsService);
|
||||||
|
|
||||||
|
let sessionStarted = false;
|
||||||
|
|
||||||
// Mark session as started
|
// Mark session as started
|
||||||
if (session.status === PamSessionStatus.Starting) {
|
if (session.status === PamSessionStatus.Starting) {
|
||||||
await pamSessionDAL.updateById(sessionId, {
|
await pamSessionDAL.updateById(sessionId, {
|
||||||
status: PamSessionStatus.Active,
|
status: PamSessionStatus.Active,
|
||||||
startedAt: new Date()
|
startedAt: new Date()
|
||||||
});
|
});
|
||||||
|
sessionStarted = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -698,7 +701,8 @@ export const pamAccountServiceFactory = ({
|
|||||||
...decryptedAccount.credentials
|
...decryptedAccount.credentials
|
||||||
},
|
},
|
||||||
projectId: project.id,
|
projectId: project.id,
|
||||||
account
|
account,
|
||||||
|
sessionStarted
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ export const eventToNameMap: { [K in EventType]: string } = {
|
|||||||
[EventType.UPDATE_IDENTITY_PROJECT_MEMBERSHIP]: "Update Identity Project Membership",
|
[EventType.UPDATE_IDENTITY_PROJECT_MEMBERSHIP]: "Update Identity Project Membership",
|
||||||
[EventType.DELETE_IDENTITY_PROJECT_MEMBERSHIP]: "Delete Identity Project Membership",
|
[EventType.DELETE_IDENTITY_PROJECT_MEMBERSHIP]: "Delete Identity Project Membership",
|
||||||
|
|
||||||
|
[EventType.PAM_SESSION_CREDENTIALS_GET]: "PAM Session Credentials Get",
|
||||||
[EventType.PAM_SESSION_START]: "PAM Session Start",
|
[EventType.PAM_SESSION_START]: "PAM Session Start",
|
||||||
[EventType.PAM_SESSION_LOGS_UPDATE]: "PAM Session Logs Update",
|
[EventType.PAM_SESSION_LOGS_UPDATE]: "PAM Session Logs Update",
|
||||||
[EventType.PAM_SESSION_END]: "PAM Session End",
|
[EventType.PAM_SESSION_END]: "PAM Session End",
|
||||||
@@ -314,6 +315,7 @@ const sharedProjectEvents = [
|
|||||||
export const projectToEventsMap: Partial<Record<ProjectType, EventType[]>> = {
|
export const projectToEventsMap: Partial<Record<ProjectType, EventType[]>> = {
|
||||||
[ProjectType.PAM]: [
|
[ProjectType.PAM]: [
|
||||||
...sharedProjectEvents,
|
...sharedProjectEvents,
|
||||||
|
EventType.PAM_SESSION_CREDENTIALS_GET,
|
||||||
EventType.PAM_SESSION_START,
|
EventType.PAM_SESSION_START,
|
||||||
EventType.PAM_SESSION_LOGS_UPDATE,
|
EventType.PAM_SESSION_LOGS_UPDATE,
|
||||||
EventType.PAM_SESSION_END,
|
EventType.PAM_SESSION_END,
|
||||||
|
|||||||
@@ -254,6 +254,7 @@ export enum EventType {
|
|||||||
UPDATE_IDENTITY_PROJECT_MEMBERSHIP = "update-identity-project-membership",
|
UPDATE_IDENTITY_PROJECT_MEMBERSHIP = "update-identity-project-membership",
|
||||||
DELETE_IDENTITY_PROJECT_MEMBERSHIP = "delete-identity-project-membership",
|
DELETE_IDENTITY_PROJECT_MEMBERSHIP = "delete-identity-project-membership",
|
||||||
|
|
||||||
|
PAM_SESSION_CREDENTIALS_GET = "pam-session-credentials-get",
|
||||||
PAM_SESSION_START = "pam-session-start",
|
PAM_SESSION_START = "pam-session-start",
|
||||||
PAM_SESSION_LOGS_UPDATE = "pam-session-logs-update",
|
PAM_SESSION_LOGS_UPDATE = "pam-session-logs-update",
|
||||||
PAM_SESSION_END = "pam-session-end",
|
PAM_SESSION_END = "pam-session-end",
|
||||||
|
|||||||
Reference in New Issue
Block a user