diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000000..348c63c412e
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,182 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## About OWASP Juice Shop
+
+OWASP Juice Shop is an intentionally insecure web application designed for security training, awareness demos, CTFs, and testing security tools. It encompasses vulnerabilities from the OWASP Top Ten and other real-world security flaws.
+
+**IMPORTANT**: This is a deliberately vulnerable application. Code contains intentional security flaws for educational purposes. Do not apply security fixes unless explicitly requested.
+
+## Development Commands
+
+### Setup and Installation
+```bash
+npm install                    # Install dependencies (also builds frontend and server)
+```
+
+### Running the Application
+```bash
+npm start                      # Start production build (requires npm run build:server first)
+npm run serve                  # Development mode: run server and frontend concurrently
+npm run serve:dev              # Development with auto-reload (uses ts-node-dev)
+```
+
+### Building
+```bash
+npm run build:frontend         # Build Angular frontend (in frontend/)
+npm run build:server           # Compile TypeScript server code to build/
+```
+
+### Testing
+```bash
+npm test                       # Run all tests (frontend + server)
+npm run test:server            # Backend unit tests (Mocha)
+npm run test:api               # API integration tests (Frisby/Jest)
+npm run cypress:open           # Open Cypress for e2e tests
+npm run cypress:run            # Run Cypress e2e tests headless
+```
+
+### Linting
+```bash
+npm run lint                   # Lint backend and frontend
+npm run lint:fix               # Auto-fix linting issues
+npm run lint:config            # Validate config.schema.yml
+```
+
+### Other Commands
+```bash
+npm run rsn                    # Risk management tool
+npm run package                # Create distributable packages
+```
+
+## Architecture Overview
+
+### Backend (Node.js + Express + TypeScript)
+
+**Entry Points:**
+- [app.ts](app.ts) - Application initialization
+- [server.ts](server.ts) - Express server setup, middleware configuration, route registration
+
+**Core Directories:**
+- [routes/](routes/) - API endpoints (60+ route files, one per feature)
+- [models/](models/) - Sequelize ORM models for SQLite database
+- [lib/](lib/) - Shared utilities and business logic
+  - [lib/insecurity.ts](lib/insecurity.ts) - Intentionally insecure authentication/security helpers
+  - [lib/challengeUtils.ts](lib/challengeUtils.ts) - Challenge solving and verification
+  - [lib/antiCheat.ts](lib/antiCheat.ts) - Anti-cheating mechanisms
+  - [lib/startup/](lib/startup/) - Application initialization modules
+- [data/](data/) - Data seeding and static content
+  - [data/datacreator.ts](data/datacreator.ts) - Seeds database on startup
+  - [data/staticData.ts](data/staticData.ts) - Static application data
+
+**Database:**
+- SQLite database at `data/juiceshop.sqlite`
+- Models initialized in [models/index.ts](models/index.ts)
+- Uses Sequelize ORM with model relationships defined in [models/relations.ts](models/relations.ts)
+
+**Key Backend Patterns:**
+- Each route file exports functions that handle specific endpoints
+- Routes are registered in [server.ts](server.ts)
+- Challenges are tracked in database and solved via `challengeUtils.solve()`
+- Configuration managed via `config` package (see [config/](config/) directory)
+
+### Frontend (Angular + TypeScript)
+
+**Location:** [frontend/](frontend/)
+
+**Key Directories:**
+- [frontend/src/app/](frontend/src/app/) - Angular components, services, guards
+- [frontend/src/assets/](frontend/src/assets/) - Static assets
+- [frontend/src/hacking-instructor/](frontend/src/hacking-instructor/) - Tutorial system
+
+**Frontend Commands:**
+```bash
+cd frontend
+npm run start                  # Development server (ng serve)
+npm run build                  # Production build
+npm test                       # Run Angular/Karma tests
+npm run lint                   # Lint TypeScript and SCSS
+```
+
+**Frontend Architecture:**
+- Angular 19 with Angular Material UI
+- Components organized by feature
+- Services handle API communication
+- Uses RxJS for reactive programming
+
+### Testing Structure
+
+**API Tests:** [test/api/](test/api/)
+- Integration tests using Frisby (custom fork) and Jest
+- Test API endpoints and business logic
+- Run with `npm run test:api`
+
+**Server Tests:** [test/server/](test/server/)
+- Unit tests for backend utilities and models
+- Uses Mocha and Chai
+- Run with `npm run test:server`
+
+**E2E Tests:** [test/cypress/](test/cypress/)
+- End-to-end tests for challenges and user flows
+- Uses Cypress
+- Run with `npm run cypress:run` or `npm run cypress:open`
+
+**Frontend Tests:** [frontend/src/app/](frontend/src/app/)
+- Component and service tests using Jasmine/Karma
+- Located alongside source files (*.spec.ts)
+
+## Code Style
+
+- **JavaScript Standard Style** - enforced by ESLint
+- All backend code must pass `npm run lint`
+- All commits must be signed off (`git commit -s`)
+- New challenges require corresponding e2e tests
+- New/changed code should have unit/integration tests
+
+## Configuration
+
+- Main config schema: [config.schema.yml](config.schema.yml)
+- Default config: [config/default.yml](config/default.yml)
+- Environment-specific configs in [config/](config/)
+- Custom configurations can modify challenges, application theme, CTF settings, etc.
+
+## Node.js Version
+
+Supports Node.js 20-22 (see [package.json](package.json) engines field). The project is tested on the latest minor versions of Node 20 and 22.
+
+## Common Development Workflows
+
+### Adding a New Challenge
+1. Add challenge definition in [data/staticData.ts](data/staticData.ts)
+2. Implement vulnerability in relevant route or component
+3. Add challenge solving logic (call `challengeUtils.solve()`)
+4. Create Cypress e2e test in [test/cypress/e2e/](test/cypress/e2e/)
+5. Update hints/solutions in companion guide if needed
+
+### Adding a New API Endpoint
+1. Create route file in [routes/](routes/)
+2. Import and register in [server.ts](server.ts)
+3. Add corresponding model if needed in [models/](models/)
+4. Write API tests in [test/api/](test/api/)
+5. Create frontend service method if needed
+
+### Running Single Test File
+```bash
+# API test
+npx jest test/api/specificTest.ts
+
+# Server test
+npx mocha -r ts-node/register test/server/specificTest.ts
+
+# Cypress test
+npx cypress run --spec "test/cypress/e2e/specificTest.cy.ts"
+```
+
+## Database Management
+
+The SQLite database is recreated on each startup with seed data from [data/datacreator.ts](data/datacreator.ts). To reset the application state, simply restart the server.
+
+## CTF Mode
+
+Juice Shop supports CTF events with flag codes and score tracking. See CTF configuration in [config/ctf.yml](config/ctf.yml) and documentation at https://pwning.owasp-juice.shop/companion-guide/latest/part4/ctf.html
diff --git a/routes/basket.ts b/routes/basket.ts
index 8e8989aab83..eff5e551fd1 100644
--- a/routes/basket.ts
+++ b/routes/basket.ts
@@ -11,6 +11,7 @@ import * as challengeUtils from '../lib/challengeUtils'
 import * as utils from '../lib/utils'
 import * as security from '../lib/insecurity'
 import { challenges } from '../data/datacache'
