Skip to content

trustpub: Remove workflow path verification from the frontend #12431

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
Turbo87 merged 1 commit into from
Dec 2, 2025
Merged

trustpub: Remove workflow path verification from the frontend #12431

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
9 changes: 2 additions & 7 deletions app/controllers/crate/settings/new-trusted-publisher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,10 @@ export default class NewTrustedPublisherController extends Controller {
}

get verificationUrl() {
if (this.publisher !== 'GitHub') return;
if (!this.namespace || !this.project || !this.workflow) return;

if (this.publisher === 'GitHub') {
return `https://raw.githubusercontent.com/${this.namespace}/${this.project}/HEAD/.github/workflows/${this.workflow}`;
}

if (this.publisher === 'GitLab') {
return `https://gitlab.com/${this.namespace}/${this.project}/-/raw/HEAD/${this.workflow}`;
}
return `https://raw.githubusercontent.com/${this.namespace}/${this.project}/HEAD/.github/workflows/${this.workflow}`;
}

saveConfigTask = task(async () => {
Expand Down
2 changes: 0 additions & 2 deletions app/templates/crate/settings/new-trusted-publisher.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,6 @@ import WorkflowVerification from 'crates-io/components/workflow-verification';
<code>ci/publish.yml</code>.
</div>
{{/if}}

<WorkflowVerification @url={{@controller.verificationUrl}} @fieldType='filepath' />
{{/let}}
</div>

Expand Down
88 changes: 0 additions & 88 deletions e2e/routes/crate/settings/new-trusted-publisher.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,93 +505,5 @@ test.describe('Route | crate.settings.new-trusted-publisher', { tag: '@routes' }
await expect(page).toHaveURL(`/crates/${crate.name}/settings`);
await expect(page.locator('[data-test-gitlab-config]')).toHaveCount(0);
});

test.describe('workflow verification', () => {
test('success case (200 OK)', async ({ msw, page }) => {
let { crate } = await prepare(msw);

await page.goto(`/crates/${crate.name}/settings/new-trusted-publisher`);
await expect(page).toHaveURL(`/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await page.selectOption('[data-test-publisher]', 'GitLab');

await msw.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml', () => {
return new HttpResponse(null, { status: 200 });
}),
);

await expect(page.locator('[data-test-workflow-verification="initial"]')).toHaveText(
'The workflow filepath will be verified once all necessary fields are filled.',
);

await page.fill('[data-test-namespace]', 'rust-lang');
await page.fill('[data-test-project]', 'crates.io');
await page.fill('[data-test-workflow]', '.gitlab-ci.yml');

await expect(page.locator('[data-test-workflow-verification="success"]')).toBeVisible();

await expect(page.locator('[data-test-workflow-verification="success"]')).toHaveText(
'✓ Workflow file found at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml',
);
});

test('not found case (404)', async ({ msw, page }) => {
let { crate } = await prepare(msw);

await page.goto(`/crates/${crate.name}/settings/new-trusted-publisher`);
await expect(page).toHaveURL(`/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await page.selectOption('[data-test-publisher]', 'GitLab');

await msw.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/missing.yml', () => {
return new HttpResponse(null, { status: 404 });
}),
);

await page.fill('[data-test-namespace]', 'rust-lang');
await page.fill('[data-test-project]', 'crates.io');
await page.fill('[data-test-workflow]', 'missing.yml');

await expect(page.locator('[data-test-workflow-verification="not-found"]')).toBeVisible();

await expect(page.locator('[data-test-workflow-verification="not-found"]')).toHaveText(
'⚠ Workflow file not found at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/missing.yml',
);

// Verify form can still be submitted
await page.click('[data-test-add]');
await expect(page).toHaveURL(`/crates/${crate.name}/settings`);
});

test('server error (5xx)', async ({ msw, page }) => {
let { crate } = await prepare(msw);

await page.goto(`/crates/${crate.name}/settings/new-trusted-publisher`);
await expect(page).toHaveURL(`/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await page.selectOption('[data-test-publisher]', 'GitLab');

await msw.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml', () => {
return new HttpResponse(null, { status: 500 });
}),
);

await page.fill('[data-test-namespace]', 'rust-lang');
await page.fill('[data-test-project]', 'crates.io');
await page.fill('[data-test-workflow]', '.gitlab-ci.yml');

await expect(page.locator('[data-test-workflow-verification="error"]')).toBeVisible();

await expect(page.locator('[data-test-workflow-verification="error"]')).toHaveText(
'⚠ Could not verify workflow file at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml (network error)',
);
});
});
});
});
2 changes: 1 addition & 1 deletion src/config/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ impl Server {
// the `script` in `public/github-redirect.html`
let content_security_policy = format!(
"default-src 'self'; \
connect-src 'self' *.ingest.sentry.io https://docs.rs https://play.rust-lang.org https://raw.githubusercontent.com https://gitlab.com {cdn_domain}; \
connect-src 'self' *.ingest.sentry.io https://docs.rs https://play.rust-lang.org https://raw.githubusercontent.com {cdn_domain}; \
script-src 'self' 'unsafe-eval' 'sha256-n1+BB7Ckjcal1Pr7QNBh/dKRTtBQsIytFodRiIosXdE=' 'sha256-dbf9FMl76C7BnK1CC3eWb3pvsQAUaTYSHAlBy9tNTG0='; \
style-src 'self' 'unsafe-inline' https://code.cdn.mozilla.net; \
font-src https://code.cdn.mozilla.net; \
Expand Down
86 changes: 0 additions & 86 deletions tests/routes/crate/settings/new-trusted-publisher-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,91 +514,5 @@ module('Route | crate.settings.new-trusted-publisher', hooks => {
assert.strictEqual(currentURL(), `/crates/${crate.name}/settings`);
assert.dom('[data-test-gitlab-config]').exists({ count: 0 });
});

module('workflow verification', function () {
test('success case (200 OK)', async function (assert) {
let { crate } = await prepare(this);

await visit(`/crates/${crate.name}/settings/new-trusted-publisher`);
assert.strictEqual(currentURL(), `/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await fillIn('[data-test-publisher]', 'GitLab');

this.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml', () => {
return new HttpResponse(null, { status: 200 });
}),
);

assert
.dom('[data-test-workflow-verification="initial"]')
.hasText('The workflow filepath will be verified once all necessary fields are filled.');

await fillIn('[data-test-namespace]', 'rust-lang');
await fillIn('[data-test-project]', 'crates.io');
await fillIn('[data-test-workflow]', '.gitlab-ci.yml');

await waitFor('[data-test-workflow-verification="success"]');

let expected = '✓ Workflow file found at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml';
assert.dom('[data-test-workflow-verification="success"]').hasText(expected);
});

