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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); action: fail closed on a malformed identity bundle by bordumb · Pull Request #19 · auths-dev/verify · GitHub
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
58 changes: 51 additions & 7 deletions dist/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -71425,15 +71425,23 @@ async function run() {
if (!commitRange) {
commitRange = await getDefaultCommitRange();
}
// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
core.error(`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`);
core.setFailed('Stale identity bundle — verification aborted');
let bundleJson;
try {
bundleJson = JSON.parse(bundleContent);
}
catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = (0, verifier_1.checkBundleFreshness)(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`);
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand DownExpand Up@@ -71876,6 +71884,7 @@ var __importStar = (this && this.__importStar) || (function () {
})();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.classifyError = classifyError;
exports.checkBundleFreshness = checkBundleFreshness;
exports.runPreflightChecks = runPreflightChecks;
exports.verifyCommits = verifyCommits;
exports.processGpgResults = processGpgResults;
Expand DownExpand Up@@ -71913,6 +71922,41 @@ function classifyError(error) {
return 'invalid_signature';
return 'error';
}
/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
function checkBundleFreshness(bundleJson, nowMs) {
const b = bundleJson;
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}
/**
* Run pre-flight checks before verification.
* Detects common issues and provides actionable error messages.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/__tests__/verifier.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult } from '../verifier';
import { getAuthsDownloadUrl, getBinaryName, getCommitsInRange, verifyChecksum, ensureAuthsInstalled, verifyArtifact, classifyArtifactError, ArtifactVerificationResult, processGpgResults, VerificationResult, checkBundleFreshness } from '../verifier';
import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
Expand DownExpand Up@@ -320,6 +320,42 @@ describe('processGpgResults', () => {
});
});

describe('checkBundleFreshness', () => {
const FIXED_NOW = new Date('2026-06-20T00:00:00Z').getTime();
const wellFormed = (overrides: Record<string, unknown> = {}) => ({
bundle_timestamp: new Date(FIXED_NOW - 1000).toISOString(), // 1s old
max_valid_for_secs: 86400,
...overrides,
});

it('accepts a well-formed, in-window bundle', () => {
expect(checkBundleFreshness(wellFormed(), FIXED_NOW).fresh).toBe(true);
});

it('rejects a bundle missing max_valid_for_secs (no silent skip)', () => {
const { max_valid_for_secs, ...noTtl } = wellFormed();
expect(checkBundleFreshness(noTtl, FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle with a non-numeric max_valid_for_secs', () => {
expect(checkBundleFreshness(wellFormed({ max_valid_for_secs: 'forever' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a bundle missing or invalid bundle_timestamp', () => {
const { bundle_timestamp, ...noTs } = wellFormed();
expect(checkBundleFreshness(noTs, FIXED_NOW).fresh).toBe(false);
expect(checkBundleFreshness(wellFormed({ bundle_timestamp: 'not-a-date' }), FIXED_NOW).fresh).toBe(false);
});

it('rejects a genuinely stale bundle', () => {
const stale = wellFormed({
bundle_timestamp: new Date(FIXED_NOW - 200_000 * 1000).toISOString(),
max_valid_for_secs: 86400,
});
expect(checkBundleFreshness(stale, FIXED_NOW).fresh).toBe(false);
});
});

describe('ensureAuthsInstalled - cross-run caching', () => {
const realTmpdir = require('os').tmpdir();
const cachePath = path.join(realTmpdir, 'auths-cache');
Expand Down
23 changes: 15 additions & 8 deletions src/main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as glob from '@actions/glob';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks } from './verifier';
import { verifyCommits, verifyArtifact, VerifyOptions, VerificationResult, ArtifactVerificationResult, FailureType, ensureAuthsInstalled, runPreflightChecks, checkBundleFreshness } from './verifier';

export interface ResolvedIdentity {
mode: 'identity-bundle' | 'kel-native';
Expand DownExpand Up@@ -95,17 +95,24 @@ async function run(): Promise<void> {
commitRange = await getDefaultCommitRange();
}

// Enforce bundle TTL before invoking CLI verification
// Validate the bundle shape and enforce TTL before invoking CLI verification.
// A malformed bundle (bad JSON, or a missing/invalid timestamp or TTL) fails CLOSED.
if (resolvedBundlePath) {
const bundleContent = fs.readFileSync(resolvedBundlePath, 'utf8');
const bundleJson = JSON.parse(bundleContent);
const ageSeconds = (Date.now() - new Date(bundleJson.bundle_timestamp).getTime()) / 1000;
if (ageSeconds > bundleJson.max_valid_for_secs) {
let bundleJson: unknown;
try {
bundleJson = JSON.parse(bundleContent);
} catch {
core.setFailed('Identity bundle is not valid JSON — verification aborted');
return;
}
const freshness = checkBundleFreshness(bundleJson, Date.now());
if (!freshness.fresh) {
core.error(
`Bundle expired: ${Math.round(ageSeconds)}s old, max ${bundleJson.max_valid_for_secs}s. ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs ${bundleJson.max_valid_for_secs}`
`${freshness.reason} ` +
`Refresh with: auths id export-bundle --alias <ALIAS> --output bundle.json --max-age-secs <SECONDS>`
);
core.setFailed('Stale identity bundle — verification aborted');
core.setFailed('Identity bundle rejected — verification aborted');
return;
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/verifier.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,45 @@ export function classifyError(error: string): FailureType {
return 'error';
}

/** Discriminated result of an identity-bundle freshness check. */
export type BundleFreshness = { fresh: true } | { fresh: false; reason: string };

/**
* Validate an identity bundle's shape and freshness, failing CLOSED.
*
* A bundle that does not carry a well-formed `bundle_timestamp` and a finite,
* non-negative numeric `max_valid_for_secs` cannot be freshness-checked, so it is
* rejected rather than silently trusted — a missing or malformed field must never
* skip the staleness check.
*
* Args:
* * `bundleJson`: The parsed bundle JSON (untrusted shape).
* * `nowMs`: The current time in epoch milliseconds.
*
* Usage:
* ```ignore
* const r = checkBundleFreshness(JSON.parse(content), Date.now());
* if (!r.fresh) core.setFailed(r.reason);
* ```
*/
export function checkBundleFreshness(bundleJson: unknown, nowMs: number): BundleFreshness {
const b = bundleJson as { bundle_timestamp?: unknown; max_valid_for_secs?: unknown };
const ts = b?.bundle_timestamp;
const tsMs = typeof ts === 'string' || typeof ts === 'number' ? new Date(ts).getTime() : NaN;
if (!Number.isFinite(tsMs)) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `bundle_timestamp`.' };
}
const maxAge = b?.max_valid_for_secs;
if (typeof maxAge !== 'number' || !Number.isFinite(maxAge) || maxAge < 0) {
return { fresh: false, reason: 'Identity bundle is malformed: missing or invalid `max_valid_for_secs`.' };
}
const ageSeconds = (nowMs - tsMs) / 1000;
if (ageSeconds > maxAge) {
return { fresh: false, reason: `Bundle expired: ${Math.round(ageSeconds)}s old, max ${maxAge}s.` };
}
return { fresh: true };
}

export interface VerifyOptions {
identityBundlePath: string;
skipMergeCommits: boolean;
Expand Down
Loading