mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 23:52:24 +00:00
fix(config): treat an empty environment variable as unset
docker-compose.yml forwards its whitelist as "${NAME:-}", so a variable
the operator never set reaches the process as the empty string. Reads
written as a nullish fallback kept that string: the weather client built
an empty base URL and every geocode failed with ERR_INVALID_URL, and the
IP geo lookup requested a relative path.
Reads with a fallback now go through src/lib/env.ts (envValue, envOr,
envFlag), which treats empty and whitespace as unset. IP_GEO_LOOKUP_DISABLED
accepts 1, true, yes and on instead of only "1". A structural test refuses
a ?? fallback written directly against process.env anywhere in src/, and
the compose whitelist guard counts the helper's call shape as a read.
This commit is contained in:
1 parent
4af6b87a2a
commit
3c3e5ceab7
25 files changed
+337
-37
No files matched your search
@@ -0,0 +1,39 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { envFlag, envOr, envValue } from "../env";
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllEnvs();
|
||||
});
|
||||
|
||||
describe("env helper: compose passes an unset variable as the empty string", () => {
|
||||
it("treats empty and whitespace as unset", () => {
|
||||
vi.stubEnv("HL_TEST_VAR", "");
|
||||
expect(envValue("HL_TEST_VAR")).toBeUndefined();
|
||||
expect(envOr("HL_TEST_VAR", "fallback")).toBe("fallback");
|
||||
vi.stubEnv("HL_TEST_VAR", " ");
|
||||
expect(envOr("HL_TEST_VAR", "fallback")).toBe("fallback");
|
||||
});
|
||||
|
||||
it("returns a set value trimmed", () => {
|
||||
vi.stubEnv("HL_TEST_VAR", " https://example.test ");
|
||||
expect(envValue("HL_TEST_VAR")).toBe("https://example.test");
|
||||
expect(envOr("HL_TEST_VAR", "fallback")).toBe("https://example.test");
|
||||
});
|
||||
|
||||
it("falls back when the variable is absent", () => {
|
||||
delete process.env.HL_TEST_ABSENT;
|
||||
expect(envOr("HL_TEST_ABSENT", "fallback")).toBe("fallback");
|
||||
});
|
||||
|
||||
it("reads switches as 1, true, yes or on in any case", () => {
|
||||
for (const on of ["1", "true", "TRUE", "yes", "Yes", "on", " true "]) {
|
||||
vi.stubEnv("HL_TEST_FLAG", on);
|
||||
expect(envFlag("HL_TEST_FLAG"), on).toBe(true);
|
||||
}
|
||||
for (const off of ["", "0", "false", "no", "off", "2", "enabled"]) {
|
||||
vi.stubEnv("HL_TEST_FLAG", off);
|
||||
expect(envFlag("HL_TEST_FLAG"), off).toBe(false);
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -104,6 +104,35 @@ describe("lookupIpLocation IP-geolocation HTTPS guard", () => {
|
||||
expect(url).toBe("https://ipwho.is/8.8.8.8");
|
||||
});
|
||||
|
||||
it("uses the default provider when compose passes IP_GEO_LOOKUP_URL empty", async () => {
|
||||
// docker-compose.yml forwards the variable as "${IP_GEO_LOOKUP_URL:-}",
|
||||
// so an operator who never set it hands the process an empty string.
|
||||
process.env.IP_GEO_LOOKUP_URL = "";
|
||||
const fetchSpy = vi
|
||||
.fn()
|
||||
.mockResolvedValue(
|
||||
jsonOk({ success: true, city: "Berlin", country_code: "DE" }),
|
||||
);
|
||||
vi.stubGlobal("fetch", fetchSpy);
|
||||
const { lookupIpLocation } = await import("../geo");
|
||||
|
||||
expect(await lookupIpLocation("8.8.8.8")).toBe("Berlin, DE");
|
||||
expect(fetchSpy.mock.calls[0]?.[0]).toBe("https://ipwho.is/8.8.8.8");
|
||||
});
|
||||
|
||||
it.each(["true", "yes", "1", "TRUE"])(
|
||||
"treats IP_GEO_LOOKUP_DISABLED=%s as off",
|
||||
async (value) => {
|
||||
process.env.IP_GEO_LOOKUP_DISABLED = value;
|
||||
const fetchSpy = vi.fn();
|
||||
vi.stubGlobal("fetch", fetchSpy);
|
||||
const { lookupIpLocation } = await import("../geo");
|
||||
|
||||
expect(await lookupIpLocation("8.8.8.8")).toBeNull();
|
||||
expect(fetchSpy).not.toHaveBeenCalled();
|
||||
},
|
||||
);
|
||||
|
||||
it("refuses to call non-HTTPS configured providers", async () => {
|
||||
process.env.IP_GEO_LOOKUP_URL = "http://ip-api.com/json";
|
||||
const fetchSpy = vi.fn().mockResolvedValue(
|
||||
|
||||
Reference in new issue
Block a user