Skip to content

refactor(hub): share one package source pin and excluded-kind check #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheGreatAxios merged 1 commit into from
Nov 4, 2026
Merged

refactor(hub): share one package source pin and excluded-kind check #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions apps/hub/src/artifacts/approval-package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,14 @@ export function parseApprovalPackageBundle(
return bundle;
}

async function verifySourcePin(
export async function verifySourcePin(
source: ApprovalPackageSource,
readSource: StoredSourceReader,
path: string,
): Promise<void> {
if (EXCLUDED_PACKAGE_SOURCE_KINDS.has(source.kind))
throw new ProjectError(422, "excluded_package_source_kind", [
{ path: "manifest.sources", message: source.kind },
{ path, message: source.kind },
]);
const stored = await readSource(source.artifactId, source.version);
if (
Expand All @@ -126,14 +127,14 @@ async function verifySourcePin(
)
throw new ProjectError(422, "invalid_package_source", [
{
path: "manifest.sources",
path,
message: `${source.artifactId}@${String(source.version)}`,
},
]);
if (stored.approved === false)
throw new ProjectError(422, "unapproved_package_source", [
{
path: "manifest.sources",
path,
message: `${source.kind}@${String(source.version)}`,
},
]);
Expand Down Expand Up @@ -199,7 +200,7 @@ export async function validateApprovalPackage(
verifySealedAssignment(bundle, sealedAssignment);
}
for (const source of bundle.manifest.sources)
await verifySourcePin(source, readSource);
await verifySourcePin(source, readSource, "manifest.sources");
return bundle;
}

Expand Down
12 changes: 6 additions & 6 deletions apps/hub/src/artifacts/approval-rounds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ import { parseJson, readJson } from "../lib/json.ts";
import { mailRunAsCaller } from "../mail/caller-mail.ts";
import { actorOf, authorizeProject } from "../projects/authorization.ts";
import { ProjectError } from "../projects/errors.ts";
import { parseApprovalPackageBundle } from "./approval-package.ts";
import {
EXCLUDED_PACKAGE_SOURCE_KINDS,
parseApprovalPackageBundle,
} from "./approval-package.ts";

export const APPROVAL_PACKAGE_KIND = "approval_package";

Expand Down Expand Up @@ -219,8 +222,7 @@ function extractSupportingDocuments(
}
}
for (const source of bundle.manifest.sources) {
if (source.kind === "app" || source.kind === APPROVAL_PACKAGE_KIND)
continue;
if (EXCLUDED_PACKAGE_SOURCE_KINDS.has(source.kind)) continue;
const path = `documents/${source.kind}.md`;
if (docMap.has(path) || !isSafeRelativePath(path)) continue;
const matched = projectDocuments.find(
Expand Down Expand Up @@ -513,9 +515,7 @@ export function createPgApprovalRoundStore(
const bundle = parseApprovalPackageBundle(stored.content);
const projectDocuments: StoredPackageDocument[] = [];
for (const source of bundle.manifest.sources) {
if (source.kind === "app" || source.kind === APPROVAL_PACKAGE_KIND) {
continue;
}
if (EXCLUDED_PACKAGE_SOURCE_KINDS.has(source.kind)) continue;
const row = await getArtifact(db, source.artifactId);
if (!row || row.tenantId !== actor.tenantId) {
continue;
Expand Down
27 changes: 3 additions & 24 deletions apps/hub/src/artifacts/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ import {
parseApprovalPackageBundle,
readProjectPackageSource,
validateApprovalPackage,
verifySourcePin,
} from "./approval-package.ts";
import {
createApprovalRoundService,
Expand Down Expand Up @@ -2069,30 +2070,8 @@ export function createArtifactService(
);
},
);
for (const source of input.assignment.sources) {
const stored = await readSource(source.artifactId, source.version);
if (
!stored ||
stored.kind !== source.kind ||
stored.version !== source.version ||
stored.sha256 !== source.sha256
) {
throw new ProjectError(422, "invalid_package_source", [
{
path: "assignment.sources",
message: `${source.artifactId}@${String(source.version)}`,
},
]);
}
if (stored.approved === false) {
throw new ProjectError(422, "unapproved_package_source", [
{
path: "assignment.sources",
message: `${source.kind}@${String(source.version)}`,
},
]);
}
}
for (const source of input.assignment.sources)
await verifySourcePin(source, readSource, "assignment.sources");
const sealedAssignment = {
...input.assignment,
sealed: true as const,
Expand Down