Compare commits
4 Commits
fix/ms21-u
...
feat/ms22-
| Author | SHA1 | Date | |
|---|---|---|---|
| 3688f89c37 | |||
| 4294deda49 | |||
| 2fe858d61a | |||
| 512a29a240 |
@@ -39,6 +39,7 @@ import { JobStepsModule } from "./job-steps/job-steps.module";
|
|||||||
import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
|
import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
|
||||||
import { FederationModule } from "./federation/federation.module";
|
import { FederationModule } from "./federation/federation.module";
|
||||||
import { CredentialsModule } from "./credentials/credentials.module";
|
import { CredentialsModule } from "./credentials/credentials.module";
|
||||||
|
import { CryptoModule } from "./crypto/crypto.module";
|
||||||
import { MosaicTelemetryModule } from "./mosaic-telemetry";
|
import { MosaicTelemetryModule } from "./mosaic-telemetry";
|
||||||
import { SpeechModule } from "./speech/speech.module";
|
import { SpeechModule } from "./speech/speech.module";
|
||||||
import { DashboardModule } from "./dashboard/dashboard.module";
|
import { DashboardModule } from "./dashboard/dashboard.module";
|
||||||
@@ -111,6 +112,7 @@ import { RlsContextInterceptor } from "./common/interceptors/rls-context.interce
|
|||||||
CoordinatorIntegrationModule,
|
CoordinatorIntegrationModule,
|
||||||
FederationModule,
|
FederationModule,
|
||||||
CredentialsModule,
|
CredentialsModule,
|
||||||
|
CryptoModule,
|
||||||
MosaicTelemetryModule,
|
MosaicTelemetryModule,
|
||||||
SpeechModule,
|
SpeechModule,
|
||||||
DashboardModule,
|
DashboardModule,
|
||||||
|
|||||||
10
apps/api/src/crypto/crypto.module.ts
Normal file
10
apps/api/src/crypto/crypto.module.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { Module } from "@nestjs/common";
|
||||||
|
import { ConfigModule } from "@nestjs/config";
|
||||||
|
import { CryptoService } from "./crypto.service";
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [ConfigModule],
|
||||||
|
providers: [CryptoService],
|
||||||
|
exports: [CryptoService],
|
||||||
|
})
|
||||||
|
export class CryptoModule {}
|
||||||
71
apps/api/src/crypto/crypto.service.spec.ts
Normal file
71
apps/api/src/crypto/crypto.service.spec.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import { describe, it, expect, beforeEach } from "vitest";
|
||||||
|
import { ConfigService } from "@nestjs/config";
|
||||||
|
import { CryptoService } from "./crypto.service";
|
||||||
|
|
||||||
|
function createConfigService(secret?: string): ConfigService {
|
||||||
|
return {
|
||||||
|
get: (key: string) => {
|
||||||
|
if (key === "MOSAIC_SECRET_KEY") {
|
||||||
|
return secret;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
|
} as unknown as ConfigService;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("CryptoService", () => {
|
||||||
|
let service: CryptoService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
service = new CryptoService(createConfigService("this-is-a-test-secret-key-with-32+chars"));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("encrypt -> decrypt roundtrip", () => {
|
||||||
|
const plaintext = "my-secret-api-key";
|
||||||
|
|
||||||
|
const encrypted = service.encrypt(plaintext);
|
||||||
|
const decrypted = service.decrypt(encrypted);
|
||||||
|
|
||||||
|
expect(encrypted.startsWith("enc:")).toBe(true);
|
||||||
|
expect(decrypted).toBe(plaintext);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("decrypt rejects tampered ciphertext", () => {
|
||||||
|
const encrypted = service.encrypt("sensitive-token");
|
||||||
|
const payload = encrypted.slice(4);
|
||||||
|
const bytes = Buffer.from(payload, "base64");
|
||||||
|
|
||||||
|
bytes[bytes.length - 1] = bytes[bytes.length - 1]! ^ 0xff;
|
||||||
|
|
||||||
|
const tampered = `enc:${bytes.toString("base64")}`;
|
||||||
|
|
||||||
|
expect(() => service.decrypt(tampered)).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("decrypt rejects non-encrypted string", () => {
|
||||||
|
expect(() => service.decrypt("plain-text-value")).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("isEncrypted detects prefix correctly", () => {
|
||||||
|
expect(service.isEncrypted("enc:abc")).toBe(true);
|
||||||
|
expect(service.isEncrypted("ENC:abc")).toBe(false);
|
||||||
|
expect(service.isEncrypted("plain-text")).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("generateToken returns 64-char hex string", () => {
|
||||||
|
const token = service.generateToken();
|
||||||
|
|
||||||
|
expect(token).toMatch(/^[0-9a-f]{64}$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("different plaintexts produce different ciphertexts (random IV)", () => {
|
||||||
|
const encryptedA = service.encrypt("value-a");
|
||||||
|
const encryptedB = service.encrypt("value-b");
|
||||||
|
|
||||||
|
expect(encryptedA).not.toBe(encryptedB);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("missing MOSAIC_SECRET_KEY throws on construction", () => {
|
||||||
|
expect(() => new CryptoService(createConfigService(undefined))).toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
82
apps/api/src/crypto/crypto.service.ts
Normal file
82
apps/api/src/crypto/crypto.service.ts
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import { ConfigService } from "@nestjs/config";
|
||||||
|
import { createCipheriv, createDecipheriv, hkdfSync, randomBytes } from "crypto";
|
||||||
|
|
||||||
|
const ALGORITHM = "aes-256-gcm";
|
||||||
|
const ENCRYPTED_PREFIX = "enc:";
|
||||||
|
const IV_LENGTH = 12;
|
||||||
|
const AUTH_TAG_LENGTH = 16;
|
||||||
|
const DERIVED_KEY_LENGTH = 32;
|
||||||
|
const HKDF_SALT = "mosaic.crypto.v1";
|
||||||
|
const HKDF_INFO = "mosaic-db-secret-encryption";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CryptoService {
|
||||||
|
private readonly key: Buffer;
|
||||||
|
|
||||||
|
constructor(private readonly config: ConfigService) {
|
||||||
|
const secret = this.config.get<string>("MOSAIC_SECRET_KEY");
|
||||||
|
|
||||||
|
if (!secret) {
|
||||||
|
throw new Error("MOSAIC_SECRET_KEY environment variable is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secret.length < 32) {
|
||||||
|
throw new Error("MOSAIC_SECRET_KEY must be at least 32 characters");
|
||||||
|
}
|
||||||
|
|
||||||
|
this.key = Buffer.from(
|
||||||
|
hkdfSync(
|
||||||
|
"sha256",
|
||||||
|
Buffer.from(secret, "utf8"),
|
||||||
|
Buffer.from(HKDF_SALT, "utf8"),
|
||||||
|
Buffer.from(HKDF_INFO, "utf8"),
|
||||||
|
DERIVED_KEY_LENGTH
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
encrypt(plaintext: string): string {
|
||||||
|
const iv = randomBytes(IV_LENGTH);
|
||||||
|
const cipher = createCipheriv(ALGORITHM, this.key, iv);
|
||||||
|
const ciphertext = Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]);
|
||||||
|
const authTag = cipher.getAuthTag();
|
||||||
|
const payload = Buffer.concat([iv, ciphertext, authTag]).toString("base64");
|
||||||
|
|
||||||
|
return `${ENCRYPTED_PREFIX}${payload}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
decrypt(encrypted: string): string {
|
||||||
|
if (!this.isEncrypted(encrypted)) {
|
||||||
|
throw new Error("Value is not encrypted");
|
||||||
|
}
|
||||||
|
|
||||||
|
const payloadBase64 = encrypted.slice(ENCRYPTED_PREFIX.length);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const payload = Buffer.from(payloadBase64, "base64");
|
||||||
|
if (payload.length < IV_LENGTH + AUTH_TAG_LENGTH) {
|
||||||
|
throw new Error("Encrypted payload is too short");
|
||||||
|
}
|
||||||
|
|
||||||
|
const iv = payload.subarray(0, IV_LENGTH);
|
||||||
|
const authTag = payload.subarray(payload.length - AUTH_TAG_LENGTH);
|
||||||
|
const ciphertext = payload.subarray(IV_LENGTH, payload.length - AUTH_TAG_LENGTH);
|
||||||
|
|
||||||
|
const decipher = createDecipheriv(ALGORITHM, this.key, iv);
|
||||||
|
decipher.setAuthTag(authTag);
|
||||||
|
|
||||||
|
return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
|
||||||
|
} catch {
|
||||||
|
throw new Error("Failed to decrypt value");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isEncrypted(value: string): boolean {
|
||||||
|
return value.startsWith(ENCRYPTED_PREFIX);
|
||||||
|
}
|
||||||
|
|
||||||
|
generateToken(): string {
|
||||||
|
return randomBytes(32).toString("hex");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +1,19 @@
|
|||||||
import type { ReactElement, ReactNode } from "react";
|
import type { ReactElement, ReactNode } from "react";
|
||||||
|
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
import { WorkspaceMemberRole } from "@mosaic/shared";
|
||||||
import { render, screen, waitFor } from "@testing-library/react";
|
import { render, screen, waitFor, within } from "@testing-library/react";
|
||||||
import userEvent from "@testing-library/user-event";
|
import userEvent from "@testing-library/user-event";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
type AdminUser,
|
||||||
deactivateUser,
|
deactivateUser,
|
||||||
fetchAdminUsers,
|
fetchAdminUsers,
|
||||||
inviteUser,
|
inviteUser,
|
||||||
updateUser,
|
updateUser,
|
||||||
type AdminUsersResponse,
|
type AdminUsersResponse,
|
||||||
} from "@/lib/api/admin";
|
} from "@/lib/api/admin";
|
||||||
|
import { useAuth } from "@/lib/auth/auth-context";
|
||||||
import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
|
import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
|
||||||
import UsersSettingsPage from "./page";
|
import UsersSettingsPage from "./page";
|
||||||
|
|
||||||
@@ -39,48 +41,80 @@ vi.mock("@/lib/api/workspaces", () => ({
|
|||||||
updateWorkspaceMemberRole: vi.fn(),
|
updateWorkspaceMemberRole: vi.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/lib/auth/auth-context", () => ({
|
||||||
|
useAuth: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
const fetchAdminUsersMock = vi.mocked(fetchAdminUsers);
|
const fetchAdminUsersMock = vi.mocked(fetchAdminUsers);
|
||||||
const inviteUserMock = vi.mocked(inviteUser);
|
const inviteUserMock = vi.mocked(inviteUser);
|
||||||
const updateUserMock = vi.mocked(updateUser);
|
const updateUserMock = vi.mocked(updateUser);
|
||||||
const deactivateUserMock = vi.mocked(deactivateUser);
|
const deactivateUserMock = vi.mocked(deactivateUser);
|
||||||
const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
|
const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
|
||||||
const updateWorkspaceMemberRoleMock = vi.mocked(updateWorkspaceMemberRole);
|
const updateWorkspaceMemberRoleMock = vi.mocked(updateWorkspaceMemberRole);
|
||||||
|
const useAuthMock = vi.mocked(useAuth);
|
||||||
|
|
||||||
const adminUsersResponse: AdminUsersResponse = {
|
function makeAdminUser(overrides?: Partial<AdminUser>): AdminUser {
|
||||||
data: [
|
return {
|
||||||
{
|
id: "user-1",
|
||||||
id: "user-1",
|
name: "Alice",
|
||||||
name: "Alice",
|
email: "alice@example.com",
|
||||||
email: "alice@example.com",
|
emailVerified: true,
|
||||||
emailVerified: true,
|
image: null,
|
||||||
image: null,
|
createdAt: "2026-01-01T00:00:00.000Z",
|
||||||
createdAt: "2026-01-01T00:00:00.000Z",
|
deactivatedAt: null,
|
||||||
deactivatedAt: null,
|
isLocalAuth: false,
|
||||||
isLocalAuth: false,
|
invitedAt: null,
|
||||||
invitedAt: null,
|
invitedBy: null,
|
||||||
invitedBy: null,
|
workspaceMemberships: [
|
||||||
workspaceMemberships: [
|
{
|
||||||
{
|
workspaceId: "workspace-1",
|
||||||
workspaceId: "workspace-1",
|
workspaceName: "Personal Workspace",
|
||||||
workspaceName: "Personal Workspace",
|
role: WorkspaceMemberRole.ADMIN,
|
||||||
role: WorkspaceMemberRole.ADMIN,
|
joinedAt: "2026-01-01T00:00:00.000Z",
|
||||||
joinedAt: "2026-01-01T00:00:00.000Z",
|
},
|
||||||
},
|
],
|
||||||
],
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeAdminUsersResponse(options?: {
|
||||||
|
data?: AdminUser[];
|
||||||
|
page?: number;
|
||||||
|
totalPages?: number;
|
||||||
|
total?: number;
|
||||||
|
limit?: number;
|
||||||
|
}): AdminUsersResponse {
|
||||||
|
const data = options?.data ?? [makeAdminUser()];
|
||||||
|
return {
|
||||||
|
data,
|
||||||
|
meta: {
|
||||||
|
total: options?.total ?? data.length,
|
||||||
|
page: options?.page ?? 1,
|
||||||
|
limit: options?.limit ?? 50,
|
||||||
|
totalPages: options?.totalPages ?? 1,
|
||||||
},
|
},
|
||||||
],
|
};
|
||||||
meta: {
|
}
|
||||||
total: 1,
|
|
||||||
page: 1,
|
function makeAuthState(userId: string): ReturnType<typeof useAuth> {
|
||||||
limit: 50,
|
return {
|
||||||
totalPages: 1,
|
user: { id: userId, email: `${userId}@example.com`, name: "Current User" },
|
||||||
},
|
isLoading: false,
|
||||||
};
|
isAuthenticated: true,
|
||||||
|
authError: null,
|
||||||
|
sessionExpiring: false,
|
||||||
|
sessionMinutesRemaining: 0,
|
||||||
|
signOut: vi.fn(() => Promise.resolve()),
|
||||||
|
refreshSession: vi.fn(() => Promise.resolve()),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
describe("UsersSettingsPage", () => {
|
describe("UsersSettingsPage", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
|
|
||||||
|
const adminUsersResponse = makeAdminUsersResponse();
|
||||||
|
|
||||||
fetchAdminUsersMock.mockResolvedValue(adminUsersResponse);
|
fetchAdminUsersMock.mockResolvedValue(adminUsersResponse);
|
||||||
fetchUserWorkspacesMock.mockResolvedValue([
|
fetchUserWorkspacesMock.mockResolvedValue([
|
||||||
{
|
{
|
||||||
@@ -97,10 +131,7 @@ describe("UsersSettingsPage", () => {
|
|||||||
email: "new@example.com",
|
email: "new@example.com",
|
||||||
invitedAt: "2026-01-02T00:00:00.000Z",
|
invitedAt: "2026-01-02T00:00:00.000Z",
|
||||||
});
|
});
|
||||||
const firstUser = adminUsersResponse.data[0];
|
const firstUser = adminUsersResponse.data[0] ?? makeAdminUser();
|
||||||
if (!firstUser) {
|
|
||||||
throw new Error("Expected at least one admin user in test fixtures");
|
|
||||||
}
|
|
||||||
|
|
||||||
updateUserMock.mockResolvedValue(firstUser);
|
updateUserMock.mockResolvedValue(firstUser);
|
||||||
deactivateUserMock.mockResolvedValue(firstUser);
|
deactivateUserMock.mockResolvedValue(firstUser);
|
||||||
@@ -116,6 +147,8 @@ describe("UsersSettingsPage", () => {
|
|||||||
image: null,
|
image: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
useAuthMock.mockReturnValue(makeAuthState("user-current"));
|
||||||
});
|
});
|
||||||
|
|
||||||
it("shows access denied to non-admin users", async () => {
|
it("shows access denied to non-admin users", async () => {
|
||||||
@@ -174,4 +207,146 @@ describe("UsersSettingsPage", () => {
|
|||||||
|
|
||||||
expect(updateWorkspaceMemberRoleMock).not.toHaveBeenCalled();
|
expect(updateWorkspaceMemberRoleMock).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("caps pagination to the last valid page after deactivation shrinks the dataset", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const pageOneUser = makeAdminUser({
|
||||||
|
id: "user-1",
|
||||||
|
name: "Alice",
|
||||||
|
email: "alice@example.com",
|
||||||
|
});
|
||||||
|
const pageTwoUser = makeAdminUser({
|
||||||
|
id: "user-2",
|
||||||
|
name: "Bob",
|
||||||
|
email: "bob@example.com",
|
||||||
|
});
|
||||||
|
|
||||||
|
fetchAdminUsersMock.mockReset();
|
||||||
|
const responses = [
|
||||||
|
{
|
||||||
|
expectedPage: 1,
|
||||||
|
response: makeAdminUsersResponse({
|
||||||
|
data: [pageOneUser],
|
||||||
|
page: 1,
|
||||||
|
totalPages: 2,
|
||||||
|
total: 2,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expectedPage: 2,
|
||||||
|
response: makeAdminUsersResponse({
|
||||||
|
data: [pageTwoUser],
|
||||||
|
page: 2,
|
||||||
|
totalPages: 2,
|
||||||
|
total: 2,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expectedPage: 2,
|
||||||
|
response: makeAdminUsersResponse({
|
||||||
|
data: [],
|
||||||
|
page: 2,
|
||||||
|
totalPages: 1,
|
||||||
|
total: 1,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expectedPage: 1,
|
||||||
|
response: makeAdminUsersResponse({
|
||||||
|
data: [pageOneUser],
|
||||||
|
page: 1,
|
||||||
|
totalPages: 1,
|
||||||
|
total: 1,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
fetchAdminUsersMock.mockImplementation((page = 1) => {
|
||||||
|
const next = responses.shift();
|
||||||
|
if (!next) {
|
||||||
|
throw new Error("Unexpected fetchAdminUsers call in pagination-cap test");
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(page).toBe(next.expectedPage);
|
||||||
|
return Promise.resolve(next.response);
|
||||||
|
});
|
||||||
|
|
||||||
|
render(<UsersSettingsPage />);
|
||||||
|
|
||||||
|
expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
|
||||||
|
|
||||||
|
await user.click(screen.getByRole("button", { name: "Next" }));
|
||||||
|
expect(await screen.findByText("bob@example.com")).toBeInTheDocument();
|
||||||
|
|
||||||
|
const pageTwoRow = screen.getByText("bob@example.com").closest('[role="button"]');
|
||||||
|
if (!(pageTwoRow instanceof HTMLElement)) {
|
||||||
|
throw new Error("Expected Bob's row to exist");
|
||||||
|
}
|
||||||
|
|
||||||
|
await user.click(within(pageTwoRow).getByRole("button", { name: "Deactivate" }));
|
||||||
|
const deactivateButtons = await screen.findAllByRole("button", { name: "Deactivate" });
|
||||||
|
const confirmDeactivateButton = deactivateButtons[deactivateButtons.length - 1];
|
||||||
|
if (!confirmDeactivateButton) {
|
||||||
|
throw new Error("Expected confirmation deactivate button to be rendered");
|
||||||
|
}
|
||||||
|
await user.click(confirmDeactivateButton);
|
||||||
|
|
||||||
|
expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
|
||||||
|
expect(deactivateUserMock).toHaveBeenCalledWith("user-2");
|
||||||
|
const requestedPages = fetchAdminUsersMock.mock.calls.map(([requestedPage]) => requestedPage);
|
||||||
|
expect(requestedPages.slice(-2)).toEqual([2, 1]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("shows the API error state without rendering the empty-state message", async () => {
|
||||||
|
fetchAdminUsersMock.mockRejectedValueOnce(new Error("Unable to load users"));
|
||||||
|
|
||||||
|
render(<UsersSettingsPage />);
|
||||||
|
|
||||||
|
expect(await screen.findByText("Unable to load users")).toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("Invite the first user to get started.")).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prevents the current user from deactivating their own account", async () => {
|
||||||
|
useAuthMock.mockReturnValue(makeAuthState("user-1"));
|
||||||
|
|
||||||
|
const selfUser = makeAdminUser({
|
||||||
|
id: "user-1",
|
||||||
|
name: "Alice",
|
||||||
|
email: "alice@example.com",
|
||||||
|
});
|
||||||
|
const otherUser = makeAdminUser({
|
||||||
|
id: "user-2",
|
||||||
|
name: "Bob",
|
||||||
|
email: "bob@example.com",
|
||||||
|
});
|
||||||
|
|
||||||
|
fetchAdminUsersMock.mockResolvedValueOnce(
|
||||||
|
makeAdminUsersResponse({
|
||||||
|
data: [selfUser, otherUser],
|
||||||
|
page: 1,
|
||||||
|
totalPages: 1,
|
||||||
|
total: 2,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
render(<UsersSettingsPage />);
|
||||||
|
|
||||||
|
expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
|
||||||
|
expect(screen.getByText("bob@example.com")).toBeInTheDocument();
|
||||||
|
|
||||||
|
const selfRow = screen.getByText("alice@example.com").closest('[role="button"]');
|
||||||
|
if (!(selfRow instanceof HTMLElement)) {
|
||||||
|
throw new Error("Expected current-user row to exist");
|
||||||
|
}
|
||||||
|
expect(within(selfRow).queryByRole("button", { name: "Deactivate" })).not.toBeInTheDocument();
|
||||||
|
|
||||||
|
const otherRow = screen.getByText("bob@example.com").closest('[role="button"]');
|
||||||
|
if (!(otherRow instanceof HTMLElement)) {
|
||||||
|
throw new Error("Expected other-user row to exist");
|
||||||
|
}
|
||||||
|
expect(within(otherRow).getByRole("button", { name: "Deactivate" })).toBeInTheDocument();
|
||||||
|
expect(deactivateUserMock).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ import {
|
|||||||
type InviteUserDto,
|
type InviteUserDto,
|
||||||
type UpdateUserDto,
|
type UpdateUserDto,
|
||||||
} from "@/lib/api/admin";
|
} from "@/lib/api/admin";
|
||||||
|
import { useAuth } from "@/lib/auth/auth-context";
|
||||||
import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
|
import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
|
||||||
import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
|
import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
|
||||||
|
|
||||||
@@ -77,6 +78,7 @@ const INITIAL_DETAIL_FORM = {
|
|||||||
workspaceId: null as string | null,
|
workspaceId: null as string | null,
|
||||||
workspaceName: null as string | null,
|
workspaceName: null as string | null,
|
||||||
};
|
};
|
||||||
|
const USERS_PAGE_SIZE = 50;
|
||||||
|
|
||||||
interface DetailInitialState {
|
interface DetailInitialState {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -104,8 +106,11 @@ function getPrimaryMembership(user: AdminUser): AdminWorkspaceMembership | null
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function UsersSettingsPage(): ReactElement {
|
export default function UsersSettingsPage(): ReactElement {
|
||||||
|
const { user: authUser } = useAuth();
|
||||||
|
|
||||||
const [users, setUsers] = useState<AdminUser[]>([]);
|
const [users, setUsers] = useState<AdminUser[]>([]);
|
||||||
const [meta, setMeta] = useState<AdminUsersResponse["meta"] | null>(null);
|
const [meta, setMeta] = useState<AdminUsersResponse["meta"] | null>(null);
|
||||||
|
const [page, setPage] = useState<number>(1);
|
||||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
const [isLoading, setIsLoading] = useState<boolean>(true);
|
||||||
const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
|
const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
@@ -127,25 +132,35 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
const [deactivateTarget, setDeactivateTarget] = useState<AdminUser | null>(null);
|
const [deactivateTarget, setDeactivateTarget] = useState<AdminUser | null>(null);
|
||||||
const [isDeactivating, setIsDeactivating] = useState<boolean>(false);
|
const [isDeactivating, setIsDeactivating] = useState<boolean>(false);
|
||||||
|
|
||||||
const loadUsers = useCallback(async (showLoadingState: boolean): Promise<void> => {
|
const loadUsers = useCallback(
|
||||||
try {
|
async (showLoadingState: boolean): Promise<void> => {
|
||||||
if (showLoadingState) {
|
try {
|
||||||
setIsLoading(true);
|
if (showLoadingState) {
|
||||||
} else {
|
setIsLoading(true);
|
||||||
setIsRefreshing(true);
|
} else {
|
||||||
}
|
setIsRefreshing(true);
|
||||||
|
}
|
||||||
|
|
||||||
const response = await fetchAdminUsers(1, 50);
|
const response = await fetchAdminUsers(page, USERS_PAGE_SIZE);
|
||||||
setUsers(response.data);
|
const lastValidPage = Math.max(1, response.meta.totalPages);
|
||||||
setMeta(response.meta);
|
|
||||||
setError(null);
|
if (page > lastValidPage) {
|
||||||
} catch (err: unknown) {
|
setPage(lastValidPage);
|
||||||
setError(err instanceof Error ? err.message : "Failed to load admin users");
|
return;
|
||||||
} finally {
|
}
|
||||||
setIsLoading(false);
|
|
||||||
setIsRefreshing(false);
|
setUsers(response.data);
|
||||||
}
|
setMeta(response.meta);
|
||||||
}, []);
|
setError(null);
|
||||||
|
} catch (err: unknown) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to load admin users");
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
setIsRefreshing(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[page]
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchUserWorkspaces()
|
fetchUserWorkspaces()
|
||||||
@@ -170,7 +185,7 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void loadUsers(true);
|
void loadUsers(true);
|
||||||
}, [isAdmin, loadUsers]);
|
}, [isAdmin, loadUsers, page]);
|
||||||
|
|
||||||
function resetInviteForm(): void {
|
function resetInviteForm(): void {
|
||||||
setInviteForm(INITIAL_INVITE_FORM);
|
setInviteForm(INITIAL_INVITE_FORM);
|
||||||
@@ -324,6 +339,12 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (authUser?.id === deactivateTarget.id) {
|
||||||
|
setDeactivateTarget(null);
|
||||||
|
setError("You cannot deactivate your own account.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setIsDeactivating(true);
|
setIsDeactivating(true);
|
||||||
await deactivateUser(deactivateTarget.id);
|
await deactivateUser(deactivateTarget.id);
|
||||||
@@ -481,7 +502,13 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{error ? (
|
{isLoading ? (
|
||||||
|
<Card>
|
||||||
|
<CardContent className="py-12 text-center text-muted-foreground">
|
||||||
|
Loading users...
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
) : error ? (
|
||||||
<Card>
|
<Card>
|
||||||
<CardContent className="py-4">
|
<CardContent className="py-4">
|
||||||
<p className="text-sm text-destructive" role="alert">
|
<p className="text-sm text-destructive" role="alert">
|
||||||
@@ -489,14 +516,6 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
</p>
|
</p>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
) : null}
|
|
||||||
|
|
||||||
{isLoading ? (
|
|
||||||
<Card>
|
|
||||||
<CardContent className="py-12 text-center text-muted-foreground">
|
|
||||||
Loading users...
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
) : users.length === 0 ? (
|
) : users.length === 0 ? (
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
@@ -514,6 +533,7 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
{users.map((user) => {
|
{users.map((user) => {
|
||||||
const primaryMembership = getPrimaryMembership(user);
|
const primaryMembership = getPrimaryMembership(user);
|
||||||
const isActive = user.deactivatedAt === null;
|
const isActive = user.deactivatedAt === null;
|
||||||
|
const isCurrentUser = authUser?.id === user.id;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -529,7 +549,14 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="space-y-1 min-w-0">
|
<div className="space-y-1 min-w-0">
|
||||||
<p className="font-semibold truncate">{user.name || "Unnamed User"}</p>
|
<p className="font-semibold truncate">
|
||||||
|
{user.name || "Unnamed User"}
|
||||||
|
{isCurrentUser ? (
|
||||||
|
<span className="ml-2 text-xs font-normal text-muted-foreground">
|
||||||
|
(You)
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
</p>
|
||||||
<p className="text-sm text-muted-foreground truncate">{user.email}</p>
|
<p className="text-sm text-muted-foreground truncate">{user.email}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -540,7 +567,7 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
<Badge variant={isActive ? "secondary" : "destructive"}>
|
<Badge variant={isActive ? "secondary" : "destructive"}>
|
||||||
{isActive ? "Active" : "Inactive"}
|
{isActive ? "Active" : "Inactive"}
|
||||||
</Badge>
|
</Badge>
|
||||||
{isActive ? (
|
{isActive && !isCurrentUser ? (
|
||||||
<Button
|
<Button
|
||||||
variant="destructive"
|
variant="destructive"
|
||||||
size="sm"
|
size="sm"
|
||||||
@@ -557,6 +584,36 @@ export default function UsersSettingsPage(): ReactElement {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|
||||||
|
{meta && meta.totalPages > 1 ? (
|
||||||
|
<div className="flex items-center justify-between pt-3 mt-1 border-t">
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
Page {page} of {meta.totalPages}
|
||||||
|
</p>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
disabled={page === 1}
|
||||||
|
onClick={() => {
|
||||||
|
setPage((previousPage) => Math.max(1, previousPage - 1));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Previous
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
disabled={page >= meta.totalPages}
|
||||||
|
onClick={() => {
|
||||||
|
setPage((previousPage) => Math.min(meta.totalPages, previousPage + 1));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -25,12 +25,12 @@
|
|||||||
| MS21-MIG-003 | not-started | phase-3 | Run migration on production database | #568 | api | — | MS21-MIG-001,MS21-TEST-003 | MS21-VER-001 | — | — | — | 5K | — | Needs deploy coordination; not automatable |
|
| MS21-MIG-003 | not-started | phase-3 | Run migration on production database | #568 | api | — | MS21-MIG-001,MS21-TEST-003 | MS21-VER-001 | — | — | — | 5K | — | Needs deploy coordination; not automatable |
|
||||||
| MS21-MIG-004 | done | phase-3 | Import API endpoints (6/6 tests) | #568 | api | feat/ms21-import-api | MS21-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | 24K | PR #567 merged, CI green. Review: 0 blockers, 4 should-fix, 1 medium sec (no audit log). |
|
| MS21-MIG-004 | done | phase-3 | Import API endpoints (6/6 tests) | #568 | api | feat/ms21-import-api | MS21-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | 24K | PR #567 merged, CI green. Review: 0 blockers, 4 should-fix, 1 medium sec (no audit log). |
|
||||||
| MS21-UI-001 | done | phase-4 | Settings/users page | #569 | web | feat/ms21-ui-users | MS21-API-001,MS21-API-002 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~30K | PR #573 merged. Review: 0 blockers, 4 should-fix → MS21-UI-001-QA |
|
| MS21-UI-001 | done | phase-4 | Settings/users page | #569 | web | feat/ms21-ui-users | MS21-API-001,MS21-API-002 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~30K | PR #573 merged. Review: 0 blockers, 4 should-fix → MS21-UI-001-QA |
|
||||||
| MS21-UI-001-QA | in-progress | phase-4 | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569 | web | fix/ms21-ui-001-qa | MS21-UI-001 | — | — | — | — | 15K | — | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
|
| MS21-UI-001-QA | done | phase-4 | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569 | web | fix/ms21-ui-001-qa | MS21-UI-001 | — | — | — | — | 15K | — | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
|
||||||
| MS21-UI-002 | done | phase-4 | User detail/edit and invite dialogs | #569 | web | feat/ms21-ui-users | MS21-UI-001 | — | — | — | — | 15K | — | |
|
| MS21-UI-002 | done | phase-4 | User detail/edit and invite dialogs | #569 | web | feat/ms21-ui-users | MS21-UI-001 | — | — | — | — | 15K | — | |
|
||||||
| MS21-UI-003 | done | phase-4 | Settings/workspaces page (wire to real API) | #569 | web | feat/ms21-ui-workspaces | MS21-API-003 | — | codex | 2026-02-28 | 2026-02-28 | 15K | ~25K | PR #574 merged. Review: 0 critical, 1 low (raw errors in UI) |
|
| MS21-UI-003 | done | phase-4 | Settings/workspaces page (wire to real API) | #569 | web | feat/ms21-ui-workspaces | MS21-API-003 | — | codex | 2026-02-28 | 2026-02-28 | 15K | ~25K | PR #574 merged. Review: 0 critical, 1 low (raw errors in UI) |
|
||||||
| MS21-UI-004 | done | phase-4 | Workspace member management UI | #569 | web | feat/ms21-ui-workspaces | MS21-UI-003,MS21-API-003 | — | — | — | — | 15K | — | Components exist |
|
| MS21-UI-004 | done | phase-4 | Workspace member management UI | #569 | web | feat/ms21-ui-workspaces | MS21-UI-003,MS21-API-003 | — | — | — | — | 15K | — | Components exist |
|
||||||
| MS21-UI-005 | done | phase-4 | Settings/teams page | #569 | web | feat/ms21-ui-teams | MS21-API-004 | — | — | — | — | 15K | — | |
|
| MS21-UI-005 | done | phase-4 | Settings/teams page | #569 | web | feat/ms21-ui-teams | MS21-API-004 | — | — | — | — | 15K | — | |
|
||||||
| MS21-TEST-004 | in-progress | phase-4 | Frontend component tests | #569 | web | test/ms21-ui | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | — | — | — | — | 20K | — | |
|
| MS21-TEST-004 | done | phase-4 | Frontend component tests | #569 | web | test/ms21-ui | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | — | — | — | — | 20K | — | |
|
||||||
| MS21-RBAC-001 | done | phase-5 | Sidebar navigation role gating | #570 | web | feat/ms21-rbac | MS21-UI-001 | — | — | — | — | 10K | — | |
|
| MS21-RBAC-001 | done | phase-5 | Sidebar navigation role gating | #570 | web | feat/ms21-rbac | MS21-UI-001 | — | — | — | — | 10K | — | |
|
||||||
| MS21-RBAC-002 | done | phase-5 | Settings page access restriction | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
| MS21-RBAC-002 | done | phase-5 | Settings page access restriction | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
||||||
| MS21-RBAC-003 | done | phase-5 | Action button permission gating | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
| MS21-RBAC-003 | done | phase-5 | Action button permission gating | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
||||||
|
|||||||
413
docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md
Normal file
413
docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md
Normal file
@@ -0,0 +1,413 @@
|
|||||||
|
# MS22 Phase 1: DB-Centric Multi-User Agent Architecture
|
||||||
|
|
||||||
|
## Design Principles
|
||||||
|
|
||||||
|
1. **2 env vars to bootstrap** — `DATABASE_URL` + `MOSAIC_SECRET_KEY`
|
||||||
|
2. **DB-centric config** — All runtime config in Postgres, managed via WebUI
|
||||||
|
3. **Mosaic is the gatekeeper** — Users authenticate to Mosaic, never to OpenClaw directly
|
||||||
|
4. **Per-user agent isolation** — Each user gets their own OpenClaw container(s) with their own credentials
|
||||||
|
5. **Onboarding-first** — Breakglass user + wizard on first boot
|
||||||
|
6. **Generic product** — No hardcoded names, models, providers, or endpoints
|
||||||
|
|
||||||
|
## Architecture Overview
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────┐
|
||||||
|
│ MOSAIC WEBUI │
|
||||||
|
│ (Auth: breakglass local + OIDC via settings) │
|
||||||
|
└──────────────────────┬──────────────────────────────┘
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
┌─────────────────────────────────────────────────────┐
|
||||||
|
│ MOSAIC API │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────┐ ┌────────────────┐ ┌─────────┐ │
|
||||||
|
│ │ Onboarding │ │ Container │ │ Config │ │
|
||||||
|
│ │ Wizard │ │ Lifecycle Mgr │ │ Store │ │
|
||||||
|
│ └──────────────┘ └───────┬────────┘ └─────────┘ │
|
||||||
|
│ │ │
|
||||||
|
└────────────────────────────┼────────────────────────┘
|
||||||
|
│ Docker API
|
||||||
|
┌──────────────────┼──────────────────┐
|
||||||
|
│ │ │
|
||||||
|
▼ ▼ ▼
|
||||||
|
┌─────────────┐ ┌─────────────┐ ┌─────────────┐
|
||||||
|
│ OpenClaw │ │ OpenClaw │ │ OpenClaw │
|
||||||
|
│ User A │ │ User B │ │ System │
|
||||||
|
│ │ │ │ │ (admin) │
|
||||||
|
│ Claude Max │ │ Z.ai key │ │ Shared key │
|
||||||
|
│ own memory │ │ own memory │ │ monitoring │
|
||||||
|
└─────────────┘ └─────────────┘ └─────────────┘
|
||||||
|
Scale to zero Scale to zero Always on
|
||||||
|
after idle after idle
|
||||||
|
```
|
||||||
|
|
||||||
|
## Container Lifecycle
|
||||||
|
|
||||||
|
### User containers (on-demand)
|
||||||
|
|
||||||
|
1. User logs in → Mosaic checks `UserContainer` table
|
||||||
|
2. No running container → Mosaic calls Docker API to create one
|
||||||
|
3. Injects user's encrypted API keys via config endpoint
|
||||||
|
4. Routes chat requests to user's container
|
||||||
|
5. Idle timeout (configurable, default 30min) → scale to zero
|
||||||
|
6. State volume persists (sessions, memory, auth tokens)
|
||||||
|
7. Next request → container restarts, picks up state from volume
|
||||||
|
|
||||||
|
### System containers (always-on, optional)
|
||||||
|
|
||||||
|
- Admin-provisioned for system tasks (monitoring, scheduled jobs)
|
||||||
|
- Use admin-configured shared API keys
|
||||||
|
- Not tied to any user
|
||||||
|
|
||||||
|
## Auth Layers
|
||||||
|
|
||||||
|
| Flow | Method |
|
||||||
|
| ------------------------------- | ---------------------------------------------------------------------- |
|
||||||
|
| User → Mosaic WebUI | Breakglass (local) or OIDC (configured in settings) |
|
||||||
|
| Mosaic API → OpenClaw container | Bearer token (auto-generated per container, stored encrypted in DB) |
|
||||||
|
| OpenClaw → LLM providers | User's own API keys (delivered via config endpoint, decrypted from DB) |
|
||||||
|
| Admin → System settings | RBAC (admin role required) |
|
||||||
|
| Internal config endpoint | Bearer token (container authenticates to fetch its config) |
|
||||||
|
|
||||||
|
## Database Schema
|
||||||
|
|
||||||
|
### System Tables
|
||||||
|
|
||||||
|
```prisma
|
||||||
|
model SystemConfig {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
key String @unique // "oidc.issuerUrl", "oidc.clientId", "onboarding.completed"
|
||||||
|
value String // plaintext or encrypted (prefix: "enc:")
|
||||||
|
encrypted Boolean @default(false)
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
model BreakglassUser {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
username String @unique
|
||||||
|
passwordHash String // bcrypt
|
||||||
|
isActive Boolean @default(true)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Provider Tables (per-user)
|
||||||
|
|
||||||
|
```prisma
|
||||||
|
model LlmProvider {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
userId String // owner — each user manages their own providers
|
||||||
|
name String // "my-zai", "work-openai", "local-ollama"
|
||||||
|
displayName String // "Z.ai", "OpenAI (Work)", "Local Ollama"
|
||||||
|
type String // "zai" | "openai" | "anthropic" | "ollama" | "custom"
|
||||||
|
baseUrl String? // null for built-in, URL for custom/ollama
|
||||||
|
apiKey String? // encrypted
|
||||||
|
apiType String @default("openai-completions")
|
||||||
|
models Json @default("[]") // [{id, name, contextWindow, maxTokens}]
|
||||||
|
isActive Boolean @default(true)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
|
@@unique([userId, name])
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Container Tables
|
||||||
|
|
||||||
|
```prisma
|
||||||
|
model UserContainer {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
userId String @unique
|
||||||
|
containerId String? // Docker container ID (null = not running)
|
||||||
|
containerName String // "mosaic-user-{userId}"
|
||||||
|
gatewayPort Int? // assigned port (null = not running)
|
||||||
|
gatewayToken String // encrypted — auto-generated
|
||||||
|
status String @default("stopped") // "running" | "stopped" | "starting" | "error"
|
||||||
|
lastActiveAt DateTime?
|
||||||
|
idleTimeoutMin Int @default(30)
|
||||||
|
config Json @default("{}") // cached openclaw.json for this user
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
model SystemContainer {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
name String @unique // "mosaic-system-ops", "mosaic-system-monitor"
|
||||||
|
role String // "operations" | "monitor" | "scheduler"
|
||||||
|
containerId String?
|
||||||
|
gatewayPort Int?
|
||||||
|
gatewayToken String // encrypted
|
||||||
|
status String @default("stopped")
|
||||||
|
providerId String? // references admin-level LlmProvider
|
||||||
|
primaryModel String // "zai/glm-5", etc.
|
||||||
|
isActive Boolean @default(true)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### User Agent Preferences
|
||||||
|
|
||||||
|
```prisma
|
||||||
|
model UserAgentConfig {
|
||||||
|
id String @id @default(cuid())
|
||||||
|
userId String @unique
|
||||||
|
primaryModel String? // user's preferred model
|
||||||
|
fallbackModels Json @default("[]")
|
||||||
|
personality String? // custom SOUL.md content
|
||||||
|
providerId String? // default provider for this user
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Internal Config Endpoint
|
||||||
|
|
||||||
|
`GET /api/internal/agent-config/:containerType/:id`
|
||||||
|
|
||||||
|
- Auth: Bearer token (container's own gateway token)
|
||||||
|
- Returns: Complete `openclaw.json` generated from DB
|
||||||
|
- For user containers: includes user's providers, model prefs, personality
|
||||||
|
- For system containers: includes admin provider config
|
||||||
|
|
||||||
|
Response assembles openclaw.json dynamically:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"gateway": { "mode": "local", "port": 18789, "bind": "lan", "auth": { "mode": "token" } ... },
|
||||||
|
"agents": { "defaults": { "model": { "primary": "<from UserAgentConfig>" } } },
|
||||||
|
"models": { "providers": { "<from LlmProvider rows>": { ... } } }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Container Lifecycle Manager
|
||||||
|
|
||||||
|
NestJS service that manages Docker containers:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
class ContainerLifecycleService {
|
||||||
|
// Create and start a user's OpenClaw container
|
||||||
|
async ensureRunning(userId: string): Promise<{ url: string; token: string }>;
|
||||||
|
|
||||||
|
// Stop idle containers (called by cron/scheduler)
|
||||||
|
async reapIdle(): Promise<number>;
|
||||||
|
|
||||||
|
// Stop a specific user's container
|
||||||
|
async stop(userId: string): Promise<void>;
|
||||||
|
|
||||||
|
// Health check all running containers
|
||||||
|
async healthCheckAll(): Promise<HealthStatus[]>;
|
||||||
|
|
||||||
|
// Restart container with updated config
|
||||||
|
async restart(userId: string): Promise<void>;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Uses Docker Engine API (`/var/run/docker.sock` or TCP) via `dockerode` npm package.
|
||||||
|
|
||||||
|
## Onboarding Wizard
|
||||||
|
|
||||||
|
### First-Boot Detection
|
||||||
|
|
||||||
|
- API checks: `SystemConfig.get("onboarding.completed")` → null = first boot
|
||||||
|
- WebUI redirects to `/onboarding` if not completed
|
||||||
|
|
||||||
|
### Steps
|
||||||
|
|
||||||
|
**Step 1: Create Breakglass Admin**
|
||||||
|
|
||||||
|
- Username + password → bcrypt → `BreakglassUser` table
|
||||||
|
- This user always works, even if OIDC is misconfigured
|
||||||
|
|
||||||
|
**Step 2: Configure Authentication (optional)**
|
||||||
|
|
||||||
|
- OIDC: provider URL, client ID, client secret → encrypted in `SystemConfig`
|
||||||
|
- Skip = breakglass-only auth (can add OIDC later in settings)
|
||||||
|
|
||||||
|
**Step 3: Add Your First LLM Provider**
|
||||||
|
|
||||||
|
- Pick type → enter API key/endpoint → test connection → save to `LlmProvider`
|
||||||
|
- This becomes the admin's default provider
|
||||||
|
|
||||||
|
**Step 4: System Agents (optional)**
|
||||||
|
|
||||||
|
- Configure always-on system agents for monitoring/ops
|
||||||
|
- Or skip — users can just use their own personal agents
|
||||||
|
|
||||||
|
**Step 5: Complete**
|
||||||
|
|
||||||
|
- Sets `SystemConfig("onboarding.completed") = true`
|
||||||
|
- Redirects to dashboard
|
||||||
|
|
||||||
|
### Post-Onboarding: User Self-Service
|
||||||
|
|
||||||
|
- Each user adds their own LLM providers in profile settings
|
||||||
|
- Each user configures their preferred model, personality
|
||||||
|
- First chat request triggers container creation
|
||||||
|
|
||||||
|
## Docker Compose (final)
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
mosaic-api:
|
||||||
|
image: mosaic/api:latest
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
|
MOSAIC_SECRET_KEY: ${MOSAIC_SECRET_KEY}
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock # Docker API access
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
|
||||||
|
mosaic-web:
|
||||||
|
image: mosaic/web:latest
|
||||||
|
environment:
|
||||||
|
NEXT_PUBLIC_API_URL: http://mosaic-api:4000
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgres:17
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: mosaic
|
||||||
|
POSTGRES_USER: mosaic
|
||||||
|
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
||||||
|
volumes:
|
||||||
|
- postgres-data:/var/lib/postgresql/data
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
|
||||||
|
# System agent (optional, admin-provisioned)
|
||||||
|
# mosaic-system:
|
||||||
|
# image: alpine/openclaw:latest
|
||||||
|
# ... (managed by ContainerLifecycleService)
|
||||||
|
|
||||||
|
# User containers are NOT in this file —
|
||||||
|
# they are dynamically created by ContainerLifecycleService
|
||||||
|
# via the Docker API at runtime.
|
||||||
|
|
||||||
|
networks:
|
||||||
|
internal:
|
||||||
|
driver: overlay
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
Note: User OpenClaw containers are **not** defined in docker-compose. They are
|
||||||
|
created dynamically by the `ContainerLifecycleService` when users start chatting.
|
||||||
|
|
||||||
|
## Entrypoint (for dynamically created containers)
|
||||||
|
|
||||||
|
```sh
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
: "${MOSAIC_API_URL:?required}"
|
||||||
|
: "${AGENT_TOKEN:?required}"
|
||||||
|
: "${AGENT_ID:?required}"
|
||||||
|
|
||||||
|
# Fetch config from Mosaic API
|
||||||
|
curl -sf "${MOSAIC_API_URL}/api/internal/agent-config/${AGENT_ID}" \
|
||||||
|
-H "Authorization: Bearer ${AGENT_TOKEN}" \
|
||||||
|
-o /tmp/openclaw.json
|
||||||
|
|
||||||
|
export OPENCLAW_CONFIG_PATH=/tmp/openclaw.json
|
||||||
|
exec openclaw gateway run --bind lan --auth token
|
||||||
|
```
|
||||||
|
|
||||||
|
Container env vars (injected by ContainerLifecycleService):
|
||||||
|
|
||||||
|
- `MOSAIC_API_URL` — internal API URL
|
||||||
|
- `AGENT_TOKEN` — this container's bearer token (from DB)
|
||||||
|
- `AGENT_ID` — container ID for config lookup
|
||||||
|
|
||||||
|
## Config Update Strategy
|
||||||
|
|
||||||
|
When a user changes settings (model, provider, personality):
|
||||||
|
|
||||||
|
1. Mosaic API updates DB
|
||||||
|
2. API calls `ContainerLifecycleService.restart(userId)`
|
||||||
|
3. Container restarts, fetches fresh config from API
|
||||||
|
4. OpenClaw gateway starts with new config
|
||||||
|
5. State volume preserves sessions/memory across restarts
|
||||||
|
|
||||||
|
## Task Breakdown
|
||||||
|
|
||||||
|
| Task | Phase | Scope | Dependencies |
|
||||||
|
| -------- | -------------- | --------------------------------------------------------------------------------------------------------------------- | ------------ |
|
||||||
|
| MS22-P1a | Schema | Prisma models: SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig. Migration. | — |
|
||||||
|
| MS22-P1b | Crypto | Encryption service for API keys/tokens (AES-256-GCM using MOSAIC_SECRET_KEY) | P1a |
|
||||||
|
| MS22-P1c | Config API | Internal config endpoint: assembles openclaw.json from DB | P1a, P1b |
|
||||||
|
| MS22-P1d | Container Mgr | ContainerLifecycleService: Docker API integration (dockerode), start/stop/health/reap | P1a |
|
||||||
|
| MS22-P1e | Onboarding API | Onboarding endpoints: breakglass, OIDC, provider, complete | P1a, P1b |
|
||||||
|
| MS22-P1f | Onboarding UI | Multi-step wizard in WebUI | P1e |
|
||||||
|
| MS22-P1g | Settings API | CRUD: providers, agent config, OIDC, breakglass | P1a, P1b |
|
||||||
|
| MS22-P1h | Settings UI | Settings pages: Providers, Agent Config, Auth | P1g |
|
||||||
|
| MS22-P1i | Chat Proxy | Route WebUI chat → user's OpenClaw container (SSE) | P1c, P1d |
|
||||||
|
| MS22-P1j | Docker | Entrypoint script, health checks, compose for core services | P1c |
|
||||||
|
| MS22-P1k | Idle Reaper | Cron service to stop idle user containers | P1d |
|
||||||
|
|
||||||
|
## Open Questions (Resolved)
|
||||||
|
|
||||||
|
1. ~~Config updates → restart?~~ **Yes.** Mosaic restarts the container, fresh config on boot.
|
||||||
|
2. ~~CLI alternative for breakglass?~~ **Yes.** Both WebUI wizard and CLI (`mosaic admin create-breakglass`).
|
||||||
|
3. ~~Config cache TTL?~~ **Yes.** Config fetched once at startup, changes trigger restart.
|
||||||
|
|
||||||
|
## Security Isolation Model
|
||||||
|
|
||||||
|
### Core Principle: ZERO cross-user access
|
||||||
|
|
||||||
|
Every user is fully sandboxed. No exceptions.
|
||||||
|
|
||||||
|
### Container Isolation
|
||||||
|
|
||||||
|
- Each user gets their **own** OpenClaw container (separate process, PID namespace)
|
||||||
|
- Each container has its **own** Docker volume (sessions, memory, workspace)
|
||||||
|
- Containers run on an **internal-only** Docker network — no external exposure
|
||||||
|
- Users NEVER talk to OpenClaw directly — Mosaic proxies all requests
|
||||||
|
- Container gateway tokens are unique per-user and single-purpose
|
||||||
|
|
||||||
|
### Data Isolation (enforced at API + DB level)
|
||||||
|
|
||||||
|
| Data | Isolation | Enforcement |
|
||||||
|
| ---------------- | ------------------------- | --------------------------------------------------------------------------------- |
|
||||||
|
| LLM API keys | Per-user, encrypted | `LlmProvider.userId` — all queries scoped by authenticated user |
|
||||||
|
| Chat history | Per-user container volume | Separate Docker volume per user, not shared |
|
||||||
|
| Agent memory | Per-user container volume | Separate Docker volume per user |
|
||||||
|
| Agent config | Per-user | `UserAgentConfig.userId` — scoped queries |
|
||||||
|
| Container access | Per-user | `UserContainer.userId` — Mosaic validates user owns the container before proxying |
|
||||||
|
|
||||||
|
### API Enforcement
|
||||||
|
|
||||||
|
- **All user-facing endpoints** include `WHERE userId = authenticatedUser.id`
|
||||||
|
- **No admin endpoint** exposes another user's API keys (even to admins)
|
||||||
|
- **Chat proxy** validates: authenticated user → owns target container → forwards request
|
||||||
|
- **Config endpoint** validates: container token matches the container requesting config
|
||||||
|
- **Provider CRUD** is fully user-scoped — User A cannot list, read, or modify User B's providers
|
||||||
|
|
||||||
|
### What admins CAN see
|
||||||
|
|
||||||
|
- Container status (running/stopped) — not contents
|
||||||
|
- User list and roles
|
||||||
|
- System-level config (OIDC, system agents)
|
||||||
|
- Aggregate usage metrics (not individual conversations)
|
||||||
|
|
||||||
|
### What admins CANNOT see
|
||||||
|
|
||||||
|
- Other users' API keys (encrypted, no decrypt endpoint)
|
||||||
|
- Other users' chat history (in container volumes, not in Mosaic DB)
|
||||||
|
- Other users' agent memory/workspace contents
|
||||||
|
|
||||||
|
### Future: Team Workspaces (NOT in scope)
|
||||||
|
|
||||||
|
Team/shared workspaces are a potential future feature where users opt-in to
|
||||||
|
shared agent contexts. This requires explicit consent, shared-key management,
|
||||||
|
and a different isolation model. **Not designed here. Not built now.**
|
||||||
|
|
||||||
|
### Attack Surface Notes
|
||||||
|
|
||||||
|
- Docker socket access (`/var/run/docker.sock`) is required by Mosaic API for container management. This is a privileged operation — the Mosaic API container must be trusted.
|
||||||
|
- `MOSAIC_SECRET_KEY` is the root of trust for encryption. Rotation requires re-encrypting all secrets in DB.
|
||||||
|
- Container-to-container communication is blocked by default (no shared network between user containers unless explicitly configured).
|
||||||
Reference in New Issue
Block a user