Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions apps/mobile/src/features/threads/ThreadFeed.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
messageSenderDetail,
messageSenderLabel,
resolveMessageSender,
} from "@t3tools/client-runtime/message-sender";
import { Button } from "../../components/ui/Button";
import * as Dialog from "../../components/ui/Dialog";
import { useOpenPullRequest } from "../../native/useOpenPullRequest";
Expand Down Expand Up @@ -2100,6 +2105,7 @@ function renderFeedEntry(
if (isUser) {
const enterAnimated = isFreshTimestamp(message.createdAt);
const foldRowId = presentation.attribution === "agent" ? `agent:${message.id}` : null;
const sender = resolveMessageSender(message);
// A linked environment's agent sent it from a thread there.
const senderRef =
message.linkedSender ??
Expand Down Expand Up @@ -2164,6 +2170,15 @@ function renderFeedEntry(
{presentation.guestName !== undefined ? (
<GuestMessageName name={presentation.guestName} />
) : null}
{sender.kind === "person" && !props.userMessageGrouping.groupedWithPrevious ? (
<Text
className="mb-1 pr-1 text-2xs text-foreground-muted opacity-80"
numberOfLines={1}
>
<Text className="font-t3-medium">{messageSenderLabel(sender)}</Text>
{messageSenderDetail(sender) === null ? "" : ` · ${messageSenderDetail(sender)}`}
</Text>
) : null}
{mediaAttachments.length + pendingMedia.length > 0 ? (
<View
className={hasBubble ? "mb-2" : undefined}
Expand Down
37 changes: 34 additions & 3 deletions apps/mobile/src/features/threads/pending-thread-feed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ThreadFeedEntry } from "../../lib/threadActivity";
import { scopedThreadKey } from "../../lib/scopedEntities";
import { threadHasCaughtUpTo } from "@t3tools/client-runtime/state/threads";
import { resolveUserMessageGrouping } from "@t3tools/client-runtime/user-message";
import { resolveMessageSender, sameMessageSender } from "@t3tools/client-runtime/message-sender";
import type {
AcknowledgedThreadMessage,
QueuedThreadMessage,
Expand Down Expand Up @@ -58,6 +59,31 @@ export type GroupedThreadFeedRow = ThreadFeedRow & {
readonly userMessageGrouping: ReturnType<typeof resolveUserMessageGrouping>;
};

type GroupingMessage = Parameters<typeof resolveUserMessageGrouping>[0] &
Parameters<typeof resolveMessageSender>[0];

/** Messages group only under one sender, so each change of person gets its name line. */
function bySender(
message: GroupingMessage,
previous: GroupingMessage | undefined,
next: GroupingMessage | undefined,
grouping: ReturnType<typeof resolveUserMessageGrouping>,
): ReturnType<typeof resolveUserMessageGrouping> {
const sender = resolveMessageSender(message);
const groupedWithPrevious =
grouping.groupedWithPrevious &&
previous !== undefined &&
sameMessageSender(sender, resolveMessageSender(previous));
return {
groupedWithPrevious,
groupedWithNext:
grouping.groupedWithNext &&
next !== undefined &&
sameMessageSender(sender, resolveMessageSender(next)),
continuesSteer: grouping.continuesSteer && groupedWithPrevious,
};
}

export function createThreadFeedGrouping() {
const rows = new WeakMap<ThreadFeedRow, GroupedThreadFeedRow>();
const ungrouped = resolveUserMessageGrouping(undefined, undefined, undefined);
Expand All @@ -76,13 +102,18 @@ export function createThreadFeedGrouping() {
};
return feed.map((entry, index) => {
const message = groupingMessage(index);
const previousMessage =
index - 1 === options.setupAnchorIndex ? undefined : groupingMessage(index - 1);
const nextMessage =
index === options.setupAnchorIndex ? undefined : groupingMessage(index + 1);
const grouping =
message === undefined
? ungrouped
: resolveUserMessageGrouping(
: bySender(
message,
index - 1 === options.setupAnchorIndex ? undefined : groupingMessage(index - 1),
index === options.setupAnchorIndex ? undefined : groupingMessage(index + 1),
previousMessage,
nextMessage,
resolveUserMessageGrouping(message, previousMessage, nextMessage),
);
const previous = rows.get(entry);
if (
Expand Down
3 changes: 3 additions & 0 deletions apps/mobile/src/lib/threadActivity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ export interface ThreadFeedMessage {
readonly scheduledTaskId?: ScheduledTaskId;
readonly senderThreadId?: ThreadId;
readonly linkedSender?: import("@t3tools/contracts").OrchestrationV2LinkedSender;
/** The signed-in client a person sent it from, stamped by the server. */
readonly sentBy?: import("@t3tools/contracts").OrchestrationV2MessageSentBy;
readonly idleCompaction?: import("@t3tools/contracts").OrchestrationV2IdleCompaction;
readonly visibility: OrchestrationV2ProjectedTurnItem["visibility"];
readonly sourceThreadId: ThreadId;
Expand Down Expand Up @@ -2499,6 +2501,7 @@ export function buildThreadFeed(
...(item.scheduledTaskId ? { scheduledTaskId: item.scheduledTaskId } : {}),
...(item.senderThreadId ? { senderThreadId: item.senderThreadId } : {}),
...(item.linkedSender ? { linkedSender: item.linkedSender } : {}),
...(item.sentBy ? { sentBy: item.sentBy } : {}),
...(item.idleCompaction ? { idleCompaction: item.idleCompaction } : {}),
}
: {}),
Expand Down
31 changes: 31 additions & 0 deletions apps/server/src/auth/EnvironmentAuth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,37 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer))(
}).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
);

it.effect("lets a client name another client's person but never its own", () =>
Effect.gen(function* () {
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
const sessions = yield* SessionStore.SessionStore;
const desktop = (label: string) =>
sessions.issue({
subject: "browser-pairing",
method: "browser-session-cookie",
client: { label, deviceType: "desktop" },
});
const admin = yield* desktop("Owner");
const laptop = yield* desktop("Work laptop");
const bot = yield* serverAuth.issueSession({ label: "Bot" });

expect(
yield* serverAuth.setClientSessionFounder(admin.sessionId, laptop.sessionId, "jeff"),
).toBe(true);
expect((yield* serverAuth.messageSenderOf(laptop.sessionId)).founder).toBe("jeff");

const selfAssign = yield* Effect.flip(
serverAuth.setClientSessionFounder(laptop.sessionId, laptop.sessionId, "kameron"),
);
expect(selfAssign._tag).toBe("ServerAuthForbiddenOperationError");
expect((yield* serverAuth.messageSenderOf(laptop.sessionId)).founder).toBe("jeff");
// A bot is never a person.
expect(
yield* serverAuth.setClientSessionFounder(admin.sessionId, bot.sessionId, "jeff"),
).toBe(false);
}).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
);

it.effect("prefers a bearer token over an empty primary cookie", () =>
Effect.gen(function* () {
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
Expand Down
86 changes: 86 additions & 0 deletions apps/server/src/auth/EnvironmentAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import {
type ServerAuthSessionMethod,
type AuthWebSocketTicketResult,
type AuthWebSocketTicketUse,
type Founder,
type OrchestrationV2MessageSentBy,
DpopFailureReason,
type DpopFailureReason as DpopFailureReasonType,
mcpClientScopes,
Expand All @@ -30,6 +32,7 @@ import * as Context from "effect/Context";
import * as Digest from "effect/crypto/Digest";
import * as DateTime from "effect/DateTime";
import * as Duration from "effect/Duration";
import * as Cause from "effect/Cause";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
Expand Down Expand Up @@ -350,6 +353,17 @@ export class ServerAuthConnectDevicesError extends Schema.TaggedError<ServerAuth
}
}

export class ServerAuthSessionFounderError extends Schema.TaggedError<ServerAuthSessionFounderError>()(
"ServerAuthSessionFounderError",
{
...serverAuthInternalErrorContext,
},
) {
override get message(): string {
return "Failed to read or record who uses a client.";
}
}

export const ServerAuthInternalError = Schema.Union([
ServerAuthBootstrapCredentialValidationError,
ServerAuthSessionCredentialValidationError,
Expand All @@ -374,6 +388,7 @@ export const ServerAuthInternalError = Schema.Union([
ServerAuthCloudHealthJwtSigningError,
ServerAuthCloudMintJwtSigningError,
ServerAuthConnectDevicesError,
ServerAuthSessionFounderError,
]);
export type ServerAuthInternalError = typeof ServerAuthInternalError.Type;
export const isServerAuthInternalError = Schema.is(ServerAuthInternalError);
Expand Down Expand Up @@ -591,6 +606,24 @@ export class EnvironmentAuth extends Context.Service<
readonly revokeOtherClientSessions: (
currentSessionId: AuthSessionId,
) => Effect.Effect<number, ServerAuthInternalError>;
/**
* Records who uses another client session, or clears it with null; false when that session is
* not live or is a bot. A client may not name itself, so who sent a message is always set by a
* different trusted client than the one that sends it.
*/
readonly setClientSessionFounder: (
currentSessionId: AuthSessionId,
targetSessionId: AuthSessionId,
founder: Founder | null,
) => Effect.Effect<boolean, ServerAuthForbiddenOperationError | ServerAuthInternalError>;
/**
* Who sent a message on this session, read from the server's own record of it. A session it
* cannot read still names itself by id with no person, so a message never claims one it lacks
* and is never refused for want of a label.
*/
readonly messageSenderOf: (
sessionId: AuthSessionId,
) => Effect.Effect<OrchestrationV2MessageSentBy>;
readonly authenticateHttpRequest: (
request: HttpServerRequest.HttpServerRequest,
) => Effect.Effect<AuthenticatedSession, ServerAuthCredentialError | ServerAuthInternalError>;
Expand Down Expand Up @@ -1424,6 +1457,57 @@ export const make = Effect.gen(function* () {
return yield* revokeSession(targetSessionId);
});

const setClientSessionFounder: EnvironmentAuth["Service"]["setClientSessionFounder"] = Effect.fn(
"EnvironmentAuth.setClientSessionFounder",
)(function* (currentSessionId, targetSessionId, founder) {
if (currentSessionId === targetSessionId) {
return yield* new ServerAuthForbiddenOperationError({});
}
// Another session on the caller's own device key is the same device naming itself.
const toFounderError = (cause: unknown) => new ServerAuthSessionFounderError({ cause });
const [currentKey, targetKey] = yield* Effect.all([
sessions.proofKeyThumbprintOf(currentSessionId),
sessions.proofKeyThumbprintOf(targetSessionId),
]).pipe(Effect.mapError(toFounderError));
if (Option.isSome(currentKey) && Option.getOrUndefined(targetKey) === currentKey.value) {
return yield* new ServerAuthForbiddenOperationError({});
}
return yield* sessions
.setFounder(targetSessionId, founder)
.pipe(Effect.mapError(toFounderError));
});

const messageSenderOf: EnvironmentAuth["Service"]["messageSenderOf"] = (sessionId) =>
sessions.senderOf(sessionId).pipe(
Effect.map((sender): OrchestrationV2MessageSentBy => ({
sessionId,
device: Option.match(sender, {
onNone: () => "",
onSome: (value) => value.label ?? "",
}),
deviceType: Option.match(sender, {
onNone: () => "unknown" as const,
onSome: (value) => value.deviceType,
}),
founder: Option.match(sender, {
onNone: () => null,
onSome: (value) => value.founder,
}),
})),
Effect.catchCause((cause) =>
Effect.logWarning("Could not read who uses a client; its message names no person.").pipe(
Effect.annotateLogs({ sessionId, cause: Cause.pretty(cause) }),
Effect.as({
sessionId,
device: "",
deviceType: "unknown" as const,
founder: null,
}),
),
),
Effect.withSpan("EnvironmentAuth.messageSenderOf"),
);

const revokeOtherClientSessions: EnvironmentAuth["Service"]["revokeOtherClientSessions"] =
Effect.fn("EnvironmentAuth.revokeOtherClientSessions")(function* (currentSessionId) {
const currentProofKey = yield* sessions
Expand Down Expand Up @@ -1647,6 +1731,8 @@ export const make = Effect.gen(function* () {
revokeSession,
listClientSessions,
revokeClientSession,
setClientSessionFounder,
messageSenderOf,
revokeOtherClientSessions,
authenticateHttpRequest,
authenticateWebSocketUpgrade,
Expand Down
Loading
Loading