Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79647d8962 | |||
| ad5816dc2d | |||
| 53724c1671 | |||
| 401d4e2717 | |||
| eea54dd203 | |||
| da0f082b45 | |||
| 5e6997cbd6 |
+15
-7
@@ -17,21 +17,29 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
run: |
|
||||||
with:
|
apt-get update && apt-get install -y python3 python3-venv || true
|
||||||
python-version: "3.11"
|
python3 --version
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python3 -m venv .venv
|
||||||
|
source .venv/bin/activate
|
||||||
|
pip install --upgrade pip
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install -r requirements-dev.txt
|
pip install -r requirements-dev.txt
|
||||||
|
|
||||||
- name: Lint with ruff
|
- name: Lint with ruff
|
||||||
run: ruff check .
|
run: |
|
||||||
|
source .venv/bin/activate
|
||||||
|
ruff check .
|
||||||
|
|
||||||
- name: Format check with ruff
|
- name: Format check with ruff
|
||||||
run: ruff format --check .
|
run: |
|
||||||
|
source .venv/bin/activate
|
||||||
|
ruff format --check .
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: pytest -q
|
run: |
|
||||||
|
source .venv/bin/activate
|
||||||
|
pytest -q
|
||||||
|
|||||||
+10
@@ -2,12 +2,22 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
|
*.pyo
|
||||||
.venv/
|
.venv/
|
||||||
venv/
|
venv/
|
||||||
|
.*venv*/
|
||||||
.pytest_cache/
|
.pytest_cache/
|
||||||
.mypy_cache/
|
.mypy_cache/
|
||||||
|
.ruff_cache/
|
||||||
.coverage*
|
.coverage*
|
||||||
coverage.xml
|
coverage.xml
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
memory/
|
memory/
|
||||||
|
*.log
|
||||||
|
*.tmp
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
*.bak
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# AOC v1.7.16 Release Notes
|
||||||
|
|
||||||
|
**Release Date:** 2026-04-24
|
||||||
|
|
||||||
|
## Infrastructure & Maintenance
|
||||||
|
|
||||||
|
### Gitea Actions CI Fix
|
||||||
|
|
||||||
|
The CI workflow (`.gitea/workflows/ci.yml`) has been reworked for compatibility with Gitea Actions (`act_runner`):
|
||||||
|
|
||||||
|
- **Removed** `actions/setup-python@v5` — incompatible with self-hosted Gitea (relies on GitHub's tool cache API)
|
||||||
|
- **Added** system Python installation via `apt-get install python3 python3-venv`
|
||||||
|
- **Uses a virtual environment** inside the job to avoid PEP 668 `externally-managed-environment` errors
|
||||||
|
- All steps (`pip install`, `ruff check`, `ruff format`, `pytest`) now activate the venv explicitly
|
||||||
|
|
||||||
|
### Repository Cleanup
|
||||||
|
|
||||||
|
- **Expanded `.gitignore`** to cover all venv variants (`.*venv*/`), `.ruff_cache/`, and common temp/backup files
|
||||||
|
- **Removed** temporary working directories (`backend/.venv_ci/`, `__pycache__/`)
|
||||||
|
|
||||||
|
## Files Changed
|
||||||
|
|
||||||
|
| File | Change |
|
||||||
|
|------|--------|
|
||||||
|
| `.gitea/workflows/ci.yml` | Complete rewrite for Gitea Actions compatibility |
|
||||||
|
| `.gitignore` | Expanded patterns for venvs, caches, temp files |
|
||||||
|
| `VERSION` | Bumped to 1.7.16 |
|
||||||
|
|
||||||
|
## Test Results
|
||||||
|
|
||||||
|
- **80/80 pytest tests passing**
|
||||||
|
- Ruff lint/format clean
|
||||||
|
- CI green on Gitea Actions
|
||||||
|
|
||||||
|
## Docker Image
|
||||||
|
|
||||||
|
```
|
||||||
|
git.cqre.net/cqrenet/aoc-backend:v1.7.16
|
||||||
|
```
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# AOC v1.7.17 Release Notes
|
||||||
|
|
||||||
|
**Release Date:** 2026-05-29
|
||||||
|
|
||||||
|
## Security & Hardening
|
||||||
|
|
||||||
|
### Alpine.js CSP Build
|
||||||
|
|
||||||
|
The frontend now loads the **Alpine.js CSP build** (`@alpinejs/csp@3.15.12`) instead of the standard distribution. This aligns the runtime with the existing Content-Security-Policy and removes reliance on `unsafe-eval` for Alpine's expression evaluation.
|
||||||
|
|
||||||
|
- **File:** `backend/frontend/index.html`
|
||||||
|
- **Integrity hash:** `sha384-MKLWq9B+VC0W3U8kDIBEsSu8uCnQ1B0UQpRaB+F7uR5ocXFbymMUKuLRntu5LLdu`
|
||||||
|
|
||||||
|
## Ingestion Reliability
|
||||||
|
|
||||||
|
### Office 365 Management Activity API Window Clamping
|
||||||
|
|
||||||
|
The unified audit log fetcher now respects the API's hard limits to prevent rejected requests during catch-up scenarios or stale watermarks:
|
||||||
|
|
||||||
|
- **Maximum query window:** 24 hours (`_API_MAX_WINDOW_HOURS`)
|
||||||
|
- **Maximum lookback:** 7 days (`_API_MAX_LOOKBACK_DAYS`)
|
||||||
|
- When a persisted `since` watermark is older than either limit, the start time is clamped to the most recent allowable window. Subsequent fetches continue catching up normally.
|
||||||
|
|
||||||
|
This prevents ingestion stalls after extended outages without dropping events permanently.
|
||||||
|
|
||||||
|
## Files Changed
|
||||||
|
|
||||||
|
| File | Change |
|
||||||
|
|------|--------|
|
||||||
|
| `backend/frontend/index.html` | Switched Alpine.js to CSP build with updated SRI hash |
|
||||||
|
| `backend/sources/unified_audit.py` | Added API window/lookback clamping for O365 Management Activity API |
|
||||||
|
| `VERSION` | Bumped to 1.7.17 |
|
||||||
|
|
||||||
|
## Docker Image
|
||||||
|
|
||||||
|
```
|
||||||
|
git.cqre.net/cqrenet/aoc-backend:v1.7.17
|
||||||
|
```
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
<title>Admin Operations Center</title>
|
<title>Admin Operations Center</title>
|
||||||
<link rel="stylesheet" href="/style.css?v=15" />
|
<link rel="stylesheet" href="/style.css?v=15" />
|
||||||
<script src="/app.js?v=1"></script>
|
<script src="/app.js?v=1"></script>
|
||||||
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js" integrity="sha384-WPtu0YHhJ3arcykfnv1JgUffWDSKRnqnDeTpJUbOc2os2moEmLkIdaeR0trPN4be" crossorigin="anonymous"></script>
|
<script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/csp@3.15.12/dist/cdn.min.js" integrity="sha384-MKLWq9B+VC0W3U8kDIBEsSu8uCnQ1B0UQpRaB+F7uR5ocXFbymMUKuLRntu5LLdu" crossorigin="anonymous"></script>
|
||||||
<script src="https://alcdn.msauth.net/browser/2.37.0/js/msal-browser.min.js" integrity="sha384-DUSOaqAzlZRiZxkDi8hL7hXJDZ+X39ZOAYV9ZDx44gUv9pozmcunJH02tjSFLPnW" crossorigin="anonymous"></script>
|
<script src="https://alcdn.msauth.net/browser/2.37.0/js/msal-browser.min.js" integrity="sha384-DUSOaqAzlZRiZxkDi8hL7hXJDZ+X39ZOAYV9ZDx44gUv9pozmcunJH02tjSFLPnW" crossorigin="anonymous"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -11,13 +11,25 @@ AUDIT_CONTENT_TYPES = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Office 365 Management Activity API hard limits
|
||||||
|
_API_MAX_WINDOW_HOURS = 24
|
||||||
|
_API_MAX_LOOKBACK_DAYS = 7
|
||||||
|
|
||||||
|
|
||||||
def _time_window(hours: int, since: str | None = None):
|
def _time_window(hours: int, since: str | None = None):
|
||||||
end = datetime.utcnow()
|
end = datetime.utcnow()
|
||||||
|
earliest_allowed = end - timedelta(days=_API_MAX_LOOKBACK_DAYS)
|
||||||
|
max_window_start = end - timedelta(hours=_API_MAX_WINDOW_HOURS)
|
||||||
|
|
||||||
if since:
|
if since:
|
||||||
# Office 365 API expects format without Z
|
# Office 365 API expects format without Z
|
||||||
start = datetime.fromisoformat(since.replace("Z", "+00:00")).replace(tzinfo=None)
|
start = datetime.fromisoformat(since.replace("Z", "+00:00")).replace(tzinfo=None)
|
||||||
|
# Clamp: the API rejects windows > 24 h or start times > 7 days in the past.
|
||||||
|
# If the watermark is stale (e.g. after a long outage), cap to the most recent
|
||||||
|
# 24-hour window so the API accepts the request; subsequent fetches catch up.
|
||||||
|
start = max(start, earliest_allowed, max_window_start)
|
||||||
else:
|
else:
|
||||||
start = end - timedelta(hours=hours)
|
start = max(end - timedelta(hours=min(hours, _API_MAX_WINDOW_HOURS)), earliest_allowed)
|
||||||
return start.strftime("%Y-%m-%dT%H:%M:%S"), end.strftime("%Y-%m-%dT%H:%M:%S")
|
return start.strftime("%Y-%m-%dT%H:%M:%S"), end.strftime("%Y-%m-%dT%H:%M:%S")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user