mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-07 04:12:04 +00:00
## [1.4.28.1] — 2026-05-16 — Dashboard-save hotfix "Speichern" on the Dashboard works again for every account whose layout was last persisted before v1.4.28. The v1.4.28 retire of the `glp1` widget id left an orphan entry in `dashboardWidgetsJson` for legacy users, which made the save validator reject the payload; the resolver now filters unknown widget ids on read. ### Fixed - **Dashboard save against legacy layouts.** `resolveDashboardLayout` in `src/lib/dashboard-layout.ts` drops widget ids that are no longer in the registry before returning the layout, so the `dashboardWidgetsJson` round-trip (`GET /api/me/dashboard` → user edit → `PUT /api/me/dashboard`) succeeds even when the persisted JSON still names `glp1` or any other retired widget. ### Tests - `src/lib/__tests__/dashboard-layout.test.ts` gains a case for the retired-id filter (19/19 green).
131 lines
5.4 KiB
Bash
Executable File
131 lines
5.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# v1.4.27 B3 — GeoLite2-City + GeoLite2-ASN download helper.
|
|
#
|
|
# The MMDB files are too large (~80 MB combined) to vendor in git.
|
|
# Instead, an operator runs this script before `docker build` so the
|
|
# files land at `assets/geolite2/` where the Dockerfile picks them up
|
|
# and copies them into `/opt/geolite2/` inside the image.
|
|
#
|
|
# The MaxMind GeoLite2 databases require a free MaxMind account and
|
|
# a licence key. The key is taken from the `MAXMIND_LICENSE_KEY`
|
|
# environment variable. Without the key, the script writes an `.empty`
|
|
# marker into the output directory and exits 0 — the Docker image
|
|
# still builds (the COPY in `Dockerfile` has a non-empty source) and
|
|
# the runtime resolver in `src/lib/geo.ts` detects the marker, falls
|
|
# back to the online `ipwho.is` provider, and emits a one-shot admin
|
|
# notification so the maintainer can wire the secret when convenient.
|
|
#
|
|
# Licence: the databases are distributed under
|
|
# Creative Commons Attribution-ShareAlike 4.0
|
|
# (https://creativecommons.org/licenses/by-sa/4.0/). The attribution
|
|
# lives in `docs/audit/v1427-summary.md` and on the `/about` page.
|
|
#
|
|
# Usage:
|
|
# MAXMIND_LICENSE_KEY=xxxx ./scripts/fetch-geolite2.sh
|
|
#
|
|
# Refresh schedule: re-run before each release. The MMDB layout is
|
|
# stable; MaxMind reissues the databases on the first Tuesday of each
|
|
# month.
|
|
set -euo pipefail
|
|
|
|
OUT_DIR="${GEOLITE2_OUT_DIR:-assets/geolite2}"
|
|
LICENSE_KEY="${MAXMIND_LICENSE_KEY:-}"
|
|
|
|
if [[ -z "$LICENSE_KEY" ]]; then
|
|
echo "fetch-geolite2: MAXMIND_LICENSE_KEY is not set — skipping download." >&2
|
|
echo "fetch-geolite2: the runtime resolver will fall back to ipwho.is." >&2
|
|
mkdir -p "$OUT_DIR"
|
|
touch "$OUT_DIR/.empty"
|
|
exit 0
|
|
fi
|
|
|
|
mkdir -p "$OUT_DIR"
|
|
# Clear any stale marker from a previous keyless run so the runtime
|
|
# resolver does not mistake a freshly populated directory for the
|
|
# fallback state.
|
|
rm -f "$OUT_DIR/.empty"
|
|
|
|
fetch_edition() {
|
|
local edition_id="$1"
|
|
local mmdb_basename="$2"
|
|
# Use an isolated working directory per edition so `find` and `tar`
|
|
# never walk shared `/tmp`. Linux runners (GitHub Actions) populate
|
|
# `/tmp` with `systemd-private-*` directories that are mode 700, and
|
|
# `find` returns exit 1 on permission-denied — under `set -e` that
|
|
# would kill the whole script before our fallback branches fire.
|
|
local work_dir
|
|
work_dir="$(mktemp -d -t "${edition_id}.XXXXXX")"
|
|
local tmp_tarball="${work_dir}/${edition_id}.tar.gz"
|
|
|
|
echo "fetch-geolite2: downloading $edition_id ..." >&2
|
|
# Use --fail-with-body so curl prints the response on failure; capture
|
|
# the exit code without aborting the script. The license key is set
|
|
# (the no-key path returned earlier with the `.empty` marker), so any
|
|
# non-zero exit is a real configuration problem — bubble it up so CI
|
|
# surfaces the gap on the next release rather than letting it ship as
|
|
# a silent no-op offline tier.
|
|
local curl_exit=0
|
|
curl --silent --show-error --fail-with-body --location \
|
|
--output "$tmp_tarball" \
|
|
"https://download.maxmind.com/app/geoip_download?edition_id=${edition_id}&license_key=${LICENSE_KEY}&suffix=tar.gz" || curl_exit=$?
|
|
|
|
if [[ "$curl_exit" -ne 0 ]]; then
|
|
echo "fetch-geolite2: $edition_id download failed (curl exit $curl_exit) with MAXMIND_LICENSE_KEY set — aborting." >&2
|
|
echo "fetch-geolite2: 401 means the key is wrong or the EULA is unsigned; 403 means a throttle; 5xx means MaxMind-side. Investigate before retrying." >&2
|
|
rm -rf "$work_dir"
|
|
return "$curl_exit"
|
|
fi
|
|
|
|
# The tarball ships under a date-stamped top-level directory
|
|
# (`GeoLite2-City_YYYYMMDD/`). Extract the MMDB into a flat layout
|
|
# so the Dockerfile COPY uses a stable path.
|
|
if ! tar -xzf "$tmp_tarball" -C "$work_dir"; then
|
|
echo "fetch-geolite2: $edition_id tarball extraction failed with MAXMIND_LICENSE_KEY set — aborting." >&2
|
|
rm -rf "$work_dir"
|
|
return 1
|
|
fi
|
|
local extracted
|
|
extracted="$(find "$work_dir" -maxdepth 2 -name "${mmdb_basename}" -print -quit 2>/dev/null)"
|
|
if [[ -z "$extracted" ]]; then
|
|
echo "fetch-geolite2: expected ${mmdb_basename} inside the ${edition_id} tarball but it was not found — aborting." >&2
|
|
rm -rf "$work_dir"
|
|
return 1
|
|
fi
|
|
mv "$extracted" "$OUT_DIR/$mmdb_basename"
|
|
rm -rf "$work_dir"
|
|
|
|
if [[ ! -s "$OUT_DIR/$mmdb_basename" ]]; then
|
|
echo "fetch-geolite2: ${mmdb_basename} landed empty — aborting." >&2
|
|
return 1
|
|
fi
|
|
|
|
local sha
|
|
sha="$(shasum -a 256 "$OUT_DIR/$mmdb_basename" | awk '{print $1}')"
|
|
echo "fetch-geolite2: $mmdb_basename SHA256 $sha" >&2
|
|
}
|
|
|
|
# With the license key present, both editions are required. Any failure
|
|
# from `fetch_edition` is a real configuration or upstream problem and
|
|
# must take the build down so the maintainer sees it — the v1.4.27
|
|
# silent-fallback path is reserved for the deliberate "no key" case
|
|
# handled at the top of the script.
|
|
fetch_edition "GeoLite2-City" "GeoLite2-City.mmdb"
|
|
fetch_edition "GeoLite2-ASN" "GeoLite2-ASN.mmdb"
|
|
|
|
# Belt-and-braces assertion: with the key set the script must leave
|
|
# both MMDB files behind. If we reach this point with a missing file
|
|
# something funny happened (filesystem fault, stray rm, ...); fail loud
|
|
# instead of producing a degraded image silently.
|
|
missing=()
|
|
for mmdb in "GeoLite2-City.mmdb" "GeoLite2-ASN.mmdb"; do
|
|
if [[ ! -s "$OUT_DIR/$mmdb" ]]; then
|
|
missing+=("$mmdb")
|
|
fi
|
|
done
|
|
if [[ "${#missing[@]}" -gt 0 ]]; then
|
|
echo "fetch-geolite2: missing or empty after fetch: ${missing[*]} — aborting." >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "fetch-geolite2: done. Files in $OUT_DIR." >&2
|