test('not found case (404)', async function (assert) {
let { crate } = await prepare(this);

await visit(`/crates/${crate.name}/settings/new-trusted-publisher`);
assert.strictEqual(currentURL(), `/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await fillIn('[data-test-publisher]', 'GitLab');

this.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/missing.yml', () => {
return new HttpResponse(null, { status: 404 });
}),
);

await fillIn('[data-test-namespace]', 'rust-lang');
await fillIn('[data-test-project]', 'crates.io');
await fillIn('[data-test-workflow]', 'missing.yml');

await waitFor('[data-test-workflow-verification="not-found"]');

let expected = '⚠ Workflow file not found at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/missing.yml';
assert.dom('[data-test-workflow-verification="not-found"]').hasText(expected);

// Verify form can still be submitted
await click('[data-test-add]');
assert.strictEqual(currentURL(), `/crates/${crate.name}/settings`);
});

test('server error (5xx)', async function (assert) {
let { crate } = await prepare(this);

await visit(`/crates/${crate.name}/settings/new-trusted-publisher`);
assert.strictEqual(currentURL(), `/crates/${crate.name}/settings/new-trusted-publisher`);

// Select GitLab from the publisher dropdown
await fillIn('[data-test-publisher]', 'GitLab');

this.worker.use(
http.head('https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml', () => {
return new HttpResponse(null, { status: 500 });
}),
);

await fillIn('[data-test-namespace]', 'rust-lang');
await fillIn('[data-test-project]', 'crates.io');
await fillIn('[data-test-workflow]', '.gitlab-ci.yml');

await waitFor('[data-test-workflow-verification="error"]');

let expected =
'⚠ Could not verify workflow file at https://gitlab.com/rust-lang/crates.io/-/raw/HEAD/.gitlab-ci.yml (network error)';
assert.dom('[data-test-workflow-verification="error"]').hasText(expected);
});
});
});
});
Loading