-
Notifications
You must be signed in to change notification settings - Fork 0
Security/p0 hardening #18
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.
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
Open
dmvasheka
wants to merge
8
commits into
main
Choose a base branch
from
security/p0-hardening
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,355
−358
Open
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
57e205e
ci: GitHub Actions pipeline + Node 20 + lint debt cleanup
dmitrovasheka 88c2d9c
feat(observability): /api/health endpoint (DB+Redis) and optional Sen…
dmitrovasheka b1b3593
test: characterization tests for cursor parsing and movies autocomplete
dmitrovasheka 0cb419b
feat(ai): OpenAI usage accounting and daily budget guard
dmitrovasheka f1e9f76
docs: mark P1 (§18) progress, split CI build step to avoid .next/type…
dmitrovasheka ef8178f
chore(db): apply pending migrations to prod, sync migration drift bot…
dmitrovasheka 32a2a11
fix(ci,review): address CodeRabbit round 2 + unbreak pnpm setup in CI
dmitrovasheka 03d4cae
ci: api tests need @repo/db and @repo/ai built first
dmitrovasheka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Secrets must never enter the image build context | ||
| .env | ||
| .env.* | ||
| !.env.example | ||
|
|
||
| # VCS / local state | ||
| .git | ||
| .claude | ||
| .turbo | ||
| *.log | ||
|
|
||
| # Dependencies and build outputs (rebuilt inside the image) | ||
| node_modules | ||
| **/node_modules | ||
| **/.next | ||
| **/dist | ||
| coverage | ||
|
|
||
| # Not needed in the API image | ||
| apps/docs | ||
| docs | ||
| supabase | ||
| scripts | ||
| setup-production.sh | ||
| *.md |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: [main] | ||
| push: | ||
| branches: [main] | ||
|
|
||
| jobs: | ||
| checks: | ||
| name: Lint, typecheck, test, build | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| # Dummy values: module-load env asserts (packages/ai, packages/db) and | ||
| # Next.js prerender need *some* value; no real services are called in CI. | ||
| OPENAI_API_KEY: ci-dummy | ||
| SUPABASE_URL: https://ci-dummy.supabase.co | ||
| SUPABASE_SERVICE_KEY: ci-dummy | ||
| SUPABASE_ANON_KEY: ci-dummy | ||
| NEXT_PUBLIC_SUPABASE_URL: https://ci-dummy.supabase.co | ||
| NEXT_PUBLIC_SUPABASE_ANON_KEY: ci-dummy | ||
| NEXT_PUBLIC_API_URL: http://localhost:3001 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| - uses: pnpm/action-setup@v4 | ||
| with: | ||
| version: 9 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| with: | ||
| node-version: 20 | ||
| cache: pnpm | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install --frozen-lockfile | ||
|
|
||
| # Two steps on purpose: next build rewrites .next/types while tsc reads | ||
| # them, so check-types must not run concurrently with build. | ||
| - name: Lint, typecheck, test | ||
| run: pnpm exec turbo run lint check-types test | ||
|
|
||
| - name: Build | ||
| run: pnpm exec turbo run build | ||
|
|
||
| security: | ||
| name: Secret scan & dependency audit | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Gitleaks (secret scan) | ||
| uses: gitleaks/gitleaks-action@v2 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - uses: pnpm/action-setup@v4 | ||
| with: | ||
| version: 9 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 20 | ||
| cache: pnpm | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install --frozen-lockfile | ||
|
|
||
| # Non-blocking for now: existing transitive vulns are tracked in IMPROVEMENTS §13.3 | ||
| - name: pnpm audit (high+) | ||
| run: pnpm audit --audit-level high | ||
| continue-on-error: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 20 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { ExecutionContext, HttpException } from '@nestjs/common'; | ||
| import { AiBudgetGuard } from '../ai-budget.guard'; | ||
| import { AiUsageService } from '../ai-usage.service'; | ||
|
|
||
| jest.mock('@repo/db', () => ({ supabase: { from: jest.fn() } })); | ||
|
|
||
| function ctx(): ExecutionContext { | ||
| return {} as ExecutionContext; | ||
| } | ||
|
|
||
| function usageServiceWithSpend(spend: number): AiUsageService { | ||
| return { getTodaySpendUsd: async () => spend } as unknown as AiUsageService; | ||
| } | ||
|
|
||
| describe('AiBudgetGuard', () => { | ||
| const originalBudget = process.env.OPENAI_DAILY_BUDGET_USD; | ||
|
|
||
| afterEach(() => { | ||
| if (originalBudget === undefined) { | ||
| delete process.env.OPENAI_DAILY_BUDGET_USD; | ||
| } else { | ||
| process.env.OPENAI_DAILY_BUDGET_USD = originalBudget; | ||
| } | ||
| }); | ||
|
|
||
| it('allows requests when no budget is configured', async () => { | ||
| delete process.env.OPENAI_DAILY_BUDGET_USD; | ||
| const guard = new AiBudgetGuard(usageServiceWithSpend(999)); | ||
| await expect(guard.canActivate(ctx())).resolves.toBe(true); | ||
| }); | ||
|
|
||
| it('allows requests while spend is under the budget', async () => { | ||
| process.env.OPENAI_DAILY_BUDGET_USD = '5'; | ||
| const guard = new AiBudgetGuard(usageServiceWithSpend(4.99)); | ||
| await expect(guard.canActivate(ctx())).resolves.toBe(true); | ||
| }); | ||
|
|
||
| it('rejects with 429 when the daily budget is exhausted', async () => { | ||
| process.env.OPENAI_DAILY_BUDGET_USD = '5'; | ||
| const guard = new AiBudgetGuard(usageServiceWithSpend(5)); | ||
|
|
||
| await expect(guard.canActivate(ctx())).rejects.toThrow(HttpException); | ||
| await guard.canActivate(ctx()).catch((e: HttpException) => { | ||
| expect(e.getStatus()).toBe(429); | ||
| }); | ||
| }); | ||
|
|
||
| it('ignores invalid budget values (fail-open)', async () => { | ||
| process.env.OPENAI_DAILY_BUDGET_USD = 'not-a-number'; | ||
| const guard = new AiBudgetGuard(usageServiceWithSpend(999)); | ||
| await expect(guard.canActivate(ctx())).resolves.toBe(true); | ||
| }); | ||
| }); |
101 changes: 101 additions & 0 deletions
101
apps/api/src/ai-usage/__tests__/ai-usage.service.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| interface TableState { | ||
| insertedRows: Record<string, unknown>[]; | ||
| selectResult: { data: Array<{ cost_usd: number }> | null; error: { message: string } | null }; | ||
| } | ||
|
|
||
| const state: TableState = { | ||
| insertedRows: [], | ||
| selectResult: { data: [], error: null }, | ||
| }; | ||
|
|
||
| const fromMock = jest.fn((..._args: unknown[]) => ({ | ||
| insert: (row: Record<string, unknown>) => { | ||
| state.insertedRows.push(row); | ||
| return Promise.resolve({ error: null }); | ||
| }, | ||
| select: () => ({ | ||
| gte: () => Promise.resolve(state.selectResult), | ||
| }), | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| })); | ||
|
|
||
| jest.mock('@repo/db', () => ({ | ||
| supabase: { from: (...args: unknown[]) => fromMock(...args) }, | ||
| })); | ||
|
|
||
| import { AiUsageService } from '../ai-usage.service'; | ||
|
|
||
| describe('AiUsageService.computeCostUsd', () => { | ||
| let service: AiUsageService; | ||
|
|
||
| beforeEach(() => { | ||
| service = new AiUsageService(); | ||
| }); | ||
|
|
||
| it('prices gpt-4o-mini at 0.15/0.60 per 1M tokens', () => { | ||
| // 1M prompt + 1M completion | ||
| expect(service.computeCostUsd('gpt-4o-mini', 1_000_000, 1_000_000)).toBeCloseTo(0.75, 6); | ||
| }); | ||
|
|
||
| it('prices text-embedding-3-small at 0.02 per 1M tokens', () => { | ||
| expect(service.computeCostUsd('text-embedding-3-small', 500_000, 0)).toBeCloseTo(0.01, 6); | ||
| }); | ||
|
|
||
| it('returns 0 for unknown models (still recorded, never blocks)', () => { | ||
| expect(service.computeCostUsd('some-future-model', 1000, 1000)).toBe(0); | ||
| }); | ||
| }); | ||
|
|
||
| describe('AiUsageService.record', () => { | ||
| let service: AiUsageService; | ||
|
|
||
| beforeEach(() => { | ||
| service = new AiUsageService(); | ||
| state.insertedRows = []; | ||
| fromMock.mockClear(); | ||
| }); | ||
|
|
||
| it('inserts a usage row with computed cost', async () => { | ||
| await service.record({ | ||
| endpoint: 'chat', | ||
| model: 'gpt-4o-mini', | ||
| promptTokens: 1000, | ||
| completionTokens: 500, | ||
| }); | ||
|
|
||
| expect(state.insertedRows).toHaveLength(1); | ||
| const row = state.insertedRows[0]; | ||
| expect(row.endpoint).toBe('chat'); | ||
| expect(row.model).toBe('gpt-4o-mini'); | ||
| expect(row.prompt_tokens).toBe(1000); | ||
| expect(row.completion_tokens).toBe(500); | ||
| expect(row.cost_usd).toBeCloseTo(0.00045, 8); | ||
| }); | ||
|
|
||
| it('never throws even when the insert fails (table may not exist yet)', async () => { | ||
| fromMock.mockImplementationOnce(() => { | ||
| throw new Error('relation "ai_usage" does not exist'); | ||
| }); | ||
| await expect( | ||
| service.record({ endpoint: 'chat', model: 'gpt-4o-mini', promptTokens: 1, completionTokens: 1 }), | ||
| ).resolves.toBeUndefined(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('AiUsageService.getTodaySpendUsd', () => { | ||
| let service: AiUsageService; | ||
|
|
||
| beforeEach(() => { | ||
| service = new AiUsageService(); | ||
| state.selectResult = { data: [], error: null }; | ||
| }); | ||
|
|
||
| it('sums cost over today rows', async () => { | ||
| state.selectResult = { data: [{ cost_usd: 0.5 }, { cost_usd: 0.25 }], error: null }; | ||
| expect(await service.getTodaySpendUsd()).toBeCloseTo(0.75, 6); | ||
| }); | ||
|
|
||
| it('returns 0 when the query fails (fail-open: availability over budgeting)', async () => { | ||
| state.selectResult = { data: null, error: { message: 'db down' } }; | ||
| expect(await service.getTodaySpendUsd()).toBe(0); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.