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
5 changes: 3 additions & 2 deletions apps/mobile/src/features/cloud/linkEnvironment.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,8 @@ describe("mobile cloud link environment client", () => {
Response.json(
{
_tag: "EnvironmentHttpUnauthorizedError",
message: "Invalid environment bearer session.",
reason: "cloud_cli_authorization_required",
message: "Run `t3 connect link` to authorize this environment.",
},
{ status: 401 },
),
Expand All @@ -623,7 +624,7 @@ describe("mobile cloud link environment client", () => {
).pipe(Effect.flip);
expect(error._tag).toBe("CloudEnvironmentLinkError");
expect(error.message).toBe(
"Could not obtain environment link proof: Invalid environment bearer session.",
"Could not obtain environment link proof: Run `t3 connect link` to authorize this environment.",
);
expect(fetchMock).toHaveBeenCalledTimes(2);
}),
Expand Down
49 changes: 46 additions & 3 deletions apps/server/src/auth/ServerSecretStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,31 @@ const makePermissionDeniedSecretStoreLayer = () =>
Layer.provideMerge(PermissionDeniedFileSystemLayer),
);

const DirectoryCreateFailureFileSystemLayer = Layer.effect(
FileSystem.FileSystem,
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
return {
...fileSystem,
makeDirectory: (path) =>
Effect.fail(
PlatformError.systemError({
_tag: "PermissionDenied",
module: "FileSystem",
method: "makeDirectory",
pathOrDescriptor: String(path),
}),
),
} satisfies FileSystem.FileSystem;
}),
).pipe(Layer.provide(NodeServices.layer));

const makeDirectoryCreateFailureSecretStoreLayer = (config: ServerConfig.ServerConfig["Service"]) =>
ServerSecretStore.layer.pipe(
Layer.provide(Layer.succeed(ServerConfig.ServerConfig, config)),
Layer.provideMerge(DirectoryCreateFailureFileSystemLayer),
);

const RenameFailureFileSystemLayer = Layer.effect(
FileSystem.FileSystem,
Effect.gen(function* () {
Expand Down Expand Up @@ -146,6 +171,20 @@ const makeConcurrentCreateSecretStoreLayer = () =>
);

it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => {
it.effect("preserves directory context when secret-store initialization fails", () =>
Effect.gen(function* () {
const config = yield* ServerConfig.ServerConfig.pipe(Effect.provide(makeServerConfigLayer()));
const error = yield* Layer.build(makeDirectoryCreateFailureSecretStoreLayer(config)).pipe(
Effect.scoped,
Effect.flip,
);

assert.instanceOf(error, ServerSecretStore.SecretStoreDirectoryCreateError);
assert.match(error.directoryPath, /secrets$/u);
assert.instanceOf(error.cause, PlatformError.PlatformError);
}),
);

it.effect("returns Option.none when a secret file does not exist", () =>
Effect.gen(function* () {
const secretStore = yield* ServerSecretStore.ServerSecretStore;
Expand Down Expand Up @@ -232,7 +271,8 @@ it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => {
const error = yield* Effect.flip(secretStore.getOrCreateRandom("session-signing-key", 32));

assert.instanceOf(error, ServerSecretStore.SecretStoreReadError);
assert.include(error.message, "Failed to read secret session-signing-key.");
assert.equal(error.secretName, "session-signing-key");
assert.match(error.secretPath, /session-signing-key\.bin$/u);
assert.instanceOf(error.cause, PlatformError.PlatformError);
assert.equal((error.cause as PlatformError.PlatformError).reason._tag, "PermissionDenied");
}).pipe(Effect.provide(makePermissionDeniedSecretStoreLayer())),
Expand All @@ -247,7 +287,9 @@ it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => {
);

assert.instanceOf(error, ServerSecretStore.SecretStorePersistError);
assert.include(error.message, "Failed to persist secret session-signing-key.");
assert.equal(error.operation, "set");
assert.equal(error.secretName, "session-signing-key");
assert.match(error.secretPath, /session-signing-key\.bin$/u);
assert.instanceOf(error.cause, PlatformError.PlatformError);
assert.equal((error.cause as PlatformError.PlatformError).reason._tag, "PermissionDenied");
}).pipe(Effect.provide(makeRenameFailureSecretStoreLayer())),
Expand All @@ -260,7 +302,8 @@ it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => {
const error = yield* Effect.flip(secretStore.remove("session-signing-key"));

assert.instanceOf(error, ServerSecretStore.SecretStoreRemoveError);
assert.include(error.message, "Failed to remove secret session-signing-key.");
assert.equal(error.secretName, "session-signing-key");
assert.match(error.secretPath, /session-signing-key\.bin$/u);
assert.instanceOf(error.cause, PlatformError.PlatformError);
assert.equal((error.cause as PlatformError.PlatformError).reason._tag, "PermissionDenied");
}).pipe(Effect.provide(makeRemoveFailureSecretStoreLayer())),
Expand Down
Loading
Loading