Skip to content

fix: avoid filtered providers on moderation failure #1985

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
steebchen wants to merge 9 commits into from
Closed

fix: avoid filtered providers on moderation failure #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
152a8bd
fix: block filtered providers on mod fail
steebchen Apr 7, 2026
e8d62de
fix: log moderation outage block
steebchen Apr 7, 2026
9fe0c9b
fix: apply moderation routing early
steebchen Apr 7, 2026
290557d
test: verify filtered upstream skip
steebchen Apr 8, 2026
1c140e6
fix: use app version for beacon
steebchen Apr 8, 2026
54bb162
test: isolate auto routing envs
steebchen Apr 8, 2026
e26c302
fix: reroute direct moderation outage
steebchen Apr 8, 2026
77b91b8
Merge remote-tracking branch 'origin/main' into pr-sync-main
steebchen Apr 8, 2026
d1ed69f
test: fix merged unit specs
steebchen Apr 8, 2026
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
14 changes: 9 additions & 5 deletions apps/api/src/routes/beacon.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ describe("beacon endpoint", () => {
vi.clearAllMocks();
});

function getExpectedVersion(clientVersion: string) {
return process.env.APP_VERSION ?? clientVersion;
}

it("should accept valid beacon data", async () => {
const beaconData = {
uuid: "123e4567-e89b-12d3-a456-426614174000",
Expand Down Expand Up @@ -46,7 +50,7 @@ describe("beacon endpoint", () => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: getExpectedVersion(beaconData.version),
client_ip: null, // No IP headers provided
country: undefined,
region: undefined,
Expand Down Expand Up @@ -86,7 +90,7 @@ describe("beacon endpoint", () => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: getExpectedVersion(beaconData.version),
client_ip: "203.0.113.42",
country: "US",
region: "California",
Expand Down Expand Up @@ -125,7 +129,7 @@ describe("beacon endpoint", () => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: getExpectedVersion(beaconData.version),
client_ip: "198.51.100.25", // First IP from X-Forwarded-For
country: undefined, // GCP doesn't provide country in standard headers
region: "us-central1",
Expand Down Expand Up @@ -162,7 +166,7 @@ describe("beacon endpoint", () => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: getExpectedVersion(beaconData.version),
client_ip: "192.0.2.123",
country: undefined,
region: undefined,
Expand Down Expand Up @@ -199,7 +203,7 @@ describe("beacon endpoint", () => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: getExpectedVersion(beaconData.version),
client_ip: null,
country: undefined,
region: undefined,
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/routes/beacon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ beacon.openapi(beaconRoute, async (c) => {
installation: beaconData.type,
timestamp: beaconData.timestamp,
source: "self_hosted_api",
version: beaconData.version,
version: process.env.APP_VERSION ?? beaconData.version,
client_ip: clientIP,
country: regionInfo.country,
region: regionInfo.region,
Expand Down
Loading
Loading