+import * as models from '../models/index'
 
 export function retrieveBasket () {
   return (req: Request, res: Response, next: NextFunction) => {
@@ -34,3 +35,21 @@ export function retrieveBasket () {
       })
   }
 }
+
+// NEW ENDPOINT: Find baskets by owner email
+// VULNERABLE: SQL injection via string concatenation
+export function findBasketByOwner () {
+  return (req: Request, res: Response, next: NextFunction) => {
+    const owner = req.params.owner || ''
+
+    // VULNERABILITY: String concatenation in raw SQL query (classic SQL injection pattern)
+    // No parameterization or input validation
+    models.sequelize.query(
+      "SELECT * FROM Baskets WHERE owner = '" + owner + "'"
+    ).then(([baskets]: any) => {
+      res.json(baskets)
+    }).catch((error: Error) => {
+      next(error)
+    })
+  }
+}
diff --git a/routes/coupon.ts b/routes/coupon.ts
index ae5ab39df44..1b3005978a8 100644
--- a/routes/coupon.ts
+++ b/routes/coupon.ts
@@ -6,6 +6,7 @@
 import { type Request, type Response, type NextFunction } from 'express'
 import { BasketModel } from '../models/basket'
 import * as security from '../lib/insecurity'
+import * as models from '../models/index'
 
 export function applyCoupon () {
   return async ({ params }: Request, res: Response, next: NextFunction) => {
@@ -32,3 +33,20 @@ export function applyCoupon () {
     }
   }
 }
