Compare commits
4
Commits
v1.1.0
..
v2026.10.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3460fff8ff | ||
|
|
954161ba8f | ||
|
|
eed5a8fb12 | ||
|
|
f74bc1a1ff |
No files matched your search
@@ -480,4 +480,6 @@ If the update changed the schema, restore the pre-update dump too (above).
|
||||
|
||||
### Releases
|
||||
|
||||
Deployed versions are tagged `vX.Y.Z` in git, with notes in `Release-Notes/vX.Y.md`. To see what's running, compare `docker image inspect homeschool-backend --format '{{.Created}}'` to the tag date.
|
||||
Since October 2026, releases use calendar versioning: the monthly update is tagged `vYYYY.MM` (e.g. `v2026.10`), with notes in `Release-Notes/vYYYY.MM.md`. A follow-up fix in the same month is tagged `vYYYY.MM.N` (e.g. `v2026.10.1`) and added to that month's notes. `frontend/package.json` carries the same version as `YYYY.MM.N` (npm requires three parts, so the monthly release is `2026.10.0`). Earlier releases used `vX.Y.Z` (last: `v1.1.1`).
|
||||
|
||||
To see what's running, compare `docker image inspect homeschool-backend --format '{{.Created}}'` to the tag date.
|
||||
@@ -35,3 +35,12 @@ Maintenance release from the 2026-09-24 review (`reports/maintenance-2026-09-24.
|
||||
### Known / accepted
|
||||
- npm audit: vite ≤6.4.2 and esbuild advisories affect only the **dev server**, which production never runs (it serves the static build). Fixing them fully needs Vite 6.4+/7.
|
||||
- mysql:8.4.11 has upstream findings in Oracle's image: curl, bundled Python tools, and gosu's Go stdlib.
|
||||
|
||||
## v1.1.1 — 2026-09-25
|
||||
|
||||
Low-severity items from the 2026-09-24 review.
|
||||
|
||||
- Frontend runs as non-root: `nginxinc/nginx-unprivileged:1.30.5-alpine`, listening on **8080** in the container. Host port 8054 is unchanged, so NPM needs no change.
|
||||
- Replaced unmaintained `passlib` with `bcrypt` 5.0.0 directly. Existing `$2b$` hashes still verify; passwords are truncated to 72 bytes as before. A malformed hash now fails verification instead of raising.
|
||||
- `DOCS_ENABLED` is now passed to the backend container (default `false`), so the README instructions work.
|
||||
- db `mem_limit` 512m → 768m (MySQL 8.4 was at ~86% of 512m).
|
||||
@@ -0,0 +1,60 @@
|
||||
# v2026.10
|
||||
|
||||
## v2026.10 — 2026-10-12
|
||||
|
||||
Monthly dependency update for October 2026. It is the first release under calendar versioning (`vYYYY.MM`); the previous release was `v1.1.1`.
|
||||
|
||||
### Security
|
||||
- **Frontend: 0 npm audit findings**, down from 6 (4 high, 2 moderate):
|
||||
- vue 3.5.12 → **3.5.43**: fixes `@vue/server-renderer` XSS (GHSA-g2v6-rqmx-r4w6). The app renders client-side only, so the real exposure was low.
|
||||
- `source-map-js` event-loop DoS (GHSA-68fv-2mgg-jv7q), fixed by the lockfile refresh.
|
||||
- vite 5.4.21 → **8.3.4** / esbuild: fixes the dev-server advisory (GHSA-67mh-4wv8-2f99) that was accepted in v1.1.0. Vite 5 is no longer maintained.
|
||||
- Backend: `pip-audit` reports no known vulnerabilities, before or after.
|
||||
|
||||
### Frontend (major upgrades)
|
||||
- vite 5.4.21 → **8.3.4** (Rolldown-based), @vitejs/plugin-vue 5.1.4 → **6.0.10**
|
||||
- pinia 2.2.4 → **4.0.3**. Pinia 4 requires `@vue/devtools-api` alongside it, so `@vue/devtools-api` 8.2.1 is now a direct dependency.
|
||||
- vue-router 4.4.5 → **5.4.0**. Upstream lists no breaking changes for plain vue-router 4 users.
|
||||
- vue 3.5.12 → 3.5.43; axios 1.20.0 was already current.
|
||||
- `package.json` now sets `"type": "module"`, and `vite.config.js` resolves `@` via `import.meta.url` instead of `__dirname`. This removes Vite 8's warning about the CommonJS config loader, which a future Vite major will drop.
|
||||
- Version `2026.10.0`.
|
||||
|
||||
### Backend
|
||||
- fastapi 0.141.1 → 0.143.0, pydantic 2.13.5 → 2.14.1, pydantic-settings 2.5.2 → 2.15.0
|
||||
- **sqlalchemy 2.0.35 → 2.1.4**, PyMySQL 1.1.2 → 1.2.3, aiomysql 0.3.0 → 0.3.2. PyMySQL 1.2.3 broke SQLAlchemy 2.0.35's connection ping in September; it works with 2.1.4.
|
||||
- uvicorn 0.30.6 → 0.54.0, httpx 0.27.2 → 0.28.1, PyJWT 2.15.0 → 2.15.1, cryptography 50.0.1 → 50.0.2, email-validator 2.2.0 → 2.3.0
|
||||
- `Settings` uses `model_config = SettingsConfigDict(...)` instead of the class-based `Config`. Pydantic deprecated the old form, and V3 will remove it.
|
||||
- Unchanged (already current): starlette 1.7.0, anyio 4.15.1, bcrypt 5.0.0, alembic 1.20.0, Mako 1.4.3, python-multipart 0.0.32.
|
||||
|
||||
### Base images
|
||||
- python 3.12.14-slim → **3.12.15-slim**
|
||||
- node 24.21.0-alpine, nginx-unprivileged 1.30.5-alpine and mysql 8.4.11 were already the latest. The rebuild applies pending OS package updates (5 apt, 8 apk) through the existing `apt-get upgrade` / `apk upgrade` steps.
|
||||
|
||||
### Testing
|
||||
Tested on an isolated copy of the stack (separate project, volume and port) with the 2026-10-12 production dump restored:
|
||||
- API smoke test through nginx: 125/126 checks passed. It covered:
|
||||
- auth (register, login, refresh, forged/`alg=none` JWT rejection)
|
||||
- CRUD on children, subjects, options, schedules, blocks, routine, break activities and rules
|
||||
- the full timer lifecycle, including break events, select/skip/reset, agenda and rules overlays
|
||||
- WebSocket broadcast of all 16 events
|
||||
- the TV dashboard with an active block
|
||||
- every list GET route
|
||||
- super-admin impersonation of all 3 real users, reading their real data and TV dashboards
|
||||
|
||||
The one failed check, refresh, was a test artifact: the `Secure` cookie isn't sent over plain HTTP. Refresh returns 200 when the cookie is sent.
|
||||
- Headless Chromium against the built UI: login form, route guards, dashboard/logs/admin rendering, reload persistence, and the TV view showing the active block and staying live after a WebSocket event. The same test was also run against the previous image to tell regressions apart from existing behavior.
|
||||
|
||||
### Known / existing (not changed in this release)
|
||||
- An expired session redirects to `/login` **without** the `?redirect=` query, so after signing in the user lands on `/dashboard` instead of the page they asked for. The previous build behaves the same way. Fixed in v2026.10.1.
|
||||
- mysql:8.4.11 upstream image findings from v1.1.0 still apply until Oracle publishes a newer 8.4.x.
|
||||
|
||||
## v2026.10.1 — 2026-10-12
|
||||
|
||||
### Fixes
|
||||
- **Sign-in returns you to the page you asked for.** Opening a protected page while logged out, or having your session expire, now goes to `/login?redirect=<page>`, and you land back on that page after signing in. Before this you always landed on `/dashboard`. The axios interceptor in `useApi.js` treated the guard's own failed `/api/auth/refresh` as an expired session and hard-navigated to a bare `/login`, which overrode the router's redirect.
|
||||
- **Wrong password now shows an error.** The same interceptor caught the 401 from `/api/auth/login` and reloaded the login page, so "incorrect password" never appeared. Login, register and refresh now skip the auto-refresh and report their own 401s.
|
||||
- When a session expires mid-use, the interceptor now keeps the current path and query in `?redirect=`.
|
||||
- `LoginView` only follows `redirect` values that are in-app paths. `//host` and `https://…` fall back to `/dashboard`.
|
||||
|
||||
### Testing
|
||||
Headless Chromium on an isolated stack, compared with the v2026.10 build: redirect after a logged-out visit (with query string), redirect after a mid-use expiry, wrong-password error without a reload, and external redirect values ignored. v2026.10 failed all of these; v2026.10.1 passes them.
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM python:3.12.14-slim
|
||||
FROM python:3.12.15-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
|
||||
+11
-4
@@ -3,21 +3,28 @@ from typing import Any
|
||||
|
||||
import jwt
|
||||
from jwt import PyJWTError
|
||||
from passlib.context import CryptContext
|
||||
import bcrypt
|
||||
|
||||
from app.config import get_settings
|
||||
|
||||
settings = get_settings()
|
||||
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
|
||||
def _encode(plain: str) -> bytes:
|
||||
# bcrypt only uses the first 72 bytes; passlib truncated silently, so do the
|
||||
# same to keep existing hashes verifiable (bcrypt>=5 raises instead).
|
||||
return plain.encode("utf-8")[:72]
|
||||
|
||||
|
||||
def hash_password(plain: str) -> str:
|
||||
return pwd_context.hash(plain)
|
||||
return bcrypt.hashpw(_encode(plain), bcrypt.gensalt(rounds=12)).decode("ascii")
|
||||
|
||||
|
||||
def verify_password(plain: str, hashed: str) -> bool:
|
||||
return pwd_context.verify(plain, hashed)
|
||||
try:
|
||||
return bcrypt.checkpw(_encode(plain), hashed.encode("ascii"))
|
||||
except ValueError: # malformed hash
|
||||
return False
|
||||
|
||||
|
||||
def create_access_token(data: dict[str, Any]) -> str:
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
from pydantic_settings import BaseSettings
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
from functools import lru_cache
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
model_config = SettingsConfigDict(env_file=".env")
|
||||
|
||||
database_url: str
|
||||
secret_key: str
|
||||
algorithm: str = "HS256"
|
||||
@@ -19,9 +21,6 @@ class Settings(BaseSettings):
|
||||
def cors_origins_list(self) -> list[str]:
|
||||
return [o.strip() for o in self.cors_origins.split(",")]
|
||||
|
||||
class Config:
|
||||
env_file = ".env"
|
||||
|
||||
|
||||
@lru_cache
|
||||
def get_settings() -> Settings:
|
||||
|
||||
+12
-13
@@ -1,18 +1,17 @@
|
||||
fastapi==0.141.1
|
||||
fastapi==0.143.0
|
||||
starlette==1.7.0
|
||||
anyio==4.15.1
|
||||
uvicorn[standard]==0.30.6
|
||||
sqlalchemy[asyncio]==2.0.35
|
||||
aiomysql==0.3.0
|
||||
PyMySQL==1.1.2
|
||||
PyJWT==2.15.0
|
||||
cryptography==50.0.1
|
||||
passlib[bcrypt]==1.7.4
|
||||
bcrypt==3.2.2
|
||||
pydantic==2.13.5
|
||||
pydantic-settings==2.5.2
|
||||
uvicorn[standard]==0.54.0
|
||||
sqlalchemy[asyncio]==2.1.4
|
||||
aiomysql==0.3.2
|
||||
PyMySQL==1.2.3
|
||||
PyJWT==2.15.1
|
||||
cryptography==50.0.2
|
||||
bcrypt==5.0.0
|
||||
pydantic==2.14.1
|
||||
pydantic-settings==2.15.0
|
||||
alembic==1.20.0
|
||||
Mako==1.4.3
|
||||
python-multipart==0.0.32
|
||||
email-validator==2.2.0
|
||||
httpx==0.27.2
|
||||
email-validator==2.3.0
|
||||
httpx==0.28.1
|
||||
+4
-3
@@ -24,7 +24,7 @@ services:
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 180s
|
||||
mem_limit: 512m
|
||||
mem_limit: 768m
|
||||
cpus: 1.0
|
||||
logging: *default-logging
|
||||
|
||||
@@ -43,6 +43,7 @@ services:
|
||||
ADMIN_PASSWORD: ${ADMIN_PASSWORD}
|
||||
NTFY_URL: ${NTFY_URL:-}
|
||||
NTFY_TOKEN: ${NTFY_TOKEN:-}
|
||||
DOCS_ENABLED: ${DOCS_ENABLED:-false}
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
@@ -63,13 +64,13 @@ services:
|
||||
container_name: homeschool_frontend
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8054:80"
|
||||
- "8054:8080"
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- homeschool_net
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1/"]
|
||||
test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:8080/"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
|
||||
+4
-2
@@ -10,11 +10,13 @@ COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# Stage 2: Serve with nginx
|
||||
FROM nginx:1.30.5-alpine
|
||||
FROM nginxinc/nginx-unprivileged:1.30.5-alpine
|
||||
|
||||
USER root
|
||||
RUN apk upgrade --no-cache
|
||||
USER nginx
|
||||
|
||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
EXPOSE 80
|
||||
EXPOSE 8080
|
||||
+1
-1
@@ -33,7 +33,7 @@ limit_req_zone $binary_remote_addr zone=auth_limit:10m rate=5r/m;
|
||||
limit_req_zone $binary_remote_addr zone=tv_limit:10m rate=10r/m;
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen 8080;
|
||||
server_tokens off;
|
||||
root /usr/share/nginx/html;
|
||||
index index.html;
|
||||
|
||||
Generated
+1163
-926
File diff suppressed because it is too large.
Load diff
@@ -1,20 +1,22 @@
|
||||
{
|
||||
"name": "homeschool-frontend",
|
||||
"version": "1.1.0",
|
||||
"version": "2026.10.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@vue/devtools-api": "8.2.1",
|
||||
"axios": "1.20.0",
|
||||
"pinia": "2.2.4",
|
||||
"vue": "3.5.12",
|
||||
"vue-router": "4.4.5"
|
||||
"pinia": "4.0.3",
|
||||
"vue": "3.5.43",
|
||||
"vue-router": "5.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "5.1.4",
|
||||
"vite": "5.4.21"
|
||||
"@vitejs/plugin-vue": "6.0.10",
|
||||
"vite": "8.3.4"
|
||||
}
|
||||
}
|
||||
@@ -17,12 +17,14 @@ api.interceptors.request.use((config) => {
|
||||
// Auto-refresh on 401
|
||||
let refreshing = false
|
||||
let waitQueue = []
|
||||
// These report their own 401s (wrong password, expired refresh cookie); refreshing on them would hide the error
|
||||
const NO_REFRESH = ['/api/auth/login', '/api/auth/register', '/api/auth/refresh']
|
||||
|
||||
api.interceptors.response.use(
|
||||
(res) => res,
|
||||
async (error) => {
|
||||
const original = error.config
|
||||
if (error.response?.status === 401 && !original._retry) {
|
||||
if (error.response?.status === 401 && !original._retry && !NO_REFRESH.includes(original.url)) {
|
||||
if (refreshing) {
|
||||
return new Promise((resolve, reject) => {
|
||||
waitQueue.push({ resolve, reject })
|
||||
@@ -43,7 +45,10 @@ api.interceptors.response.use(
|
||||
waitQueue.forEach(({ reject }) => reject())
|
||||
waitQueue = []
|
||||
localStorage.removeItem('access_token')
|
||||
window.location.href = '/login'
|
||||
const { pathname, search } = window.location
|
||||
window.location.href = pathname === '/login'
|
||||
? '/login'
|
||||
: `/login?redirect=${encodeURIComponent(pathname + search)}`
|
||||
} finally {
|
||||
refreshing = false
|
||||
}
|
||||
|
||||
@@ -57,8 +57,10 @@ async function submit() {
|
||||
} else {
|
||||
await auth.register(form.value.email, form.value.password, form.value.fullName)
|
||||
}
|
||||
const redirect = route.query.redirect || '/dashboard'
|
||||
router.push(redirect)
|
||||
// Only follow in-app paths ("//host" would be protocol-relative)
|
||||
const redirect = route.query.redirect
|
||||
const safe = typeof redirect === 'string' && redirect.startsWith('/') && !redirect.startsWith('//')
|
||||
router.push(safe ? redirect : '/dashboard')
|
||||
} catch (e) {
|
||||
error.value = e.response?.data?.detail || 'Something went wrong'
|
||||
} finally {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import vue from '@vitejs/plugin-vue'
|
||||
import { resolve } from 'path'
|
||||
import { fileURLToPath, URL } from 'node:url'
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [vue()],
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve(__dirname, 'src'),
|
||||
'@': fileURLToPath(new URL('./src', import.meta.url)),
|
||||
},
|
||||
},
|
||||
server: {
|
||||
|
||||
@@ -153,13 +153,17 @@ This section was first blocked on backups. The user then asked for the HIGH find
|
||||
| Container | Image | Image ID |
|
||||
|---|---|---|
|
||||
| homeschool_db | mysql:8.4.11 | sha256:ee241324a55f… |
|
||||
| homeschool_backend | homeschool-backend | sha256:51b49afb4ec4… |
|
||||
| homeschool_frontend | homeschool-frontend | sha256:f9a737699cda… |
|
||||
| homeschool_backend | homeschool-backend (v1.1.0) | sha256:1eb66dc84e67… |
|
||||
| homeschool_frontend | homeschool-frontend (v1.1.0) | sha256:50f1de90c447… |
|
||||
|
||||
### Post-deploy regression
|
||||
|
||||
After the HIGH deploy, `POST /api/sessions/{id}/timer` returned **500 on every call**: 8 failures, 0 successes, starting 06:43 UTC. FastAPI 0.141 raises on a failed lazy-load of `current_block.subject.options` during response serialization, where 0.115 silently skipped it. The first smoke test didn't cover timer actions. Fixed in v1.1.0 by eager-loading `Subject.options` in `sessions.py` and `dashboard.py`. The smoke test now covers the full timer lifecycle, the TV dashboard with an active block, schedule/subject writes, and every parameterless GET route (from the OpenAPI spec).
|
||||
|
||||
### v1.1.0 deploy verification
|
||||
|
||||
All 3 containers are healthy with 0 restarts, and log rotation is active (10m × 3). Public `/api/health` returns 200. Production timer actions return 200 (4 of 4 right after the deploy). Tagged `v1.1.0` and pushed. The pre-review rollback images (`rollback-20260924`) were pruned by the user; `rollback-20260924b` (the HIGH-fix build) remains.
|
||||
|
||||
### Post-update scan (trivy HIGH/CRITICAL)
|
||||
|
||||
| Image | Before | After |
|
||||
|
||||
Reference in new issue
Block a user