Skip to content
Open
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
30 changes: 30 additions & 0 deletions web/__tests__/lib/skill-route-resolver.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { beforeEach, describe, expect, it, vi } from "vitest";

const { mockInitializeDatabase, mockSql } = vi.hoisted(() => ({
mockInitializeDatabase: vi.fn(),
mockSql: vi.fn(),
}));

vi.mock("@/lib/db", () => ({
initializeDatabase: mockInitializeDatabase,
sql: () => mockSql,
}));

import {
resolveSkillRouteParam,
resolveSkillRoutePath,
} from "@/lib/skillRouteResolver";

describe("skill route resolution", () => {
beforeEach(() => {
vi.clearAllMocks();
});

it("treats malformed percent-encoded route params as missing before database work", async () => {
await expect(resolveSkillRoutePath("%", "skill")).resolves.toBeNull();
await expect(resolveSkillRouteParam("%")).resolves.toBeNull();

expect(mockInitializeDatabase).not.toHaveBeenCalled();
expect(mockSql).not.toHaveBeenCalled();
});
});
17 changes: 14 additions & 3 deletions web/lib/skillRouteResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ export function getCanonicalSkillPath(skill: SkillRouteRecord): string {
return getPublicSkillPath(skill);
}

function decodeRouteParam(rawParam: string): string | null {
try {
return decodeURIComponent(rawParam);
} catch {
return null;
}
}

export async function buildUniquePublicSkillRoute(
db: SqlQuery,
input: {
Expand Down Expand Up @@ -73,9 +81,11 @@ export const resolveSkillRoutePath = cache(
rawAuthorSlug: string,
rawSkillSlug: string
): Promise<SkillRouteRecord | null> => {
const authorSlug = decodeRouteParam(rawAuthorSlug);
const skillSlug = decodeRouteParam(rawSkillSlug);
if (authorSlug === null || skillSlug === null) return null;

await initializeDatabase();
const authorSlug = decodeURIComponent(rawAuthorSlug);
const skillSlug = decodeURIComponent(rawSkillSlug);
const rows = await sql()<SkillRouteRecord>`
SELECT id, skill_id, public_slug, public_author_slug
FROM skills
Expand Down Expand Up @@ -120,7 +130,8 @@ export async function listStaticSkillRouteParams(
export async function resolveSkillRouteParam(
rawParam: string
): Promise<SkillRouteRecord | null> {
const param = decodeURIComponent(rawParam);
const param = decodeRouteParam(rawParam);
if (param === null) return null;
if (param.startsWith(CHAIN_SKILL_PREFIX)) {
return {
id: param,
Expand Down
Loading