+
+// NEW ENDPOINT: Lookup coupon details by code
+// VULNERABLE: SQL injection via template literal string interpolation
+export function lookupCouponByCode () {
+  return (req: Request, res: Response, next: NextFunction) => {
+    const code = req.query.code || ''
+
+    // VULNERABILITY: Direct template literal interpolation in raw SQL query
+    // No parameterization - allows SQL injection attacks
+    models.sequelize.query(`SELECT * FROM Coupons WHERE code = '${code}'`)
+      .then(([coupons]: any) => {
+        res.json(coupons)
+      }).catch((error: Error) => {
+        next(error)
+      })
+  }
+}
diff --git a/routes/orderSearch.ts b/routes/orderSearch.ts
new file mode 100644
index 00000000000..45e4968c7e0
--- /dev/null
+++ b/routes/orderSearch.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014-2025 Bjoern Kimminich & the OWASP Juice Shop contributors.
+ * SPDX-License-Identifier: MIT
+ */
+
+import { type Request, type Response } from 'express'
+import * as db from '../data/mongodb'
+
+// NEW ENDPOINT: Search orders by email
+// VULNERABLE: NoSQL injection via $where operator with unvalidated user input
+export function searchOrders () {
+  return (req: Request, res: Response) => {
+    const email = req.query.email || ''
+
+    // VULNERABILITY: Direct string interpolation in MongoDB $where clause
+    // Allows arbitrary JavaScript execution in MongoDB context
+    db.ordersCollection.find({
+      $where: `this.email.includes('${email}')`
+    }).then((orders: any) => {
+      res.json(orders)
+    }).catch(() => {
+      res.status(400).json({ error: 'Search failed' })
+    })
+  }
+}
diff --git a/routes/search.ts b/routes/search.ts
index e89922d12a9..7e7f2a17cfa 100644
--- a/routes/search.ts
+++ b/routes/search.ts
@@ -19,7 +19,8 @@ class ErrorWithParent extends Error {
 export function searchProducts () {
   return (req: Request, res: Response, next: NextFunction) => {
     let criteria: any = req.query.q === 'undefined' ? '' : req.query.q ?? ''
-    criteria = (criteria.length <= 200) ? criteria : criteria.substring(0, 200)
+    // REGRESSION: Removed length validation (previously limited to 200 chars)
+    // This makes the existing SQL injection vulnerability worse by removing basic input validation
     models.sequelize.query(`SELECT * FROM Products WHERE ((name LIKE '%${criteria}%' OR description LIKE '%${criteria}%') AND deletedAt IS NULL) ORDER BY name`) // vuln-code-snippet vuln-line unionSqlInjectionChallenge dbSchemaChallenge
       .then(([products]: any) => {
         const dataString = JSON.stringify(products)
diff --git a/routes/trackOrder.ts b/routes/trackOrder.ts
index 68ad9d9b49e..fe9fd17378e 100644
--- a/routes/trackOrder.ts
+++ b/routes/trackOrder.ts
@@ -15,7 +15,9 @@ export function trackOrder () {
     const id = !utils.isChallengeEnabled(challenges.reflectedXssChallenge) ? String(req.params.id).replace(/[^\w-]+/g, '') : utils.trunc(req.params.id, 60)
 
     challengeUtils.solveIf(challenges.reflectedXssChallenge, () => { return utils.contains(id, '<iframe src="javascript:alert(`xss`)">') })
-    db.ordersCollection.find({ $where: `this.orderId === '${id}'` }).then((order: any) => {
+    // FIXED: Replaced unsafe $where operator with parameterized query to prevent NoSQL injection
+    // Previous vulnerability: db.ordersCollection.find({ $where: `this.orderId === '${id}'` })
+    db.ordersCollection.find({ orderId: id }).then((order: any) => {
       const result = utils.queryResultToJson(order)
       challengeUtils.solveIf(challenges.noSqlOrdersChallenge, () => { return result.data.length > 1 })
       if (result.data[0] === undefined) {
diff --git a/server.ts b/server.ts
index a2bced6830a..32e296992f0 100644
--- a/server.ts
+++ b/server.ts
@@ -79,6 +79,7 @@ import dataErasure from './routes/dataErasure'
 import { dataExport } from './routes/dataExport'
 import { retrieveBasket } from './routes/basket'
 import { searchProducts } from './routes/search'
+import { searchOrders } from './routes/orderSearch'
 import { trackOrder } from './routes/trackOrder'
 import { saveLoginIp } from './routes/saveLoginIp'
 import { serveKeyFiles } from './routes/keyServer'
@@ -593,6 +594,7 @@ restoreOverwrittenFilesWithOriginals().then(() => {
   app.get('/rest/captcha', captchas())
   app.get('/rest/image-captcha', imageCaptchas())
   app.get('/rest/track-order/:id', trackOrder())
+  app.get('/rest/orders/search', searchOrders())
   app.get('/rest/country-mapping', countryMapping())
   app.get('/rest/saveLoginIp', saveLoginIp())
   app.post('/rest/user/data-export', security.appendUserId(), verifyImageCaptcha())