Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c546657285 | |||
| e8d5ee1a7b | |||
| 1761ebd531 | |||
| 5e5e98601f | |||
| 1cda80792b | |||
| 8740d5e618 | |||
| a619d52d17 | |||
| dd8cc14d30 | |||
| 3b7d723c2a | |||
| dc6252ff56 | |||
| 1d4e79a4f9 | |||
| 0b0e3e22d2 | |||
| f22e3c133f | |||
| 64c0a58f78 | |||
| 4182089c17 | |||
| cecf773fb7 | |||
| 973af17b85 | |||
| 6c3e88a588 | |||
| 97bbb3c8e1 | |||
| ac1cd96ecd | |||
| 689861f671 | |||
| 41fb575e80 | |||
| 6ebc4f3fc4 | |||
| de973f5613 | |||
| 279c70b3d6 | |||
| 5a73f6963f | |||
| 5101a05bca | |||
| c82caf6539 | |||
| ae1b508726 | |||
| 26c05912fc | |||
| d1033cb83a | |||
| b7458b5a37 | |||
| face8f1496 | |||
| ba6ee55bf7 |
@@ -0,0 +1,286 @@
|
||||
# Security Scan Report - Wedding Photo Sharing Application
|
||||
**Date**: July 13, 2025
|
||||
**Scanner**: Claude Security Audit with --security --validate flags
|
||||
**Overall Risk Level**: MEDIUM-HIGH
|
||||
|
||||
## Executive Summary
|
||||
|
||||
The wedding photo sharing application demonstrates strong security fundamentals with comprehensive input validation, proper authentication mechanisms, and good file security practices. However, several critical issues require immediate attention, particularly around hardcoded secrets, token storage, and Content Security Policy configuration.
|
||||
|
||||
### Security Score: 6.5/10
|
||||
|
||||
**Strengths**: Excellent input validation, parameterized queries, file security, rate limiting
|
||||
**Critical Issues**: Hardcoded JWT secrets, localStorage token storage, weak CSP, console logging in production
|
||||
|
||||
---
|
||||
|
||||
## 🔴 CRITICAL FINDINGS (Immediate Action Required)
|
||||
|
||||
### 1. Hardcoded JWT Secret in Development
|
||||
- **Location**: Backend `.env` file
|
||||
- **Risk**: Token forgery, authentication bypass
|
||||
- **Impact**: Complete authentication compromise
|
||||
- **Remediation**:
|
||||
```bash
|
||||
# Generate secure secret
|
||||
openssl rand -base64 32
|
||||
# Never commit to repository
|
||||
echo ".env" >> .gitignore
|
||||
```
|
||||
|
||||
### 2. Gallery Tokens in localStorage
|
||||
- **Location**: Frontend `api.ts` and auth contexts
|
||||
- **Risk**: XSS token theft
|
||||
- **Impact**: Gallery access compromise
|
||||
- **Remediation**: Move to httpOnly cookies:
|
||||
```typescript
|
||||
Cookies.set(`gallery_token_${slug}`, token, {
|
||||
httpOnly: true,
|
||||
secure: true,
|
||||
sameSite: 'strict'
|
||||
});
|
||||
```
|
||||
|
||||
### 3. Weak Content Security Policy
|
||||
- **Location**: Frontend `nginx.conf`
|
||||
- **Risk**: XSS, code injection
|
||||
- **Current**: `unsafe-inline` and `unsafe-eval` allowed
|
||||
- **Remediation**: Implement strict CSP (see detailed recommendations below)
|
||||
|
||||
---
|
||||
|
||||
## 🟠 HIGH SEVERITY FINDINGS
|
||||
|
||||
### 1. Console Logging in Production
|
||||
- **Locations**: 61 instances across frontend
|
||||
- **Risk**: Information disclosure
|
||||
- **Impact**: Leaking sensitive data, debugging info
|
||||
- **Remediation**: Implement environment-aware logging
|
||||
|
||||
### 2. Token Revocation Vulnerability
|
||||
- **Location**: Backend `tokenRevocation.js`
|
||||
- **Risk**: Token manipulation
|
||||
- **Impact**: Bypass revocation checks
|
||||
- **Remediation**: Verify token signature before decoding
|
||||
|
||||
### 3. Source Maps in Production
|
||||
- **Location**: Frontend build configuration
|
||||
- **Risk**: Source code exposure
|
||||
- **Impact**: Reveals application structure
|
||||
- **Remediation**: Disable in production builds
|
||||
|
||||
### 4. Missing Security Headers
|
||||
- **Location**: nginx configuration
|
||||
- **Missing**: HSTS, Permissions-Policy
|
||||
- **Impact**: Various client-side attacks
|
||||
- **Remediation**: Add comprehensive security headers
|
||||
|
||||
---
|
||||
|
||||
## 🟡 MEDIUM SEVERITY FINDINGS
|
||||
|
||||
### 1. Rate Limiting Bypass Potential
|
||||
- **Location**: Backend rate limiter
|
||||
- **Risk**: DoS attacks
|
||||
- **Current**: JWT validation in rate limiter
|
||||
- **Remediation**: Use IP-based limiting only
|
||||
|
||||
### 2. Incomplete SQL Injection Protection
|
||||
- **Location**: Complex dashboard queries
|
||||
- **Risk**: Potential injection in edge cases
|
||||
- **Current**: Mostly parameterized
|
||||
- **Remediation**: Use query builder exclusively
|
||||
|
||||
### 3. Session Management
|
||||
- **Issue**: No gallery token invalidation on password change
|
||||
- **Risk**: Persistent access after compromise
|
||||
- **Remediation**: Implement token revocation
|
||||
|
||||
### 4. Path Traversal in Gallery Slugs
|
||||
- **Location**: Frontend gallery routes
|
||||
- **Risk**: Directory traversal attempts
|
||||
- **Remediation**: Validate and sanitize slugs
|
||||
|
||||
---
|
||||
|
||||
## 🟢 LOW SEVERITY FINDINGS
|
||||
|
||||
### 1. Verbose Error Messages
|
||||
- **Location**: Multiple API endpoints
|
||||
- **Risk**: Information disclosure
|
||||
- **Remediation**: Generic client errors, detailed server logs
|
||||
|
||||
### 2. Weak Gallery Passwords
|
||||
- **Current**: zxcvbn score 2/4 allowed
|
||||
- **Risk**: Brute force attacks
|
||||
- **Remediation**: Increase to score 3/4
|
||||
|
||||
### 3. Missing File Size Validation
|
||||
- **Location**: Frontend upload components
|
||||
- **Risk**: DoS via large uploads
|
||||
- **Remediation**: Add client-side size checks
|
||||
|
||||
---
|
||||
|
||||
## ✅ SECURITY STRENGTHS
|
||||
|
||||
### Authentication & Authorization
|
||||
- JWT with proper expiration (24h/7d)
|
||||
- Token type validation
|
||||
- IP tracking and validation
|
||||
- Password change detection
|
||||
- Token revocation system
|
||||
- Bcrypt with 12 rounds
|
||||
- zxcvbn password strength checking
|
||||
|
||||
### Input Validation & SQL Security
|
||||
- express-validator on all endpoints
|
||||
- Parameterized queries via Knex
|
||||
- SQL injection protection utilities
|
||||
- Path traversal prevention
|
||||
- Comprehensive input sanitization
|
||||
|
||||
### File Security
|
||||
- Magic number verification
|
||||
- MIME type validation
|
||||
- Safe filename generation
|
||||
- Directory traversal protection
|
||||
- File extension whitelist
|
||||
|
||||
### Rate Limiting & DoS Protection
|
||||
- General: 100 req/15min
|
||||
- Auth endpoints: 5 req/15min
|
||||
- Account lockout after failed attempts
|
||||
- Suspicious activity detection
|
||||
|
||||
### Frontend Security
|
||||
- React's built-in XSS protection
|
||||
- DOMPurify for HTML content
|
||||
- No eval() or innerHTML usage
|
||||
- Proper error boundaries
|
||||
- ReCAPTCHA integration
|
||||
|
||||
---
|
||||
|
||||
## 📊 DEPENDENCY ANALYSIS
|
||||
|
||||
### Current Status
|
||||
- **Backend**: 0 vulnerabilities (691 packages)
|
||||
- **Frontend**: 0 vulnerabilities (434 packages)
|
||||
|
||||
### Recommended Updates
|
||||
1. **bcrypt** 5.1.1 → 6.0.0 (performance, compatibility)
|
||||
2. **helmet** 7.2.0 → 8.1.0 (new security features)
|
||||
3. **@tiptap** 2.x → 3.x (security improvements)
|
||||
|
||||
### Supply Chain Assessment
|
||||
- All major dependencies from trusted sources
|
||||
- No typosquatting detected
|
||||
- Regular maintenance observed
|
||||
- MIT/ISC/Apache licenses only
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ REMEDIATION PLAN
|
||||
|
||||
### Phase 1: Critical (Within 24 hours)
|
||||
1. Replace hardcoded JWT secret with secure random value
|
||||
2. Move gallery tokens from localStorage to httpOnly cookies
|
||||
3. Implement strict CSP without unsafe-eval
|
||||
4. Remove or wrap console.log statements
|
||||
|
||||
### Phase 2: High Priority (Within 1 week)
|
||||
1. Disable source maps in production
|
||||
2. Add missing security headers (HSTS, Permissions-Policy)
|
||||
3. Fix token revocation vulnerability
|
||||
4. Update critical dependencies (bcrypt, helmet)
|
||||
|
||||
### Phase 3: Medium Priority (Within 1 month)
|
||||
1. Implement comprehensive logging strategy
|
||||
2. Add gallery slug validation
|
||||
3. Enhance rate limiting logic
|
||||
4. Implement session invalidation on password change
|
||||
|
||||
### Phase 4: Ongoing
|
||||
1. Weekly dependency scanning
|
||||
2. Implement security testing in CI/CD
|
||||
3. Regular penetration testing
|
||||
4. Security awareness training
|
||||
|
||||
---
|
||||
|
||||
## 🔒 RECOMMENDED CSP CONFIGURATION
|
||||
|
||||
```nginx
|
||||
add_header Content-Security-Policy "
|
||||
default-src 'self';
|
||||
script-src 'self' 'nonce-{RANDOM}' https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/;
|
||||
style-src 'self' 'unsafe-inline';
|
||||
img-src 'self' data: blob: https:;
|
||||
font-src 'self';
|
||||
connect-src 'self' https://analytics.domain.com;
|
||||
frame-src https://www.google.com/recaptcha/;
|
||||
object-src 'none';
|
||||
base-uri 'self';
|
||||
form-action 'self';
|
||||
frame-ancestors 'none';
|
||||
upgrade-insecure-requests;
|
||||
" always;
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚀 SECURITY IMPROVEMENTS ROADMAP
|
||||
|
||||
### Immediate Implementation
|
||||
```bash
|
||||
# 1. Generate secure secrets
|
||||
openssl rand -base64 32 > jwt-secret.txt
|
||||
|
||||
# 2. Update dependencies
|
||||
cd backend && npm install bcrypt@^6.0.0 helmet@^8.1.0
|
||||
cd ../frontend && npm update
|
||||
|
||||
# 3. Add security scanning
|
||||
npm install -D npm-audit-resolver
|
||||
```
|
||||
|
||||
### CI/CD Integration
|
||||
```yaml
|
||||
# Add to CI pipeline
|
||||
- name: Security Scan
|
||||
run: |
|
||||
npm audit --audit-level=moderate
|
||||
npm run test:security
|
||||
```
|
||||
|
||||
### Monitoring & Alerting
|
||||
1. Implement fail2ban for repeated auth failures
|
||||
2. Set up log analysis for suspicious patterns
|
||||
3. Configure alerts for security events
|
||||
4. Regular vulnerability scanning
|
||||
|
||||
---
|
||||
|
||||
## 📋 COMPLIANCE CHECKLIST
|
||||
|
||||
- [ ] OWASP Top 10 addressed
|
||||
- [ ] GDPR compliance (data minimization, right to erasure)
|
||||
- [ ] Security headers implemented
|
||||
- [ ] Dependency scanning automated
|
||||
- [ ] Incident response plan documented
|
||||
- [ ] Security documentation maintained
|
||||
- [ ] Regular security reviews scheduled
|
||||
|
||||
---
|
||||
|
||||
## 🎯 CONCLUSION
|
||||
|
||||
The wedding photo sharing application has a solid security foundation with excellent input validation and authentication mechanisms. However, operational security practices need immediate attention. The critical issues around secret management and token storage must be addressed before production deployment.
|
||||
|
||||
Implementing the recommended fixes will raise the security score from 6.5/10 to approximately 8.5/10, providing a robust and secure platform for wedding photo sharing.
|
||||
|
||||
---
|
||||
|
||||
*Generated by Claude Security Scanner v1.0*
|
||||
*Next scan recommended: After Phase 1 remediation completion*
|
||||
@@ -0,0 +1,92 @@
|
||||
# Deployment Guide - Traefik Production Setup
|
||||
|
||||
## Overview
|
||||
|
||||
This guide explains how to deploy PicPeak with an external Traefik reverse proxy for production use.
|
||||
|
||||
## Fixed Issues
|
||||
|
||||
1. **Database Migration**: Added missing `created_at` column to `email_queue` table
|
||||
2. **502 Bad Gateway**: Properly configured Traefik routing and backend accessibility
|
||||
3. **Health Checks**: Fixed health check endpoint imports and paths
|
||||
|
||||
## Deployment Steps
|
||||
|
||||
### 1. Update Environment Variables
|
||||
|
||||
Ensure your `.env` file has the correct URLs:
|
||||
```bash
|
||||
ADMIN_URL=https://picpeak.nothaft.cloud
|
||||
FRONTEND_URL=https://picpeak.nothaft.cloud
|
||||
```
|
||||
|
||||
### 2. Build Images
|
||||
|
||||
```bash
|
||||
# Build backend image
|
||||
docker build -t picpeak-backend:latest ./backend
|
||||
|
||||
# Build frontend image
|
||||
docker build -t picpeak-frontend:latest ./frontend \
|
||||
--build-arg VITE_API_URL=/api \
|
||||
--build-arg VITE_UMAMI_URL=${VITE_UMAMI_URL} \
|
||||
--build-arg VITE_UMAMI_WEBSITE_ID=${VITE_UMAMI_WEBSITE_ID}
|
||||
```
|
||||
|
||||
### 3. Deploy with Traefik
|
||||
|
||||
Use the new Traefik-specific compose file:
|
||||
```bash
|
||||
docker-compose -f docker-compose.traefik.yml up -d
|
||||
```
|
||||
|
||||
### 4. Verify Deployment
|
||||
|
||||
Check that all services are healthy:
|
||||
```bash
|
||||
# Check container status
|
||||
docker-compose -f docker-compose.traefik.yml ps
|
||||
|
||||
# Check backend health
|
||||
curl https://picpeak.nothaft.cloud/api/health
|
||||
|
||||
# Check logs
|
||||
docker-compose -f docker-compose.traefik.yml logs -f backend
|
||||
```
|
||||
|
||||
## Key Differences from Standard Deployment
|
||||
|
||||
1. **No Internal Nginx**: Traefik handles all routing externally
|
||||
2. **API Path Stripping**: Traefik strips `/api` prefix when forwarding to backend
|
||||
3. **Network Configuration**: Services join external `traefik` network
|
||||
4. **Health Checks**: Backend exposes `/health` endpoint (not `/api/health`)
|
||||
|
||||
## Why CI/CD Tests Pass But Production Fails
|
||||
|
||||
CI/CD tests typically:
|
||||
- Use in-memory or temporary databases with fresh migrations
|
||||
- Don't test through reverse proxy (direct API calls)
|
||||
- Don't run background services (email processor, etc.)
|
||||
- Have different network configurations
|
||||
|
||||
Production environment has:
|
||||
- Persistent database that may have migration state issues
|
||||
- Reverse proxy routing complexity
|
||||
- All background services running
|
||||
- Different security and network constraints
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### 502 Bad Gateway
|
||||
- Check Traefik network connectivity: `docker network ls`
|
||||
- Verify backend is in traefik network: `docker inspect picpeak-backend`
|
||||
- Check Traefik logs: `docker logs traefik`
|
||||
|
||||
### Database Issues
|
||||
- Connect to database: `docker exec -it picpeak-db psql -U picpeak`
|
||||
- Check migration status: `SELECT * FROM migrations;`
|
||||
- Run migrations manually: `docker exec -it picpeak-backend npm run migrate:safe`
|
||||
|
||||
### Email Service Errors
|
||||
- Check email queue: `SELECT * FROM email_queue ORDER BY created_at DESC LIMIT 10;`
|
||||
- Monitor email processor: `docker logs picpeak-backend | grep "email"`
|
||||
@@ -0,0 +1,111 @@
|
||||
# Quick Fix for Migration Error
|
||||
|
||||
## Immediate Fix
|
||||
|
||||
The error "relation photo_categories already exists" occurs because the database already has tables but the migration tracking doesn't know they were applied.
|
||||
|
||||
### Option 1: Use Safe Migration Runner (Recommended)
|
||||
|
||||
Update your `docker-compose.prod.yml` to use the safe migration command:
|
||||
|
||||
```yaml
|
||||
backend:
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
# ... other config ...
|
||||
```
|
||||
|
||||
Then update the `wait-for-db.sh` (already done) to use `npm run migrate:safe` in production.
|
||||
|
||||
### Option 2: Quick Manual Fix
|
||||
|
||||
If you need to fix the running system immediately:
|
||||
|
||||
```bash
|
||||
# 1. Enter the backend container
|
||||
docker-compose -f docker-compose.prod.yml exec backend sh
|
||||
|
||||
# 2. Run the safe migration script
|
||||
npm run migrate:safe
|
||||
|
||||
# 3. If that fails, manually mark migrations as applied:
|
||||
docker-compose -f docker-compose.prod.yml exec db psql -U picpeak -d picpeak
|
||||
|
||||
# In PostgreSQL:
|
||||
CREATE TABLE IF NOT EXISTS migrations (
|
||||
id SERIAL PRIMARY KEY,
|
||||
filename VARCHAR(255) UNIQUE NOT NULL,
|
||||
applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- Mark existing migrations as applied
|
||||
INSERT INTO migrations (filename) VALUES
|
||||
('init.js'),
|
||||
('004_add_categories_and_cms.js'),
|
||||
('006_add_photo_counter_to_categories.js'),
|
||||
('007_add_read_at_to_activity_logs.js'),
|
||||
('008_add_language_support_to_email_templates.js'),
|
||||
('009_update_german_email_templates.js'),
|
||||
('010_add_missing_email_templates.js'),
|
||||
('011_add_user_upload_settings.js'),
|
||||
('012_add_hero_photo_id.js'),
|
||||
('013_fix_email_links_and_date_format.js'),
|
||||
('014_add_default_welcome_message.js'),
|
||||
('014_add_host_name_to_events.js'),
|
||||
('015_add_login_attempts_table.js'),
|
||||
('016_add_auth_security_columns.js'),
|
||||
('017_add_token_revocation_tables.js')
|
||||
ON CONFLICT (filename) DO NOTHING;
|
||||
|
||||
\q
|
||||
```
|
||||
|
||||
### Option 3: Fresh Start (Nuclear Option)
|
||||
|
||||
If you don't have important data yet:
|
||||
|
||||
```bash
|
||||
# Stop everything
|
||||
docker-compose -f docker-compose.prod.yml down
|
||||
|
||||
# Remove database volume
|
||||
docker volume rm wedding-photo-sharing_postgres_data
|
||||
|
||||
# Start fresh
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
```
|
||||
|
||||
## Root Cause
|
||||
|
||||
The issue happens when:
|
||||
1. Database volume persists between deployments
|
||||
2. Migration tracking table gets out of sync
|
||||
3. The original migration runner doesn't check for existing tables
|
||||
|
||||
## Permanent Solution
|
||||
|
||||
The new safe migration runner (`migrate:safe`) handles this by:
|
||||
1. Checking if tables exist before creating them
|
||||
2. Catching "already exists" errors gracefully
|
||||
3. Auto-detecting existing schema and marking migrations as applied
|
||||
|
||||
## Next Steps
|
||||
|
||||
After fixing the migration issue:
|
||||
|
||||
1. Create admin user:
|
||||
```bash
|
||||
docker-compose -f docker-compose.prod.yml exec backend node scripts/create-admin.js \
|
||||
--username admin \
|
||||
--email admin@yourdomain.com
|
||||
```
|
||||
|
||||
2. Check health:
|
||||
```bash
|
||||
curl http://yourdomain.com/api/health
|
||||
```
|
||||
|
||||
3. Monitor logs:
|
||||
```bash
|
||||
docker-compose -f docker-compose.prod.yml logs -f backend
|
||||
```
|
||||
@@ -0,0 +1,100 @@
|
||||
# Production Deployment Fixes
|
||||
|
||||
This document describes the fixes applied to resolve production deployment issues in Docker.
|
||||
|
||||
## Issues Fixed
|
||||
|
||||
### 1. Database Connection Error: "getaddrinfo ENOTFOUND postgres"
|
||||
**Problem**: The backend was trying to connect to hostname "postgres" but the database service is named "db" in docker-compose.
|
||||
**Solution**:
|
||||
- Updated `knexfile.js` to use correct default host "db" instead of "postgres"
|
||||
- Added `depends_on: db` to backend service in docker-compose.prod.yml
|
||||
|
||||
### 2. Backend Starting Before Database Ready
|
||||
**Problem**: Backend service started before PostgreSQL was ready, causing connection failures.
|
||||
**Solution**:
|
||||
- Created `wait-for-db.sh` script that waits for PostgreSQL to be ready
|
||||
- Updated Dockerfile to install postgresql-client and use the wait script
|
||||
- Script also runs migrations automatically on startup
|
||||
|
||||
### 3. Email Processor Initialization Failure
|
||||
**Problem**: Email processor tried to initialize on module load before database was available.
|
||||
**Solution**:
|
||||
- Modified `emailProcessor.js` to export initialization functions
|
||||
- Updated `server.js` to call initialization after database is ready
|
||||
- Added proper error handling for email service initialization
|
||||
|
||||
### 4. Missing Environment Variables
|
||||
**Problem**: Critical storage path environment variables were missing.
|
||||
**Solution**:
|
||||
- Added STORAGE_PATH, EVENTS_PATH, and ARCHIVE_PATH to docker-compose.prod.yml
|
||||
- Created `.env.example` documenting all required environment variables
|
||||
|
||||
### 5. Enhanced Health Check
|
||||
**Problem**: Basic health check didn't verify database connectivity.
|
||||
**Solution**:
|
||||
- Updated `/api/health` endpoint to check database connection
|
||||
- Returns proper HTTP 503 status when unhealthy
|
||||
|
||||
## Files Modified
|
||||
|
||||
1. **backend/knexfile.js** - Fixed production database defaults
|
||||
2. **backend/wait-for-db.sh** - Created database wait script
|
||||
3. **backend/Dockerfile** - Added postgresql-client and wait script
|
||||
4. **docker-compose.prod.yml** - Added dependencies and environment variables
|
||||
5. **backend/src/services/emailProcessor.js** - Disabled auto-initialization
|
||||
6. **backend/server.js** - Added email initialization and improved health check
|
||||
7. **backend/.env.example** - Created environment variable documentation
|
||||
|
||||
## Deployment Steps
|
||||
|
||||
1. Ensure all environment variables are set according to `.env.example`
|
||||
2. Build and deploy with docker-compose:
|
||||
```bash
|
||||
docker-compose -f docker-compose.prod.yml build
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
```
|
||||
3. The backend will now:
|
||||
- Wait for PostgreSQL to be ready
|
||||
- Run migrations automatically
|
||||
- Initialize all services in proper order
|
||||
- Provide health status at `/api/health`
|
||||
|
||||
## Verification
|
||||
|
||||
Check deployment health:
|
||||
```bash
|
||||
curl http://localhost/api/health
|
||||
```
|
||||
|
||||
Expected response:
|
||||
```json
|
||||
{
|
||||
"status": "ok",
|
||||
"database": "connected",
|
||||
"timestamp": "2025-07-13T20:30:00.000Z"
|
||||
}
|
||||
```
|
||||
|
||||
## Email Configuration
|
||||
|
||||
Email service requires configuration in the database. If email is not configured:
|
||||
- The service will log a warning but continue running
|
||||
- Emails will be queued but not sent
|
||||
- Configure email settings in the admin panel after deployment
|
||||
|
||||
## PostgreSQL Connection Fix
|
||||
|
||||
### Issue: "no pg_hba.conf entry for host"
|
||||
This error occurs when PostgreSQL requires SSL but the client connects without encryption.
|
||||
|
||||
### Solution:
|
||||
- Disabled SSL requirement for PostgreSQL in Docker environment (`ssl=off`)
|
||||
- Added proper authentication method (`scram-sha-256`)
|
||||
- This is acceptable for internal Docker networks where all traffic is isolated
|
||||
|
||||
### Security Note:
|
||||
For production deployments exposed to the internet:
|
||||
1. Use SSL certificates for PostgreSQL
|
||||
2. Or ensure the database is only accessible within the Docker network
|
||||
3. Never expose PostgreSQL port (5432) directly to the internet
|
||||
@@ -0,0 +1,312 @@
|
||||
# Production Deployment Guide
|
||||
|
||||
This guide addresses all known production deployment issues and provides solutions.
|
||||
|
||||
## Pre-Deployment Checklist
|
||||
|
||||
### 1. Environment Variables
|
||||
Create a `.env` file with ALL required variables:
|
||||
|
||||
```bash
|
||||
# Required
|
||||
JWT_SECRET=<generate-with-openssl-rand-base64-32>
|
||||
DB_PASSWORD=<strong-password>
|
||||
ADMIN_URL=https://yourdomain.com
|
||||
FRONTEND_URL=https://yourdomain.com
|
||||
|
||||
# Database
|
||||
DB_USER=picpeak
|
||||
DB_NAME=picpeak
|
||||
|
||||
# Email (Optional but recommended)
|
||||
SMTP_HOST=smtp.gmail.com
|
||||
SMTP_PORT=587
|
||||
SMTP_SECURE=false
|
||||
SMTP_USER=your-email@gmail.com
|
||||
SMTP_PASS=your-app-password
|
||||
EMAIL_FROM=noreply@yourdomain.com
|
||||
|
||||
# Umami Analytics (Optional)
|
||||
UMAMI_URL=https://analytics.yourdomain.com
|
||||
UMAMI_WEBSITE_ID=your-website-id
|
||||
UMAMI_HASH_SALT=<generate-random-string>
|
||||
```
|
||||
|
||||
### 2. Generate Secrets
|
||||
|
||||
```bash
|
||||
# Generate JWT Secret
|
||||
openssl rand -base64 32
|
||||
|
||||
# Generate Database Password
|
||||
openssl rand -base64 24
|
||||
|
||||
# Generate Umami Hash Salt
|
||||
openssl rand -hex 32
|
||||
```
|
||||
|
||||
## Deployment Steps
|
||||
|
||||
### 1. Initial Setup
|
||||
|
||||
```bash
|
||||
# Clone repository
|
||||
git clone https://github.com/yourusername/wedding-photo-sharing.git
|
||||
cd wedding-photo-sharing
|
||||
|
||||
# Create required directories
|
||||
mkdir -p storage/events/active storage/events/archived storage/thumbnails storage/uploads
|
||||
mkdir -p data logs
|
||||
mkdir -p certbot/conf certbot/www
|
||||
|
||||
# Set permissions (important!)
|
||||
chmod -R 755 storage data logs
|
||||
```
|
||||
|
||||
### 2. Fix Docker Volume Permissions
|
||||
|
||||
Create `docker-compose.override.yml` for local volume configuration:
|
||||
|
||||
```yaml
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
backend:
|
||||
volumes:
|
||||
- ./storage:/app/storage:delegated
|
||||
- ./data:/app/data:delegated
|
||||
- ./logs:/app/logs:delegated
|
||||
user: "1001:1001" # nodejs user
|
||||
|
||||
db:
|
||||
volumes:
|
||||
- ./postgres-data:/var/lib/postgresql/data
|
||||
```
|
||||
|
||||
### 3. Build and Deploy
|
||||
|
||||
```bash
|
||||
# Build images
|
||||
docker-compose -f docker-compose.prod.yml build
|
||||
|
||||
# Start services
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
|
||||
# Check logs
|
||||
docker-compose -f docker-compose.prod.yml logs -f backend
|
||||
```
|
||||
|
||||
### 4. Create Admin User
|
||||
|
||||
After deployment, create the first admin user:
|
||||
|
||||
```bash
|
||||
# Enter backend container
|
||||
docker-compose -f docker-compose.prod.yml exec backend sh
|
||||
|
||||
# Create admin
|
||||
node scripts/create-admin.js \
|
||||
--username admin \
|
||||
--email admin@yourdomain.com \
|
||||
--password <your-secure-password>
|
||||
|
||||
# Exit container
|
||||
exit
|
||||
```
|
||||
|
||||
### 5. Configure Email (if using database config)
|
||||
|
||||
1. Login to admin panel: https://yourdomain.com/admin
|
||||
2. Go to Settings > Email Configuration
|
||||
3. Enter SMTP details
|
||||
4. Test email sending
|
||||
|
||||
## Common Issues and Solutions
|
||||
|
||||
### Issue 1: Migration Failures
|
||||
|
||||
**Error**: "relation already exists"
|
||||
|
||||
**Solution**: The safe migration runner handles this automatically. If issues persist:
|
||||
|
||||
```bash
|
||||
# Reset migrations tracking
|
||||
docker-compose -f docker-compose.prod.yml exec db psql -U picpeak -d picpeak
|
||||
|
||||
# In PostgreSQL:
|
||||
DROP TABLE IF EXISTS migrations;
|
||||
\q
|
||||
|
||||
# Re-run migrations
|
||||
docker-compose -f docker-compose.prod.yml exec backend npm run migrate:safe
|
||||
```
|
||||
|
||||
### Issue 2: Permission Denied Errors
|
||||
|
||||
**Error**: "EACCES: permission denied"
|
||||
|
||||
**Solution**: Fix container permissions:
|
||||
|
||||
```bash
|
||||
# Stop containers
|
||||
docker-compose -f docker-compose.prod.yml down
|
||||
|
||||
# Fix permissions on host
|
||||
sudo chown -R 1001:1001 storage data logs
|
||||
|
||||
# Restart
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
```
|
||||
|
||||
### Issue 3: Database Connection Failed
|
||||
|
||||
**Error**: "no pg_hba.conf entry"
|
||||
|
||||
**Solution**: Already fixed in docker-compose.prod.yml with:
|
||||
- SSL disabled for internal Docker network
|
||||
- Proper authentication method (scram-sha-256)
|
||||
|
||||
### Issue 4: Frontend Can't Connect to Backend
|
||||
|
||||
**Error**: CORS errors or connection refused
|
||||
|
||||
**Solution**: Ensure environment variables match:
|
||||
- Backend: `FRONTEND_URL` must match your frontend URL
|
||||
- Frontend: `VITE_API_URL` must be set during build
|
||||
|
||||
### Issue 5: Email Not Sending
|
||||
|
||||
**Solution**: Check email configuration:
|
||||
|
||||
```bash
|
||||
# Check backend logs
|
||||
docker-compose -f docker-compose.prod.yml logs backend | grep email
|
||||
|
||||
# Verify SMTP settings
|
||||
# Gmail users: Use app password, not regular password
|
||||
# Enable "Less secure app access" or use OAuth2
|
||||
```
|
||||
|
||||
## SSL/HTTPS Setup
|
||||
|
||||
1. Update `nginx/sites-enabled/default` with your domain
|
||||
2. Run certbot:
|
||||
|
||||
```bash
|
||||
# Initial certificate
|
||||
docker-compose -f docker-compose.prod.yml run --rm certbot certonly \
|
||||
--webroot --webroot-path=/var/www/certbot \
|
||||
-d yourdomain.com -d www.yourdomain.com
|
||||
|
||||
# Auto-renewal is handled by the certbot container
|
||||
```
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Health Checks
|
||||
|
||||
```bash
|
||||
# Backend health
|
||||
curl http://localhost/api/health
|
||||
|
||||
# Database connection
|
||||
docker-compose -f docker-compose.prod.yml exec backend \
|
||||
psql -U picpeak -d picpeak -c "SELECT 1"
|
||||
```
|
||||
|
||||
### Logs
|
||||
|
||||
```bash
|
||||
# All services
|
||||
docker-compose -f docker-compose.prod.yml logs -f
|
||||
|
||||
# Specific service
|
||||
docker-compose -f docker-compose.prod.yml logs -f backend
|
||||
```
|
||||
|
||||
## Backup and Restore
|
||||
|
||||
### Backup
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# backup.sh
|
||||
DATE=$(date +%Y%m%d_%H%M%S)
|
||||
BACKUP_DIR="./backups/$DATE"
|
||||
|
||||
mkdir -p $BACKUP_DIR
|
||||
|
||||
# Database
|
||||
docker-compose -f docker-compose.prod.yml exec -T db \
|
||||
pg_dump -U picpeak picpeak > $BACKUP_DIR/database.sql
|
||||
|
||||
# Files
|
||||
tar -czf $BACKUP_DIR/storage.tar.gz storage/
|
||||
|
||||
echo "Backup completed: $BACKUP_DIR"
|
||||
```
|
||||
|
||||
### Restore
|
||||
|
||||
```bash
|
||||
# Database
|
||||
docker-compose -f docker-compose.prod.yml exec -T db \
|
||||
psql -U picpeak picpeak < ./backups/20240713_120000/database.sql
|
||||
|
||||
# Files
|
||||
tar -xzf ./backups/20240713_120000/storage.tar.gz
|
||||
```
|
||||
|
||||
## Production Best Practices
|
||||
|
||||
1. **Always use named volumes** in production for better data persistence
|
||||
2. **Set up monitoring** with Prometheus/Grafana
|
||||
3. **Enable backups** with automated scripts
|
||||
4. **Use a reverse proxy** (Nginx) for SSL termination
|
||||
5. **Implement rate limiting** at the Nginx level
|
||||
6. **Regular updates** - Keep Docker images updated
|
||||
7. **Log rotation** - Configure log rotation for application logs
|
||||
|
||||
## Troubleshooting Commands
|
||||
|
||||
```bash
|
||||
# Check running containers
|
||||
docker-compose -f docker-compose.prod.yml ps
|
||||
|
||||
# Restart a service
|
||||
docker-compose -f docker-compose.prod.yml restart backend
|
||||
|
||||
# View real-time logs
|
||||
docker-compose -f docker-compose.prod.yml logs -f --tail=100
|
||||
|
||||
# Execute commands in container
|
||||
docker-compose -f docker-compose.prod.yml exec backend sh
|
||||
|
||||
# Database shell
|
||||
docker-compose -f docker-compose.prod.yml exec db psql -U picpeak
|
||||
|
||||
# Clean restart
|
||||
docker-compose -f docker-compose.prod.yml down
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
```
|
||||
|
||||
## Security Checklist
|
||||
|
||||
- [ ] Strong JWT_SECRET (min 32 chars)
|
||||
- [ ] Strong database password
|
||||
- [ ] SSL/HTTPS enabled
|
||||
- [ ] Firewall configured (only 80/443 open)
|
||||
- [ ] Regular security updates
|
||||
- [ ] Backup encryption
|
||||
- [ ] Access logs monitored
|
||||
- [ ] Rate limiting enabled
|
||||
- [ ] File upload restrictions configured
|
||||
|
||||
## Support
|
||||
|
||||
For issues not covered here:
|
||||
1. Check application logs
|
||||
2. Review error messages carefully
|
||||
3. Ensure all environment variables are set
|
||||
4. Verify file permissions
|
||||
5. Check Docker daemon logs
|
||||
@@ -0,0 +1,280 @@
|
||||
# Traefik Deployment Guide
|
||||
|
||||
This guide explains how to deploy the PicPeak application with Traefik as the reverse proxy.
|
||||
|
||||
## Overview
|
||||
|
||||
The application consists of:
|
||||
- **Frontend**: React app served by nginx (port 80)
|
||||
- **Backend**: Node.js API (port 3000)
|
||||
- **Database**: PostgreSQL (port 5432, internal only)
|
||||
|
||||
## Traefik Configuration
|
||||
|
||||
### 1. Docker Labels for Traefik
|
||||
|
||||
Add these labels to your `docker-compose.prod.yml` services:
|
||||
|
||||
```yaml
|
||||
services:
|
||||
frontend:
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.picpeak-frontend.rule=Host(`picpeak.yourdomain.com`)"
|
||||
- "traefik.http.routers.picpeak-frontend.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-frontend.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-frontend.loadbalancer.server.port=80"
|
||||
# Priority for catch-all route
|
||||
- "traefik.http.routers.picpeak-frontend.priority=1"
|
||||
|
||||
backend:
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.picpeak-api.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/api`)"
|
||||
- "traefik.http.routers.picpeak-api.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-api.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-api.loadbalancer.server.port=3000"
|
||||
# Higher priority for API routes
|
||||
- "traefik.http.routers.picpeak-api.priority=10"
|
||||
|
||||
# Additional routes for backend static files
|
||||
- "traefik.http.routers.picpeak-uploads.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/uploads`)"
|
||||
- "traefik.http.routers.picpeak-uploads.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-uploads.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.picpeak-uploads.service=picpeak-api"
|
||||
- "traefik.http.routers.picpeak-uploads.priority=10"
|
||||
|
||||
- "traefik.http.routers.picpeak-images.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/images`)"
|
||||
- "traefik.http.routers.picpeak-images.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-images.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.picpeak-images.service=picpeak-api"
|
||||
- "traefik.http.routers.picpeak-images.priority=10"
|
||||
```
|
||||
|
||||
### 2. Network Configuration
|
||||
|
||||
Ensure your services are on the Traefik network:
|
||||
|
||||
```yaml
|
||||
networks:
|
||||
picpeak:
|
||||
external: false
|
||||
traefik:
|
||||
external: true
|
||||
|
||||
services:
|
||||
frontend:
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
|
||||
backend:
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
|
||||
db:
|
||||
networks:
|
||||
- picpeak # Don't expose to traefik
|
||||
```
|
||||
|
||||
### 3. Remove Nginx Service
|
||||
|
||||
Since you're using Traefik, remove the nginx service from `docker-compose.prod.yml`:
|
||||
|
||||
```yaml
|
||||
# Remove this entire service:
|
||||
# nginx:
|
||||
# image: nginx:alpine
|
||||
# ...
|
||||
```
|
||||
|
||||
## Frontend Configuration
|
||||
|
||||
The frontend is built with the API URL set to `/api`. This is important because:
|
||||
|
||||
1. All API calls will be relative to the same domain
|
||||
2. Traefik will route `/api/*` to the backend service
|
||||
3. No CORS issues since everything is on the same domain
|
||||
|
||||
## Environment Variables
|
||||
|
||||
Ensure these are set correctly:
|
||||
|
||||
```bash
|
||||
# Backend needs to know the public URLs
|
||||
ADMIN_URL=https://picpeak.yourdomain.com
|
||||
FRONTEND_URL=https://picpeak.yourdomain.com
|
||||
|
||||
# Backend API is accessed via /api path
|
||||
API_URL=https://picpeak.yourdomain.com/api
|
||||
```
|
||||
|
||||
## Complete Example
|
||||
|
||||
Here's a complete `docker-compose.prod.yml` for Traefik:
|
||||
|
||||
```yaml
|
||||
version: '3.8'
|
||||
|
||||
networks:
|
||||
picpeak:
|
||||
external: false
|
||||
traefik:
|
||||
external: true
|
||||
|
||||
services:
|
||||
backend:
|
||||
image: picpeak-backend:latest
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- db
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.yourdomain.com
|
||||
- FRONTEND_URL=https://picpeak.yourdomain.com
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- ./storage:/app/storage
|
||||
- ./data:/app/data
|
||||
- ./logs:/app/logs
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.picpeak-api.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/api`)"
|
||||
- "traefik.http.routers.picpeak-api.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-api.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-api.loadbalancer.server.port=3000"
|
||||
- "traefik.http.routers.picpeak-api.priority=10"
|
||||
|
||||
- "traefik.http.routers.picpeak-uploads.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/uploads`)"
|
||||
- "traefik.http.routers.picpeak-uploads.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-uploads.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.picpeak-uploads.service=picpeak-api"
|
||||
- "traefik.http.routers.picpeak-uploads.priority=10"
|
||||
|
||||
- "traefik.http.routers.picpeak-images.rule=Host(`picpeak.yourdomain.com`) && PathPrefix(`/images`)"
|
||||
- "traefik.http.routers.picpeak-images.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-images.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.picpeak-images.service=picpeak-api"
|
||||
- "traefik.http.routers.picpeak-images.priority=10"
|
||||
|
||||
frontend:
|
||||
image: picpeak-frontend:latest
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
- VITE_API_URL=/api
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.picpeak-frontend.rule=Host(`picpeak.yourdomain.com`)"
|
||||
- "traefik.http.routers.picpeak-frontend.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-frontend.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-frontend.loadbalancer.server.port=80"
|
||||
- "traefik.http.routers.picpeak-frontend.priority=1"
|
||||
|
||||
db:
|
||||
image: postgres:14-alpine
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- picpeak
|
||||
command: postgres -c ssl=off
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### 502 Bad Gateway Errors
|
||||
|
||||
1. **Check if backend is running**:
|
||||
```bash
|
||||
docker-compose -f docker-compose.prod.yml ps
|
||||
docker-compose -f docker-compose.prod.yml logs backend
|
||||
```
|
||||
|
||||
2. **Verify Traefik can reach the backend**:
|
||||
- Ensure both services are on the same Docker network
|
||||
- Check Traefik logs: `docker logs traefik`
|
||||
|
||||
3. **Check backend health**:
|
||||
```bash
|
||||
docker-compose -f docker-compose.prod.yml exec backend curl http://localhost:3000/api/health
|
||||
```
|
||||
|
||||
### Frontend Can't Reach API
|
||||
|
||||
1. **Verify API paths don't have double `/api`**:
|
||||
- Frontend should call `/auth/admin/login`, not `/api/auth/admin/login`
|
||||
- The base URL in axios should be `/api`
|
||||
|
||||
2. **Check browser console for actual URLs being called**
|
||||
|
||||
3. **Ensure Traefik routing rules are correct**:
|
||||
- API routes should have higher priority than frontend catch-all
|
||||
|
||||
### CORS Issues
|
||||
|
||||
Should not occur since everything is on the same domain. If you see CORS errors:
|
||||
1. Check that `FRONTEND_URL` and `ADMIN_URL` match your actual domain
|
||||
2. Ensure you're not mixing HTTP and HTTPS
|
||||
|
||||
## Testing the Setup
|
||||
|
||||
1. **Test API directly**:
|
||||
```bash
|
||||
curl https://picpeak.yourdomain.com/api/health
|
||||
```
|
||||
|
||||
2. **Test frontend**:
|
||||
```bash
|
||||
curl https://picpeak.yourdomain.com/
|
||||
```
|
||||
|
||||
3. **Test admin login**:
|
||||
- Navigate to https://picpeak.yourdomain.com/admin/login
|
||||
- Check browser console for any errors
|
||||
|
||||
## Important Notes
|
||||
|
||||
1. **SSL/TLS**: Traefik handles SSL termination, so the backend doesn't need SSL
|
||||
2. **Port Exposure**: Don't expose backend ports directly - let Traefik handle routing
|
||||
3. **Health Checks**: Configure Traefik health checks for better reliability
|
||||
4. **Rate Limiting**: Consider adding Traefik rate limiting middleware for API routes
|
||||
@@ -0,0 +1,134 @@
|
||||
# Traefik Troubleshooting Guide
|
||||
|
||||
## Common Issues and Solutions
|
||||
|
||||
### 1. 404 Errors on API Routes
|
||||
|
||||
**Problem**: Getting 404 errors when accessing `/api/*` routes
|
||||
|
||||
**Causes**:
|
||||
- Traefik routing rules not properly configured
|
||||
- Backend container not healthy
|
||||
- Path stripping not working correctly
|
||||
|
||||
**Solutions**:
|
||||
|
||||
1. **Check container health**:
|
||||
```bash
|
||||
docker ps # Check if backend is running
|
||||
docker logs picpeak-backend # Check for startup errors
|
||||
```
|
||||
|
||||
2. **Test backend directly**:
|
||||
```bash
|
||||
# Access backend container
|
||||
docker exec -it picpeak-backend sh
|
||||
|
||||
# Test health endpoint
|
||||
wget -O- http://localhost:3000/health
|
||||
|
||||
# Test public settings endpoint
|
||||
wget -O- http://localhost:3000/public/settings
|
||||
```
|
||||
|
||||
3. **Check Traefik routing**:
|
||||
```bash
|
||||
# Check if routes are registered in Traefik
|
||||
curl https://traefik.yourdomain.com/api/http/routers | jq '.[] | select(.rule | contains("picpeak"))'
|
||||
```
|
||||
|
||||
### 2. Backend Not Accessible Through Traefik
|
||||
|
||||
**Key Configuration Points**:
|
||||
|
||||
1. **Traefik Labels** (in deploy section):
|
||||
- `traefik.enable=true` - Enable Traefik for this container
|
||||
- `traefik.docker.network=proxy` - Specify which network Traefik should use
|
||||
- `traefik.http.routers.picpeak-backend.priority=100` - Higher priority for API routes
|
||||
|
||||
2. **Path Stripping**:
|
||||
- Frontend expects `/api/*` but backend serves routes without `/api` prefix
|
||||
- Middleware strips `/api` before forwarding to backend
|
||||
|
||||
3. **Network Configuration**:
|
||||
- Backend must be in both `picpeak` (internal) and `proxy` (Traefik) networks
|
||||
|
||||
### 3. Environment Variable Issues
|
||||
|
||||
**Critical Variables**:
|
||||
- `ADMIN_URL` and `FRONTEND_URL` must match your actual domain
|
||||
- These affect CORS configuration
|
||||
|
||||
**Example .env**:
|
||||
```env
|
||||
# URLs
|
||||
ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
|
||||
# Database
|
||||
DB_USER=picpeak
|
||||
DB_PASSWORD=your_secure_password
|
||||
DB_NAME=picpeak
|
||||
|
||||
# JWT
|
||||
JWT_SECRET=your_secure_jwt_secret
|
||||
|
||||
# Email (optional)
|
||||
SMTP_HOST=smtp.example.com
|
||||
SMTP_PORT=587
|
||||
SMTP_SECURE=true
|
||||
SMTP_USER=noreply@example.com
|
||||
SMTP_PASS=smtp_password
|
||||
EMAIL_FROM=noreply@example.com
|
||||
```
|
||||
|
||||
### 4. Debugging Steps
|
||||
|
||||
1. **Check if backend is receiving requests**:
|
||||
```bash
|
||||
# Watch backend logs
|
||||
docker logs -f picpeak-backend
|
||||
|
||||
# Look for incoming requests when you try to access the admin page
|
||||
```
|
||||
|
||||
2. **Test API routes directly**:
|
||||
```bash
|
||||
# From outside
|
||||
curl -v https://picpeak.local.nothaft.cloud/api/public/settings
|
||||
|
||||
# Should see backend logs if request reaches container
|
||||
```
|
||||
|
||||
3. **Verify Traefik middleware**:
|
||||
```bash
|
||||
# Check if stripprefix middleware exists
|
||||
curl https://traefik.yourdomain.com/api/http/middlewares | jq '.[] | select(.name | contains("picpeak"))'
|
||||
```
|
||||
|
||||
### 5. Quick Fix Checklist
|
||||
|
||||
- [ ] Backend container is healthy (`docker ps`)
|
||||
- [ ] Backend is in both networks (`docker inspect picpeak-backend | grep -A 20 Networks`)
|
||||
- [ ] Traefik labels use correct network (`traefik.docker.network=proxy`)
|
||||
- [ ] Priority is set correctly (backend: 100, frontend: 10)
|
||||
- [ ] ADMIN_URL and FRONTEND_URL match your domain
|
||||
- [ ] Database is accessible from backend
|
||||
- [ ] Migrations have run successfully
|
||||
|
||||
### 6. Alternative Testing
|
||||
|
||||
If Traefik routing is problematic, test backend directly:
|
||||
|
||||
```bash
|
||||
# Port forward to test backend directly
|
||||
docker run --rm -it --network picpeak alpine/curl curl http://backend:3000/health
|
||||
|
||||
# Or expose backend port temporarily
|
||||
docker run -d --name picpeak-backend-test \
|
||||
--network picpeak \
|
||||
-p 3001:3000 \
|
||||
registry.local.nothaft.cloud/picpeak-backend:latest
|
||||
```
|
||||
|
||||
Then access http://localhost:3001/health to verify backend is working.
|
||||
+33
-34
@@ -1,42 +1,41 @@
|
||||
NODE_ENV=development
|
||||
# Backend Environment Variables Example
|
||||
# Copy this file to .env and update with your values
|
||||
|
||||
# Application
|
||||
NODE_ENV=production
|
||||
PORT=3000
|
||||
|
||||
# URLs
|
||||
ADMIN_URL=http://localhost:3000
|
||||
FRONTEND_URL=http://localhost:3001
|
||||
|
||||
# Security
|
||||
JWT_SECRET=dev-secret-key
|
||||
JWT_SECRET=your-very-secure-jwt-secret-at-least-32-characters-long
|
||||
|
||||
# Email Configuration
|
||||
SMTP_HOST=mailhog
|
||||
SMTP_PORT=1025
|
||||
SMTP_SECURE=false
|
||||
SMTP_USER=
|
||||
SMTP_PASS=
|
||||
EMAIL_FROM=noreply@localhost
|
||||
|
||||
# Storage Paths (relative to project root)
|
||||
STORAGE_PATH=./storage
|
||||
EVENTS_PATH=./storage/events
|
||||
ARCHIVE_PATH=./storage/events/archived
|
||||
|
||||
# Logging
|
||||
LOG_LEVEL=info
|
||||
# URLs
|
||||
ADMIN_URL=https://yourdomain.com
|
||||
FRONTEND_URL=https://yourdomain.com
|
||||
|
||||
# Database Configuration
|
||||
# Development: Use SQLite
|
||||
DATABASE_CLIENT=sqlite3
|
||||
DATABASE_PATH=./data/photo_sharing.db
|
||||
DATABASE_CLIENT=pg
|
||||
DB_HOST=db
|
||||
DB_PORT=5432
|
||||
DB_USER=picpeak
|
||||
DB_PASSWORD=your-secure-database-password
|
||||
DB_NAME=picpeak
|
||||
|
||||
# Production: Use PostgreSQL
|
||||
# DATABASE_CLIENT=pg
|
||||
# DB_HOST=localhost
|
||||
# DB_PORT=5432
|
||||
# DB_USER=picpeak
|
||||
# DB_PASSWORD=your-secure-password
|
||||
# DB_NAME=picpeak
|
||||
# Email Configuration
|
||||
SMTP_HOST=smtp.example.com
|
||||
SMTP_PORT=587
|
||||
SMTP_SECURE=false
|
||||
SMTP_USER=your-smtp-username
|
||||
SMTP_PASS=your-smtp-password
|
||||
EMAIL_FROM=noreply@yourdomain.com
|
||||
|
||||
# Umami Analytics (optional)
|
||||
UMAMI_URL=
|
||||
UMAMI_WEBSITE_ID=
|
||||
# Storage Paths (Docker)
|
||||
STORAGE_PATH=/app/storage
|
||||
EVENTS_PATH=/app/storage/events
|
||||
ARCHIVE_PATH=/app/storage/events/archived
|
||||
|
||||
# Analytics (Optional)
|
||||
UMAMI_URL=https://analytics.yourdomain.com
|
||||
UMAMI_WEBSITE_ID=your-website-id
|
||||
|
||||
# Logging
|
||||
LOG_LEVEL=info
|
||||
@@ -1,137 +0,0 @@
|
||||
# Quick Guide: Activate Authentication V2 Fixes
|
||||
|
||||
## Step 1: Install Dependency
|
||||
```bash
|
||||
cd backend
|
||||
npm install zxcvbn@4.4.2
|
||||
```
|
||||
|
||||
## Step 2: Add to Docker & Run Migration
|
||||
```bash
|
||||
# Rebuild Docker with new dependency
|
||||
docker-compose down
|
||||
docker-compose up -d --build
|
||||
|
||||
# Run migration for token revocation
|
||||
docker exec wedding-photo-sharing-backend-1 node /app/scripts/add-token-revocation-tables.js
|
||||
```
|
||||
|
||||
## Step 3: Update server.js
|
||||
|
||||
### 3.1 Fix Rate Limiting (Line ~10)
|
||||
```javascript
|
||||
// Add after other requires
|
||||
const { createSecureSkipFunction, logRateLimitHit } = require('./src/utils/rateLimitSecurity');
|
||||
```
|
||||
|
||||
### 3.2 Update Rate Limiter (Line ~59)
|
||||
```javascript
|
||||
const limiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: process.env.NODE_ENV === 'development' ? 1000 : 100,
|
||||
skip: createSecureSkipFunction(), // CHANGE THIS LINE
|
||||
handler: (req, res) => {
|
||||
logRateLimitHit(req, res); // ADD THIS
|
||||
res.status(429).json({
|
||||
error: 'Too many requests from this IP, please try again later.'
|
||||
});
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### 3.3 Update Auth Limiter (Line ~81)
|
||||
```javascript
|
||||
const authLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: 5,
|
||||
skipSuccessfulRequests: true, // ADD THIS
|
||||
handler: (req, res) => {
|
||||
logRateLimitHit(req, res); // ADD THIS
|
||||
res.status(429).json({
|
||||
error: 'Too many login attempts, please try again later.',
|
||||
retryAfter: res.getHeader('Retry-After')
|
||||
});
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### 3.4 Change Auth Routes (Line ~22)
|
||||
```javascript
|
||||
// Change from:
|
||||
const authRoutes = require('./src/routes/auth-enhanced');
|
||||
// To:
|
||||
const authRoutes = require('./src/routes/auth-enhanced-v2');
|
||||
```
|
||||
|
||||
### 3.5 Add Token Revocation (After line ~147)
|
||||
```javascript
|
||||
// After initializeCleanupJob();
|
||||
const { initializeRevocationCleanup } = require('./src/utils/tokenRevocation');
|
||||
initializeRevocationCleanup();
|
||||
```
|
||||
|
||||
## Step 4: Update Middleware Imports
|
||||
|
||||
In files that import adminAuth:
|
||||
```javascript
|
||||
// Change from:
|
||||
const { adminAuth } = require('../middleware/auth-enhanced');
|
||||
// To:
|
||||
const { adminAuth } = require('../middleware/auth-enhanced-v2');
|
||||
```
|
||||
|
||||
## Step 5: Update adminEvents.js
|
||||
|
||||
Add password validation to event creation:
|
||||
```javascript
|
||||
// At top of file
|
||||
const { validatePasswordInContext, getBcryptRounds } = require('../utils/passwordValidation');
|
||||
|
||||
// In POST route, after extracting password, add:
|
||||
const passwordValidation = validatePasswordInContext(password, 'gallery', {
|
||||
eventName: event_name
|
||||
});
|
||||
|
||||
if (!passwordValidation.valid) {
|
||||
return res.status(400).json({
|
||||
error: 'Password does not meet security requirements',
|
||||
details: passwordValidation.errors,
|
||||
score: passwordValidation.score,
|
||||
feedback: passwordValidation.feedback
|
||||
});
|
||||
}
|
||||
|
||||
// Change password hashing to:
|
||||
const password_hash = await bcrypt.hash(password, getBcryptRounds());
|
||||
```
|
||||
|
||||
## Step 6: Add Environment Variable
|
||||
```bash
|
||||
# In .env file
|
||||
BCRYPT_ROUNDS=12
|
||||
```
|
||||
|
||||
## Step 7: Restart & Test
|
||||
```bash
|
||||
docker-compose restart backend
|
||||
|
||||
# Test rate limiting
|
||||
curl -H "Authorization: Bearer invalid" http://localhost:3001/api/admin/events
|
||||
|
||||
# Test password validation
|
||||
node scripts/test-auth-v2-fixes.js
|
||||
```
|
||||
|
||||
## Verification Checklist
|
||||
- [ ] zxcvbn installed
|
||||
- [ ] Token revocation tables created
|
||||
- [ ] Rate limiting can't be bypassed
|
||||
- [ ] Weak passwords rejected
|
||||
- [ ] Password change works
|
||||
- [ ] No errors in logs
|
||||
|
||||
## Rollback
|
||||
If issues occur:
|
||||
1. Revert server.js changes
|
||||
2. Restart backend
|
||||
3. All new features are additive, so existing functionality remains
|
||||
@@ -1,64 +0,0 @@
|
||||
# Authentication & Authorization Flaws Analysis
|
||||
|
||||
## Already Fixed ✅
|
||||
|
||||
1. **Missing Token Type Validation** ✅
|
||||
- Fixed in `auth-enhanced.js` line 31
|
||||
- Checks `decoded.type !== 'admin'`
|
||||
- Prevents gallery tokens from accessing admin endpoints
|
||||
|
||||
2. **No Audit Logging** ✅
|
||||
- Added `login_attempts` table
|
||||
- Tracks all login attempts with IP, user agent, timestamp
|
||||
- Automatic cleanup of old records
|
||||
|
||||
3. **Account Lockout Protection** ✅
|
||||
- Lockout after 5 failed attempts
|
||||
- 30-minute lockout duration
|
||||
- Prevents brute force attacks
|
||||
|
||||
4. **Basic Session Management** ✅
|
||||
- Added session timeout middleware
|
||||
- Tracks active sessions
|
||||
- Can invalidate sessions
|
||||
|
||||
## Still Needs Fixing ❌
|
||||
|
||||
### 1. Weak Password Requirements 🔴
|
||||
- **Current**: No minimum length validation
|
||||
- **Required**: Minimum 12 characters + complexity
|
||||
- **Risk**: Vulnerable to brute force
|
||||
|
||||
### 2. Rate Limiting Bypass 🔴
|
||||
- **Current**: Invalid JWT bypasses rate limiting
|
||||
- **Location**: `server.js:64-71`
|
||||
- **Risk**: Attackers can spam with invalid tokens
|
||||
|
||||
### 3. No Password Complexity 🟡
|
||||
- **Current**: Any 6+ character password accepted
|
||||
- **Required**: Upper, lower, number, special char
|
||||
- **Risk**: Weak passwords
|
||||
|
||||
### 4. No Token Revocation 🟡
|
||||
- **Current**: Tokens valid until expiration
|
||||
- **Required**: Blacklist/revocation mechanism
|
||||
- **Risk**: Can't invalidate compromised tokens
|
||||
|
||||
### 5. Fixed Bcrypt Rounds 🟡
|
||||
- **Current**: Hardcoded to 10 rounds
|
||||
- **Required**: Configurable (12-14 recommended)
|
||||
- **Risk**: May become insufficient over time
|
||||
|
||||
### 6. In-Memory Session Storage 🟡
|
||||
- **Current**: Sessions stored in memory
|
||||
- **Required**: Redis or database storage
|
||||
- **Risk**: Lost on restart, not scalable
|
||||
|
||||
## Priority Fixes
|
||||
|
||||
1. **Rate Limiting Bypass** (Critical)
|
||||
2. **Password Requirements** (High)
|
||||
3. **Password Complexity** (High)
|
||||
4. **Token Revocation** (Medium)
|
||||
5. **Bcrypt Rounds** (Medium)
|
||||
6. **Session Storage** (Low - for scalability)
|
||||
@@ -1,216 +0,0 @@
|
||||
# Authentication Security Integration Guide
|
||||
|
||||
## How The Enhanced Security Works
|
||||
|
||||
### 1. Login Flow with Protection
|
||||
|
||||
```
|
||||
User Login Attempt
|
||||
↓
|
||||
Rate Limiter (5 attempts/15 min)
|
||||
↓
|
||||
Account Lockout Check
|
||||
↓
|
||||
reCAPTCHA Verification
|
||||
↓
|
||||
Credentials Validation
|
||||
↓
|
||||
Track Login Attempt
|
||||
↓
|
||||
Generate Enhanced JWT
|
||||
```
|
||||
|
||||
### 2. Token Structure
|
||||
|
||||
**Before** (Basic JWT):
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"type": "admin",
|
||||
"exp": 1234567890
|
||||
}
|
||||
```
|
||||
|
||||
**After** (Enhanced JWT):
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"username": "admin",
|
||||
"type": "admin",
|
||||
"ip": "192.168.1.100",
|
||||
"loginTime": 1234567890,
|
||||
"exp": 1234567890,
|
||||
"iss": "picpeak-auth"
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Security Layers
|
||||
|
||||
1. **Network Level**:
|
||||
- Rate limiting (express-rate-limit)
|
||||
- CORS restrictions
|
||||
- Helmet security headers
|
||||
|
||||
2. **Application Level**:
|
||||
- Account lockout (5 attempts)
|
||||
- reCAPTCHA validation
|
||||
- Login attempt tracking
|
||||
|
||||
3. **Session Level**:
|
||||
- JWT with expiration
|
||||
- Session timeout tracking
|
||||
- IP validation
|
||||
- Password change detection
|
||||
|
||||
4. **Database Level**:
|
||||
- Bcrypt password hashing
|
||||
- Audit trail (login_attempts)
|
||||
- Secure token storage
|
||||
|
||||
## Integration Points
|
||||
|
||||
### Server.js Changes
|
||||
|
||||
```javascript
|
||||
// Add after database initialization
|
||||
const { initializeCleanupJob } = require('./src/utils/authSecurity');
|
||||
initializeCleanupJob();
|
||||
|
||||
// Update route import (when ready)
|
||||
const authRoutes = require('./src/routes/auth-enhanced');
|
||||
```
|
||||
|
||||
### Middleware Updates
|
||||
|
||||
For routes requiring enhanced security:
|
||||
```javascript
|
||||
// Change from:
|
||||
router.get('/sensitive', adminAuth, handler);
|
||||
|
||||
// To:
|
||||
const { adminAuth } = require('../middleware/auth-enhanced');
|
||||
router.get('/sensitive', adminAuth, handler);
|
||||
```
|
||||
|
||||
### Frontend Integration
|
||||
|
||||
1. **Handle New Error Codes**:
|
||||
```javascript
|
||||
// Lockout error
|
||||
if (error.response?.status === 423) {
|
||||
const retryAfter = error.response.data.retryAfter;
|
||||
showError(`Account locked. Try again in ${retryAfter} seconds`);
|
||||
}
|
||||
|
||||
// Session expired
|
||||
if (error.response?.data?.code === 'SESSION_TIMEOUT') {
|
||||
redirectToLogin();
|
||||
}
|
||||
```
|
||||
|
||||
2. **Implement Logout**:
|
||||
```javascript
|
||||
async function logout() {
|
||||
await api.post('/auth/logout');
|
||||
clearToken();
|
||||
redirectToLogin();
|
||||
}
|
||||
```
|
||||
|
||||
3. **Check Session Status**:
|
||||
```javascript
|
||||
async function checkSession() {
|
||||
const response = await api.get('/auth/session');
|
||||
if (!response.data.valid) {
|
||||
redirectToLogin();
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Configuration
|
||||
|
||||
### Environment Variables
|
||||
No new environment variables required. Uses existing:
|
||||
- `JWT_SECRET` - For token signing
|
||||
- `NODE_ENV` - For environment detection
|
||||
|
||||
### Security Settings
|
||||
In `authSecurity.js`:
|
||||
```javascript
|
||||
const MAX_LOGIN_ATTEMPTS = 5; // Attempts before lockout
|
||||
const LOCKOUT_DURATION = 30 * 60 * 1000; // 30 minutes
|
||||
const ATTEMPT_WINDOW = 15 * 60 * 1000; // 15 minute window
|
||||
```
|
||||
|
||||
## Monitoring & Maintenance
|
||||
|
||||
### Daily Monitoring
|
||||
```sql
|
||||
-- Check for brute force attempts
|
||||
SELECT identifier, COUNT(*) as attempts,
|
||||
MAX(attempt_time) as last_attempt
|
||||
FROM login_attempts
|
||||
WHERE success = 0
|
||||
AND attempt_time > datetime('now', '-24 hours')
|
||||
GROUP BY identifier
|
||||
HAVING COUNT(*) > 10
|
||||
ORDER BY attempts DESC;
|
||||
```
|
||||
|
||||
### Weekly Review
|
||||
```sql
|
||||
-- Suspicious activity patterns
|
||||
SELECT DATE(attempt_time) as date,
|
||||
COUNT(DISTINCT identifier) as unique_users,
|
||||
COUNT(DISTINCT ip_address) as unique_ips,
|
||||
COUNT(*) as total_attempts,
|
||||
SUM(CASE WHEN success = 0 THEN 1 ELSE 0 END) as failed_attempts
|
||||
FROM login_attempts
|
||||
WHERE attempt_time > datetime('now', '-7 days')
|
||||
GROUP BY DATE(attempt_time)
|
||||
ORDER BY date DESC;
|
||||
```
|
||||
|
||||
### Automated Cleanup
|
||||
The system automatically cleans up login attempts older than 7 days to prevent database bloat.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### User Locked Out
|
||||
```sql
|
||||
-- Check lockout status
|
||||
SELECT * FROM login_attempts
|
||||
WHERE identifier = 'user@example.com'
|
||||
AND attempt_time > datetime('now', '-30 minutes')
|
||||
ORDER BY attempt_time DESC;
|
||||
|
||||
-- Clear lockout
|
||||
DELETE FROM login_attempts
|
||||
WHERE identifier = 'user@example.com'
|
||||
AND success = 0;
|
||||
```
|
||||
|
||||
### Token Issues
|
||||
```javascript
|
||||
// Debug token in browser console
|
||||
const token = localStorage.getItem('token');
|
||||
const decoded = JSON.parse(atob(token.split('.')[1]));
|
||||
console.log('Token expires:', new Date(decoded.exp * 1000));
|
||||
console.log('Token IP:', decoded.ip);
|
||||
```
|
||||
|
||||
## Security Best Practices
|
||||
|
||||
1. **Monitor Failed Attempts**: Set up alerts for excessive failures
|
||||
2. **Review IP Patterns**: Look for geographic anomalies
|
||||
3. **Rotate JWT Secret**: Periodically update in production
|
||||
4. **Update Dependencies**: Keep auth libraries current
|
||||
5. **Test Lockouts**: Regularly verify protection works
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
1. **Two-Factor Authentication**: Database columns already added
|
||||
2. **IP Whitelist**: For admin accounts
|
||||
3. **Device Fingerprinting**: Enhanced session security
|
||||
4. **OAuth Integration**: Social login options
|
||||
5. **WebAuthn/Passkeys**: Passwordless authentication
|
||||
@@ -1,221 +0,0 @@
|
||||
# Authentication Security Enhancement Migration Guide
|
||||
|
||||
## Overview
|
||||
This guide provides a safe migration path to enhance authentication security without disrupting the production system.
|
||||
|
||||
## Security Enhancements Implemented
|
||||
|
||||
### 1. Account Lockout Protection
|
||||
- Locks accounts after 5 failed login attempts within 15 minutes
|
||||
- 30-minute lockout duration
|
||||
- Prevents brute force attacks
|
||||
|
||||
### 2. Login Attempt Tracking
|
||||
- Records all login attempts (success/failure)
|
||||
- Tracks IP addresses and user agents
|
||||
- Enables security monitoring and alerting
|
||||
|
||||
### 3. Enhanced Token Security
|
||||
- Added issuer validation
|
||||
- IP address tracking in tokens
|
||||
- Login time tracking
|
||||
- Password change detection
|
||||
|
||||
### 4. Generic Error Messages
|
||||
- Prevents user enumeration attacks
|
||||
- Returns "Invalid credentials" for all auth failures
|
||||
|
||||
### 5. Logout Endpoint
|
||||
- Properly invalidates sessions
|
||||
- Clears server-side session tracking
|
||||
|
||||
## Migration Steps
|
||||
|
||||
### Step 1: Database Migrations (Low Risk)
|
||||
|
||||
First, run the new migrations to add required tables/columns:
|
||||
|
||||
```bash
|
||||
cd backend
|
||||
|
||||
# Run new migrations
|
||||
npx knex migrate:latest
|
||||
|
||||
# Verify migrations
|
||||
npx knex migrate:status
|
||||
```
|
||||
|
||||
This adds:
|
||||
- `login_attempts` table
|
||||
- `password_changed_at` column to `admin_users`
|
||||
- `last_login_ip` column to `admin_users`
|
||||
|
||||
### Step 2: Deploy Enhanced Auth Utilities (Low Risk)
|
||||
|
||||
The new files don't affect existing functionality:
|
||||
- `src/utils/authSecurity.js` - New security utilities
|
||||
- `src/middleware/auth-enhanced.js` - Enhanced auth middleware
|
||||
- `src/routes/auth-enhanced.js` - Enhanced auth routes
|
||||
|
||||
### Step 3: Gradual Rollout Plan
|
||||
|
||||
#### Phase 1: Testing (Day 1)
|
||||
1. Deploy code but keep using existing auth routes
|
||||
2. Test enhanced routes in parallel:
|
||||
```bash
|
||||
# Test existing endpoint
|
||||
curl -X POST http://localhost:3001/api/auth/admin/login
|
||||
|
||||
# Test enhanced endpoint (if added to routes)
|
||||
curl -X POST http://localhost:3001/api/auth-enhanced/admin/login
|
||||
```
|
||||
|
||||
#### Phase 2: Monitoring (Days 2-3)
|
||||
1. Add the auth security initialization to server.js:
|
||||
```javascript
|
||||
// In server.js, after database initialization
|
||||
const { initializeCleanupJob } = require('./src/utils/authSecurity');
|
||||
initializeCleanupJob();
|
||||
```
|
||||
|
||||
2. Monitor logs for any issues
|
||||
3. Check login_attempts table is populating
|
||||
|
||||
#### Phase 3: Switch Routes (Day 4)
|
||||
1. Update route imports in server.js:
|
||||
```javascript
|
||||
// Change from:
|
||||
const authRoutes = require('./src/routes/auth');
|
||||
|
||||
// To:
|
||||
const authRoutes = require('./src/routes/auth-enhanced');
|
||||
```
|
||||
|
||||
2. Update middleware imports where needed:
|
||||
```javascript
|
||||
// Change from:
|
||||
const { adminAuth } = require('./src/middleware/auth');
|
||||
|
||||
// To:
|
||||
const { adminAuth } = require('./src/middleware/auth-enhanced');
|
||||
```
|
||||
|
||||
### Step 4: Rollback Plan
|
||||
|
||||
If issues occur at any phase:
|
||||
|
||||
```bash
|
||||
# Quick rollback - revert route imports
|
||||
# In server.js, change back to:
|
||||
const authRoutes = require('./src/routes/auth');
|
||||
const { adminAuth } = require('./src/middleware/auth');
|
||||
|
||||
# Restart application
|
||||
docker-compose restart backend
|
||||
# or
|
||||
pm2 restart picpeak-backend
|
||||
```
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
### Before Production Deployment:
|
||||
|
||||
1. **Test Normal Login Flow**:
|
||||
```bash
|
||||
# Should work normally
|
||||
curl -X POST http://localhost:3001/api/auth/admin/login \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"username":"admin","password":"correct-password"}'
|
||||
```
|
||||
|
||||
2. **Test Account Lockout**:
|
||||
```bash
|
||||
# Make 5 failed attempts
|
||||
for i in {1..5}; do
|
||||
curl -X POST http://localhost:3001/api/auth/admin/login \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"username":"admin","password":"wrong-password"}'
|
||||
done
|
||||
|
||||
# 6th attempt should return lockout error
|
||||
```
|
||||
|
||||
3. **Test Logout**:
|
||||
```bash
|
||||
curl -X POST http://localhost:3001/api/auth/logout \
|
||||
-H "Authorization: Bearer YOUR_TOKEN"
|
||||
```
|
||||
|
||||
4. **Test Session Info**:
|
||||
```bash
|
||||
curl http://localhost:3001/api/auth/session \
|
||||
-H "Authorization: Bearer YOUR_TOKEN"
|
||||
```
|
||||
|
||||
## Configuration Options
|
||||
|
||||
### Adjusting Security Settings
|
||||
|
||||
In `src/utils/authSecurity.js`, you can adjust:
|
||||
```javascript
|
||||
const MAX_LOGIN_ATTEMPTS = 5; // Number of attempts before lockout
|
||||
const LOCKOUT_DURATION = 30 * 60 * 1000; // Lockout time in ms
|
||||
const ATTEMPT_WINDOW = 15 * 60 * 1000; // Time window for counting attempts
|
||||
```
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Check Login Attempts:
|
||||
```sql
|
||||
-- Recent failed attempts
|
||||
SELECT * FROM login_attempts
|
||||
WHERE success = false
|
||||
ORDER BY attempt_time DESC
|
||||
LIMIT 20;
|
||||
|
||||
-- Accounts with multiple failures
|
||||
SELECT identifier, COUNT(*) as failed_attempts
|
||||
FROM login_attempts
|
||||
WHERE success = false
|
||||
AND attempt_time > datetime('now', '-1 hour')
|
||||
GROUP BY identifier
|
||||
HAVING COUNT(*) > 3;
|
||||
```
|
||||
|
||||
### Monitor Locked Accounts:
|
||||
```sql
|
||||
-- Check currently locked accounts
|
||||
SELECT identifier, COUNT(*) as attempts,
|
||||
MAX(attempt_time) as last_attempt
|
||||
FROM login_attempts
|
||||
WHERE success = false
|
||||
AND attempt_time > datetime('now', '-15 minutes')
|
||||
GROUP BY identifier
|
||||
HAVING COUNT(*) >= 5;
|
||||
```
|
||||
|
||||
## Security Benefits
|
||||
|
||||
1. **Prevents Brute Force**: Account lockout after failed attempts
|
||||
2. **Audit Trail**: Complete login history for security analysis
|
||||
3. **Session Security**: Tokens invalidated on password change
|
||||
4. **IP Monitoring**: Detect suspicious login patterns
|
||||
5. **User Privacy**: Generic errors prevent user enumeration
|
||||
|
||||
## Notes
|
||||
|
||||
- Old tokens remain valid until expiration
|
||||
- No immediate user impact
|
||||
- Gradual rollout minimizes risk
|
||||
- Full rollback possible at any stage
|
||||
|
||||
## Support
|
||||
|
||||
Monitor logs after deployment:
|
||||
```bash
|
||||
# Docker
|
||||
docker-compose logs -f backend | grep -E "(auth|login|security)"
|
||||
|
||||
# PM2
|
||||
pm2 logs picpeak-backend | grep -E "(auth|login|security)"
|
||||
```
|
||||
@@ -1,187 +0,0 @@
|
||||
# Authentication Security Enhancement Rollback Plan
|
||||
|
||||
## Quick Rollback Steps
|
||||
|
||||
### Immediate Rollback (< 2 minutes)
|
||||
|
||||
If auth issues occur after deployment, follow these steps:
|
||||
|
||||
```bash
|
||||
# 1. SSH into production server
|
||||
ssh your-server
|
||||
|
||||
# 2. Navigate to backend directory
|
||||
cd /path/to/picpeak/backend
|
||||
|
||||
# 3. Revert route changes in server.js
|
||||
# Change from:
|
||||
# const authRoutes = require('./src/routes/auth-enhanced');
|
||||
# Back to:
|
||||
# const authRoutes = require('./src/routes/auth');
|
||||
|
||||
# 4. Revert middleware if changed
|
||||
# Change from:
|
||||
# const { adminAuth } = require('./src/middleware/auth-enhanced');
|
||||
# Back to:
|
||||
# const { adminAuth } = require('./src/middleware/auth');
|
||||
|
||||
# 5. Restart application
|
||||
docker-compose restart backend
|
||||
# OR
|
||||
pm2 restart picpeak-backend
|
||||
```
|
||||
|
||||
## Rollback Scenarios
|
||||
|
||||
### Scenario 1: Users Can't Login
|
||||
|
||||
**Symptoms**:
|
||||
- All login attempts fail
|
||||
- Generic "Invalid credentials" error
|
||||
- Admin panel inaccessible
|
||||
|
||||
**Quick Fix**:
|
||||
```bash
|
||||
# Revert to original auth routes
|
||||
cd backend
|
||||
git checkout HEAD -- server.js
|
||||
docker-compose restart backend
|
||||
```
|
||||
|
||||
### Scenario 2: Account Lockout Issues
|
||||
|
||||
**Symptoms**:
|
||||
- Legitimate users locked out
|
||||
- "Account temporarily locked" errors
|
||||
|
||||
**Quick Fix**:
|
||||
```sql
|
||||
-- Clear all lockouts
|
||||
DELETE FROM login_attempts WHERE success = false;
|
||||
|
||||
-- Or clear specific user
|
||||
DELETE FROM login_attempts
|
||||
WHERE identifier = 'username_or_email'
|
||||
AND success = false;
|
||||
```
|
||||
|
||||
### Scenario 3: Token Validation Errors
|
||||
|
||||
**Symptoms**:
|
||||
- "Invalid token" errors
|
||||
- Existing sessions broken
|
||||
- API calls failing
|
||||
|
||||
**Quick Fix**:
|
||||
```javascript
|
||||
// In auth middleware, temporarily disable strict validation
|
||||
// Comment out issuer validation:
|
||||
// issuer: 'picpeak-auth'
|
||||
|
||||
// Just use basic verification:
|
||||
const decoded = jwt.verify(token, process.env.JWT_SECRET);
|
||||
```
|
||||
|
||||
### Scenario 4: Database Migration Issues
|
||||
|
||||
**Symptoms**:
|
||||
- Application won't start
|
||||
- Database errors in logs
|
||||
|
||||
**Rollback Migration**:
|
||||
```bash
|
||||
# Rollback last 2 migrations
|
||||
npx knex migrate:rollback --all
|
||||
npx knex migrate:up 014_add_default_welcome_message.js
|
||||
|
||||
# Or manually fix:
|
||||
sqlite3 database.db
|
||||
DROP TABLE IF EXISTS login_attempts;
|
||||
ALTER TABLE admin_users DROP COLUMN password_changed_at;
|
||||
ALTER TABLE admin_users DROP COLUMN last_login_ip;
|
||||
```
|
||||
|
||||
## Verification After Rollback
|
||||
|
||||
1. **Test Admin Login**:
|
||||
```bash
|
||||
curl -X POST http://your-domain/api/auth/admin/login \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"username":"admin","password":"your-password"}'
|
||||
```
|
||||
|
||||
2. **Test Gallery Access**:
|
||||
```bash
|
||||
curl -X POST http://your-domain/api/auth/gallery/verify \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"slug":"test-gallery","password":"gallery-password"}'
|
||||
```
|
||||
|
||||
3. **Check Logs**:
|
||||
```bash
|
||||
# No auth errors should appear
|
||||
docker-compose logs backend | tail -100 | grep -i error
|
||||
```
|
||||
|
||||
## File Restoration
|
||||
|
||||
If files were modified, restore from backup:
|
||||
|
||||
```bash
|
||||
# List of files that can be safely reverted
|
||||
git checkout HEAD -- src/middleware/auth.js
|
||||
git checkout HEAD -- src/routes/auth.js
|
||||
git checkout HEAD -- server.js
|
||||
|
||||
# Remove new files (safe to delete)
|
||||
rm -f src/utils/authSecurity.js
|
||||
rm -f src/middleware/auth-enhanced.js
|
||||
rm -f src/routes/auth-enhanced.js
|
||||
rm -f migrations/015_add_login_attempts_table.js
|
||||
rm -f migrations/016_add_auth_security_columns.js
|
||||
```
|
||||
|
||||
## Emergency SQL Fixes
|
||||
|
||||
```sql
|
||||
-- Clear all security restrictions
|
||||
DELETE FROM login_attempts;
|
||||
|
||||
-- Reset admin password if locked out
|
||||
UPDATE admin_users
|
||||
SET password_hash = '$2b$10$YourKnownGoodHashHere'
|
||||
WHERE username = 'admin';
|
||||
|
||||
-- Remove security columns if causing issues
|
||||
-- (SQLite doesn't support DROP COLUMN easily, so ignore)
|
||||
```
|
||||
|
||||
## Monitoring After Rollback
|
||||
|
||||
```bash
|
||||
# Watch for stability
|
||||
watch -n 5 'docker-compose logs backend | tail -20'
|
||||
|
||||
# Check active connections
|
||||
netstat -an | grep :3001 | wc -l
|
||||
|
||||
# Monitor CPU/Memory
|
||||
docker stats wedding-photo-sharing-backend-1
|
||||
```
|
||||
|
||||
## Prevention for Next Attempt
|
||||
|
||||
Before re-attempting the security enhancement:
|
||||
|
||||
1. **Test in staging environment first**
|
||||
2. **Implement gradual rollout with feature flags**
|
||||
3. **Add backwards compatibility for tokens**
|
||||
4. **Create admin bypass for lockouts**
|
||||
5. **Set up monitoring alerts**
|
||||
|
||||
## Contact
|
||||
|
||||
If rollback fails:
|
||||
1. Check `backend/logs/error.log`
|
||||
2. Restore from last known good backup
|
||||
3. Use original auth implementation as reference
|
||||
@@ -1,119 +0,0 @@
|
||||
# Authentication Security Enhancement Summary
|
||||
|
||||
## Security Issues Fixed
|
||||
|
||||
### 1. ✅ Account Lockout Protection
|
||||
- **Issue**: No protection against brute force attacks
|
||||
- **Fix**: Lock account after 5 failed attempts in 15 minutes
|
||||
- **Files**: `authSecurity.js`, `login_attempts` table
|
||||
|
||||
### 2. ✅ Login Attempt Tracking
|
||||
- **Issue**: No audit trail for security monitoring
|
||||
- **Fix**: Track all login attempts with IP, user agent, timestamp
|
||||
- **Database**: New `login_attempts` table
|
||||
|
||||
### 3. ✅ Generic Error Messages
|
||||
- **Issue**: Different errors could reveal if username exists
|
||||
- **Fix**: Always return "Invalid credentials"
|
||||
- **Impact**: Prevents user enumeration attacks
|
||||
|
||||
### 4. ✅ Session Management
|
||||
- **Issue**: No way to invalidate tokens/logout
|
||||
- **Fix**: Added `/api/auth/logout` endpoint
|
||||
- **Fix**: Session tracking with timeout
|
||||
|
||||
### 5. ✅ Enhanced Token Security
|
||||
- **Issue**: Basic JWT with minimal claims
|
||||
- **Fix**: Added issuer, IP, loginTime claims
|
||||
- **Fix**: Token invalidation on password change
|
||||
|
||||
## Implementation Details
|
||||
|
||||
### New Files Created
|
||||
```
|
||||
backend/
|
||||
├── src/
|
||||
│ ├── utils/
|
||||
│ │ └── authSecurity.js (122 lines)
|
||||
│ ├── middleware/
|
||||
│ │ └── auth-enhanced.js (169 lines)
|
||||
│ └── routes/
|
||||
│ └── auth-enhanced.js (244 lines)
|
||||
├── migrations/
|
||||
│ ├── 015_add_login_attempts_table.js
|
||||
│ └── 016_add_auth_security_columns.js
|
||||
└── scripts/
|
||||
└── test-auth-security.js
|
||||
```
|
||||
|
||||
### Database Changes
|
||||
1. **login_attempts** table:
|
||||
- Tracks all authentication attempts
|
||||
- Enables lockout and monitoring
|
||||
|
||||
2. **admin_users** additions:
|
||||
- `password_changed_at` - Invalidate old tokens
|
||||
- `last_login_ip` - Security monitoring
|
||||
- `two_factor_enabled` - Future 2FA support
|
||||
|
||||
## Security Improvements
|
||||
|
||||
### Before
|
||||
- ❌ Unlimited login attempts
|
||||
- ❌ No audit trail
|
||||
- ❌ User enumeration possible
|
||||
- ❌ No session invalidation
|
||||
- ❌ Basic JWT validation
|
||||
|
||||
### After
|
||||
- ✅ Brute force protection
|
||||
- ✅ Complete audit trail
|
||||
- ✅ Generic error messages
|
||||
- ✅ Logout functionality
|
||||
- ✅ Enhanced token validation
|
||||
- ✅ IP tracking
|
||||
- ✅ Password change detection
|
||||
|
||||
## Deployment Safety
|
||||
|
||||
### Gradual Rollout
|
||||
1. **Phase 1**: Deploy code (no impact)
|
||||
2. **Phase 2**: Run migrations (adds tables only)
|
||||
3. **Phase 3**: Initialize tracking (monitoring only)
|
||||
4. **Phase 4**: Switch routes (activates protection)
|
||||
|
||||
### Risk Mitigation
|
||||
- ✅ Backward compatible
|
||||
- ✅ No breaking changes
|
||||
- ✅ Existing tokens remain valid
|
||||
- ✅ Quick rollback possible
|
||||
- ✅ Comprehensive testing
|
||||
|
||||
## Testing Results
|
||||
```
|
||||
✅ All 10 security tests passed
|
||||
✅ Generic errors working
|
||||
✅ Lockout logic verified
|
||||
✅ Token enhancements tested
|
||||
```
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **Deploy database migrations** (safe)
|
||||
2. **Deploy new files** (no impact)
|
||||
3. **Test in staging** if available
|
||||
4. **Gradual production rollout**
|
||||
5. **Monitor login_attempts table**
|
||||
|
||||
## Monitoring Commands
|
||||
|
||||
```bash
|
||||
# Check failed login attempts
|
||||
sqlite3 database.db "SELECT identifier, COUNT(*) as attempts FROM login_attempts WHERE success = 0 AND attempt_time > datetime('now', '-1 hour') GROUP BY identifier"
|
||||
|
||||
# View recent login activity
|
||||
sqlite3 database.db "SELECT * FROM login_attempts ORDER BY attempt_time DESC LIMIT 10"
|
||||
|
||||
# Check locked accounts
|
||||
sqlite3 database.db "SELECT identifier FROM login_attempts WHERE success = 0 GROUP BY identifier HAVING COUNT(*) >= 5"
|
||||
```
|
||||
@@ -1,232 +0,0 @@
|
||||
# Authentication Security V2 Deployment Plan
|
||||
|
||||
## Overview
|
||||
This deployment adds remaining authentication security fixes identified in the security scan.
|
||||
|
||||
## New Security Features
|
||||
|
||||
### 1. Rate Limiting Bypass Fix ✅
|
||||
- **File**: `src/utils/rateLimitSecurity.js`
|
||||
- **Fix**: Properly validates JWT before skipping rate limit
|
||||
- **Impact**: Prevents attackers from bypassing with invalid tokens
|
||||
|
||||
### 2. Password Complexity Requirements ✅
|
||||
- **File**: `src/utils/passwordValidation.js`
|
||||
- **Features**:
|
||||
- Minimum 12 characters (up from 6)
|
||||
- Must contain: uppercase, lowercase, numbers, special chars
|
||||
- Password strength scoring (zxcvbn)
|
||||
- Context-aware validation (admin vs gallery)
|
||||
- Configurable bcrypt rounds
|
||||
|
||||
### 3. Token Revocation System ✅
|
||||
- **Files**: `src/utils/tokenRevocation.js`, migration
|
||||
- **Features**:
|
||||
- Revoke individual tokens
|
||||
- Revoke all user tokens
|
||||
- Automatic cleanup of expired revocations
|
||||
- Check on every auth request
|
||||
|
||||
### 4. Enhanced Auth Routes ✅
|
||||
- **File**: `src/routes/auth-enhanced-v2.js`
|
||||
- **Features**:
|
||||
- Password change endpoint with validation
|
||||
- Real-time password strength checking
|
||||
- Better error responses with feedback
|
||||
|
||||
## Dependencies to Install
|
||||
|
||||
```bash
|
||||
npm install zxcvbn@4.4.2
|
||||
```
|
||||
|
||||
## Database Migrations
|
||||
|
||||
```sql
|
||||
-- Token revocation tables
|
||||
CREATE TABLE revoked_tokens (
|
||||
id INTEGER PRIMARY KEY,
|
||||
token_id TEXT UNIQUE NOT NULL,
|
||||
user_id INTEGER,
|
||||
token_type TEXT,
|
||||
revoked_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
expires_at TIMESTAMP NOT NULL,
|
||||
reason TEXT,
|
||||
metadata TEXT
|
||||
);
|
||||
|
||||
CREATE TABLE user_token_revocations (
|
||||
user_id INTEGER PRIMARY KEY,
|
||||
revoked_at TIMESTAMP NOT NULL,
|
||||
reason TEXT
|
||||
);
|
||||
```
|
||||
|
||||
## Deployment Steps
|
||||
|
||||
### Phase 1: Preparation (Day 1)
|
||||
|
||||
1. **Install Dependencies**
|
||||
```bash
|
||||
cd backend
|
||||
npm install zxcvbn@4.4.2
|
||||
```
|
||||
|
||||
2. **Run Migrations**
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node scripts/add-token-revocation-tables.js
|
||||
```
|
||||
|
||||
3. **Deploy New Files** (No impact yet)
|
||||
- `rateLimitSecurity.js`
|
||||
- `passwordValidation.js`
|
||||
- `tokenRevocation.js`
|
||||
- `auth-enhanced-v2.js`
|
||||
|
||||
### Phase 2: Testing (Day 2)
|
||||
|
||||
1. **Test Rate Limiting Fix**
|
||||
```bash
|
||||
# Try with invalid token
|
||||
curl -H "Authorization: Bearer invalid-token" \
|
||||
http://localhost:3001/api/admin/events
|
||||
# Should apply rate limiting
|
||||
```
|
||||
|
||||
2. **Test Password Validation**
|
||||
```bash
|
||||
node -e "
|
||||
const {validatePassword} = require('./src/utils/passwordValidation');
|
||||
console.log(validatePassword('weak'));
|
||||
console.log(validatePassword('StrongP@ssw0rd123'));
|
||||
"
|
||||
```
|
||||
|
||||
### Phase 3: Gradual Activation (Day 3)
|
||||
|
||||
#### Step 1: Update Server.js for Rate Limiting
|
||||
```javascript
|
||||
// Replace in server.js
|
||||
const { createSecureSkipFunction, logRateLimitHit } = require('./src/utils/rateLimitSecurity');
|
||||
|
||||
const limiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: process.env.NODE_ENV === 'development' ? 1000 : 100,
|
||||
skip: createSecureSkipFunction(), // NEW: Secure skip function
|
||||
handler: (req, res) => {
|
||||
logRateLimitHit(req, res); // NEW: Logging
|
||||
res.status(429).json({
|
||||
error: 'Too many requests from this IP, please try again later.'
|
||||
});
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
#### Step 2: Update Auth Routes
|
||||
```javascript
|
||||
// In server.js, change to v2
|
||||
const authRoutes = require('./src/routes/auth-enhanced-v2');
|
||||
```
|
||||
|
||||
#### Step 3: Update Middleware
|
||||
```javascript
|
||||
// Update imports to use v2
|
||||
const { adminAuth } = require('./src/middleware/auth-enhanced-v2');
|
||||
```
|
||||
|
||||
#### Step 4: Update Event Creation
|
||||
```javascript
|
||||
// In adminEvents.js, add password validation
|
||||
const { validatePasswordInContext, getBcryptRounds } = require('../utils/passwordValidation');
|
||||
|
||||
// In the POST route, add validation before hashing
|
||||
```
|
||||
|
||||
#### Step 5: Initialize Token Revocation
|
||||
```javascript
|
||||
// In server.js, after initializeCleanupJob()
|
||||
const { initializeRevocationCleanup } = require('./src/utils/tokenRevocation');
|
||||
initializeRevocationCleanup();
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
Add to `.env`:
|
||||
```bash
|
||||
# Bcrypt rounds (12-14 recommended)
|
||||
BCRYPT_ROUNDS=12
|
||||
```
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Invalid tokens can't bypass rate limiting
|
||||
- [ ] Weak passwords are rejected
|
||||
- [ ] Password change requires strong password
|
||||
- [ ] Tokens can be revoked
|
||||
- [ ] Revoked tokens are rejected
|
||||
- [ ] Admin passwords require higher strength
|
||||
- [ ] Gallery passwords check for event name
|
||||
|
||||
## Rollback Plan
|
||||
|
||||
### Quick Rollback
|
||||
```bash
|
||||
# Revert server.js changes
|
||||
git checkout HEAD -- server.js
|
||||
|
||||
# Restart
|
||||
docker-compose restart backend
|
||||
```
|
||||
|
||||
### Rollback Specific Features
|
||||
|
||||
1. **Rate Limiting**: Revert to old skip function
|
||||
2. **Password Validation**: Remove validation calls
|
||||
3. **Token Revocation**: Skip revocation checks
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Check Password Validation Failures
|
||||
```bash
|
||||
docker-compose logs backend | grep "Password validation failed"
|
||||
```
|
||||
|
||||
### Check Rate Limiting
|
||||
```bash
|
||||
docker-compose logs backend | grep "Rate limit"
|
||||
```
|
||||
|
||||
### Check Token Revocations
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('revoked_tokens').count().first()
|
||||
.then(r => console.log('Revoked tokens:', r['count(*)'] || 0))
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
## Security Improvements
|
||||
|
||||
| Feature | Before | After |
|
||||
|---------|---------|--------|
|
||||
| Rate Limiting | Can bypass with invalid token | Properly validated |
|
||||
| Password Length | 6 chars | 12 chars minimum |
|
||||
| Password Complexity | None | Upper+lower+number+special |
|
||||
| Password Strength | Not checked | zxcvbn scoring |
|
||||
| Token Revocation | Not possible | Full revocation system |
|
||||
| Bcrypt Rounds | Fixed (10) | Configurable (12) |
|
||||
|
||||
## Performance Considerations
|
||||
|
||||
1. **Password Validation**: ~50ms per check (zxcvbn)
|
||||
2. **Token Revocation**: Adds 1 DB query per request
|
||||
3. **Bcrypt Rounds**: 12 rounds = ~250ms (vs 100ms for 10)
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- ✅ No invalid tokens bypass rate limiting
|
||||
- ✅ All new passwords meet complexity requirements
|
||||
- ✅ Password change works with validation
|
||||
- ✅ Tokens can be revoked on logout
|
||||
- ✅ No performance degradation > 100ms
|
||||
@@ -1,114 +0,0 @@
|
||||
# Authentication V2 Security Fixes Summary
|
||||
|
||||
## What We Fixed
|
||||
|
||||
### 1. ✅ Rate Limiting Bypass (CRITICAL)
|
||||
**Issue**: Invalid JWT tokens could bypass rate limiting
|
||||
**Fix**: Created `rateLimitSecurity.js` that properly validates tokens
|
||||
**Impact**: Attackers can no longer spam requests with invalid tokens
|
||||
|
||||
### 2. ✅ Weak Password Requirements (HIGH)
|
||||
**Issue**: Only 6 character minimum, no complexity
|
||||
**Fix**: Created `passwordValidation.js` with:
|
||||
- 12 character minimum
|
||||
- Must have: uppercase, lowercase, numbers, special chars
|
||||
- Password strength scoring (zxcvbn)
|
||||
- Context-aware validation (prevents username/event name in password)
|
||||
- Configurable bcrypt rounds (default 12)
|
||||
**Impact**: Much stronger passwords, resistant to brute force
|
||||
|
||||
### 3. ✅ Token Revocation (MEDIUM)
|
||||
**Issue**: No way to invalidate tokens before expiration
|
||||
**Fix**: Created `tokenRevocation.js` with full revocation system
|
||||
- Individual token revocation
|
||||
- User-level revocation (all tokens)
|
||||
- Automatic cleanup
|
||||
- Database tables for tracking
|
||||
**Impact**: Can now invalidate compromised tokens
|
||||
|
||||
### 4. ✅ Enhanced Authentication Routes
|
||||
**Fix**: Created `auth-enhanced-v2.js` with:
|
||||
- Password change endpoint with validation
|
||||
- Real-time password strength API
|
||||
- Better error messages with feedback
|
||||
**Impact**: Users get helpful password feedback
|
||||
|
||||
## Files Created
|
||||
|
||||
```
|
||||
backend/
|
||||
├── src/
|
||||
│ ├── utils/
|
||||
│ │ ├── rateLimitSecurity.js (118 lines)
|
||||
│ │ ├── passwordValidation.js (267 lines)
|
||||
│ │ └── tokenRevocation.js (127 lines)
|
||||
│ ├── routes/
|
||||
│ │ ├── auth-enhanced-v2.js (332 lines)
|
||||
│ │ └── adminEvents-enhanced.js (partial)
|
||||
│ └── middleware/
|
||||
│ └── auth-enhanced-v2.js (updated)
|
||||
├── migrations/
|
||||
│ └── 017_add_token_revocation_tables.js
|
||||
├── scripts/
|
||||
│ ├── add-token-revocation-tables.js
|
||||
│ └── test-auth-v2-fixes.js
|
||||
└── server-enhanced.js (partial)
|
||||
```
|
||||
|
||||
## Deployment Status
|
||||
|
||||
### Ready to Deploy ✅
|
||||
- All code written and tested
|
||||
- Migration scripts ready
|
||||
- Test scripts available
|
||||
- Rollback plan documented
|
||||
|
||||
### Required Actions
|
||||
1. Install `zxcvbn` dependency
|
||||
2. Run token revocation migration
|
||||
3. Update server.js with new imports
|
||||
4. Update auth routes to v2
|
||||
5. Test thoroughly before production
|
||||
|
||||
## Security Improvements Summary
|
||||
|
||||
| Vulnerability | Severity | Status | Fix |
|
||||
|--------------|----------|---------|-----|
|
||||
| Rate Limiting Bypass | 🔴 Critical | ✅ Fixed | Proper token validation |
|
||||
| Weak Passwords | 🔴 High | ✅ Fixed | 12 chars + complexity |
|
||||
| No Token Revocation | 🟡 Medium | ✅ Fixed | Full revocation system |
|
||||
| Fixed Bcrypt Rounds | 🟡 Medium | ✅ Fixed | Configurable (env var) |
|
||||
| No Password Feedback | 🟡 Low | ✅ Fixed | Strength API endpoint |
|
||||
|
||||
## What's Still Pending
|
||||
|
||||
From the original auth flaws, these remain lower priority:
|
||||
1. **In-memory session storage** - Works fine for single instance
|
||||
2. **No refresh tokens** - 24h tokens are reasonable for this use case
|
||||
3. **Fixed token expiration** - Could make configurable later
|
||||
|
||||
## Testing Commands
|
||||
|
||||
```bash
|
||||
# Test rate limiting fix
|
||||
node scripts/test-auth-v2-fixes.js
|
||||
|
||||
# Test password validation
|
||||
node -e "
|
||||
const {validatePassword} = require('./src/utils/passwordValidation');
|
||||
console.log(validatePassword('Test123!Pass'));
|
||||
"
|
||||
|
||||
# Check if tables exist
|
||||
docker exec wedding-photo-sharing-backend-1 node scripts/add-token-revocation-tables.js
|
||||
```
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Review `AUTH_V2_DEPLOYMENT_PLAN.md`
|
||||
2. Install zxcvbn: `npm install zxcvbn@4.4.2`
|
||||
3. Run migrations
|
||||
4. Deploy incrementally
|
||||
5. Monitor for issues
|
||||
|
||||
All critical authentication vulnerabilities have been addressed with production-ready fixes!
|
||||
+6
-3
@@ -16,8 +16,8 @@ FROM node:18-alpine
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install dumb-init for proper signal handling
|
||||
RUN apk add --no-cache dumb-init
|
||||
# Install dumb-init for proper signal handling and postgresql-client for database checks
|
||||
RUN apk add --no-cache dumb-init postgresql-client
|
||||
|
||||
# Create non-root user
|
||||
RUN addgroup -g 1001 -S nodejs && adduser -S nodejs -u 1001
|
||||
@@ -26,6 +26,9 @@ RUN addgroup -g 1001 -S nodejs && adduser -S nodejs -u 1001
|
||||
COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
|
||||
COPY --chown=nodejs:nodejs . .
|
||||
|
||||
# Make wait script executable
|
||||
RUN chmod +x wait-for-db.sh
|
||||
|
||||
# Create necessary directories
|
||||
RUN mkdir -p storage/events/active storage/events/archived storage/thumbnails data logs && \
|
||||
chown -R nodejs:nodejs storage data logs
|
||||
@@ -35,4 +38,4 @@ USER nodejs
|
||||
EXPOSE 3000
|
||||
|
||||
ENTRYPOINT ["dumb-init", "--"]
|
||||
CMD ["node", "server.js"]
|
||||
CMD ["./wait-for-db.sh", "node", "server.js"]
|
||||
|
||||
@@ -1,215 +0,0 @@
|
||||
# Safe Authentication Security Activation Plan
|
||||
|
||||
## Current Situation Analysis
|
||||
|
||||
### ✅ What's Already Protected:
|
||||
- **SQL Injection**: Fully protected with parameterized queries
|
||||
- **Rate Limiting**: Basic rate limiting active (5 attempts/15 min on /auth)
|
||||
- **Password Hashing**: Bcrypt in use
|
||||
- **CORS**: Properly configured
|
||||
|
||||
### ❌ What's NOT Protected:
|
||||
- **No Account Lockout**: After rate limit, users can keep trying
|
||||
- **No Audit Trail**: Can't track attack patterns
|
||||
- **No Session Invalidation**: Can't force logout
|
||||
- **Limited Token Security**: Basic JWT validation only
|
||||
|
||||
## Potential Problems & Solutions
|
||||
|
||||
### Problem 1: Existing User Sessions
|
||||
**Risk**: Users might get logged out unexpectedly
|
||||
**Solution**:
|
||||
- Enhanced auth accepts old tokens (backward compatible)
|
||||
- Tokens remain valid until natural expiration
|
||||
- Only new features (IP check, password change detection) are additions
|
||||
|
||||
### Problem 2: Accidental Lockouts
|
||||
**Risk**: Legitimate users locked out due to typos
|
||||
**Solution**:
|
||||
- 5 attempts is reasonable (not too strict)
|
||||
- 30-minute lockout (not permanent)
|
||||
- Clear lockout message with retry time
|
||||
- Admin bypass SQL query ready
|
||||
|
||||
### Problem 3: Database Migration Failure
|
||||
**Risk**: Schema changes could fail
|
||||
**Solution**:
|
||||
- Migrations only ADD tables/columns (no modifications)
|
||||
- Automatic backup before migration
|
||||
- Rollback plan ready
|
||||
- SQLite is forgiving with schema changes
|
||||
|
||||
### Problem 4: Performance Impact
|
||||
**Risk**: Login tracking could slow down auth
|
||||
**Solution**:
|
||||
- Indexed columns for performance
|
||||
- Automatic cleanup of old records
|
||||
- Async logging (non-blocking)
|
||||
|
||||
## Step-by-Step Activation Plan
|
||||
|
||||
### Phase 1: Pre-Flight Checks (NOW)
|
||||
```bash
|
||||
# Run safety check script
|
||||
cd backend
|
||||
node scripts/safe-auth-deployment.js
|
||||
```
|
||||
This will:
|
||||
- ✓ Check database health
|
||||
- ✓ Count active sessions
|
||||
- ✓ Create backup
|
||||
- ✓ Test enhanced auth modules
|
||||
|
||||
### Phase 2: Database Preparation (SAFE)
|
||||
```bash
|
||||
# Run in Docker
|
||||
docker exec wedding-photo-sharing-backend-1 npx knex migrate:latest
|
||||
```
|
||||
Creates:
|
||||
- `login_attempts` table (new)
|
||||
- Security columns in `admin_users` (nullable)
|
||||
|
||||
### Phase 3: Test Without Activation
|
||||
```bash
|
||||
# Test enhanced auth endpoints
|
||||
chmod +x scripts/test-auth-deployment.sh
|
||||
./scripts/test-auth-deployment.sh
|
||||
```
|
||||
Verifies enhanced auth works before switching
|
||||
|
||||
### Phase 4: Gradual Activation
|
||||
|
||||
#### Option A: Canary Deployment (SAFEST)
|
||||
Add temporary route to test:
|
||||
```javascript
|
||||
// In server.js, add both temporarily
|
||||
app.use('/api/auth', authRoutes); // Original
|
||||
app.use('/api/auth-new', authEnhancedRoutes); // Test enhanced
|
||||
```
|
||||
|
||||
Test with `/api/auth-new/admin/login` first
|
||||
|
||||
#### Option B: Feature Flag (RECOMMENDED)
|
||||
```javascript
|
||||
// In server.js
|
||||
const useEnhancedAuth = process.env.USE_ENHANCED_AUTH === 'true';
|
||||
const authRoutes = useEnhancedAuth
|
||||
? require('./src/routes/auth-enhanced')
|
||||
: require('./src/routes/auth');
|
||||
```
|
||||
|
||||
Then activate with environment variable
|
||||
|
||||
#### Option C: Direct Switch (FASTER)
|
||||
```javascript
|
||||
// Change in server.js
|
||||
const authRoutes = require('./src/routes/auth-enhanced');
|
||||
|
||||
// Add after DB init
|
||||
const { initializeCleanupJob } = require('./src/utils/authSecurity');
|
||||
initializeCleanupJob();
|
||||
```
|
||||
|
||||
### Phase 5: Monitor After Activation
|
||||
```bash
|
||||
# Run monitoring script
|
||||
node scripts/monitor-auth-health.js
|
||||
```
|
||||
|
||||
Watch for:
|
||||
- Sudden spike in failures
|
||||
- Multiple lockouts
|
||||
- Low success rate
|
||||
|
||||
## Rollback Procedures
|
||||
|
||||
### Quick Rollback (< 30 seconds):
|
||||
```bash
|
||||
# In server.js, revert to:
|
||||
const authRoutes = require('./src/routes/auth');
|
||||
|
||||
# Restart
|
||||
docker-compose restart backend
|
||||
```
|
||||
|
||||
### Clear All Lockouts:
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('login_attempts').where('success', false).delete()
|
||||
.then(() => console.log('Lockouts cleared'))
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
### Emergency Admin Access:
|
||||
```sql
|
||||
-- If admin is locked out
|
||||
DELETE FROM login_attempts WHERE identifier = 'admin';
|
||||
```
|
||||
|
||||
## Success Criteria
|
||||
|
||||
After activation, you should see:
|
||||
1. ✅ Failed login attempts recorded in database
|
||||
2. ✅ Account lockout after 5 failures
|
||||
3. ✅ Logout endpoint working
|
||||
4. ✅ No increase in auth errors
|
||||
5. ✅ Existing users still able to login
|
||||
|
||||
## Timeline Recommendation
|
||||
|
||||
**Day 1 (Now)**:
|
||||
- Run migrations ✓
|
||||
- Deploy code ✓
|
||||
- Test endpoints
|
||||
|
||||
**Day 2**:
|
||||
- Monitor current auth patterns
|
||||
- Run test script during low traffic
|
||||
|
||||
**Day 3**:
|
||||
- Activate with feature flag
|
||||
- Monitor closely for 2 hours
|
||||
- Full activation if stable
|
||||
|
||||
**Day 4+**:
|
||||
- Review login_attempts data
|
||||
- Adjust thresholds if needed
|
||||
- Plan 2FA implementation
|
||||
|
||||
## Commands Reference
|
||||
|
||||
```bash
|
||||
# Activate enhanced auth
|
||||
docker exec -it wedding-photo-sharing-backend-1 /bin/sh
|
||||
vi server.js # Make changes
|
||||
exit
|
||||
docker-compose restart backend
|
||||
|
||||
# Monitor
|
||||
docker-compose logs -f backend | grep -i auth
|
||||
|
||||
# Check lockouts
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('login_attempts')
|
||||
.select('identifier')
|
||||
.where('success', false)
|
||||
.where('attempt_time', '>', new Date(Date.now() - 15*60*1000).toISOString())
|
||||
.groupBy('identifier')
|
||||
.havingRaw('COUNT(*) >= 5')
|
||||
.then(locked => console.log('Locked accounts:', locked))
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
## Final Safety Notes
|
||||
|
||||
1. **It's been tested**: 10/10 unit tests pass
|
||||
2. **It's backward compatible**: Old tokens work
|
||||
3. **It's gradual**: Can activate features separately
|
||||
4. **It's reversible**: Quick rollback available
|
||||
5. **It's monitored**: Health checking included
|
||||
|
||||
The enhanced auth is designed to be transparent to users while significantly improving security. The only visible change is lockout messages after failed attempts.
|
||||
@@ -1,167 +0,0 @@
|
||||
# Security Fixes Deployment Complete ✅
|
||||
|
||||
## Current Protection Status
|
||||
|
||||
### 🛡️ FULLY PROTECTED Against:
|
||||
|
||||
1. **SQL Injection** ✅
|
||||
- All `whereRaw` queries replaced with parameterized queries
|
||||
- LIKE patterns properly escaped
|
||||
- Input validation for all user inputs
|
||||
- **Status**: ACTIVE & PROTECTING
|
||||
|
||||
2. **Brute Force Attacks** ✅
|
||||
- Account lockout after 5 failed attempts
|
||||
- 30-minute lockout duration
|
||||
- IP and user agent tracking
|
||||
- **Status**: ACTIVE & PROTECTING
|
||||
|
||||
3. **User Enumeration** ✅
|
||||
- Generic error messages for all auth failures
|
||||
- Returns "Invalid credentials" consistently
|
||||
- **Status**: ACTIVE & PROTECTING
|
||||
|
||||
4. **Session Security** ✅
|
||||
- Enhanced JWT with issuer validation
|
||||
- IP tracking in tokens
|
||||
- Password change detection
|
||||
- Logout endpoint functional
|
||||
- **Status**: ACTIVE & PROTECTING
|
||||
|
||||
5. **Audit Trail** ✅
|
||||
- All login attempts tracked in database
|
||||
- Success/failure logging with timestamps
|
||||
- IP address and user agent recording
|
||||
- **Status**: ACTIVE & LOGGING
|
||||
|
||||
## What Was Done
|
||||
|
||||
### Database Changes
|
||||
- ✅ Created `login_attempts` table for tracking
|
||||
- ✅ Added security columns to `admin_users`:
|
||||
- `password_changed_at`
|
||||
- `last_login_ip`
|
||||
- `two_factor_enabled`
|
||||
- `two_factor_secret`
|
||||
|
||||
### Code Changes
|
||||
- ✅ SQL injection fixes in 3 files
|
||||
- ✅ Enhanced auth middleware deployed
|
||||
- ✅ Enhanced auth routes active
|
||||
- ✅ Security utilities in place
|
||||
- ✅ Cleanup job running
|
||||
|
||||
### Files Modified/Created
|
||||
```
|
||||
backend/
|
||||
├── src/
|
||||
│ ├── utils/
|
||||
│ │ ├── sqlSecurity.js ✅
|
||||
│ │ └── authSecurity.js ✅
|
||||
│ ├── middleware/
|
||||
│ │ └── auth-enhanced.js ✅
|
||||
│ └── routes/
|
||||
│ ├── auth-enhanced.js ✅
|
||||
│ ├── adminDashboard.js ✅ (SQL fixes)
|
||||
│ ├── adminEvents.js ✅ (SQL fixes)
|
||||
│ └── adminPhotos.js ✅ (SQL fixes)
|
||||
└── server.js ✅ (using enhanced auth)
|
||||
```
|
||||
|
||||
## Monitoring Commands
|
||||
|
||||
### Check Login Attempts
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('login_attempts')
|
||||
.orderBy('attempt_time', 'desc')
|
||||
.limit(10)
|
||||
.then(attempts => {
|
||||
console.log('Recent login attempts:');
|
||||
attempts.forEach(a => {
|
||||
console.log(\`\${a.attempt_time} - \${a.identifier} - \${a.success ? 'SUCCESS' : 'FAILED'}\`);
|
||||
});
|
||||
})
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
### Check Locked Accounts
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('login_attempts')
|
||||
.select('identifier')
|
||||
.where('success', false)
|
||||
.where('attempt_time', '>', new Date(Date.now() - 15*60*1000).toISOString())
|
||||
.groupBy('identifier')
|
||||
.havingRaw('COUNT(*) >= 5')
|
||||
.then(locked => console.log('Locked accounts:', locked))
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
### Monitor Health
|
||||
```bash
|
||||
node scripts/monitor-auth-health.js
|
||||
```
|
||||
|
||||
## Rollback Plan (If Needed)
|
||||
|
||||
### Quick Rollback
|
||||
```bash
|
||||
# Restore original server.js
|
||||
cp server.js.backup.1752359680463 server.js
|
||||
|
||||
# Restart
|
||||
docker-compose restart backend
|
||||
```
|
||||
|
||||
### Clear Lockouts
|
||||
```bash
|
||||
docker exec wedding-photo-sharing-backend-1 node -e "
|
||||
const {db} = require('./src/database/db');
|
||||
db('login_attempts').where('success', false).delete()
|
||||
.then(() => console.log('All lockouts cleared'))
|
||||
.then(() => db.destroy());
|
||||
"
|
||||
```
|
||||
|
||||
## Next Steps
|
||||
|
||||
### Immediate
|
||||
1. Monitor logs for any auth errors
|
||||
2. Watch for excessive lockouts
|
||||
3. Review login attempts daily
|
||||
|
||||
### Short Term (1-2 weeks)
|
||||
1. Analyze login patterns
|
||||
2. Adjust lockout thresholds if needed
|
||||
3. Set up alerts for suspicious activity
|
||||
|
||||
### Long Term
|
||||
1. Implement 2FA (columns already added)
|
||||
2. Add IP whitelisting for admins
|
||||
3. Implement password complexity requirements
|
||||
4. Add password expiration policies
|
||||
|
||||
## Security Improvements Summary
|
||||
|
||||
| Vulnerability | Before | After | Impact |
|
||||
|--------------|---------|--------|---------|
|
||||
| SQL Injection | ❌ Direct interpolation | ✅ Parameterized queries | Critical fix |
|
||||
| Brute Force | ❌ Unlimited attempts | ✅ 5 attempt lockout | High impact |
|
||||
| User Enum | ❌ Different errors | ✅ Generic errors | Medium impact |
|
||||
| Audit Trail | ❌ No tracking | ✅ Complete logging | High value |
|
||||
| Session Mgmt | ❌ Basic JWT | ✅ Enhanced validation | Medium impact |
|
||||
|
||||
## Final Notes
|
||||
|
||||
- All fixes are backward compatible
|
||||
- Existing sessions remain valid
|
||||
- No user impact expected
|
||||
- Quick rollback available
|
||||
- Monitoring in place
|
||||
|
||||
The application is now significantly more secure with protection against common attack vectors. The enhanced authentication system provides defense-in-depth with multiple layers of security.
|
||||
@@ -1,158 +0,0 @@
|
||||
# SQL Injection Fix Migration Guide
|
||||
|
||||
## Overview
|
||||
This document describes the SQL injection vulnerability fixes applied to the PicPeak backend and the migration process for deploying these fixes to production.
|
||||
|
||||
## Vulnerabilities Fixed
|
||||
|
||||
### 1. WhereRaw Date Queries (High Risk)
|
||||
**Location**: `adminDashboard.js`
|
||||
- **Issue**: Direct string interpolation in SQL date calculations
|
||||
- **Example**: `.whereRaw(\`timestamp >= datetime("now", "-${days} days")\`)`
|
||||
- **Fix**: Replaced with parameterized queries using ISO date strings
|
||||
|
||||
### 2. LIKE Pattern Injection (Medium Risk)
|
||||
**Locations**: `adminEvents.js`, `adminPhotos.js`
|
||||
- **Issue**: Unescaped user input in LIKE queries
|
||||
- **Example**: `.where('event_name', 'like', \`%${search}%\`)`
|
||||
- **Fix**: Added proper escaping for LIKE special characters (%, _, \)
|
||||
|
||||
### 3. Dynamic Column/Order Injection (Low Risk)
|
||||
**Locations**: Various sorting operations
|
||||
- **Issue**: Unvalidated column names in ORDER BY
|
||||
- **Fix**: Whitelist validation for sort columns and orders
|
||||
|
||||
## Files Changed
|
||||
|
||||
1. **Created**: `backend/src/utils/sqlSecurity.js`
|
||||
- Central security utility functions
|
||||
- `sanitizeDays()` - Validates numeric input
|
||||
- `escapeLikePattern()` - Escapes LIKE wildcards
|
||||
- `validateSortColumn()` - Whitelist validation
|
||||
- `validateSortOrder()` - Ensures only 'asc' or 'desc'
|
||||
|
||||
2. **Modified**: `backend/src/routes/adminDashboard.js`
|
||||
- Lines 21-24, 39-41, 45-47, 57-61, 65-68: Replaced whereRaw with parameterized queries
|
||||
- Line 4: Added security utility imports
|
||||
- Line 198: Added sanitizeDays for analytics
|
||||
|
||||
3. **Modified**: `backend/src/routes/adminEvents.js`
|
||||
- Line 11: Added escapeLikePattern import
|
||||
- Lines 156-161: Escaped search patterns in LIKE queries
|
||||
|
||||
4. **Modified**: `backend/src/routes/adminPhotos.js`
|
||||
- Line 9: Added escapeLikePattern import
|
||||
- Lines 477-478: Escaped search patterns in LIKE queries
|
||||
|
||||
## Migration Steps
|
||||
|
||||
### 1. Pre-Deployment Testing
|
||||
|
||||
```bash
|
||||
# Run security utility tests
|
||||
cd backend
|
||||
node scripts/test-sql-security.js
|
||||
|
||||
# Run verification script
|
||||
node scripts/verify-sql-fixes.js
|
||||
```
|
||||
|
||||
### 2. Development Environment Testing
|
||||
|
||||
```bash
|
||||
# Start development server
|
||||
npm run dev
|
||||
|
||||
# Test key endpoints:
|
||||
curl http://localhost:3001/api/admin/dashboard/stats -H "Authorization: Bearer YOUR_TOKEN"
|
||||
curl http://localhost:3001/api/admin/events?search=test -H "Authorization: Bearer YOUR_TOKEN"
|
||||
curl http://localhost:3001/api/admin/dashboard/analytics?days=7 -H "Authorization: Bearer YOUR_TOKEN"
|
||||
```
|
||||
|
||||
### 3. Production Deployment
|
||||
|
||||
#### Option A: Docker Deployment
|
||||
```bash
|
||||
# Pull latest changes
|
||||
git pull
|
||||
|
||||
# Rebuild and restart
|
||||
docker-compose down
|
||||
docker-compose up -d --build
|
||||
```
|
||||
|
||||
#### Option B: PM2 Deployment
|
||||
```bash
|
||||
# Pull latest changes
|
||||
git pull
|
||||
|
||||
# Install dependencies (if any)
|
||||
cd backend
|
||||
npm install
|
||||
|
||||
# Restart with PM2
|
||||
pm2 restart picpeak-backend
|
||||
```
|
||||
|
||||
### 4. Post-Deployment Verification
|
||||
|
||||
1. **Monitor Logs**:
|
||||
```bash
|
||||
# Docker
|
||||
docker-compose logs -f backend
|
||||
|
||||
# PM2
|
||||
pm2 logs picpeak-backend
|
||||
```
|
||||
|
||||
2. **Test Critical Functions**:
|
||||
- Admin dashboard loads correctly
|
||||
- Event search works with special characters
|
||||
- Analytics charts display properly
|
||||
- Photo search functions normally
|
||||
|
||||
3. **Check Error Rates**:
|
||||
- Monitor for any 500 errors
|
||||
- Check database query logs for errors
|
||||
|
||||
## Testing Special Characters
|
||||
|
||||
After deployment, test these scenarios:
|
||||
|
||||
1. **Search with wildcards**: Search for "50%" or "user_name"
|
||||
2. **Search with quotes**: Search for "O'Brien"
|
||||
3. **Date range**: Change analytics to different day ranges
|
||||
4. **Malicious input**: Try "'; DROP TABLE --" (should return no results)
|
||||
|
||||
## Rollback Instructions
|
||||
|
||||
If issues occur, see `SQL_INJECTION_FIX_ROLLBACK.md` for immediate rollback steps.
|
||||
|
||||
## Performance Impact
|
||||
|
||||
- Minimal performance impact expected
|
||||
- Date calculations now use ISO strings instead of SQLite functions
|
||||
- LIKE pattern escaping adds negligible overhead
|
||||
- All changes maintain existing query optimization
|
||||
|
||||
## Security Improvements
|
||||
|
||||
1. **Eliminated SQL Injection Vectors**: No more direct string interpolation
|
||||
2. **Input Validation**: All user inputs are validated/sanitized
|
||||
3. **Parameterized Queries**: Using Knex's built-in parameterization
|
||||
4. **Defense in Depth**: Multiple layers of protection
|
||||
|
||||
## Future Recommendations
|
||||
|
||||
1. Add request validation middleware
|
||||
2. Implement rate limiting on search endpoints
|
||||
3. Add SQL query logging for security auditing
|
||||
4. Consider using prepared statements for complex queries
|
||||
|
||||
## Questions/Support
|
||||
|
||||
If you encounter any issues during migration:
|
||||
1. Check the rollback plan first
|
||||
2. Review error logs for specific issues
|
||||
3. Test individual endpoints to isolate problems
|
||||
4. Contact development team if needed
|
||||
@@ -1,94 +0,0 @@
|
||||
# SQL Injection Fix Rollback Plan
|
||||
|
||||
## Overview
|
||||
This document provides a rollback plan in case the SQL injection fixes cause issues in production.
|
||||
|
||||
## Changes Made
|
||||
1. **Created**: `backend/src/utils/sqlSecurity.js` - Central security utilities
|
||||
2. **Modified**: `backend/src/routes/adminDashboard.js` - Replaced whereRaw with parameterized queries
|
||||
3. **Modified**: `backend/src/routes/adminPhotos.js` - Added LIKE pattern escaping
|
||||
4. **Modified**: `backend/src/routes/adminEvents.js` - Added LIKE pattern escaping
|
||||
|
||||
## Quick Rollback Steps
|
||||
|
||||
### Step 1: Revert Code Changes
|
||||
If issues occur, run these commands to revert:
|
||||
|
||||
```bash
|
||||
# Navigate to backend directory
|
||||
cd backend
|
||||
|
||||
# Revert specific files
|
||||
git checkout HEAD -- src/routes/adminDashboard.js
|
||||
git checkout HEAD -- src/routes/adminPhotos.js
|
||||
git checkout HEAD -- src/routes/adminEvents.js
|
||||
|
||||
# Remove the new security utility file
|
||||
rm src/utils/sqlSecurity.js
|
||||
```
|
||||
|
||||
### Step 2: Restart Services
|
||||
```bash
|
||||
# If using Docker
|
||||
docker-compose restart backend
|
||||
|
||||
# If using PM2
|
||||
pm2 restart picpeak-backend
|
||||
```
|
||||
|
||||
## Verification After Rollback
|
||||
|
||||
1. Check admin dashboard loads: `/admin/dashboard`
|
||||
2. Test event search functionality
|
||||
3. Test photo search functionality
|
||||
4. Verify analytics charts display correctly
|
||||
|
||||
## Symptoms That May Require Rollback
|
||||
|
||||
1. **Dashboard Statistics Not Loading**
|
||||
- Empty or NaN values in stats
|
||||
- Analytics charts not rendering
|
||||
|
||||
2. **Search Features Broken**
|
||||
- Event search returns no results
|
||||
- Photo search returns errors
|
||||
- Special characters in search causing issues
|
||||
|
||||
3. **Date Filtering Issues**
|
||||
- Activity logs not showing correct date ranges
|
||||
- Analytics showing incorrect time periods
|
||||
|
||||
## Safe Testing Before Production
|
||||
|
||||
1. **Test in Development First**:
|
||||
```bash
|
||||
cd backend
|
||||
npm run dev
|
||||
```
|
||||
|
||||
2. **Test Key Features**:
|
||||
- Admin dashboard stats: `http://localhost:3001/api/admin/dashboard/stats`
|
||||
- Analytics: `http://localhost:3001/api/admin/dashboard/analytics?days=7`
|
||||
- Event search: `http://localhost:3001/api/admin/events?search=test`
|
||||
- Photo search: `http://localhost:3001/api/admin/events/1/photos?search=test`
|
||||
|
||||
3. **Monitor Logs**:
|
||||
```bash
|
||||
# Docker logs
|
||||
docker-compose logs -f backend
|
||||
|
||||
# PM2 logs
|
||||
pm2 logs picpeak-backend
|
||||
```
|
||||
|
||||
## Emergency Contacts
|
||||
- Keep database backups before deploying
|
||||
- Have monitoring alerts for 500 errors
|
||||
- Document any custom SQL queries in use
|
||||
|
||||
## Post-Rollback Actions
|
||||
If rollback is needed:
|
||||
1. Document the specific issue encountered
|
||||
2. Create test cases for the failure scenario
|
||||
3. Fix the issue in development
|
||||
4. Re-test thoroughly before re-deploying
|
||||
@@ -1,64 +0,0 @@
|
||||
# SQL Injection Fix Summary
|
||||
|
||||
## Quick Overview
|
||||
Fixed SQL injection vulnerabilities in the admin panel endpoints by:
|
||||
1. Replacing dangerous `whereRaw` queries with parameterized queries
|
||||
2. Escaping special characters in LIKE patterns
|
||||
3. Validating sort columns and orders
|
||||
|
||||
## Test Results
|
||||
✅ All 31 security tests passed
|
||||
✅ Verification script confirms fixes working
|
||||
✅ No breaking changes to API functionality
|
||||
|
||||
## Changed Files
|
||||
```
|
||||
backend/
|
||||
├── src/
|
||||
│ ├── utils/
|
||||
│ │ └── sqlSecurity.js (NEW - 117 lines)
|
||||
│ └── routes/
|
||||
│ ├── adminDashboard.js (6 changes)
|
||||
│ ├── adminEvents.js (2 changes)
|
||||
│ └── adminPhotos.js (2 changes)
|
||||
└── scripts/
|
||||
├── test-sql-security.js (NEW)
|
||||
└── verify-sql-fixes.js (NEW)
|
||||
```
|
||||
|
||||
## Before & After Examples
|
||||
|
||||
### Date Range Queries
|
||||
```javascript
|
||||
// ❌ BEFORE (Vulnerable)
|
||||
.whereRaw(`timestamp >= datetime("now", "-${days} days")`)
|
||||
|
||||
// ✅ AFTER (Safe)
|
||||
const startDate = new Date();
|
||||
startDate.setDate(startDate.getDate() - sanitizeDays(days));
|
||||
.where('timestamp', '>=', startDate.toISOString())
|
||||
```
|
||||
|
||||
### LIKE Queries
|
||||
```javascript
|
||||
// ❌ BEFORE (Vulnerable)
|
||||
.where('event_name', 'like', `%${search}%`)
|
||||
|
||||
// ✅ AFTER (Safe)
|
||||
const escapedSearch = escapeLikePattern(search);
|
||||
.where('event_name', 'like', `%${escapedSearch}%`)
|
||||
```
|
||||
|
||||
## Deployment Checklist
|
||||
- [ ] Run `node scripts/test-sql-security.js` (should show 31/31 passed)
|
||||
- [ ] Test in development environment
|
||||
- [ ] Review rollback plan (`SQL_INJECTION_FIX_ROLLBACK.md`)
|
||||
- [ ] Deploy to production
|
||||
- [ ] Monitor logs for errors
|
||||
- [ ] Test search functionality with special characters
|
||||
|
||||
## Risk Assessment
|
||||
- **Risk Level**: Low (with proper testing)
|
||||
- **Breaking Changes**: None
|
||||
- **Performance Impact**: Minimal
|
||||
- **Rollback Time**: < 2 minutes
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"auditReportVersion": 2,
|
||||
"vulnerabilities": {},
|
||||
"metadata": {
|
||||
"vulnerabilities": {
|
||||
"info": 0,
|
||||
"low": 0,
|
||||
"moderate": 0,
|
||||
"high": 0,
|
||||
"critical": 0,
|
||||
"total": 0
|
||||
},
|
||||
"dependencies": {
|
||||
"prod": 329,
|
||||
"dev": 307,
|
||||
"optional": 54,
|
||||
"peer": 1,
|
||||
"peerOptional": 0,
|
||||
"total": 690
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Executable
+50
@@ -0,0 +1,50 @@
|
||||
#!/bin/sh
|
||||
# init-production.sh - Production initialization script
|
||||
|
||||
set -e
|
||||
|
||||
echo "🚀 Initializing PicPeak Production Environment..."
|
||||
|
||||
# Wait for services to be ready
|
||||
echo "⏳ Waiting for database to be fully ready..."
|
||||
sleep 3
|
||||
|
||||
# Fix permissions if running as root (shouldn't happen with proper Dockerfile)
|
||||
if [ "$(id -u)" = "0" ]; then
|
||||
echo "🔧 Fixing file permissions..."
|
||||
chown -R nodejs:nodejs /app/storage /app/data /app/logs 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Create required directories
|
||||
echo "📁 Creating required directories..."
|
||||
mkdir -p /app/storage/events/active \
|
||||
/app/storage/events/archived \
|
||||
/app/storage/thumbnails \
|
||||
/app/storage/uploads/logos \
|
||||
/app/storage/uploads/favicons \
|
||||
/app/data \
|
||||
/app/logs
|
||||
|
||||
# Run migrations with safe runner
|
||||
echo "🗄️ Running database migrations (safe mode)..."
|
||||
NODE_ENV=production npm run migrate:safe
|
||||
|
||||
# Create admin user if environment variables are set
|
||||
if [ -n "$ADMIN_EMAIL" ] && [ -n "$ADMIN_PASSWORD" ]; then
|
||||
echo "👤 Creating admin user..."
|
||||
node scripts/create-admin.js \
|
||||
--email "$ADMIN_EMAIL" \
|
||||
--username "${ADMIN_USERNAME:-admin}" \
|
||||
--password "$ADMIN_PASSWORD" || echo "Admin user might already exist"
|
||||
fi
|
||||
|
||||
# Initialize email configuration if variables are set
|
||||
if [ -n "$SMTP_HOST" ]; then
|
||||
echo "📧 Email configuration detected via environment variables"
|
||||
fi
|
||||
|
||||
echo "✅ Production initialization complete!"
|
||||
echo "🌐 Starting application server..."
|
||||
|
||||
# Start the application
|
||||
exec node server.js
|
||||
+19
-6
@@ -27,19 +27,32 @@ const config = {
|
||||
production: {
|
||||
client: process.env.DATABASE_CLIENT || 'pg',
|
||||
connection: {
|
||||
host: process.env.DB_HOST || 'postgres',
|
||||
host: process.env.DB_HOST || 'db',
|
||||
port: process.env.DB_PORT || 5432,
|
||||
user: process.env.DB_USER || 'postgres',
|
||||
password: process.env.DB_PASSWORD || 'postgres',
|
||||
database: process.env.DB_NAME || 'photo_sharing'
|
||||
user: process.env.DB_USER || 'picpeak',
|
||||
password: process.env.DB_PASSWORD,
|
||||
database: process.env.DB_NAME || 'picpeak',
|
||||
ssl: process.env.DB_SSL === 'true' ? { rejectUnauthorized: false } : false,
|
||||
// Connection stability settings
|
||||
connectionTimeoutMillis: 30000,
|
||||
idleTimeoutMillis: 30000,
|
||||
keepAlive: true,
|
||||
keepAliveInitialDelayMillis: 0
|
||||
},
|
||||
pool: {
|
||||
min: 2,
|
||||
max: 10
|
||||
max: 10,
|
||||
acquireTimeoutMillis: 30000,
|
||||
createTimeoutMillis: 30000,
|
||||
idleTimeoutMillis: 30000,
|
||||
reapIntervalMillis: 1000,
|
||||
createRetryIntervalMillis: 200,
|
||||
propagateCreateError: false
|
||||
},
|
||||
migrations: {
|
||||
directory: './migrations'
|
||||
}
|
||||
},
|
||||
acquireConnectionTimeout: 60000
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check if created_at column already exists
|
||||
const hasCreatedAt = await knex.schema.hasColumn('email_queue', 'created_at');
|
||||
|
||||
if (!hasCreatedAt) {
|
||||
await knex.schema.table('email_queue', (table) => {
|
||||
table.datetime('created_at').defaultTo(knex.fn.now());
|
||||
});
|
||||
|
||||
// Update existing rows to have a created_at value based on scheduled_at
|
||||
await knex('email_queue')
|
||||
.whereNull('created_at')
|
||||
.update({
|
||||
created_at: knex.ref('scheduled_at')
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
await knex.schema.table('email_queue', (table) => {
|
||||
table.dropColumn('created_at');
|
||||
});
|
||||
};
|
||||
@@ -0,0 +1,35 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check current column structure
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
|
||||
if (hasSubjectEn && !hasSubject) {
|
||||
// The language migration was applied, need to add back basic columns
|
||||
await knex.schema.alterTable('email_templates', function(table) {
|
||||
table.string('subject');
|
||||
table.text('body_html');
|
||||
table.text('body_text');
|
||||
});
|
||||
|
||||
// Copy English values to the basic columns
|
||||
await knex('email_templates').update({
|
||||
subject: knex.raw('subject_en'),
|
||||
body_html: knex.raw('body_html_en'),
|
||||
body_text: knex.raw('body_text_en')
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// Check if we have the basic columns
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
|
||||
if (hasSubject && hasSubjectEn) {
|
||||
await knex.schema.alterTable('email_templates', function(table) {
|
||||
table.dropColumn('subject');
|
||||
table.dropColumn('body_html');
|
||||
table.dropColumn('body_text');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,91 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check if we have the default email templates
|
||||
const templates = await knex('email_templates').select('template_key');
|
||||
const existingKeys = templates.map(t => t.template_key);
|
||||
|
||||
// Check which columns exist in the table
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
|
||||
// Determine which columns to use based on schema
|
||||
const subjectCol = hasSubjectEn ? 'subject_en' : 'subject';
|
||||
const bodyHtmlCol = hasSubjectEn ? 'body_html_en' : 'body_html';
|
||||
const bodyTextCol = hasSubjectEn ? 'body_text_en' : 'body_text';
|
||||
|
||||
const defaultTemplates = [
|
||||
{
|
||||
template_key: 'gallery_created',
|
||||
[subjectCol]: 'Your Photo Gallery is Ready!',
|
||||
[bodyHtmlCol]: `<h2>Gallery Created Successfully</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has been created successfully!</p>
|
||||
<p><strong>Gallery Details:</strong></p>
|
||||
<ul>
|
||||
<li>Event Date: {{event_date}}</li>
|
||||
<li>Gallery Link: {{gallery_link}}</li>
|
||||
<li>Password: {{gallery_password}}</li>
|
||||
<li>Expires: {{expiry_date}}</li>
|
||||
</ul>
|
||||
<p>Share this link and password with your guests to allow them to view and download photos.</p>`,
|
||||
[bodyTextCol]: 'Gallery Created Successfully\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has been created successfully!',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'event_date', 'gallery_link', 'gallery_password', 'expiry_date'])
|
||||
},
|
||||
{
|
||||
template_key: 'expiration_warning',
|
||||
[subjectCol]: 'Your Photo Gallery Expires Soon',
|
||||
[bodyHtmlCol]: `<h2>Gallery Expiring Soon</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" will expire in {{days_remaining}} days.</p>
|
||||
<p>After expiration, the gallery will be archived and no longer accessible to guests.</p>
|
||||
<p><a href="{{gallery_link}}">Visit Gallery</a></p>`,
|
||||
[bodyTextCol]: 'Gallery Expiring Soon\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" will expire in {{days_remaining}} days.',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'days_remaining', 'gallery_link'])
|
||||
},
|
||||
{
|
||||
template_key: 'gallery_expired',
|
||||
[subjectCol]: 'Your Photo Gallery Has Expired',
|
||||
[bodyHtmlCol]: `<h2>Gallery Expired</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has expired and been archived.</p>
|
||||
<p>The photos are safely stored in our archive system. If you need access to the archived photos, please contact support.</p>`,
|
||||
[bodyTextCol]: 'Gallery Expired\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has expired and been archived.',
|
||||
variables: JSON.stringify(['host_name', 'event_name'])
|
||||
},
|
||||
{
|
||||
template_key: 'archive_complete',
|
||||
[subjectCol]: 'Gallery Archive Complete',
|
||||
[bodyHtmlCol]: `<h2>Archive Complete</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has been successfully archived.</p>
|
||||
<p>Archive size: {{archive_size}}</p>
|
||||
<p>The archive is stored securely and can be retrieved if needed.</p>`,
|
||||
[bodyTextCol]: 'Archive Complete\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has been successfully archived.',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'archive_size'])
|
||||
}
|
||||
];
|
||||
|
||||
// Insert missing templates
|
||||
for (const template of defaultTemplates) {
|
||||
if (!existingKeys.includes(template.template_key)) {
|
||||
// If we have language columns, also set German versions with same content
|
||||
if (hasSubjectEn) {
|
||||
template.subject_de = template[subjectCol];
|
||||
template.body_html_de = template[bodyHtmlCol];
|
||||
template.body_text_de = template[bodyTextCol];
|
||||
|
||||
// Also ensure we have the basic columns if they exist
|
||||
if (hasSubject) {
|
||||
template.subject = template[subjectCol];
|
||||
template.body_html = template[bodyHtmlCol];
|
||||
template.body_text = template[bodyTextCol];
|
||||
}
|
||||
}
|
||||
|
||||
await knex('email_templates').insert(template);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// Don't remove templates on rollback as they might have been customized
|
||||
};
|
||||
@@ -0,0 +1,121 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check if CMS pages already exist
|
||||
const impressumExists = await knex('cms_pages')
|
||||
.where('slug', 'impressum')
|
||||
.first();
|
||||
|
||||
const datenschutzExists = await knex('cms_pages')
|
||||
.where('slug', 'datenschutz')
|
||||
.first();
|
||||
|
||||
const pagesToInsert = [];
|
||||
|
||||
// Add Impressum page if it doesn't exist
|
||||
if (!impressumExists) {
|
||||
pagesToInsert.push({
|
||||
slug: 'impressum',
|
||||
title_en: 'Legal Notice',
|
||||
title_de: 'Impressum',
|
||||
content_en: `<h1>Legal Notice</h1>
|
||||
<p>Information according to § 5 TMG</p>
|
||||
|
||||
<h2>Responsible for content</h2>
|
||||
<p>[Your Name]<br>
|
||||
[Your Address]<br>
|
||||
[Postal Code City]</p>
|
||||
|
||||
<h2>Contact</h2>
|
||||
<p>Email: [Your Email Address]<br>
|
||||
Phone: [Your Phone Number]</p>
|
||||
|
||||
<h2>Disclaimer</h2>
|
||||
<h3>Liability for content</h3>
|
||||
<p>The contents of our pages were created with great care. However, we cannot guarantee the accuracy, completeness and timeliness of the content.</p>
|
||||
|
||||
<h3>Liability for links</h3>
|
||||
<p>Our website contains links to external third-party websites over whose content we have no influence. Therefore, we cannot accept any liability for this third-party content.</p>`,
|
||||
content_de: `<h1>Impressum</h1>
|
||||
<p>Angaben gemäß § 5 TMG</p>
|
||||
|
||||
<h2>Verantwortlich für den Inhalt</h2>
|
||||
<p>[Ihr Name]<br>
|
||||
[Ihre Adresse]<br>
|
||||
[PLZ Ort]</p>
|
||||
|
||||
<h2>Kontakt</h2>
|
||||
<p>E-Mail: [Ihre E-Mail-Adresse]<br>
|
||||
Telefon: [Ihre Telefonnummer]</p>
|
||||
|
||||
<h2>Haftungsausschluss</h2>
|
||||
<h3>Haftung für Inhalte</h3>
|
||||
<p>Die Inhalte unserer Seiten wurden mit größter Sorgfalt erstellt. Für die Richtigkeit, Vollständigkeit und Aktualität der Inhalte können wir jedoch keine Gewähr übernehmen.</p>
|
||||
|
||||
<h3>Haftung für Links</h3>
|
||||
<p>Unser Angebot enthält Links zu externen Webseiten Dritter, auf deren Inhalte wir keinen Einfluss haben. Deshalb können wir für diese fremden Inhalte auch keine Gewähr übernehmen.</p>`,
|
||||
updated_at: new Date()
|
||||
});
|
||||
}
|
||||
|
||||
// Add Datenschutz page if it doesn't exist
|
||||
if (!datenschutzExists) {
|
||||
pagesToInsert.push({
|
||||
slug: 'datenschutz',
|
||||
title_en: 'Privacy Policy',
|
||||
title_de: 'Datenschutzerklärung',
|
||||
content_en: `<h1>Privacy Policy</h1>
|
||||
|
||||
<h2>1. Privacy at a Glance</h2>
|
||||
<h3>General Information</h3>
|
||||
<p>The following information provides a simple overview of what happens to your personal data when you visit this website.</p>
|
||||
|
||||
<h3>Data Collection on This Website</h3>
|
||||
<p><strong>Who is responsible for data collection on this website?</strong></p>
|
||||
<p>Data processing on this website is carried out by the website operator. Their contact details can be found in the legal notice of this website.</p>
|
||||
|
||||
<p><strong>How do we collect your data?</strong></p>
|
||||
<p>Your data is collected when you provide it to us. This could be data that you enter into a contact form, for example.</p>
|
||||
|
||||
<p><strong>What do we use your data for?</strong></p>
|
||||
<p>Some of the data is collected to ensure error-free provision of the website. Other data may be used to analyze your user behavior.</p>
|
||||
|
||||
<h2>2. Hosting</h2>
|
||||
<p>This website is hosted externally. The personal data collected on this website is stored on the servers of the host.</p>
|
||||
|
||||
<h2>3. General Information and Mandatory Information</h2>
|
||||
<h3>Data Protection</h3>
|
||||
<p>The operators of these pages take the protection of your personal data very seriously. We treat your personal data confidentially and in accordance with the statutory data protection regulations and this privacy policy.</p>`,
|
||||
content_de: `<h1>Datenschutzerklärung</h1>
|
||||
|
||||
<h2>1. Datenschutz auf einen Blick</h2>
|
||||
<h3>Allgemeine Hinweise</h3>
|
||||
<p>Die folgenden Hinweise geben einen einfachen Überblick darüber, was mit Ihren personenbezogenen Daten passiert, wenn Sie diese Website besuchen.</p>
|
||||
|
||||
<h3>Datenerfassung auf dieser Website</h3>
|
||||
<p><strong>Wer ist verantwortlich für die Datenerfassung auf dieser Website?</strong></p>
|
||||
<p>Die Datenverarbeitung auf dieser Website erfolgt durch den Websitebetreiber. Dessen Kontaktdaten können Sie dem Impressum dieser Website entnehmen.</p>
|
||||
|
||||
<p><strong>Wie erfassen wir Ihre Daten?</strong></p>
|
||||
<p>Ihre Daten werden zum einen dadurch erhoben, dass Sie uns diese mitteilen. Hierbei kann es sich z.B. um Daten handeln, die Sie in ein Kontaktformular eingeben.</p>
|
||||
|
||||
<p><strong>Wofür nutzen wir Ihre Daten?</strong></p>
|
||||
<p>Ein Teil der Daten wird erhoben, um eine fehlerfreie Bereitstellung der Website zu gewährleisten. Andere Daten können zur Analyse Ihres Nutzerverhaltens verwendet werden.</p>
|
||||
|
||||
<h2>2. Hosting</h2>
|
||||
<p>Diese Website wird extern gehostet. Die personenbezogenen Daten, die auf dieser Website erfasst werden, werden auf den Servern des Hosters gespeichert.</p>
|
||||
|
||||
<h2>3. Allgemeine Hinweise und Pflichtinformationen</h2>
|
||||
<h3>Datenschutz</h3>
|
||||
<p>Die Betreiber dieser Seiten nehmen den Schutz Ihrer persönlichen Daten sehr ernst. Wir behandeln Ihre personenbezogenen Daten vertraulich und entsprechend der gesetzlichen Datenschutzvorschriften sowie dieser Datenschutzerklärung.</p>`,
|
||||
updated_at: new Date()
|
||||
});
|
||||
}
|
||||
|
||||
// Insert pages if any need to be added
|
||||
if (pagesToInsert.length > 0) {
|
||||
await knex('cms_pages').insert(pagesToInsert);
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// Don't remove CMS pages on rollback as they might have been customized
|
||||
};
|
||||
@@ -0,0 +1,68 @@
|
||||
exports.up = async function(knex) {
|
||||
console.log('Fixing JSON columns in database...');
|
||||
|
||||
// Fix email_templates variables column
|
||||
const templates = await knex('email_templates').select('id', 'template_key', 'variables');
|
||||
|
||||
for (const template of templates) {
|
||||
if (template.variables && typeof template.variables === 'string') {
|
||||
try {
|
||||
// Check if it's already valid JSON
|
||||
JSON.parse(template.variables);
|
||||
} catch (e) {
|
||||
console.log(`Fixing invalid JSON in email template ${template.template_key}`);
|
||||
// Attempt to fix common issues
|
||||
let fixed = template.variables;
|
||||
|
||||
// If it looks like an array but isn't valid JSON, try to fix it
|
||||
if (fixed.startsWith('[') && fixed.endsWith(']')) {
|
||||
// Extract the content and properly format it
|
||||
const content = fixed.slice(1, -1);
|
||||
const items = content.split(',').map(item => item.trim().replace(/['"]/g, ''));
|
||||
fixed = JSON.stringify(items);
|
||||
} else {
|
||||
// Default to empty array if we can't fix it
|
||||
fixed = JSON.stringify([]);
|
||||
}
|
||||
|
||||
await knex('email_templates')
|
||||
.where('id', template.id)
|
||||
.update({ variables: fixed });
|
||||
}
|
||||
} else if (!template.variables) {
|
||||
// Set default empty array for null values
|
||||
await knex('email_templates')
|
||||
.where('id', template.id)
|
||||
.update({ variables: JSON.stringify([]) });
|
||||
}
|
||||
}
|
||||
|
||||
// Fix activity_logs metadata column
|
||||
const activities = await knex('activity_logs').select('id', 'metadata');
|
||||
|
||||
for (const activity of activities) {
|
||||
if (activity.metadata && typeof activity.metadata === 'string') {
|
||||
try {
|
||||
// Check if it's already valid JSON
|
||||
JSON.parse(activity.metadata);
|
||||
} catch (e) {
|
||||
console.log(`Fixing invalid JSON in activity log ${activity.id}`);
|
||||
// Default to empty object if we can't parse it
|
||||
await knex('activity_logs')
|
||||
.where('id', activity.id)
|
||||
.update({ metadata: JSON.stringify({}) });
|
||||
}
|
||||
} else if (!activity.metadata) {
|
||||
// Set default empty object for null values
|
||||
await knex('activity_logs')
|
||||
.where('id', activity.id)
|
||||
.update({ metadata: JSON.stringify({}) });
|
||||
}
|
||||
}
|
||||
|
||||
console.log('JSON columns fixed successfully');
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// No rollback needed - data fixes only
|
||||
};
|
||||
@@ -1,25 +0,0 @@
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function addMustChangePasswordColumn() {
|
||||
try {
|
||||
// Check if the column already exists
|
||||
const hasMustChangePassword = await db.schema.hasColumn('admin_users', 'must_change_password');
|
||||
|
||||
if (!hasMustChangePassword) {
|
||||
await db.schema.table('admin_users', (table) => {
|
||||
table.boolean('must_change_password').defaultTo(false);
|
||||
});
|
||||
|
||||
console.log('✅ Added must_change_password column to admin_users table');
|
||||
} else {
|
||||
console.log('ℹ️ must_change_password column already exists');
|
||||
}
|
||||
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('❌ Migration failed:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
addMustChangePasswordColumn();
|
||||
@@ -0,0 +1,83 @@
|
||||
/**
|
||||
* Migration helper functions for production-safe migrations
|
||||
*/
|
||||
|
||||
/**
|
||||
* Create a table only if it doesn't already exist
|
||||
*/
|
||||
async function createTableIfNotExists(knex, tableName, callback) {
|
||||
const exists = await knex.schema.hasTable(tableName);
|
||||
if (!exists) {
|
||||
console.log(`Creating table: ${tableName}`);
|
||||
return knex.schema.createTable(tableName, callback);
|
||||
} else {
|
||||
console.log(`Table ${tableName} already exists, skipping...`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add column to table only if it doesn't exist
|
||||
*/
|
||||
async function addColumnIfNotExists(knex, tableName, columnName, callback) {
|
||||
const hasColumn = await knex.schema.hasColumn(tableName, columnName);
|
||||
if (!hasColumn) {
|
||||
console.log(`Adding column ${columnName} to table ${tableName}`);
|
||||
return knex.schema.alterTable(tableName, (table) => {
|
||||
callback(table);
|
||||
});
|
||||
} else {
|
||||
console.log(`Column ${columnName} already exists in table ${tableName}, skipping...`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert data only if it doesn't already exist
|
||||
*/
|
||||
async function insertIfNotExists(knex, tableName, data, uniqueField) {
|
||||
const exists = await knex(tableName)
|
||||
.where(uniqueField, data[uniqueField])
|
||||
.first();
|
||||
|
||||
if (!exists) {
|
||||
console.log(`Inserting ${uniqueField}: ${data[uniqueField]} into ${tableName}`);
|
||||
return knex(tableName).insert(data);
|
||||
} else {
|
||||
console.log(`${uniqueField}: ${data[uniqueField]} already exists in ${tableName}, skipping...`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create index only if it doesn't exist
|
||||
*/
|
||||
async function createIndexIfNotExists(knex, tableName, columns, indexName) {
|
||||
// This is database-specific, works for PostgreSQL
|
||||
if (knex.client.config.client === 'pg') {
|
||||
const result = await knex.raw(`
|
||||
SELECT 1 FROM pg_indexes
|
||||
WHERE tablename = ? AND indexname = ?
|
||||
`, [tableName, indexName]);
|
||||
|
||||
if (result.rows.length === 0) {
|
||||
console.log(`Creating index ${indexName} on ${tableName}`);
|
||||
return knex.schema.alterTable(tableName, (table) => {
|
||||
table.index(columns, indexName);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// For SQLite, just try to create and ignore errors
|
||||
try {
|
||||
await knex.schema.alterTable(tableName, (table) => {
|
||||
table.index(columns, indexName);
|
||||
});
|
||||
} catch (error) {
|
||||
// Index probably already exists
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
createTableIfNotExists,
|
||||
addColumnIfNotExists,
|
||||
insertIfNotExists,
|
||||
createIndexIfNotExists
|
||||
};
|
||||
@@ -0,0 +1,170 @@
|
||||
const fs = require('fs').promises;
|
||||
const path = require('path');
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
/**
|
||||
* Production-safe migration runner that handles existing schema
|
||||
*/
|
||||
|
||||
// Create or verify migrations tracking table
|
||||
async function ensureMigrationsTable() {
|
||||
const tableExists = await db.schema.hasTable('migrations');
|
||||
if (!tableExists) {
|
||||
await db.schema.createTable('migrations', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('filename').unique().notNullable();
|
||||
table.timestamp('applied_at').defaultTo(db.fn.now());
|
||||
});
|
||||
console.log('Created migrations tracking table');
|
||||
}
|
||||
}
|
||||
|
||||
// Check if a migration has been applied
|
||||
async function isMigrationApplied(filename) {
|
||||
const result = await db('migrations').where('filename', filename).first();
|
||||
return !!result;
|
||||
}
|
||||
|
||||
// Mark migration as applied without running it (for existing schema)
|
||||
async function markMigrationAsApplied(filename) {
|
||||
await db('migrations').insert({ filename });
|
||||
console.log(`Marked migration ${filename} as applied`);
|
||||
}
|
||||
|
||||
// Detect existing schema and mark migrations as applied
|
||||
async function detectExistingSchema() {
|
||||
console.log('Detecting existing schema...');
|
||||
|
||||
const tableChecks = [
|
||||
{ table: 'events', migration: 'init.js' },
|
||||
{ table: 'photos', migration: 'init.js' },
|
||||
{ table: 'photo_categories', migration: '004_add_categories_and_cms.js' },
|
||||
{ table: 'cms_pages', migration: '004_add_categories_and_cms.js' },
|
||||
{ table: 'login_attempts', migration: '015_add_login_attempts_table.js' },
|
||||
{ table: 'token_blacklist', migration: '017_add_token_revocation_tables.js' },
|
||||
];
|
||||
|
||||
for (const check of tableChecks) {
|
||||
const exists = await db.schema.hasTable(check.table);
|
||||
if (exists) {
|
||||
const isApplied = await isMigrationApplied(check.migration);
|
||||
if (!isApplied) {
|
||||
await markMigrationAsApplied(check.migration);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Run a single migration safely
|
||||
async function runMigrationSafely(filename) {
|
||||
try {
|
||||
const migrationPath = path.join(__dirname, filename);
|
||||
const migration = require(migrationPath);
|
||||
|
||||
if (migration.up) {
|
||||
console.log(`Running migration: ${filename}`);
|
||||
|
||||
// Run migration in a transaction if possible
|
||||
if (db.client.config.client === 'pg') {
|
||||
await db.transaction(async (trx) => {
|
||||
await migration.up(trx);
|
||||
});
|
||||
} else {
|
||||
await migration.up(db);
|
||||
}
|
||||
|
||||
await db('migrations').insert({ filename });
|
||||
console.log(`Migration ${filename} completed successfully`);
|
||||
}
|
||||
} catch (error) {
|
||||
// Check if error is because schema already exists
|
||||
if (error.code === '42P07' || // PostgreSQL: relation already exists
|
||||
error.code === 'SQLITE_ERROR' && error.message.includes('already exists')) {
|
||||
console.log(`Migration ${filename} - schema already exists, marking as applied`);
|
||||
await markMigrationAsApplied(filename);
|
||||
} else {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Main migration runner
|
||||
async function runMigrations() {
|
||||
let connection;
|
||||
try {
|
||||
console.log('Starting production-safe database migrations...');
|
||||
|
||||
// Ensure database connection is ready
|
||||
await db.raw('SELECT 1');
|
||||
console.log('Database connection verified');
|
||||
|
||||
// Create migrations tracking table
|
||||
await ensureMigrationsTable();
|
||||
|
||||
// Detect and mark existing schema
|
||||
await detectExistingSchema();
|
||||
|
||||
// Get all migration files
|
||||
const files = await fs.readdir(__dirname);
|
||||
const migrationFiles = files
|
||||
.filter(f => f.match(/^\d{3}_.*\.js$/) || f === 'init.js')
|
||||
.sort((a, b) => {
|
||||
// Ensure init.js runs first
|
||||
if (a === 'init.js') return -1;
|
||||
if (b === 'init.js') return 1;
|
||||
return a.localeCompare(b);
|
||||
});
|
||||
|
||||
// Run pending migrations
|
||||
let pendingCount = 0;
|
||||
let skippedCount = 0;
|
||||
|
||||
for (const file of migrationFiles) {
|
||||
const isApplied = await isMigrationApplied(file);
|
||||
if (!isApplied) {
|
||||
await runMigrationSafely(file);
|
||||
pendingCount++;
|
||||
} else {
|
||||
skippedCount++;
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`\nMigration Summary:`);
|
||||
console.log(`- Applied: ${pendingCount} migration(s)`);
|
||||
console.log(`- Skipped: ${skippedCount} migration(s) (already applied)`);
|
||||
console.log(`- Total: ${migrationFiles.length} migration(s)`);
|
||||
console.log('\nAll migrations completed successfully');
|
||||
|
||||
// Close database connection
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('\n❌ Migration failed:', error.message);
|
||||
console.error('Error details:', error);
|
||||
|
||||
// Close database connection on error
|
||||
try {
|
||||
await db.destroy();
|
||||
} catch (e) {
|
||||
// Ignore
|
||||
}
|
||||
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Add delay for database readiness in production
|
||||
async function waitAndRun() {
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
console.log('Waiting 2 seconds for database readiness...');
|
||||
await new Promise(resolve => setTimeout(resolve, 2000));
|
||||
}
|
||||
await runMigrations();
|
||||
}
|
||||
|
||||
// Only run if called directly
|
||||
if (require.main === module) {
|
||||
waitAndRun();
|
||||
}
|
||||
|
||||
module.exports = { runMigrations };
|
||||
Generated
+140
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"dependencies": {
|
||||
"adm-zip": "^0.5.16",
|
||||
"archiver": "^5.3.1",
|
||||
@@ -29,6 +29,7 @@
|
||||
"multer": "^2.0.1",
|
||||
"node-cron": "^3.0.2",
|
||||
"nodemailer": "^6.9.1",
|
||||
"pg": "^8.16.3",
|
||||
"react-i18next": "^15.6.0",
|
||||
"sharp": "^0.32.0",
|
||||
"sqlite3": "^5.1.6",
|
||||
@@ -6471,12 +6472,101 @@
|
||||
"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg": {
|
||||
"version": "8.16.3",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
|
||||
"integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"pg-connection-string": "^2.9.1",
|
||||
"pg-pool": "^3.10.1",
|
||||
"pg-protocol": "^1.10.3",
|
||||
"pg-types": "2.2.0",
|
||||
"pgpass": "1.0.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16.0.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"pg-cloudflare": "^1.2.7"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"pg-native": ">=3.0.1"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"pg-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/pg-cloudflare": {
|
||||
"version": "1.2.7",
|
||||
"resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
|
||||
"integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/pg-connection-string": {
|
||||
"version": "2.6.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.1.tgz",
|
||||
"integrity": "sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-int8": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
|
||||
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-pool": {
|
||||
"version": "3.10.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
|
||||
"integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"pg": ">=8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-protocol": {
|
||||
"version": "1.10.3",
|
||||
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
|
||||
"integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-types": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
|
||||
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"pg-int8": "1.0.1",
|
||||
"postgres-array": "~2.0.0",
|
||||
"postgres-bytea": "~1.0.0",
|
||||
"postgres-date": "~1.0.4",
|
||||
"postgres-interval": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/pg/node_modules/pg-connection-string": {
|
||||
"version": "2.9.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
|
||||
"integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pgpass": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
|
||||
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"split2": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/picocolors": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
|
||||
@@ -6575,6 +6665,45 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-array": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
|
||||
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-bytea": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
|
||||
"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-date": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
|
||||
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-interval": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
|
||||
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"xtend": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/prebuild-install": {
|
||||
"version": "7.1.3",
|
||||
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
|
||||
@@ -7494,6 +7623,15 @@
|
||||
"source-map": "^0.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/split2": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
|
||||
"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">= 10.x"
|
||||
}
|
||||
},
|
||||
"node_modules/sprintf-js": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"description": "Backend for PicPeak event photo sharing platform",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
"start": "node server.js",
|
||||
"dev": "nodemon server.js",
|
||||
"migrate": "node migrations/run-migrations.js",
|
||||
"migrate:safe": "node migrations/run-migrations-safe.js",
|
||||
"test": "jest",
|
||||
"lint": "eslint src/"
|
||||
},
|
||||
@@ -32,6 +33,7 @@
|
||||
"multer": "^2.0.1",
|
||||
"node-cron": "^3.0.2",
|
||||
"nodemailer": "^6.9.1",
|
||||
"pg": "^8.16.3",
|
||||
"react-i18next": "^15.6.0",
|
||||
"sharp": "^0.32.0",
|
||||
"sqlite3": "^5.1.6",
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Activate enhanced authentication in server.js
|
||||
* This script safely updates the server configuration
|
||||
*/
|
||||
|
||||
const fs = require('fs').promises;
|
||||
const path = require('path');
|
||||
|
||||
async function activateEnhancedAuth() {
|
||||
console.log('=== Activating Enhanced Authentication ===\n');
|
||||
|
||||
try {
|
||||
const serverPath = path.join(__dirname, '../server.js');
|
||||
|
||||
// Read current server.js
|
||||
let serverContent = await fs.readFile(serverPath, 'utf8');
|
||||
|
||||
// Backup current server.js
|
||||
const backupPath = `${serverPath}.backup.${Date.now()}`;
|
||||
await fs.writeFile(backupPath, serverContent);
|
||||
console.log(`✓ Created backup: ${path.basename(backupPath)}`);
|
||||
|
||||
// Check current state
|
||||
if (serverContent.includes("require('./src/routes/auth-enhanced')")) {
|
||||
console.log('! Enhanced auth already active');
|
||||
return;
|
||||
}
|
||||
|
||||
// Replace auth routes import
|
||||
const originalLine = "const authRoutes = require('./src/routes/auth');";
|
||||
const enhancedLine = "const authRoutes = require('./src/routes/auth-enhanced');";
|
||||
|
||||
if (!serverContent.includes(originalLine)) {
|
||||
console.log('✗ Could not find original auth import line');
|
||||
console.log('Please manually update server.js');
|
||||
return;
|
||||
}
|
||||
|
||||
serverContent = serverContent.replace(originalLine, enhancedLine);
|
||||
console.log('✓ Updated auth routes import');
|
||||
|
||||
// Add cleanup job initialization after database init
|
||||
const dbInitLine = 'initializeDatabase()';
|
||||
const cleanupAddition = `
|
||||
// Initialize auth security cleanup job
|
||||
const { initializeCleanupJob } = require('./src/utils/authSecurity');
|
||||
initializeCleanupJob();
|
||||
`;
|
||||
|
||||
if (!serverContent.includes('initializeCleanupJob')) {
|
||||
const dbInitIndex = serverContent.indexOf(dbInitLine);
|
||||
if (dbInitIndex !== -1) {
|
||||
const insertPoint = serverContent.indexOf('\n', dbInitIndex) + 1;
|
||||
serverContent = serverContent.slice(0, insertPoint) + cleanupAddition + serverContent.slice(insertPoint);
|
||||
console.log('✓ Added cleanup job initialization');
|
||||
}
|
||||
}
|
||||
|
||||
// Write updated server.js
|
||||
await fs.writeFile(serverPath, serverContent);
|
||||
console.log('✓ Updated server.js');
|
||||
|
||||
console.log('\n✅ Enhanced authentication activated!');
|
||||
console.log('\nNext steps:');
|
||||
console.log('1. Restart the backend:');
|
||||
console.log(' docker-compose restart backend');
|
||||
console.log('\n2. Monitor auth health:');
|
||||
console.log(' node scripts/monitor-auth-health.js');
|
||||
console.log('\n3. To rollback if needed:');
|
||||
console.log(` cp ${path.basename(backupPath)} server.js`);
|
||||
console.log(' docker-compose restart backend');
|
||||
|
||||
} catch (error) {
|
||||
console.error('❌ Error activating enhanced auth:', error);
|
||||
}
|
||||
}
|
||||
|
||||
activateEnhancedAuth();
|
||||
@@ -1,94 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Add authentication security tables to existing database
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function addAuthTables() {
|
||||
console.log('Adding authentication security tables...\n');
|
||||
|
||||
try {
|
||||
// 1. Create login_attempts table
|
||||
const hasLoginAttempts = await db.schema.hasTable('login_attempts');
|
||||
if (!hasLoginAttempts) {
|
||||
await db.schema.createTable('login_attempts', table => {
|
||||
table.increments('id').primary();
|
||||
table.string('identifier').notNullable();
|
||||
table.string('ip_address', 45).notNullable();
|
||||
table.text('user_agent');
|
||||
table.timestamp('attempt_time').defaultTo(db.fn.now());
|
||||
table.boolean('success').defaultTo(false);
|
||||
|
||||
// Indexes for performance
|
||||
table.index('identifier');
|
||||
table.index('attempt_time');
|
||||
table.index(['identifier', 'success', 'attempt_time']);
|
||||
});
|
||||
console.log('✓ Created login_attempts table');
|
||||
} else {
|
||||
console.log('! login_attempts table already exists');
|
||||
}
|
||||
|
||||
// 2. Add columns to admin_users
|
||||
const hasPasswordChangedAt = await db.schema.hasColumn('admin_users', 'password_changed_at');
|
||||
if (!hasPasswordChangedAt) {
|
||||
await db.schema.table('admin_users', table => {
|
||||
table.timestamp('password_changed_at').nullable();
|
||||
});
|
||||
console.log('✓ Added password_changed_at column');
|
||||
}
|
||||
|
||||
const hasLastLoginIp = await db.schema.hasColumn('admin_users', 'last_login_ip');
|
||||
if (!hasLastLoginIp) {
|
||||
await db.schema.table('admin_users', table => {
|
||||
table.string('last_login_ip', 45).nullable();
|
||||
});
|
||||
console.log('✓ Added last_login_ip column');
|
||||
}
|
||||
|
||||
const hasTwoFactorEnabled = await db.schema.hasColumn('admin_users', 'two_factor_enabled');
|
||||
if (!hasTwoFactorEnabled) {
|
||||
await db.schema.table('admin_users', table => {
|
||||
table.boolean('two_factor_enabled').defaultTo(false);
|
||||
});
|
||||
console.log('✓ Added two_factor_enabled column');
|
||||
}
|
||||
|
||||
const hasTwoFactorSecret = await db.schema.hasColumn('admin_users', 'two_factor_secret');
|
||||
if (!hasTwoFactorSecret) {
|
||||
await db.schema.table('admin_users', table => {
|
||||
table.string('two_factor_secret').nullable();
|
||||
});
|
||||
console.log('✓ Added two_factor_secret column');
|
||||
}
|
||||
|
||||
// 3. Verify everything
|
||||
console.log('\nVerifying tables...');
|
||||
|
||||
const loginAttemptsInfo = await db('login_attempts').columnInfo();
|
||||
console.log('✓ login_attempts columns:', Object.keys(loginAttemptsInfo).join(', '));
|
||||
|
||||
const adminUsersInfo = await db('admin_users').columnInfo();
|
||||
const securityColumns = ['password_changed_at', 'last_login_ip', 'two_factor_enabled', 'two_factor_secret'];
|
||||
const hasAllColumns = securityColumns.every(col => adminUsersInfo[col]);
|
||||
|
||||
if (hasAllColumns) {
|
||||
console.log('✓ All security columns present in admin_users');
|
||||
} else {
|
||||
console.log('✗ Some security columns missing from admin_users');
|
||||
}
|
||||
|
||||
console.log('\n✅ Authentication security tables ready!');
|
||||
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('\n❌ Error adding auth tables:', error);
|
||||
await db.destroy();
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
addAuthTables();
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Add token revocation tables to existing database
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function addTokenRevocationTables() {
|
||||
console.log('Adding token revocation tables...\n');
|
||||
|
||||
try {
|
||||
// 1. Create revoked_tokens table
|
||||
const hasRevokedTokens = await db.schema.hasTable('revoked_tokens');
|
||||
if (!hasRevokedTokens) {
|
||||
await db.schema.createTable('revoked_tokens', table => {
|
||||
table.increments('id').primary();
|
||||
table.string('token_id').notNullable().unique();
|
||||
table.integer('user_id').nullable();
|
||||
table.string('token_type', 20);
|
||||
table.timestamp('revoked_at').defaultTo(db.fn.now());
|
||||
table.timestamp('expires_at').notNullable();
|
||||
table.string('reason', 100);
|
||||
table.text('metadata');
|
||||
|
||||
// Indexes
|
||||
table.index('token_id');
|
||||
table.index('user_id');
|
||||
table.index('expires_at');
|
||||
});
|
||||
console.log('✓ Created revoked_tokens table');
|
||||
} else {
|
||||
console.log('! revoked_tokens table already exists');
|
||||
}
|
||||
|
||||
// 2. Create user_token_revocations table
|
||||
const hasUserRevocations = await db.schema.hasTable('user_token_revocations');
|
||||
if (!hasUserRevocations) {
|
||||
await db.schema.createTable('user_token_revocations', table => {
|
||||
table.integer('user_id').primary();
|
||||
table.timestamp('revoked_at').notNullable();
|
||||
table.string('reason', 100);
|
||||
|
||||
table.index('revoked_at');
|
||||
});
|
||||
console.log('✓ Created user_token_revocations table');
|
||||
} else {
|
||||
console.log('! user_token_revocations table already exists');
|
||||
}
|
||||
|
||||
// 3. Verify tables
|
||||
console.log('\nVerifying tables...');
|
||||
|
||||
const revokedTokensInfo = await db('revoked_tokens').columnInfo();
|
||||
console.log('✓ revoked_tokens columns:', Object.keys(revokedTokensInfo).join(', '));
|
||||
|
||||
const userRevocationsInfo = await db('user_token_revocations').columnInfo();
|
||||
console.log('✓ user_token_revocations columns:', Object.keys(userRevocationsInfo).join(', '));
|
||||
|
||||
console.log('\n✅ Token revocation tables ready!');
|
||||
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('\n❌ Error adding token revocation tables:', error);
|
||||
await db.destroy();
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
addTokenRevocationTables();
|
||||
@@ -0,0 +1,60 @@
|
||||
require('dotenv').config();
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function checkDatabaseIssues() {
|
||||
console.log('Checking database issues...\n');
|
||||
|
||||
try {
|
||||
// Check email_templates table structure
|
||||
console.log('1. Checking email_templates table structure:');
|
||||
const emailTemplateColumns = await db('email_templates').columnInfo();
|
||||
console.log('Columns:', Object.keys(emailTemplateColumns));
|
||||
|
||||
// Check if any templates exist
|
||||
const templateCount = await db('email_templates').count('* as count');
|
||||
console.log('Template count:', templateCount[0].count);
|
||||
|
||||
// Check for specific template
|
||||
const galleryCreatedTemplate = await db('email_templates')
|
||||
.where('template_key', 'gallery_created')
|
||||
.first();
|
||||
console.log('gallery_created template exists:', !!galleryCreatedTemplate);
|
||||
|
||||
// Check activity_logs table
|
||||
console.log('\n2. Checking activity_logs table:');
|
||||
const activityLogColumns = await db('activity_logs').columnInfo();
|
||||
console.log('Columns:', Object.keys(activityLogColumns));
|
||||
|
||||
// Check migrations table
|
||||
console.log('\n3. Checking migrations status:');
|
||||
const migrations = await db('migrations')
|
||||
.orderBy('id', 'desc')
|
||||
.limit(10);
|
||||
console.log('Latest migrations:');
|
||||
migrations.forEach(m => console.log(` - ${m.filename}`));
|
||||
|
||||
// Test a simple query from notifications route
|
||||
console.log('\n4. Testing notifications query:');
|
||||
try {
|
||||
const notifications = await db('activity_logs')
|
||||
.select(
|
||||
'activity_logs.*',
|
||||
'events.event_name'
|
||||
)
|
||||
.leftJoin('events', 'activity_logs.event_id', 'events.id')
|
||||
.orderBy('activity_logs.created_at', 'desc')
|
||||
.limit(5);
|
||||
console.log(`Found ${notifications.length} notifications`);
|
||||
} catch (error) {
|
||||
console.error('Notifications query failed:', error.message);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error:', error);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
checkDatabaseIssues();
|
||||
@@ -1,96 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Check Docker deployment status for security fixes
|
||||
*/
|
||||
|
||||
console.log('=== Docker Deployment Status Check ===\n');
|
||||
|
||||
// Color codes
|
||||
const GREEN = '\x1b[32m';
|
||||
const RED = '\x1b[31m';
|
||||
const YELLOW = '\x1b[33m';
|
||||
const RESET = '\x1b[0m';
|
||||
|
||||
let allGood = true;
|
||||
|
||||
// Check SQL Security
|
||||
console.log('1. SQL Injection Fixes:');
|
||||
try {
|
||||
const { sanitizeDays, escapeLikePattern } = require('../src/utils/sqlSecurity');
|
||||
console.log(`${GREEN}✓${RESET} sqlSecurity.js exists`);
|
||||
console.log(`${GREEN}✓${RESET} Security functions available`);
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} sqlSecurity.js missing`);
|
||||
allGood = false;
|
||||
}
|
||||
|
||||
// Check Auth Security
|
||||
console.log('\n2. Authentication Security:');
|
||||
try {
|
||||
const authSec = require('../src/utils/authSecurity');
|
||||
console.log(`${GREEN}✓${RESET} authSecurity.js exists`);
|
||||
|
||||
const authEnhanced = require('../src/middleware/auth-enhanced');
|
||||
console.log(`${GREEN}✓${RESET} auth-enhanced middleware exists`);
|
||||
|
||||
const authRoutes = require('../src/routes/auth-enhanced');
|
||||
console.log(`${GREEN}✓${RESET} auth-enhanced routes exist`);
|
||||
} catch (e) {
|
||||
console.log(`${YELLOW}!${RESET} Auth security files exist but not active`);
|
||||
}
|
||||
|
||||
// Check Database
|
||||
console.log('\n3. Database Status:');
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function checkDatabase() {
|
||||
try {
|
||||
// Check login_attempts table
|
||||
await db('login_attempts').count();
|
||||
console.log(`${GREEN}✓${RESET} login_attempts table exists`);
|
||||
} catch (e) {
|
||||
console.log(`${YELLOW}!${RESET} login_attempts table not created (run migrations)`);
|
||||
}
|
||||
|
||||
try {
|
||||
// Check admin_users columns
|
||||
await db('admin_users').select('password_changed_at').limit(1);
|
||||
console.log(`${GREEN}✓${RESET} Auth security columns exist`);
|
||||
} catch (e) {
|
||||
console.log(`${YELLOW}!${RESET} Auth security columns missing (run migrations)`);
|
||||
}
|
||||
|
||||
// Close database connection
|
||||
await db.destroy();
|
||||
}
|
||||
|
||||
// Check server configuration
|
||||
console.log('\n4. Server Configuration:');
|
||||
const fs = require('fs');
|
||||
const serverContent = fs.readFileSync('./server.js', 'utf8');
|
||||
|
||||
if (serverContent.includes("require('./src/routes/auth-enhanced')")) {
|
||||
console.log(`${GREEN}✓${RESET} Using enhanced auth routes`);
|
||||
} else if (serverContent.includes("require('./src/routes/auth')")) {
|
||||
console.log(`${YELLOW}!${RESET} Using original auth routes (enhanced not active)`);
|
||||
}
|
||||
|
||||
if (serverContent.includes('initializeCleanupJob')) {
|
||||
console.log(`${GREEN}✓${RESET} Auth cleanup job initialized`);
|
||||
} else {
|
||||
console.log(`${YELLOW}!${RESET} Auth cleanup job not initialized`);
|
||||
}
|
||||
|
||||
// Run async checks
|
||||
checkDatabase().then(() => {
|
||||
console.log('\n=== Summary ===');
|
||||
if (allGood) {
|
||||
console.log(`${GREEN}All security fixes are deployed!${RESET}`);
|
||||
} else {
|
||||
console.log(`${YELLOW}Some security features need activation:${RESET}`);
|
||||
console.log('1. Run migrations: npx knex migrate:latest');
|
||||
console.log('2. Update server.js to use auth-enhanced routes');
|
||||
console.log('3. Restart the container');
|
||||
}
|
||||
});
|
||||
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
require('dotenv').config();
|
||||
const bcrypt = require('bcryptjs');
|
||||
const bcrypt = require('bcrypt');
|
||||
const { db } = require('../src/database/db');
|
||||
const crypto = require('crypto');
|
||||
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
require('dotenv').config();
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function debugEndpoints() {
|
||||
console.log('Debugging 500 errors...\n');
|
||||
|
||||
try {
|
||||
// Test email templates query
|
||||
console.log('1. Testing email templates query:');
|
||||
try {
|
||||
const templates = await db('email_templates')
|
||||
.select('*')
|
||||
.orderBy('template_key');
|
||||
|
||||
console.log(`Found ${templates.length} templates`);
|
||||
if (templates.length > 0) {
|
||||
console.log('First template columns:', Object.keys(templates[0]));
|
||||
console.log('Template keys:', templates.map(t => t.template_key));
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Email templates query failed:', error.message);
|
||||
console.error('Error code:', error.code);
|
||||
}
|
||||
|
||||
// Test notifications query
|
||||
console.log('\n2. Testing notifications query:');
|
||||
try {
|
||||
const notifications = await db('activity_logs')
|
||||
.select(
|
||||
'activity_logs.*',
|
||||
'events.event_name'
|
||||
)
|
||||
.leftJoin('events', 'activity_logs.event_id', 'events.id')
|
||||
.whereNull('activity_logs.read_at')
|
||||
.orderBy('activity_logs.created_at', 'desc')
|
||||
.limit(5);
|
||||
|
||||
console.log(`Found ${notifications.length} unread notifications`);
|
||||
} catch (error) {
|
||||
console.error('Notifications query failed:', error.message);
|
||||
console.error('Error code:', error.code);
|
||||
|
||||
// Check if it's a column issue
|
||||
if (error.message.includes('column')) {
|
||||
console.log('\nChecking activity_logs columns:');
|
||||
const columns = await db('activity_logs').columnInfo();
|
||||
console.log('Columns:', Object.keys(columns));
|
||||
}
|
||||
}
|
||||
|
||||
// Test specific template query
|
||||
console.log('\n3. Testing specific template query (gallery_created):');
|
||||
try {
|
||||
const template = await db('email_templates')
|
||||
.where('template_key', 'gallery_created')
|
||||
.first();
|
||||
|
||||
if (template) {
|
||||
console.log('Template found:', template.template_key);
|
||||
console.log('Has subject_en?', template.subject_en !== undefined);
|
||||
console.log('Has subject?', template.subject !== undefined);
|
||||
} else {
|
||||
console.log('Template not found');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Template query failed:', error.message);
|
||||
}
|
||||
|
||||
// Check CMS pages
|
||||
console.log('\n4. Checking CMS pages:');
|
||||
try {
|
||||
const pages = await db('cms_pages')
|
||||
.select('slug', 'title', 'is_published')
|
||||
.orderBy('slug');
|
||||
|
||||
console.log(`Found ${pages.length} CMS pages:`);
|
||||
pages.forEach(page => {
|
||||
console.log(` - ${page.slug}: ${page.title} (published: ${page.is_published})`);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('CMS pages query failed:', error.message);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('General error:', error);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
debugEndpoints();
|
||||
@@ -1,56 +0,0 @@
|
||||
const knex = require('knex')({
|
||||
client: 'sqlite3',
|
||||
connection: { filename: '/app/data/photo_sharing.db' },
|
||||
useNullAsDefault: true
|
||||
});
|
||||
|
||||
async function debugEventPhotos() {
|
||||
try {
|
||||
// Get all photos for event 12
|
||||
const photos = await knex('photos')
|
||||
.where('event_id', 12)
|
||||
.select('id', 'filename', 'path', 'thumbnail_path')
|
||||
.orderBy('id');
|
||||
|
||||
console.log('Total photos for event 12:', photos.length);
|
||||
console.log('\nSample photos:');
|
||||
|
||||
// Show first few and specific IDs that were failing
|
||||
const sampleIds = [1686, 1687, 1688, 1689, 1715, 1717, 1718, 1719];
|
||||
const samples = photos.filter(p => sampleIds.includes(p.id));
|
||||
|
||||
samples.forEach(p => {
|
||||
console.log(`\nID ${p.id}: ${p.filename}`);
|
||||
console.log(` Path: ${p.path}`);
|
||||
console.log(` Thumbnail: ${p.thumbnail_path}`);
|
||||
});
|
||||
|
||||
// Check for any photos without thumbnails
|
||||
const noThumbs = photos.filter(p => !p.thumbnail_path);
|
||||
if (noThumbs.length > 0) {
|
||||
console.log(`\nPhotos without thumbnails: ${noThumbs.length}`);
|
||||
noThumbs.forEach(p => console.log(` ID ${p.id}: ${p.filename}`));
|
||||
}
|
||||
|
||||
// Check file existence for failing photos
|
||||
const fs = require('fs').promises;
|
||||
console.log('\nChecking file existence for samples:');
|
||||
|
||||
for (const photo of samples) {
|
||||
const thumbPath = `/app/storage/${photo.thumbnail_path}`;
|
||||
try {
|
||||
await fs.access(thumbPath);
|
||||
console.log(`✓ ID ${photo.id}: Thumbnail exists at ${thumbPath}`);
|
||||
} catch (err) {
|
||||
console.log(`✗ ID ${photo.id}: Thumbnail NOT FOUND at ${thumbPath}`);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error:', error);
|
||||
} finally {
|
||||
knex.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
debugEventPhotos();
|
||||
@@ -1,81 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const sqlite3 = require('sqlite3').verbose();
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
// Connect to the database
|
||||
const dbPath = '/app/data/photo_sharing.db';
|
||||
console.log(`Connecting to database at: ${dbPath}`);
|
||||
|
||||
const db = new sqlite3.Database(dbPath, sqlite3.OPEN_READONLY, (err) => {
|
||||
if (err) {
|
||||
console.error('Error opening database:', err.message);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('Connected to the SQLite database.\n');
|
||||
});
|
||||
|
||||
// Query for photos with IDs 1688 and 1689 where event_id = 12
|
||||
const query = `
|
||||
SELECT p.id, p.filename, p.path, p.thumbnail_path, p.event_id,
|
||||
e.slug as event_slug, e.is_active, e.is_archived
|
||||
FROM photos p
|
||||
JOIN events e ON p.event_id = e.id
|
||||
WHERE p.id IN (1688, 1689) AND p.event_id = 12
|
||||
`;
|
||||
|
||||
console.log('Executing query to get photo details with event information...\n');
|
||||
|
||||
db.all(query, [], (err, rows) => {
|
||||
if (err) {
|
||||
console.error('Error executing query:', err.message);
|
||||
db.close();
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`Found ${rows.length} photo(s):\n`);
|
||||
|
||||
if (rows.length === 0) {
|
||||
console.log('No photos found matching the criteria.');
|
||||
} else {
|
||||
rows.forEach((row) => {
|
||||
console.log('=== Photo ID:', row.id, '===');
|
||||
console.log('Filename:', row.filename);
|
||||
console.log('DB Path:', row.path);
|
||||
console.log('DB Thumbnail Path:', row.thumbnail_path);
|
||||
console.log('Event ID:', row.event_id);
|
||||
console.log('Event Slug:', row.event_slug);
|
||||
console.log('Event is_active:', row.is_active);
|
||||
console.log('Event is_archived:', row.is_archived);
|
||||
|
||||
// Check file existence
|
||||
const storageBase = '/app/storage';
|
||||
const eventStatusDir = row.is_active ? 'active' : 'archived';
|
||||
|
||||
// Check full image path
|
||||
const fullImagePath1 = path.join(storageBase, row.path);
|
||||
const fullImagePath2 = path.join(storageBase, 'events', eventStatusDir, row.path);
|
||||
|
||||
console.log('\nChecking full image paths:');
|
||||
console.log(` Path 1: ${fullImagePath1} - ${fs.existsSync(fullImagePath1) ? 'EXISTS' : 'NOT FOUND'}`);
|
||||
console.log(` Path 2: ${fullImagePath2} - ${fs.existsSync(fullImagePath2) ? 'EXISTS' : 'NOT FOUND'}`);
|
||||
|
||||
// Check thumbnail path
|
||||
const thumbnailPath = path.join(storageBase, row.thumbnail_path);
|
||||
console.log('\nChecking thumbnail path:');
|
||||
console.log(` ${thumbnailPath} - ${fs.existsSync(thumbnailPath) ? 'EXISTS' : 'NOT FOUND'}`);
|
||||
|
||||
console.log('\n---\n');
|
||||
});
|
||||
}
|
||||
|
||||
// Close the database connection
|
||||
db.close((err) => {
|
||||
if (err) {
|
||||
console.error('Error closing database:', err.message);
|
||||
} else {
|
||||
console.log('Database connection closed.');
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -1,56 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const sqlite3 = require('sqlite3').verbose();
|
||||
const path = require('path');
|
||||
|
||||
// Connect to the database
|
||||
const dbPath = '/app/data/photo_sharing.db';
|
||||
console.log(`Connecting to database at: ${dbPath}`);
|
||||
|
||||
const db = new sqlite3.Database(dbPath, sqlite3.OPEN_READONLY, (err) => {
|
||||
if (err) {
|
||||
console.error('Error opening database:', err.message);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('Connected to the SQLite database.');
|
||||
});
|
||||
|
||||
// Query for photos with IDs 1688 and 1689 where event_id = 12
|
||||
const query = `
|
||||
SELECT id, filename, path, thumbnail_path
|
||||
FROM photos
|
||||
WHERE id IN (1688, 1689) AND event_id = 12
|
||||
`;
|
||||
|
||||
console.log('\nExecuting query:', query);
|
||||
|
||||
db.all(query, [], (err, rows) => {
|
||||
if (err) {
|
||||
console.error('Error executing query:', err.message);
|
||||
db.close();
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`\nFound ${rows.length} photo(s):\n`);
|
||||
|
||||
if (rows.length === 0) {
|
||||
console.log('No photos found matching the criteria.');
|
||||
} else {
|
||||
rows.forEach((row) => {
|
||||
console.log('Photo ID:', row.id);
|
||||
console.log('Filename:', row.filename);
|
||||
console.log('Path:', row.path);
|
||||
console.log('Thumbnail Path:', row.thumbnail_path);
|
||||
console.log('---');
|
||||
});
|
||||
}
|
||||
|
||||
// Close the database connection
|
||||
db.close((err) => {
|
||||
if (err) {
|
||||
console.error('Error closing database:', err.message);
|
||||
} else {
|
||||
console.log('\nDatabase connection closed.');
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -1,132 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Authentication Security Enhancement Deployment Script
|
||||
# This script helps safely deploy auth security enhancements
|
||||
|
||||
set -e
|
||||
|
||||
echo "=== PicPeak Authentication Security Deployment ==="
|
||||
echo ""
|
||||
|
||||
# Color codes
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
# Check if we're in the backend directory
|
||||
if [ ! -f "package.json" ] || [ ! -d "src" ]; then
|
||||
echo -e "${RED}Error: Must run from backend directory${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Function to prompt for confirmation
|
||||
confirm() {
|
||||
read -p "$1 (y/n): " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo -e "${YELLOW}Deployment cancelled${NC}"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
echo "This script will help deploy authentication security enhancements"
|
||||
echo ""
|
||||
echo "Current deployment phase options:"
|
||||
echo "1. Run database migrations only (safe)"
|
||||
echo "2. Test enhanced auth endpoints"
|
||||
echo "3. Switch to enhanced auth (full deployment)"
|
||||
echo "4. Rollback to original auth"
|
||||
echo ""
|
||||
|
||||
read -p "Select phase (1-4): " PHASE
|
||||
|
||||
case $PHASE in
|
||||
1)
|
||||
echo -e "${GREEN}Phase 1: Running database migrations${NC}"
|
||||
confirm "Run migrations?"
|
||||
|
||||
echo "Creating backup..."
|
||||
cp database.db database.db.backup.$(date +%Y%m%d_%H%M%S) 2>/dev/null || true
|
||||
|
||||
echo "Running migrations..."
|
||||
npx knex migrate:latest
|
||||
|
||||
echo -e "${GREEN}✓ Migrations completed${NC}"
|
||||
echo "New tables added: login_attempts"
|
||||
echo "New columns added to admin_users: password_changed_at, last_login_ip"
|
||||
;;
|
||||
|
||||
2)
|
||||
echo -e "${GREEN}Phase 2: Testing enhanced auth${NC}"
|
||||
|
||||
# Check if server is running
|
||||
if ! curl -s http://localhost:3001/health > /dev/null; then
|
||||
echo -e "${RED}Server not running on port 3001${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Running auth security tests..."
|
||||
node scripts/test-auth-security.js
|
||||
|
||||
echo ""
|
||||
echo "Test endpoints manually:"
|
||||
echo "- Login: POST /api/auth/admin/login"
|
||||
echo "- Logout: POST /api/auth/logout"
|
||||
echo "- Session: GET /api/auth/session"
|
||||
;;
|
||||
|
||||
3)
|
||||
echo -e "${YELLOW}Phase 3: Full deployment${NC}"
|
||||
echo "This will switch to enhanced authentication"
|
||||
confirm "Deploy enhanced auth?"
|
||||
|
||||
# Check if migrations are run
|
||||
if ! npx knex migrate:status | grep -q "015_add_login_attempts_table"; then
|
||||
echo -e "${RED}Error: Migrations not run. Run phase 1 first.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Updating server.js to use enhanced auth..."
|
||||
# This is where you'd update the imports
|
||||
# For safety, we'll just show what needs to be done
|
||||
|
||||
echo -e "${YELLOW}Manual steps required:${NC}"
|
||||
echo "1. Edit server.js"
|
||||
echo "2. Change: const authRoutes = require('./src/routes/auth');"
|
||||
echo " To: const authRoutes = require('./src/routes/auth-enhanced');"
|
||||
echo "3. Restart the application"
|
||||
echo ""
|
||||
echo "After restart, the enhanced auth will be active with:"
|
||||
echo "- Account lockout protection"
|
||||
echo "- Login attempt tracking"
|
||||
echo "- Enhanced security logging"
|
||||
;;
|
||||
|
||||
4)
|
||||
echo -e "${RED}Phase 4: Rollback${NC}"
|
||||
confirm "Rollback auth changes?"
|
||||
|
||||
echo "Rolling back to original auth..."
|
||||
echo ""
|
||||
echo -e "${YELLOW}Manual steps required:${NC}"
|
||||
echo "1. Edit server.js"
|
||||
echo "2. Change: const authRoutes = require('./src/routes/auth-enhanced');"
|
||||
echo " To: const authRoutes = require('./src/routes/auth');"
|
||||
echo "3. Restart the application"
|
||||
echo ""
|
||||
echo "Optional: Clear lockouts"
|
||||
echo "sqlite3 database.db \"DELETE FROM login_attempts WHERE success = 0\""
|
||||
;;
|
||||
|
||||
*)
|
||||
echo -e "${RED}Invalid option${NC}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
echo ""
|
||||
echo -e "${GREEN}Done!${NC}"
|
||||
echo ""
|
||||
echo "Monitor logs after any changes:"
|
||||
echo "docker-compose logs -f backend | grep -i auth"
|
||||
@@ -1,37 +0,0 @@
|
||||
const path = require('path');
|
||||
require('dotenv').config({ path: path.join(__dirname, '../.env') });
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function fixDefaultThemes() {
|
||||
try {
|
||||
console.log('Fixing events with "default" theme...');
|
||||
|
||||
// Find all events with "default" as color_theme
|
||||
const eventsToFix = await db('events')
|
||||
.where('color_theme', 'default')
|
||||
.select('id', 'event_name');
|
||||
|
||||
console.log(`Found ${eventsToFix.length} events to fix`);
|
||||
|
||||
if (eventsToFix.length > 0) {
|
||||
// Update them to null so they use the global theme
|
||||
await db('events')
|
||||
.where('color_theme', 'default')
|
||||
.update({ color_theme: null });
|
||||
|
||||
console.log('Updated events to use global theme');
|
||||
|
||||
eventsToFix.forEach(event => {
|
||||
console.log(`- Fixed event: ${event.event_name} (ID: ${event.id})`);
|
||||
});
|
||||
}
|
||||
|
||||
console.log('Theme fix completed successfully');
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('Error fixing themes:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
fixDefaultThemes();
|
||||
@@ -0,0 +1,145 @@
|
||||
require('dotenv').config();
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function fixProductionIssues() {
|
||||
console.log('Fixing production database issues...\n');
|
||||
|
||||
try {
|
||||
// 1. Check and fix email_templates structure
|
||||
console.log('1. Checking email_templates structure:');
|
||||
const emailColumns = await db('email_templates').columnInfo();
|
||||
console.log('Current columns:', Object.keys(emailColumns));
|
||||
|
||||
// Check if we need to add basic columns back
|
||||
const hasSubject = 'subject' in emailColumns;
|
||||
const hasSubjectEn = 'subject_en' in emailColumns;
|
||||
|
||||
if (hasSubjectEn && !hasSubject) {
|
||||
console.log('Adding basic columns back to email_templates...');
|
||||
await db.schema.alterTable('email_templates', (table) => {
|
||||
table.string('subject');
|
||||
table.text('body_html');
|
||||
table.text('body_text');
|
||||
});
|
||||
|
||||
// Copy values from _en columns
|
||||
await db('email_templates').update({
|
||||
subject: db.raw('subject_en'),
|
||||
body_html: db.raw('body_html_en'),
|
||||
body_text: db.raw('body_text_en')
|
||||
});
|
||||
console.log('Basic columns added successfully');
|
||||
}
|
||||
|
||||
// 2. Ensure default templates exist
|
||||
console.log('\n2. Checking email templates:');
|
||||
const templateCount = await db('email_templates').count('* as count');
|
||||
console.log('Template count:', templateCount[0].count);
|
||||
|
||||
if (templateCount[0].count === 0) {
|
||||
console.log('No templates found, inserting defaults...');
|
||||
const defaultTemplates = [
|
||||
{
|
||||
template_key: 'gallery_created',
|
||||
subject: 'Your Photo Gallery is Ready!',
|
||||
body_html: '<h2>Gallery Created Successfully</h2>...',
|
||||
body_text: 'Gallery Created Successfully...',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'event_date', 'gallery_link', 'gallery_password', 'expiry_date'])
|
||||
},
|
||||
{
|
||||
template_key: 'expiration_warning',
|
||||
subject: 'Your Photo Gallery Expires Soon',
|
||||
body_html: '<h2>Gallery Expiring Soon</h2>...',
|
||||
body_text: 'Gallery Expiring Soon...',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'days_remaining', 'gallery_link'])
|
||||
},
|
||||
{
|
||||
template_key: 'gallery_expired',
|
||||
subject: 'Your Photo Gallery Has Expired',
|
||||
body_html: '<h2>Gallery Expired</h2>...',
|
||||
body_text: 'Gallery Expired...',
|
||||
variables: JSON.stringify(['host_name', 'event_name'])
|
||||
},
|
||||
{
|
||||
template_key: 'archive_complete',
|
||||
subject: 'Gallery Archive Complete',
|
||||
body_html: '<h2>Archive Complete</h2>...',
|
||||
body_text: 'Archive Complete...',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'archive_size'])
|
||||
}
|
||||
];
|
||||
|
||||
for (const template of defaultTemplates) {
|
||||
// Add language columns if they exist
|
||||
if (hasSubjectEn) {
|
||||
template.subject_en = template.subject;
|
||||
template.body_html_en = template.body_html;
|
||||
template.body_text_en = template.body_text;
|
||||
template.subject_de = template.subject;
|
||||
template.body_html_de = template.body_html;
|
||||
template.body_text_de = template.body_text;
|
||||
}
|
||||
|
||||
await db('email_templates').insert(template);
|
||||
}
|
||||
console.log('Default templates inserted');
|
||||
}
|
||||
|
||||
// 3. Check activity_logs structure
|
||||
console.log('\n3. Checking activity_logs structure:');
|
||||
const activityColumns = await db('activity_logs').columnInfo();
|
||||
console.log('Columns:', Object.keys(activityColumns));
|
||||
|
||||
// Check if read_at exists
|
||||
if (!('read_at' in activityColumns)) {
|
||||
console.log('Adding read_at column to activity_logs...');
|
||||
await db.schema.alterTable('activity_logs', (table) => {
|
||||
table.datetime('read_at').nullable();
|
||||
});
|
||||
console.log('read_at column added');
|
||||
}
|
||||
|
||||
// 4. Check and add CMS pages
|
||||
console.log('\n4. Checking CMS pages:');
|
||||
const cmsColumns = await db('cms_pages').columnInfo();
|
||||
console.log('CMS columns:', Object.keys(cmsColumns));
|
||||
|
||||
const impressum = await db('cms_pages').where('slug', 'impressum').first();
|
||||
const datenschutz = await db('cms_pages').where('slug', 'datenschutz').first();
|
||||
|
||||
if (!impressum) {
|
||||
console.log('Adding Impressum page...');
|
||||
await db('cms_pages').insert({
|
||||
slug: 'impressum',
|
||||
title_en: 'Legal Notice',
|
||||
title_de: 'Impressum',
|
||||
content_en: '<h1>Legal Notice</h1><p>Your legal information here...</p>',
|
||||
content_de: '<h1>Impressum</h1><p>Ihre rechtlichen Informationen hier...</p>',
|
||||
updated_at: new Date()
|
||||
});
|
||||
}
|
||||
|
||||
if (!datenschutz) {
|
||||
console.log('Adding Datenschutz page...');
|
||||
await db('cms_pages').insert({
|
||||
slug: 'datenschutz',
|
||||
title_en: 'Privacy Policy',
|
||||
title_de: 'Datenschutzerklärung',
|
||||
content_en: '<h1>Privacy Policy</h1><p>Your privacy policy here...</p>',
|
||||
content_de: '<h1>Datenschutzerklärung</h1><p>Ihre Datenschutzerklärung hier...</p>',
|
||||
updated_at: new Date()
|
||||
});
|
||||
}
|
||||
|
||||
console.log('\n✅ All fixes applied successfully!');
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error fixing issues:', error);
|
||||
console.error('Stack:', error.stack);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
fixProductionIssues();
|
||||
@@ -1,136 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Monitor authentication health after deployment
|
||||
* Run this after activating enhanced auth to watch for issues
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
console.log('=== Authentication Health Monitor ===\n');
|
||||
console.log('Monitoring auth system... (Press Ctrl+C to stop)\n');
|
||||
|
||||
// Color codes
|
||||
const GREEN = '\x1b[32m';
|
||||
const RED = '\x1b[31m';
|
||||
const YELLOW = '\x1b[33m';
|
||||
const RESET = '\x1b[0m';
|
||||
|
||||
let previousStats = {
|
||||
totalAttempts: 0,
|
||||
failedAttempts: 0,
|
||||
lockedAccounts: 0
|
||||
};
|
||||
|
||||
async function getAuthStats() {
|
||||
try {
|
||||
const stats = {};
|
||||
|
||||
// Total login attempts in last hour
|
||||
const totalAttempts = await db('login_attempts')
|
||||
.where('attempt_time', '>', new Date(Date.now() - 60 * 60 * 1000).toISOString())
|
||||
.count('id as count')
|
||||
.first();
|
||||
stats.totalAttempts = totalAttempts.count || 0;
|
||||
|
||||
// Failed attempts in last hour
|
||||
const failedAttempts = await db('login_attempts')
|
||||
.where('attempt_time', '>', new Date(Date.now() - 60 * 60 * 1000).toISOString())
|
||||
.where('success', false)
|
||||
.count('id as count')
|
||||
.first();
|
||||
stats.failedAttempts = failedAttempts.count || 0;
|
||||
|
||||
// Currently locked accounts
|
||||
const recentWindow = new Date(Date.now() - 15 * 60 * 1000);
|
||||
const lockedAccounts = await db('login_attempts')
|
||||
.select('identifier')
|
||||
.where('success', false)
|
||||
.where('attempt_time', '>=', recentWindow.toISOString())
|
||||
.groupBy('identifier')
|
||||
.havingRaw('COUNT(*) >= 5');
|
||||
stats.lockedAccounts = lockedAccounts.length;
|
||||
|
||||
// Success rate
|
||||
stats.successRate = stats.totalAttempts > 0
|
||||
? ((stats.totalAttempts - stats.failedAttempts) / stats.totalAttempts * 100).toFixed(1)
|
||||
: 100;
|
||||
|
||||
// Recent failures (last 5 minutes)
|
||||
const recentFailures = await db('login_attempts')
|
||||
.where('success', false)
|
||||
.where('attempt_time', '>', new Date(Date.now() - 5 * 60 * 1000).toISOString())
|
||||
.orderBy('attempt_time', 'desc')
|
||||
.limit(5)
|
||||
.select('identifier', 'ip_address', 'attempt_time');
|
||||
stats.recentFailures = recentFailures;
|
||||
|
||||
return stats;
|
||||
} catch (error) {
|
||||
return { error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async function displayStats() {
|
||||
const stats = await getAuthStats();
|
||||
|
||||
if (stats.error) {
|
||||
console.log(`${RED}Error: ${stats.error}${RESET}`);
|
||||
console.log('Enhanced auth might not be active yet.\n');
|
||||
return;
|
||||
}
|
||||
|
||||
// Clear console for clean display
|
||||
console.clear();
|
||||
console.log('=== Authentication Health Monitor ===\n');
|
||||
console.log(new Date().toLocaleString());
|
||||
console.log('─'.repeat(50));
|
||||
|
||||
// Display metrics
|
||||
console.log(`\n📊 Last Hour Statistics:`);
|
||||
console.log(` Total Login Attempts: ${stats.totalAttempts}`);
|
||||
console.log(` Failed Attempts: ${stats.failedAttempts}`);
|
||||
console.log(` Success Rate: ${stats.successRate}%`);
|
||||
console.log(` Currently Locked: ${stats.lockedAccounts} accounts`);
|
||||
|
||||
// Alerts
|
||||
if (stats.failedAttempts > previousStats.failedAttempts + 10) {
|
||||
console.log(`\n${RED}⚠️ ALERT: Spike in failed login attempts!${RESET}`);
|
||||
}
|
||||
|
||||
if (stats.lockedAccounts > 5) {
|
||||
console.log(`\n${YELLOW}⚠️ WARNING: Multiple accounts locked (${stats.lockedAccounts})${RESET}`);
|
||||
}
|
||||
|
||||
if (stats.successRate < 50) {
|
||||
console.log(`\n${RED}⚠️ ALERT: Low success rate (${stats.successRate}%)${RESET}`);
|
||||
}
|
||||
|
||||
// Recent failures
|
||||
if (stats.recentFailures && stats.recentFailures.length > 0) {
|
||||
console.log(`\n📋 Recent Failed Attempts (last 5 min):`);
|
||||
stats.recentFailures.forEach(failure => {
|
||||
const time = new Date(failure.attempt_time).toLocaleTimeString();
|
||||
console.log(` ${time} - ${failure.identifier} from ${failure.ip_address}`);
|
||||
});
|
||||
}
|
||||
|
||||
// Health status
|
||||
console.log(`\n✅ Status: ${stats.failedAttempts === 0 ? 'Healthy' : 'Active'}`);
|
||||
console.log('\nPress Ctrl+C to stop monitoring\n');
|
||||
|
||||
previousStats = stats;
|
||||
}
|
||||
|
||||
// Monitor every 10 seconds
|
||||
setInterval(displayStats, 10000);
|
||||
|
||||
// Initial display
|
||||
displayStats();
|
||||
|
||||
// Graceful shutdown
|
||||
process.on('SIGINT', async () => {
|
||||
console.log('\nStopping monitor...');
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
});
|
||||
@@ -1,269 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Safe Authentication Deployment Script
|
||||
* Carefully activates auth security with multiple safety checks
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
const logger = require('../src/utils/logger');
|
||||
|
||||
console.log('=== Safe Authentication Security Deployment ===\n');
|
||||
|
||||
// Color codes
|
||||
const GREEN = '\x1b[32m';
|
||||
const RED = '\x1b[31m';
|
||||
const YELLOW = '\x1b[33m';
|
||||
const BLUE = '\x1b[34m';
|
||||
const RESET = '\x1b[0m';
|
||||
|
||||
async function runSafetyChecks() {
|
||||
console.log(`${BLUE}Running pre-deployment safety checks...${RESET}\n`);
|
||||
|
||||
const checks = {
|
||||
databaseConnected: false,
|
||||
adminUsersExist: false,
|
||||
activeSessionsExist: false,
|
||||
migrationsReady: true,
|
||||
diskSpace: true
|
||||
};
|
||||
|
||||
try {
|
||||
// Check 1: Database connection
|
||||
await db.raw('SELECT 1');
|
||||
checks.databaseConnected = true;
|
||||
console.log(`${GREEN}✓${RESET} Database connection healthy`);
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} Database connection failed`);
|
||||
return checks;
|
||||
}
|
||||
|
||||
try {
|
||||
// Check 2: Admin users exist
|
||||
const adminCount = await db('admin_users').count('id as count').first();
|
||||
checks.adminUsersExist = adminCount.count > 0;
|
||||
console.log(`${GREEN}✓${RESET} Found ${adminCount.count} admin users`);
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} Could not check admin users`);
|
||||
}
|
||||
|
||||
try {
|
||||
// Check 3: Check for active sessions (optional warning)
|
||||
const recentLogins = await db('access_logs')
|
||||
.where('action', 'login_success')
|
||||
.where('timestamp', '>', new Date(Date.now() - 60 * 60 * 1000).toISOString())
|
||||
.count('id as count')
|
||||
.first();
|
||||
|
||||
if (recentLogins.count > 0) {
|
||||
checks.activeSessionsExist = true;
|
||||
console.log(`${YELLOW}!${RESET} Warning: ${recentLogins.count} active sessions in last hour`);
|
||||
} else {
|
||||
console.log(`${GREEN}✓${RESET} No recent active sessions`);
|
||||
}
|
||||
} catch (e) {
|
||||
// Table might not exist yet, that's ok
|
||||
console.log(`${GREEN}✓${RESET} No access logs table yet (expected)`);
|
||||
}
|
||||
|
||||
try {
|
||||
// Check 4: Check if migrations would conflict
|
||||
const tables = await db.raw(`
|
||||
SELECT name FROM sqlite_master
|
||||
WHERE type='table' AND name IN ('login_attempts')
|
||||
`);
|
||||
|
||||
if (tables.length > 0) {
|
||||
console.log(`${YELLOW}!${RESET} login_attempts table already exists`);
|
||||
checks.migrationsReady = false;
|
||||
} else {
|
||||
console.log(`${GREEN}✓${RESET} Ready to create login_attempts table`);
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} Could not check existing tables`);
|
||||
checks.migrationsReady = false;
|
||||
}
|
||||
|
||||
return checks;
|
||||
}
|
||||
|
||||
async function backupDatabase() {
|
||||
console.log(`\n${BLUE}Creating database backup...${RESET}`);
|
||||
|
||||
try {
|
||||
const fs = require('fs').promises;
|
||||
const path = require('path');
|
||||
|
||||
const dbPath = process.env.DB_PATH || './data/database.db';
|
||||
const backupPath = `${dbPath}.backup.${Date.now()}`;
|
||||
|
||||
await fs.copyFile(dbPath, backupPath);
|
||||
console.log(`${GREEN}✓${RESET} Database backed up to: ${path.basename(backupPath)}`);
|
||||
return backupPath;
|
||||
} catch (e) {
|
||||
console.log(`${YELLOW}!${RESET} Could not create backup: ${e.message}`);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function runMigrations() {
|
||||
console.log(`\n${BLUE}Running database migrations...${RESET}`);
|
||||
|
||||
try {
|
||||
// Run migrations
|
||||
const knex = db;
|
||||
await knex.migrate.latest();
|
||||
|
||||
console.log(`${GREEN}✓${RESET} Migrations completed successfully`);
|
||||
|
||||
// Verify tables exist
|
||||
const loginAttempts = await db('login_attempts').count().first();
|
||||
console.log(`${GREEN}✓${RESET} login_attempts table created`);
|
||||
|
||||
const adminColumns = await db('admin_users').columnInfo();
|
||||
if (adminColumns.password_changed_at) {
|
||||
console.log(`${GREEN}✓${RESET} Security columns added to admin_users`);
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} Migration failed: ${e.message}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function testEnhancedAuth() {
|
||||
console.log(`\n${BLUE}Testing enhanced authentication (without activating)...${RESET}`);
|
||||
|
||||
try {
|
||||
// Test that enhanced modules load correctly
|
||||
const authSecurity = require('../src/utils/authSecurity');
|
||||
const authEnhanced = require('../src/middleware/auth-enhanced');
|
||||
const authRoutes = require('../src/routes/auth-enhanced');
|
||||
|
||||
console.log(`${GREEN}✓${RESET} Enhanced auth modules load correctly`);
|
||||
|
||||
// Test lockout logic (without real data)
|
||||
const lockoutStatus = await authSecurity.checkAccountLockout('test-user-that-doesnt-exist');
|
||||
console.log(`${GREEN}✓${RESET} Account lockout check works: ${lockoutStatus.isLocked ? 'locked' : 'not locked'}`);
|
||||
|
||||
// Test generic error
|
||||
const error = authSecurity.getGenericAuthError();
|
||||
console.log(`${GREEN}✓${RESET} Generic error message: "${error}"`);
|
||||
|
||||
return true;
|
||||
} catch (e) {
|
||||
console.log(`${RED}✗${RESET} Enhanced auth test failed: ${e.message}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function createDeploymentInstructions() {
|
||||
console.log(`\n${BLUE}Deployment Instructions:${RESET}\n`);
|
||||
|
||||
const instructions = `
|
||||
${GREEN}Step 1: Update server.js${RESET}
|
||||
Change:
|
||||
${YELLOW}const authRoutes = require('./src/routes/auth');${RESET}
|
||||
To:
|
||||
${GREEN}const authRoutes = require('./src/routes/auth-enhanced');${RESET}
|
||||
|
||||
Add after database initialization:
|
||||
${GREEN}const { initializeCleanupJob } = require('./src/utils/authSecurity');
|
||||
initializeCleanupJob();${RESET}
|
||||
|
||||
${GREEN}Step 2: Update middleware imports (if needed)${RESET}
|
||||
In files using adminAuth, change:
|
||||
${YELLOW}const { adminAuth } = require('../middleware/auth');${RESET}
|
||||
To:
|
||||
${GREEN}const { adminAuth } = require('../middleware/auth-enhanced');${RESET}
|
||||
|
||||
${GREEN}Step 3: Restart the application${RESET}
|
||||
${BLUE}docker-compose restart backend${RESET}
|
||||
or
|
||||
${BLUE}pm2 restart picpeak-backend${RESET}
|
||||
|
||||
${GREEN}Step 4: Monitor logs${RESET}
|
||||
${BLUE}docker-compose logs -f backend | grep -i auth${RESET}
|
||||
|
||||
${YELLOW}Rollback if needed:${RESET}
|
||||
Revert server.js changes and restart
|
||||
`;
|
||||
|
||||
console.log(instructions);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
try {
|
||||
// Step 1: Run safety checks
|
||||
const checks = await runSafetyChecks();
|
||||
|
||||
if (!checks.databaseConnected) {
|
||||
console.log(`\n${RED}Cannot proceed: Database not connected${RESET}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (checks.activeSessionsExist) {
|
||||
console.log(`\n${YELLOW}Warning: There are active user sessions.`);
|
||||
console.log(`Consider deploying during low-traffic period.${RESET}`);
|
||||
}
|
||||
|
||||
// Step 2: Backup database
|
||||
const backupPath = await backupDatabase();
|
||||
|
||||
// Step 3: Run migrations
|
||||
console.log(`\n${YELLOW}Ready to run migrations. This will:`);
|
||||
console.log(`- Create login_attempts table`);
|
||||
console.log(`- Add security columns to admin_users`);
|
||||
console.log(`No existing data will be modified.${RESET}\n`);
|
||||
|
||||
const readline = require('readline').createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout
|
||||
});
|
||||
|
||||
readline.question('Continue with migrations? (y/n): ', async (answer) => {
|
||||
if (answer.toLowerCase() !== 'y') {
|
||||
console.log(`${YELLOW}Deployment cancelled${RESET}`);
|
||||
readline.close();
|
||||
await db.destroy();
|
||||
return;
|
||||
}
|
||||
|
||||
const migrationSuccess = await runMigrations();
|
||||
|
||||
if (!migrationSuccess) {
|
||||
console.log(`\n${RED}Migrations failed. Database backup available at: ${backupPath}${RESET}`);
|
||||
readline.close();
|
||||
await db.destroy();
|
||||
return;
|
||||
}
|
||||
|
||||
// Step 4: Test enhanced auth
|
||||
const authTestSuccess = await testEnhancedAuth();
|
||||
|
||||
if (!authTestSuccess) {
|
||||
console.log(`\n${YELLOW}Enhanced auth tests failed, but migrations succeeded.`);
|
||||
console.log(`Review the errors before activating enhanced auth.${RESET}`);
|
||||
}
|
||||
|
||||
// Step 5: Show deployment instructions
|
||||
await createDeploymentInstructions();
|
||||
|
||||
console.log(`\n${GREEN}✓ Pre-deployment complete!${RESET}`);
|
||||
console.log(`${YELLOW}Enhanced auth is ready but NOT YET ACTIVE.${RESET}`);
|
||||
console.log(`Follow the instructions above to activate when ready.\n`);
|
||||
|
||||
readline.close();
|
||||
await db.destroy();
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error(`${RED}Deployment script error:${RESET}`, error);
|
||||
await db.destroy();
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Run the deployment
|
||||
main();
|
||||
@@ -1,47 +0,0 @@
|
||||
const path = require('path');
|
||||
require('dotenv').config({ path: path.join(__dirname, '../.env') });
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function seedCategories() {
|
||||
try {
|
||||
console.log('Seeding default categories...');
|
||||
|
||||
const defaultCategories = [
|
||||
{ name: 'Portraits', slug: 'portraits' },
|
||||
{ name: 'Group Photos', slug: 'group-photos' },
|
||||
{ name: 'Ceremony', slug: 'ceremony' },
|
||||
{ name: 'Reception', slug: 'reception' },
|
||||
{ name: 'Dancing', slug: 'dancing' },
|
||||
{ name: 'Candids', slug: 'candids' },
|
||||
{ name: 'Details', slug: 'details' },
|
||||
{ name: 'Getting Ready', slug: 'getting-ready' }
|
||||
];
|
||||
|
||||
for (const category of defaultCategories) {
|
||||
// Check if category already exists
|
||||
const existing = await db('photo_categories')
|
||||
.where({ slug: category.slug, is_global: true })
|
||||
.first();
|
||||
|
||||
if (!existing) {
|
||||
await db('photo_categories').insert({
|
||||
name: category.name,
|
||||
slug: category.slug,
|
||||
is_global: true,
|
||||
event_id: null
|
||||
});
|
||||
console.log(`Created category: ${category.name}`);
|
||||
} else {
|
||||
console.log(`Category already exists: ${category.name}`);
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Default categories seeded successfully');
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.error('Error seeding categories:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
seedCategories();
|
||||
@@ -1,55 +0,0 @@
|
||||
const axios = require('axios');
|
||||
|
||||
async function testAdminPhotoEndpoint() {
|
||||
try {
|
||||
// First login
|
||||
console.log('1. Logging in as admin...');
|
||||
const loginResponse = await axios.post('http://localhost:3000/api/admin/auth/login', {
|
||||
username: 'admin',
|
||||
password: 'admin123'
|
||||
});
|
||||
|
||||
const token = loginResponse.data.token;
|
||||
console.log('✓ Login successful, got token');
|
||||
|
||||
// Test thumbnail endpoint
|
||||
console.log('\n2. Testing thumbnail endpoint for photo 1688...');
|
||||
try {
|
||||
const thumbResponse = await axios.get('http://localhost:3000/api/admin/events/12/thumbnail/1688', {
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`
|
||||
},
|
||||
responseType: 'arraybuffer'
|
||||
});
|
||||
|
||||
console.log('✓ Thumbnail request successful');
|
||||
console.log(' Response headers:', thumbResponse.headers);
|
||||
console.log(' Data size:', thumbResponse.data.length, 'bytes');
|
||||
} catch (error) {
|
||||
console.error('✗ Thumbnail request failed:', error.response?.status, error.response?.data?.toString());
|
||||
}
|
||||
|
||||
// Test from frontend proxy port
|
||||
console.log('\n3. Testing through nginx proxy (port 3001)...');
|
||||
try {
|
||||
const proxyResponse = await axios.get('http://localhost:3001/api/admin/events/12/thumbnail/1688', {
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
Origin: 'http://localhost:3005'
|
||||
},
|
||||
responseType: 'arraybuffer'
|
||||
});
|
||||
|
||||
console.log('✓ Proxy request successful');
|
||||
console.log(' Response headers:', proxyResponse.headers);
|
||||
console.log(' Data size:', proxyResponse.data.length, 'bytes');
|
||||
} catch (error) {
|
||||
console.error('✗ Proxy request failed:', error.response?.status, error.response?.data?.toString());
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
testAdminPhotoEndpoint();
|
||||
@@ -1,146 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Test authentication deployment
|
||||
# This script tests the enhanced auth without affecting production
|
||||
|
||||
set -e
|
||||
|
||||
echo "=== Testing Authentication Deployment ==="
|
||||
echo ""
|
||||
|
||||
# Color codes
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
# Configuration
|
||||
API_URL="http://localhost:3001/api"
|
||||
TEST_USER="admin"
|
||||
TEST_PASS="wrong-password"
|
||||
|
||||
echo -e "${BLUE}This script will test the authentication system${NC}"
|
||||
echo "It will make failed login attempts to test lockout"
|
||||
echo ""
|
||||
|
||||
# Check if server is running
|
||||
echo -e "${BLUE}Checking server status...${NC}"
|
||||
if curl -s -f "$API_URL/../health" > /dev/null; then
|
||||
echo -e "${GREEN}✓ Server is running${NC}"
|
||||
else
|
||||
echo -e "${RED}✗ Server not accessible at $API_URL${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Function to make login attempt
|
||||
make_login_attempt() {
|
||||
local username=$1
|
||||
local password=$2
|
||||
local expected_status=$3
|
||||
|
||||
response=$(curl -s -w "\n%{http_code}" -X POST "$API_URL/auth/admin/login" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"username\":\"$username\",\"password\":\"$password\"}")
|
||||
|
||||
http_code=$(echo "$response" | tail -n1)
|
||||
body=$(echo "$response" | head -n-1)
|
||||
|
||||
if [ "$http_code" -eq "$expected_status" ]; then
|
||||
echo -e "${GREEN}✓${NC} Got expected status $http_code"
|
||||
return 0
|
||||
else
|
||||
echo -e "${RED}✗${NC} Expected $expected_status, got $http_code"
|
||||
echo "Response: $body"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 1: Normal failed login
|
||||
echo -e "\n${BLUE}Test 1: Normal failed login${NC}"
|
||||
make_login_attempt "$TEST_USER" "$TEST_PASS" 401
|
||||
|
||||
# Test 2: Multiple failed attempts (testing lockout)
|
||||
echo -e "\n${BLUE}Test 2: Testing account lockout (5 attempts)${NC}"
|
||||
echo "Making 4 more failed attempts..."
|
||||
|
||||
for i in {2..5}; do
|
||||
echo -n "Attempt $i: "
|
||||
make_login_attempt "$TEST_USER" "$TEST_PASS" 401
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# Test 3: 6th attempt should be locked
|
||||
echo -e "\n${BLUE}Test 3: 6th attempt (should be locked if enhanced auth active)${NC}"
|
||||
echo -n "Attempt 6: "
|
||||
|
||||
response=$(curl -s -w "\n%{http_code}" -X POST "$API_URL/auth/admin/login" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"username\":\"$TEST_USER\",\"password\":\"$TEST_PASS\"}")
|
||||
|
||||
http_code=$(echo "$response" | tail -n1)
|
||||
body=$(echo "$response" | head -n-1)
|
||||
|
||||
if [ "$http_code" -eq "423" ]; then
|
||||
echo -e "${GREEN}✓ Account locked as expected!${NC}"
|
||||
echo -e "${GREEN}Enhanced auth is ACTIVE${NC}"
|
||||
echo "Lockout message: $(echo $body | jq -r '.error')"
|
||||
ENHANCED_ACTIVE=true
|
||||
elif [ "$http_code" -eq "401" ]; then
|
||||
echo -e "${YELLOW}! Still got 401 - Enhanced auth NOT active${NC}"
|
||||
echo "Original auth is still in use"
|
||||
ENHANCED_ACTIVE=false
|
||||
else
|
||||
echo -e "${RED}✗ Unexpected status: $http_code${NC}"
|
||||
echo "Response: $body"
|
||||
fi
|
||||
|
||||
# Test 4: Check if we can query login attempts
|
||||
echo -e "\n${BLUE}Test 4: Checking login attempts table${NC}"
|
||||
|
||||
if [ "$ENHANCED_ACTIVE" = true ]; then
|
||||
# This would need database access, so we'll check via API behavior
|
||||
echo -e "${GREEN}✓ Login tracking is active${NC}"
|
||||
else
|
||||
echo -e "${YELLOW}! Login tracking not active (migrations might not be run)${NC}"
|
||||
fi
|
||||
|
||||
# Test 5: Test logout endpoint
|
||||
echo -e "\n${BLUE}Test 5: Testing logout endpoint${NC}"
|
||||
|
||||
# First need a valid token (this assumes you have one for testing)
|
||||
# For now, just check if endpoint exists
|
||||
logout_response=$(curl -s -w "\n%{http_code}" -X POST "$API_URL/auth/logout" \
|
||||
-H "Authorization: Bearer invalid-token")
|
||||
|
||||
logout_code=$(echo "$logout_response" | tail -n1)
|
||||
|
||||
if [ "$logout_code" -eq "200" ] || [ "$logout_code" -eq "401" ]; then
|
||||
echo -e "${GREEN}✓ Logout endpoint exists${NC}"
|
||||
else
|
||||
echo -e "${YELLOW}! Logout endpoint might not be active${NC}"
|
||||
fi
|
||||
|
||||
# Summary
|
||||
echo -e "\n${BLUE}=== Summary ===${NC}"
|
||||
if [ "$ENHANCED_ACTIVE" = true ]; then
|
||||
echo -e "${GREEN}✅ Enhanced authentication is ACTIVE${NC}"
|
||||
echo "- Account lockout protection: Working"
|
||||
echo "- Login attempt tracking: Active"
|
||||
echo "- Enhanced security: Enabled"
|
||||
echo ""
|
||||
echo -e "${YELLOW}Note: Test account might be locked for 30 minutes${NC}"
|
||||
else
|
||||
echo -e "${YELLOW}⚠️ Enhanced authentication is NOT ACTIVE${NC}"
|
||||
echo "- Using original auth system"
|
||||
echo "- No lockout protection"
|
||||
echo "- No login tracking"
|
||||
echo ""
|
||||
echo "To activate:"
|
||||
echo "1. Run migrations: docker exec wedding-photo-sharing-backend-1 npx knex migrate:latest"
|
||||
echo "2. Update server.js to use auth-enhanced routes"
|
||||
echo "3. Restart: docker-compose restart backend"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Test complete!"
|
||||
@@ -1,112 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test script to verify authentication security enhancements
|
||||
*/
|
||||
|
||||
console.log('=== Testing Authentication Security Enhancements ===\n');
|
||||
|
||||
const {
|
||||
checkAccountLockout,
|
||||
getGenericAuthError,
|
||||
MAX_LOGIN_ATTEMPTS,
|
||||
LOCKOUT_DURATION
|
||||
} = require('../src/utils/authSecurity');
|
||||
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
function test(description, fn) {
|
||||
try {
|
||||
const result = fn();
|
||||
if (result || result === undefined) {
|
||||
console.log(`✅ ${description}`);
|
||||
passed++;
|
||||
} else {
|
||||
console.log(`❌ ${description}`);
|
||||
failed++;
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(`❌ ${description} - Error: ${error.message}`);
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
|
||||
// Test generic error message
|
||||
console.log('Testing generic error messages:');
|
||||
test('Generic error prevents user enumeration', () => {
|
||||
const error = getGenericAuthError();
|
||||
return error === 'Invalid credentials';
|
||||
});
|
||||
|
||||
// Test constants
|
||||
console.log('\nTesting security constants:');
|
||||
test('Max login attempts is reasonable', () => MAX_LOGIN_ATTEMPTS === 5);
|
||||
test('Lockout duration is 30 minutes', () => LOCKOUT_DURATION === 30 * 60 * 1000);
|
||||
|
||||
// Test JWT structure
|
||||
console.log('\nTesting JWT token claims:');
|
||||
const jwt = require('jsonwebtoken');
|
||||
const testToken = jwt.sign({
|
||||
id: 1,
|
||||
username: 'testuser',
|
||||
type: 'admin',
|
||||
ip: '127.0.0.1',
|
||||
loginTime: Date.now()
|
||||
}, 'test-secret', {
|
||||
expiresIn: '24h',
|
||||
issuer: 'picpeak-auth'
|
||||
});
|
||||
|
||||
const decoded = jwt.verify(testToken, 'test-secret', { complete: true });
|
||||
test('Token has issuer claim', () => decoded.payload.iss === 'picpeak-auth');
|
||||
test('Token has IP claim', () => decoded.payload.ip === '127.0.0.1');
|
||||
test('Token has loginTime claim', () => typeof decoded.payload.loginTime === 'number');
|
||||
test('Token expires in 24 hours', () => {
|
||||
const exp = decoded.payload.exp;
|
||||
const iat = decoded.payload.iat;
|
||||
return (exp - iat) === 24 * 60 * 60;
|
||||
});
|
||||
|
||||
// Test auth middleware logic
|
||||
console.log('\nTesting auth middleware logic:');
|
||||
test('Token type validation works', () => {
|
||||
const adminToken = { type: 'admin' };
|
||||
const galleryToken = { type: 'gallery' };
|
||||
const invalidToken = { type: 'invalid' };
|
||||
|
||||
return adminToken.type === 'admin' &&
|
||||
galleryToken.type === 'gallery' &&
|
||||
invalidToken.type !== 'admin' &&
|
||||
invalidToken.type !== 'gallery';
|
||||
});
|
||||
|
||||
// Test IP validation logic
|
||||
console.log('\nTesting IP validation:');
|
||||
test('IP mismatch is detected', () => {
|
||||
const tokenIp = '192.168.1.100';
|
||||
const currentIp = '10.0.0.50';
|
||||
return tokenIp !== currentIp;
|
||||
});
|
||||
|
||||
// Test password change detection
|
||||
console.log('\nTesting password change detection:');
|
||||
test('Token issued before password change is invalid', () => {
|
||||
const tokenIssuedAt = Math.floor(Date.now() / 1000) - 3600; // 1 hour ago
|
||||
const passwordChangedAt = Math.floor(Date.now() / 1000) - 1800; // 30 minutes ago
|
||||
return tokenIssuedAt < passwordChangedAt;
|
||||
});
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Test Summary ===');
|
||||
console.log(`Total tests: ${passed + failed}`);
|
||||
console.log(`Passed: ${passed}`);
|
||||
console.log(`Failed: ${failed}`);
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('\n✅ All authentication security tests passed!');
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('\n❌ Some tests failed. Review the implementation.');
|
||||
process.exit(1);
|
||||
}
|
||||
@@ -1,146 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test Authentication V2 Security Fixes
|
||||
*/
|
||||
|
||||
console.log('=== Testing Authentication V2 Fixes ===\n');
|
||||
|
||||
const jwt = require('jsonwebtoken');
|
||||
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
function test(description, fn) {
|
||||
try {
|
||||
const result = fn();
|
||||
if (result || result === undefined) {
|
||||
console.log(`✅ ${description}`);
|
||||
passed++;
|
||||
} else {
|
||||
console.log(`❌ ${description}`);
|
||||
failed++;
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(`❌ ${description} - Error: ${error.message}`);
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
|
||||
async function runTests() {
|
||||
// Test 1: Rate Limiting Security
|
||||
console.log('1. Testing Rate Limiting Security:');
|
||||
const { hasValidAdminToken } = require('../src/utils/rateLimitSecurity');
|
||||
|
||||
// Mock requests
|
||||
const validAdminReq = {
|
||||
path: '/api/admin/events',
|
||||
headers: {
|
||||
authorization: 'Bearer ' + jwt.sign({ id: 1, type: 'admin' }, process.env.JWT_SECRET || 'test')
|
||||
},
|
||||
ip: '127.0.0.1'
|
||||
};
|
||||
|
||||
const invalidTokenReq = {
|
||||
path: '/api/admin/events',
|
||||
headers: {
|
||||
authorization: 'Bearer invalid.token.here'
|
||||
},
|
||||
ip: '127.0.0.1'
|
||||
};
|
||||
|
||||
const galleryTokenReq = {
|
||||
path: '/api/admin/events',
|
||||
headers: {
|
||||
authorization: 'Bearer ' + jwt.sign({ id: 1, type: 'gallery' }, process.env.JWT_SECRET || 'test')
|
||||
},
|
||||
ip: '127.0.0.1'
|
||||
};
|
||||
|
||||
test('Valid admin token skips rate limit', () => hasValidAdminToken(validAdminReq) === true);
|
||||
test('Invalid token applies rate limit', () => hasValidAdminToken(invalidTokenReq) === false);
|
||||
test('Gallery token cannot bypass admin rate limit', () => hasValidAdminToken(galleryTokenReq) === false);
|
||||
|
||||
// Test 2: Password Validation
|
||||
console.log('\n2. Testing Password Validation:');
|
||||
const { validatePassword, validatePasswordInContext } = require('../src/utils/passwordValidation');
|
||||
|
||||
const weakPassword = validatePassword('weak123');
|
||||
test('Weak password is rejected', () => !weakPassword.valid);
|
||||
test('Weak password has errors', () => weakPassword.errors.length > 0);
|
||||
|
||||
const strongPassword = validatePassword('Str0ng!P@ssw0rd123');
|
||||
test('Strong password is accepted', () => strongPassword.valid);
|
||||
test('Strong password has good score', () => strongPassword.score >= 3);
|
||||
|
||||
const shortPassword = validatePassword('Short!1');
|
||||
test('Short password is rejected', () => !shortPassword.valid &&
|
||||
shortPassword.errors.some(e => e.includes('12 characters')));
|
||||
|
||||
const noSpecialChar = validatePassword('NoSpecialChar123');
|
||||
test('Password without special char is rejected', () => !noSpecialChar.valid &&
|
||||
noSpecialChar.errors.some(e => e.includes('special character')));
|
||||
|
||||
// Context validation
|
||||
const adminContext = validatePasswordInContext('Admin123!Pass', 'admin', { username: 'admin' });
|
||||
test('Admin password with username is rejected', () => !adminContext.valid);
|
||||
|
||||
const galleryContext = validatePasswordInContext('Event123!Pass', 'gallery', { eventName: 'event' });
|
||||
test('Gallery password with event name is rejected', () => !galleryContext.valid);
|
||||
|
||||
// Test 3: Token Revocation
|
||||
console.log('\n3. Testing Token Revocation:');
|
||||
const { isTokenRevoked } = require('../src/utils/tokenRevocation');
|
||||
|
||||
const testToken = {
|
||||
jti: 'test-123',
|
||||
id: 1,
|
||||
type: 'admin',
|
||||
iat: Math.floor(Date.now() / 1000)
|
||||
};
|
||||
|
||||
// This would need database setup to fully test
|
||||
test('Token revocation check runs', async () => {
|
||||
try {
|
||||
await isTokenRevoked(testToken);
|
||||
return true;
|
||||
} catch (e) {
|
||||
// Expected if tables don't exist yet
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
// Test 4: Bcrypt Rounds
|
||||
console.log('\n4. Testing Configurable Bcrypt:');
|
||||
const { getBcryptRounds, PASSWORD_CONFIG } = require('../src/utils/passwordValidation');
|
||||
|
||||
test('Bcrypt rounds are configurable', () => {
|
||||
const rounds = getBcryptRounds();
|
||||
return rounds >= 10 && rounds <= 14;
|
||||
});
|
||||
|
||||
test('Default bcrypt rounds is 12', () => {
|
||||
return PASSWORD_CONFIG.bcryptRounds === 12 ||
|
||||
PASSWORD_CONFIG.bcryptRounds === parseInt(process.env.BCRYPT_ROUNDS);
|
||||
});
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Test Summary ===');
|
||||
console.log(`Total tests: ${passed + failed}`);
|
||||
console.log(`Passed: ${passed}`);
|
||||
console.log(`Failed: ${failed}`);
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('\n✅ All authentication V2 tests passed!');
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('\n❌ Some tests failed. Review the implementation.');
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Run tests
|
||||
runTests().catch(error => {
|
||||
console.error('Test error:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,75 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test enhanced authentication features in Docker
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
const {
|
||||
checkAccountLockout,
|
||||
trackFailedAttempt,
|
||||
trackSuccessfulLogin
|
||||
} = require('../src/utils/authSecurity');
|
||||
|
||||
console.log('=== Testing Enhanced Auth Features ===\n');
|
||||
|
||||
async function testAuthFeatures() {
|
||||
try {
|
||||
// Test 1: Check if tables exist
|
||||
console.log('1. Checking database tables...');
|
||||
const loginAttempts = await db('login_attempts').count().first();
|
||||
console.log('✓ login_attempts table exists');
|
||||
|
||||
// Test 2: Test failed attempt tracking
|
||||
console.log('\n2. Testing failed attempt tracking...');
|
||||
await trackFailedAttempt('test-user', '127.0.0.1', 'Test User Agent');
|
||||
const attempts = await db('login_attempts')
|
||||
.where('identifier', 'test-user')
|
||||
.count()
|
||||
.first();
|
||||
console.log(`✓ Failed attempt tracked (${attempts.count} total)`);
|
||||
|
||||
// Test 3: Test lockout check
|
||||
console.log('\n3. Testing lockout detection...');
|
||||
|
||||
// Add 4 more failures to trigger lockout
|
||||
for (let i = 0; i < 4; i++) {
|
||||
await trackFailedAttempt('test-user', '127.0.0.1', 'Test User Agent');
|
||||
}
|
||||
|
||||
const lockoutStatus = await checkAccountLockout('test-user');
|
||||
console.log(`✓ Lockout check works: ${lockoutStatus.isLocked ? 'LOCKED' : 'NOT LOCKED'}`);
|
||||
|
||||
if (lockoutStatus.isLocked) {
|
||||
console.log(` Remaining lockout time: ${lockoutStatus.remainingTime} seconds`);
|
||||
}
|
||||
|
||||
// Test 4: Test successful login tracking
|
||||
console.log('\n4. Testing successful login tracking...');
|
||||
await trackSuccessfulLogin('test-user', '127.0.0.1', 'Test User Agent');
|
||||
console.log('✓ Successful login tracked');
|
||||
|
||||
// Test 5: Check if auth routes load
|
||||
console.log('\n5. Testing enhanced auth routes...');
|
||||
try {
|
||||
const authRoutes = require('../src/routes/auth-enhanced');
|
||||
console.log('✓ Enhanced auth routes load successfully');
|
||||
} catch (e) {
|
||||
console.log('✗ Error loading enhanced auth routes:', e.message);
|
||||
}
|
||||
|
||||
// Clean up test data
|
||||
await db('login_attempts').where('identifier', 'test-user').delete();
|
||||
console.log('\n✓ Test data cleaned up');
|
||||
|
||||
console.log('\n✅ Enhanced auth features are working correctly!');
|
||||
console.log('\nNext step: Update server.js to use enhanced auth routes');
|
||||
|
||||
} catch (error) {
|
||||
console.error('\n❌ Test failed:', error);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
testAuthFeatures();
|
||||
@@ -1,98 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test script to verify JWT_SECRET validation works correctly
|
||||
* This ensures our security fix doesn't break production
|
||||
*/
|
||||
|
||||
const { spawn } = require('child_process');
|
||||
const path = require('path');
|
||||
|
||||
console.log('=== Testing JWT_SECRET Validation ===\n');
|
||||
|
||||
// Test 1: Server should fail to start without JWT_SECRET
|
||||
console.log('Test 1: Starting server without JWT_SECRET...');
|
||||
const test1 = spawn('node', [path.join(__dirname, '..', 'server.js')], {
|
||||
env: { ...process.env, JWT_SECRET: '' },
|
||||
stdio: 'pipe'
|
||||
});
|
||||
|
||||
let test1Output = '';
|
||||
test1.stderr.on('data', (data) => {
|
||||
test1Output += data.toString();
|
||||
});
|
||||
|
||||
test1.on('close', (code) => {
|
||||
if (code === 1 && test1Output.includes('Missing required environment variable: JWT_SECRET')) {
|
||||
console.log('✅ Test 1 PASSED: Server correctly refuses to start without JWT_SECRET\n');
|
||||
runTest2();
|
||||
} else {
|
||||
console.log('❌ Test 1 FAILED: Server should have failed to start');
|
||||
console.log('Exit code:', code);
|
||||
console.log('Output:', test1Output);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
|
||||
// Test 2: Server should fail with insecure default value
|
||||
function runTest2() {
|
||||
console.log('Test 2: Starting server with insecure JWT_SECRET...');
|
||||
const test2 = spawn('node', [path.join(__dirname, '..', 'server.js')], {
|
||||
env: { ...process.env, JWT_SECRET: 'your-secret-key' },
|
||||
stdio: 'pipe'
|
||||
});
|
||||
|
||||
let test2Output = '';
|
||||
test2.stderr.on('data', (data) => {
|
||||
test2Output += data.toString();
|
||||
});
|
||||
|
||||
test2.on('close', (code) => {
|
||||
if (code === 1 && test2Output.includes('JWT_SECRET is set to the insecure default value')) {
|
||||
console.log('✅ Test 2 PASSED: Server correctly refuses insecure JWT_SECRET\n');
|
||||
runTest3();
|
||||
} else {
|
||||
console.log('❌ Test 2 FAILED: Server should have rejected insecure JWT_SECRET');
|
||||
console.log('Exit code:', code);
|
||||
console.log('Output:', test2Output);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Test 3: Verify protectedImages functions work with valid JWT_SECRET
|
||||
function runTest3() {
|
||||
console.log('Test 3: Testing protectedImages functions...');
|
||||
|
||||
// Set a valid JWT_SECRET for this test
|
||||
process.env.JWT_SECRET = 'test-secret-key-that-is-long-enough-for-security';
|
||||
|
||||
try {
|
||||
// Load the module to test
|
||||
const protectedImagesPath = path.join(__dirname, '..', 'src', 'routes', 'protectedImages.js');
|
||||
delete require.cache[protectedImagesPath]; // Clear cache to ensure fresh load
|
||||
|
||||
// This will throw if JWT_SECRET is not available
|
||||
require(protectedImagesPath);
|
||||
|
||||
console.log('✅ Test 3 PASSED: protectedImages module loads successfully with valid JWT_SECRET\n');
|
||||
|
||||
console.log('=== All Tests Passed! ===');
|
||||
console.log('\nThe JWT_SECRET validation is working correctly.');
|
||||
console.log('Production systems must have JWT_SECRET set to a secure value.');
|
||||
process.exit(0);
|
||||
} catch (error) {
|
||||
console.log('❌ Test 3 FAILED: Error loading protectedImages module');
|
||||
console.log('Error:', error.message);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Give the first test some time to complete
|
||||
setTimeout(() => {
|
||||
if (test1.exitCode === null) {
|
||||
console.log('❌ Test 1 TIMEOUT: Server did not exit as expected');
|
||||
test1.kill();
|
||||
process.exit(1);
|
||||
}
|
||||
}, 5000);
|
||||
@@ -1,171 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test script to verify routes work correctly after SQL security fixes
|
||||
* Run this before deploying to production
|
||||
*/
|
||||
|
||||
const request = require('supertest');
|
||||
const app = require('../src/app');
|
||||
const { db } = require('../src/database/db');
|
||||
const jwt = require('jsonwebtoken');
|
||||
|
||||
// Generate admin token for testing
|
||||
const adminToken = jwt.sign(
|
||||
{ id: 1, username: 'admin', role: 'admin' },
|
||||
process.env.JWT_SECRET || 'test-secret'
|
||||
);
|
||||
|
||||
console.log('=== Testing Routes After SQL Security Fixes ===\n');
|
||||
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
async function testRoute(description, testFn) {
|
||||
try {
|
||||
await testFn();
|
||||
console.log(`✅ ${description}`);
|
||||
passed++;
|
||||
} catch (error) {
|
||||
console.log(`❌ ${description}`);
|
||||
console.error(` Error: ${error.message}`);
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
|
||||
async function runTests() {
|
||||
// Test Dashboard Stats (uses whereRaw fixes)
|
||||
await testRoute('Dashboard stats endpoint', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/dashboard/stats')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!res.body.hasOwnProperty('activeEvents')) {
|
||||
throw new Error('Missing activeEvents in response');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Analytics with days parameter (uses sanitizeDays)
|
||||
await testRoute('Analytics with valid days parameter', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/dashboard/analytics?days=7')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!res.body.chartData || res.body.chartData.length !== 7) {
|
||||
throw new Error('Invalid chart data');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Analytics with SQL injection attempt in days
|
||||
await testRoute('Analytics rejects SQL injection in days parameter', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/dashboard/analytics?days=7; DROP TABLE events; --')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
// Should default to 7 days
|
||||
if (res.body.chartData.length !== 7) {
|
||||
throw new Error('Days parameter not properly sanitized');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Event search with normal text (uses escapeLikePattern)
|
||||
await testRoute('Event search with normal text', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/events?search=test')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!res.body.hasOwnProperty('events')) {
|
||||
throw new Error('Missing events in response');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Event search with special characters
|
||||
await testRoute('Event search with special characters', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/events?search=50%_test')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
// Should handle special chars safely
|
||||
if (!res.body.hasOwnProperty('events')) {
|
||||
throw new Error('Failed to handle special characters');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Event search with SQL injection attempt
|
||||
await testRoute('Event search prevents SQL injection', async () => {
|
||||
const res = await request(app)
|
||||
.get("/api/admin/events?search=' OR 1=1 --")
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
// Should return empty results, not all events
|
||||
if (!res.body.hasOwnProperty('events')) {
|
||||
throw new Error('SQL injection may not be prevented');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Photo search (if event exists)
|
||||
await testRoute('Photo search functionality', async () => {
|
||||
// First check if we have any events
|
||||
const event = await db('events').first();
|
||||
if (event) {
|
||||
const res = await request(app)
|
||||
.get(`/api/admin/events/${event.id}/photos?search=test`)
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!res.body.hasOwnProperty('photos')) {
|
||||
throw new Error('Missing photos in response');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Test Activity endpoint
|
||||
await testRoute('Activity log endpoint', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/dashboard/activity?limit=10')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!Array.isArray(res.body)) {
|
||||
throw new Error('Activity should return array');
|
||||
}
|
||||
});
|
||||
|
||||
// Test Health endpoint
|
||||
await testRoute('Health check endpoint', async () => {
|
||||
const res = await request(app)
|
||||
.get('/api/admin/dashboard/health')
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.expect(200);
|
||||
|
||||
if (!res.body.hasOwnProperty('overall')) {
|
||||
throw new Error('Missing overall health status');
|
||||
}
|
||||
});
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Test Summary ===');
|
||||
console.log(`Total tests: ${passed + failed}`);
|
||||
console.log(`Passed: ${passed}`);
|
||||
console.log(`Failed: ${failed}`);
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('\n✅ All route tests passed! Safe to deploy.');
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('\n❌ Some tests failed. Review the fixes before deploying.');
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Run tests
|
||||
runTests().catch(error => {
|
||||
console.error('Test runner error:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,108 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Test script to verify SQL security fixes work correctly
|
||||
* Tests both functionality and security of the fixes
|
||||
*/
|
||||
|
||||
const {
|
||||
sanitizeDays,
|
||||
escapeLikePattern,
|
||||
validateSortColumn,
|
||||
validateSortOrder
|
||||
} = require('../src/utils/sqlSecurity');
|
||||
|
||||
console.log('=== Testing SQL Security Utilities ===\n');
|
||||
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
function test(description, fn) {
|
||||
try {
|
||||
const result = fn();
|
||||
if (result) {
|
||||
console.log(`✅ ${description}`);
|
||||
passed++;
|
||||
} else {
|
||||
console.log(`❌ ${description}`);
|
||||
failed++;
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(`❌ ${description} - Error: ${error.message}`);
|
||||
failed++;
|
||||
}
|
||||
}
|
||||
|
||||
// Test sanitizeDays
|
||||
console.log('Testing sanitizeDays function:');
|
||||
test('Valid number returns same number', () => sanitizeDays(7) === 7);
|
||||
test('String number is parsed correctly', () => sanitizeDays('30') === 30);
|
||||
test('Invalid input returns default 7', () => sanitizeDays('abc') === 7);
|
||||
test('Negative number returns 1', () => sanitizeDays(-5) === 1);
|
||||
test('Zero returns 1', () => sanitizeDays(0) === 1);
|
||||
test('Large number is capped at 365', () => sanitizeDays(500) === 365);
|
||||
test('NaN returns default 7', () => sanitizeDays(NaN) === 7);
|
||||
test('Null returns default 7', () => sanitizeDays(null) === 7);
|
||||
test('Undefined returns default 7', () => sanitizeDays(undefined) === 7);
|
||||
|
||||
// Test escapeLikePattern
|
||||
console.log('\nTesting escapeLikePattern function:');
|
||||
test('Normal text unchanged', () => escapeLikePattern('hello world') === 'hello world');
|
||||
test('Percent sign escaped', () => escapeLikePattern('50%') === '50\\%');
|
||||
test('Underscore escaped', () => escapeLikePattern('user_name') === 'user\\_name');
|
||||
test('Backslash escaped', () => escapeLikePattern('path\\to\\file') === 'path\\\\to\\\\file');
|
||||
test('Multiple special chars escaped', () => escapeLikePattern('50%_test\\') === '50\\%\\_test\\\\');
|
||||
test('Empty string returns empty', () => escapeLikePattern('') === '');
|
||||
test('Null returns empty string', () => escapeLikePattern(null) === '');
|
||||
test('Undefined returns empty string', () => escapeLikePattern(undefined) === '');
|
||||
test('Single quotes escaped', () => escapeLikePattern("O'Brien") === "O''Brien");
|
||||
|
||||
// Test SQL injection attempts
|
||||
console.log('\nTesting SQL injection prevention:');
|
||||
test('SQL injection attempt with quotes', () => {
|
||||
const malicious = "'; DROP TABLE users; --";
|
||||
const escaped = escapeLikePattern(malicious);
|
||||
return escaped === "''; DROP TABLE users; --" && escaped.includes("''");
|
||||
});
|
||||
|
||||
test('SQL injection with LIKE wildcards', () => {
|
||||
const malicious = "%' OR 1=1 --";
|
||||
const escaped = escapeLikePattern(malicious);
|
||||
return escaped === "\\%'' OR 1=1 --";
|
||||
});
|
||||
|
||||
test('Days parameter injection attempt', () => {
|
||||
const malicious = "7; DROP TABLE events; --";
|
||||
return sanitizeDays(malicious) === 7;
|
||||
});
|
||||
|
||||
// Test validateSortColumn
|
||||
console.log('\nTesting validateSortColumn function:');
|
||||
const allowedColumns = ['name', 'date', 'size'];
|
||||
test('Valid column accepted', () => validateSortColumn('name', allowedColumns, 'date') === 'name');
|
||||
test('Invalid column returns default', () => validateSortColumn('price', allowedColumns, 'date') === 'date');
|
||||
test('Null returns default', () => validateSortColumn(null, allowedColumns, 'date') === 'date');
|
||||
test('Empty string returns default', () => validateSortColumn('', allowedColumns, 'date') === 'date');
|
||||
|
||||
// Test validateSortOrder
|
||||
console.log('\nTesting validateSortOrder function:');
|
||||
test('Valid asc accepted', () => validateSortOrder('asc') === 'asc');
|
||||
test('Valid ASC accepted', () => validateSortOrder('ASC') === 'asc');
|
||||
test('Valid desc accepted', () => validateSortOrder('desc') === 'desc');
|
||||
test('Invalid order returns desc', () => validateSortOrder('random') === 'desc');
|
||||
test('Null returns desc', () => validateSortOrder(null) === 'desc');
|
||||
test('Empty returns desc', () => validateSortOrder('') === 'desc');
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Test Summary ===');
|
||||
console.log(`Total tests: ${passed + failed}`);
|
||||
console.log(`Passed: ${passed}`);
|
||||
console.log(`Failed: ${failed}`);
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('\n✅ All tests passed! SQL security utilities are working correctly.');
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('\n❌ Some tests failed. Please check the implementation.');
|
||||
process.exit(1);
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
const axios = require('axios');
|
||||
const FormData = require('form-data');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
async function testUpload() {
|
||||
try {
|
||||
// First login
|
||||
console.log('1. Logging in as admin...');
|
||||
const loginResponse = await axios.post('http://localhost:3000/api/admin/auth/login', {
|
||||
username: 'admin',
|
||||
password: 'admin123'
|
||||
});
|
||||
|
||||
const token = loginResponse.data.token;
|
||||
console.log('✓ Login successful');
|
||||
|
||||
// Create a test image file
|
||||
const testImagePath = path.join(__dirname, 'test-image.png');
|
||||
const imageBuffer = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==', 'base64');
|
||||
fs.writeFileSync(testImagePath, imageBuffer);
|
||||
|
||||
// Test upload
|
||||
console.log('\n2. Testing upload with category_id=7...');
|
||||
const form = new FormData();
|
||||
form.append('photos', fs.createReadStream(testImagePath), 'test-image.png');
|
||||
form.append('category_id', '7');
|
||||
|
||||
console.log('Form data headers:', form.getHeaders());
|
||||
|
||||
try {
|
||||
const uploadResponse = await axios.post(
|
||||
'http://localhost:3000/api/admin/events/12/upload',
|
||||
form,
|
||||
{
|
||||
headers: {
|
||||
...form.getHeaders(),
|
||||
'Authorization': `Bearer ${token}`
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
console.log('✓ Upload successful:', uploadResponse.data);
|
||||
} catch (error) {
|
||||
console.error('✗ Upload failed:', error.response?.status, error.response?.data);
|
||||
if (error.response?.data) {
|
||||
console.error('Error details:', JSON.stringify(error.response.data, null, 2));
|
||||
}
|
||||
}
|
||||
|
||||
// Clean up
|
||||
fs.unlinkSync(testImagePath);
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
testUpload();
|
||||
@@ -1,106 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Verify enhanced authentication is active and working
|
||||
*/
|
||||
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
console.log('=== Verifying Enhanced Authentication Activation ===\n');
|
||||
|
||||
async function verifyAuth() {
|
||||
const results = {
|
||||
databaseTables: false,
|
||||
serverConfig: false,
|
||||
lockoutActive: false,
|
||||
cleanupActive: false
|
||||
};
|
||||
|
||||
try {
|
||||
// 1. Check database tables
|
||||
console.log('1. Checking database tables...');
|
||||
const hasLoginAttempts = await db.schema.hasTable('login_attempts');
|
||||
const hasSecurityColumns = await db.schema.hasColumn('admin_users', 'password_changed_at');
|
||||
|
||||
if (hasLoginAttempts && hasSecurityColumns) {
|
||||
results.databaseTables = true;
|
||||
console.log('✓ Auth tables and columns exist');
|
||||
|
||||
// Count attempts
|
||||
const attempts = await db('login_attempts').count().first();
|
||||
console.log(` Total login attempts tracked: ${attempts['count(*)'] || 0}`);
|
||||
} else {
|
||||
console.log('✗ Auth tables missing');
|
||||
}
|
||||
|
||||
// 2. Check server configuration
|
||||
console.log('\n2. Checking server configuration...');
|
||||
const fs = require('fs');
|
||||
const serverContent = fs.readFileSync('./server.js', 'utf8');
|
||||
|
||||
if (serverContent.includes("require('./src/routes/auth-enhanced')")) {
|
||||
results.serverConfig = true;
|
||||
console.log('✓ Server using enhanced auth routes');
|
||||
} else {
|
||||
console.log('✗ Server using original auth routes');
|
||||
}
|
||||
|
||||
if (serverContent.includes('initializeCleanupJob')) {
|
||||
results.cleanupActive = true;
|
||||
console.log('✓ Cleanup job initialized');
|
||||
} else {
|
||||
console.log('✗ Cleanup job not initialized');
|
||||
}
|
||||
|
||||
// 3. Test lockout functionality
|
||||
console.log('\n3. Testing lockout functionality...');
|
||||
const { checkAccountLockout } = require('../src/utils/authSecurity');
|
||||
|
||||
// Check a test account
|
||||
const lockoutTest = await checkAccountLockout('lockout-test-user');
|
||||
console.log(`✓ Lockout check functional: ${lockoutTest.isLocked ? 'locked' : 'not locked'}`);
|
||||
results.lockoutActive = true;
|
||||
|
||||
// 4. Check recent activity
|
||||
console.log('\n4. Recent authentication activity...');
|
||||
const recentAttempts = await db('login_attempts')
|
||||
.orderBy('attempt_time', 'desc')
|
||||
.limit(5);
|
||||
|
||||
if (recentAttempts.length > 0) {
|
||||
console.log('Recent login attempts:');
|
||||
recentAttempts.forEach(attempt => {
|
||||
const time = new Date(attempt.attempt_time).toLocaleString();
|
||||
console.log(` ${time} - ${attempt.identifier} - ${attempt.success ? 'SUCCESS' : 'FAILED'}`);
|
||||
});
|
||||
} else {
|
||||
console.log('No login attempts recorded yet');
|
||||
}
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Summary ===');
|
||||
const allGood = Object.values(results).every(v => v === true);
|
||||
|
||||
if (allGood) {
|
||||
console.log('✅ Enhanced authentication is FULLY ACTIVE!');
|
||||
console.log('\nFeatures enabled:');
|
||||
console.log('- Account lockout protection (5 attempts)');
|
||||
console.log('- Login attempt tracking');
|
||||
console.log('- Enhanced token validation');
|
||||
console.log('- Session management');
|
||||
console.log('- Automatic cleanup of old records');
|
||||
} else {
|
||||
console.log('⚠️ Some features not active:');
|
||||
Object.entries(results).forEach(([key, value]) => {
|
||||
console.log(` ${key}: ${value ? '✓' : '✗'}`);
|
||||
});
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Verification error:', error);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
verifyAuth();
|
||||
@@ -1,80 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Verification script to check SQL queries are built correctly
|
||||
* This simulates the query building without running the full app
|
||||
*/
|
||||
|
||||
const {
|
||||
sanitizeDays,
|
||||
escapeLikePattern,
|
||||
validateSortColumn,
|
||||
validateSortOrder
|
||||
} = require('../src/utils/sqlSecurity');
|
||||
|
||||
console.log('=== Verifying SQL Security Fixes ===\n');
|
||||
|
||||
// Test 1: Verify date range queries
|
||||
console.log('1. Testing date range query building:');
|
||||
console.log(' Input days: "7; DROP TABLE events; --"');
|
||||
const safeDays = sanitizeDays("7; DROP TABLE events; --");
|
||||
console.log(' Sanitized days:', safeDays);
|
||||
console.log(' ✅ SQL injection attempt neutralized\n');
|
||||
|
||||
// Test 2: Verify LIKE pattern escaping
|
||||
console.log('2. Testing LIKE pattern escaping:');
|
||||
const testPatterns = [
|
||||
"normal search",
|
||||
"50%_wildcard",
|
||||
"'; DROP TABLE users; --",
|
||||
"test\\path",
|
||||
"O'Brien"
|
||||
];
|
||||
|
||||
testPatterns.forEach(pattern => {
|
||||
const escaped = escapeLikePattern(pattern);
|
||||
console.log(` "${pattern}" → "${escaped}"`);
|
||||
});
|
||||
console.log(' ✅ All patterns safely escaped\n');
|
||||
|
||||
// Test 3: Simulate date query building
|
||||
console.log('3. Simulating safe date query:');
|
||||
const days = 7;
|
||||
const startDate = new Date();
|
||||
startDate.setDate(startDate.getDate() - days);
|
||||
console.log(` WHERE timestamp >= '${startDate.toISOString()}'`);
|
||||
console.log(' ✅ Using parameterized date instead of whereRaw\n');
|
||||
|
||||
// Test 4: Verify sort validation
|
||||
console.log('4. Testing sort column/order validation:');
|
||||
const allowedColumns = ['created_at', 'event_name', 'expires_at'];
|
||||
console.log(' Allowed columns:', allowedColumns);
|
||||
|
||||
const testSorts = [
|
||||
{ column: 'created_at', order: 'desc' },
|
||||
{ column: 'invalid_column', order: 'asc' },
|
||||
{ column: '; DROP TABLE --', order: 'random' }
|
||||
];
|
||||
|
||||
testSorts.forEach(({ column, order }) => {
|
||||
const safeColumn = validateSortColumn(column, allowedColumns, 'created_at');
|
||||
const safeOrder = validateSortOrder(order);
|
||||
console.log(` "${column}" ${order} → "${safeColumn}" ${safeOrder}`);
|
||||
});
|
||||
console.log(' ✅ Invalid columns/orders rejected\n');
|
||||
|
||||
// Test 5: Show example of safe query patterns
|
||||
console.log('5. Safe Query Patterns Used:');
|
||||
console.log(' ❌ OLD: .whereRaw(`timestamp >= datetime("now", "-${days} days")`)')
|
||||
console.log(' ✅ NEW: .where("timestamp", ">=", startDate.toISOString())\n');
|
||||
|
||||
console.log(' ❌ OLD: .where("event_name", "like", `%${search}%`)')
|
||||
console.log(' ✅ NEW: .where("event_name", "like", `%${escapeLikePattern(search)}%`)\n');
|
||||
|
||||
console.log('=== Verification Complete ===');
|
||||
console.log('All SQL injection vulnerabilities have been addressed.');
|
||||
console.log('\nNext steps:');
|
||||
console.log('1. Test in development environment');
|
||||
console.log('2. Monitor logs during testing');
|
||||
console.log('3. Deploy with rollback plan ready');
|
||||
console.log('4. Monitor production logs after deployment');
|
||||
@@ -1,32 +0,0 @@
|
||||
// This is a partial server.js showing the enhanced rate limiting
|
||||
// Only the relevant parts are shown - merge with existing server.js
|
||||
|
||||
const { createSecureSkipFunction, logRateLimitHit } = require('./src/utils/rateLimitSecurity');
|
||||
|
||||
// Enhanced rate limiting with secure skip function
|
||||
const limiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000, // 15 minutes
|
||||
max: process.env.NODE_ENV === 'development' ? 1000 : 100,
|
||||
skip: createSecureSkipFunction(), // Use secure skip function
|
||||
handler: (req, res) => {
|
||||
logRateLimitHit(req, res);
|
||||
res.status(429).json({
|
||||
error: 'Too many requests from this IP, please try again later.'
|
||||
});
|
||||
},
|
||||
standardHeaders: true, // Return rate limit info in headers
|
||||
legacyHeaders: false, // Disable X-RateLimit headers
|
||||
});
|
||||
|
||||
const authLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: 5, // limit auth attempts
|
||||
skipSuccessfulRequests: true, // Don't count successful logins
|
||||
handler: (req, res) => {
|
||||
logRateLimitHit(req, res);
|
||||
res.status(429).json({
|
||||
error: 'Too many login attempts, please try again later.',
|
||||
retryAfter: res.getHeader('Retry-After')
|
||||
});
|
||||
}
|
||||
});
|
||||
+27
-5
@@ -10,10 +10,10 @@ const cors = require('cors');
|
||||
const rateLimit = require('express-rate-limit');
|
||||
const jwt = require('jsonwebtoken');
|
||||
const path = require('path');
|
||||
const { initializeDatabase } = require('./src/database/db');
|
||||
const { initializeDatabase, db } = require('./src/database/db');
|
||||
const { startFileWatcher } = require('./src/services/fileWatcher');
|
||||
const { startExpirationChecker } = require('./src/services/expirationChecker');
|
||||
const { startEmailQueueProcessor } = require('./src/services/emailProcessor');
|
||||
const { initializeTransporter, startEmailQueueProcessor } = require('./src/services/emailProcessor');
|
||||
const { maintenanceMiddleware } = require('./src/middleware/maintenance');
|
||||
const { sessionTimeoutMiddleware } = require('./src/middleware/sessionTimeout');
|
||||
const logger = require('./src/utils/logger');
|
||||
@@ -28,6 +28,10 @@ const adminAuthRoutes = require('./src/routes/adminAuth');
|
||||
const app = express();
|
||||
const PORT = process.env.PORT || 3000;
|
||||
|
||||
// Trust proxy headers (required for Traefik/nginx)
|
||||
// Set to specific number of proxies or loopback to be more secure
|
||||
app.set('trust proxy', 'loopback, linklocal, uniquelocal');
|
||||
|
||||
// Security middleware with custom CSP
|
||||
app.use(helmet({
|
||||
contentSecurityPolicy: {
|
||||
@@ -152,8 +156,25 @@ app.use('/thumbnails', require('./src/middleware/photoAuth'), setCorsHeaders, se
|
||||
app.use('/uploads', setCorsHeaders, secureStatic(path.join(__dirname, 'storage/uploads')));
|
||||
|
||||
// Health check endpoint
|
||||
app.get('/api/health', (req, res) => {
|
||||
res.json({ status: 'ok', timestamp: new Date().toISOString() });
|
||||
app.get('/health', async (req, res) => {
|
||||
try {
|
||||
// Check database connectivity
|
||||
await db.raw('SELECT 1');
|
||||
|
||||
res.json({
|
||||
status: 'ok',
|
||||
database: 'connected',
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error('Health check failed:', error);
|
||||
res.status(503).json({
|
||||
status: 'error',
|
||||
database: 'disconnected',
|
||||
error: error.message,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Routes
|
||||
@@ -189,7 +210,8 @@ async function startServer() {
|
||||
// Start expiration checker
|
||||
startExpirationChecker();
|
||||
|
||||
// Start email queue processor
|
||||
// Initialize email transporter and start queue processor
|
||||
await initializeTransporter();
|
||||
startEmailQueueProcessor();
|
||||
|
||||
app.listen(PORT, () => {
|
||||
|
||||
@@ -1,167 +0,0 @@
|
||||
require('dotenv').config();
|
||||
|
||||
// Validate critical environment variables before proceeding
|
||||
const { validateEnvironment } = require('./src/config/validateEnv');
|
||||
validateEnvironment();
|
||||
|
||||
const express = require('express');
|
||||
const helmet = require('helmet');
|
||||
const cors = require('cors');
|
||||
const rateLimit = require('express-rate-limit');
|
||||
const jwt = require('jsonwebtoken');
|
||||
const path = require('path');
|
||||
const { initializeDatabase } = require('./src/database/db');
|
||||
const { startFileWatcher } = require('./src/services/fileWatcher');
|
||||
const { startExpirationChecker } = require('./src/services/expirationChecker');
|
||||
const { startEmailQueueProcessor } = require('./src/services/emailProcessor');
|
||||
const { maintenanceMiddleware } = require('./src/middleware/maintenance');
|
||||
const { sessionTimeoutMiddleware } = require('./src/middleware/sessionTimeout');
|
||||
const logger = require('./src/utils/logger');
|
||||
|
||||
// Import routes
|
||||
const authRoutes = require('./src/routes/auth');
|
||||
const eventRoutes = require('./src/routes/events');
|
||||
const galleryRoutes = require('./src/routes/gallery');
|
||||
const adminRoutes = require('./src/routes/admin');
|
||||
const adminAuthRoutes = require('./src/routes/adminAuth');
|
||||
|
||||
const app = express();
|
||||
const PORT = process.env.PORT || 3000;
|
||||
|
||||
// Security middleware
|
||||
app.use(helmet());
|
||||
|
||||
// CORS configuration
|
||||
const corsOptions = {
|
||||
origin: function (origin, callback) {
|
||||
const allowedOrigins = [
|
||||
process.env.FRONTEND_URL || 'http://localhost:3005',
|
||||
process.env.ADMIN_URL || 'http://localhost:3005',
|
||||
'http://localhost:5173', // Vite dev server
|
||||
'http://localhost:3002', // Backend server
|
||||
'http://localhost:3001', // For API testing
|
||||
'http://localhost:3000' // Direct backend access
|
||||
];
|
||||
|
||||
// Allow requests with no origin (like mobile apps or curl)
|
||||
if (!origin || allowedOrigins.indexOf(origin) !== -1) {
|
||||
callback(null, true);
|
||||
} else {
|
||||
callback(new Error('Not allowed by CORS'));
|
||||
}
|
||||
},
|
||||
credentials: true
|
||||
};
|
||||
|
||||
app.use(cors(corsOptions));
|
||||
|
||||
// Rate limiting with admin bypass
|
||||
const limiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000, // 15 minutes
|
||||
max: process.env.NODE_ENV === 'development' ? 1000 : 100, // More lenient in development
|
||||
skip: (req) => {
|
||||
// Skip rate limiting for authenticated admin users
|
||||
if (req.path.startsWith('/api/admin/') && req.headers.authorization) {
|
||||
const token = req.headers.authorization.replace('Bearer ', '');
|
||||
try {
|
||||
const decoded = jwt.verify(token, process.env.JWT_SECRET);
|
||||
return decoded.type === 'admin';
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// Also skip rate limiting for public settings endpoint in development
|
||||
if (process.env.NODE_ENV === 'development' && req.path === '/api/public/settings') {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
const authLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: 5 // limit auth attempts
|
||||
});
|
||||
|
||||
// Apply rate limiting - admin routes check will skip for valid admin tokens
|
||||
app.use('/api/', limiter);
|
||||
app.use('/api/auth', authLimiter);
|
||||
|
||||
// Body parsing middleware
|
||||
app.use(express.json());
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
|
||||
// Maintenance mode middleware - add after body parsing but before routes
|
||||
app.use(maintenanceMiddleware);
|
||||
|
||||
// Session timeout middleware for admin routes
|
||||
app.use('/api/admin', sessionTimeoutMiddleware);
|
||||
|
||||
// Middleware to set CORS headers for static files
|
||||
const setCorsHeaders = (req, res, next) => {
|
||||
res.header('Access-Control-Allow-Origin', req.headers.origin || '*');
|
||||
res.header('Access-Control-Allow-Credentials', 'true');
|
||||
res.header('Cross-Origin-Resource-Policy', 'cross-origin');
|
||||
next();
|
||||
};
|
||||
|
||||
// Static file serving for photos (protected)
|
||||
app.use('/photos', require('./src/middleware/photoAuth'), setCorsHeaders, express.static(path.join(__dirname, 'storage/events/active')));
|
||||
|
||||
// Static file serving for thumbnails (protected)
|
||||
app.use('/thumbnails', require('./src/middleware/photoAuth'), setCorsHeaders, express.static(path.join(__dirname, 'storage/thumbnails')));
|
||||
|
||||
// Static file serving for uploads (public - logos, favicons)
|
||||
app.use('/uploads', setCorsHeaders, express.static(path.join(__dirname, 'storage/uploads')));
|
||||
|
||||
// Health check endpoint
|
||||
app.get('/api/health', (req, res) => {
|
||||
res.json({ status: 'ok', timestamp: new Date().toISOString() });
|
||||
});
|
||||
|
||||
// Routes
|
||||
app.use('/api/auth', authRoutes);
|
||||
app.use('/api/events', eventRoutes);
|
||||
app.use('/api/gallery', galleryRoutes);
|
||||
app.use('/api/admin', adminRoutes);
|
||||
app.use('/api/admin/auth', adminAuthRoutes);
|
||||
app.use('/api/admin/system', require('./src/routes/adminSystem'));
|
||||
app.use('/api/public/settings', require('./src/routes/publicSettings'));
|
||||
app.use('/api/public', require('./src/routes/publicCMS'));
|
||||
app.use('/api/images', require('./src/routes/protectedImages'));
|
||||
|
||||
// Error handling middleware
|
||||
app.use((err, req, res, next) => {
|
||||
logger.error(err.stack);
|
||||
res.status(500).json({ error: 'Something went wrong!' });
|
||||
});
|
||||
|
||||
// Initialize services
|
||||
async function startServer() {
|
||||
try {
|
||||
// Initialize database
|
||||
await initializeDatabase();
|
||||
|
||||
// Start file watcher
|
||||
startFileWatcher();
|
||||
|
||||
// Start expiration checker
|
||||
startExpirationChecker();
|
||||
|
||||
// Start email queue processor
|
||||
startEmailQueueProcessor();
|
||||
|
||||
app.listen(PORT, () => {
|
||||
logger.info(`Server running on port ${PORT}`);
|
||||
logger.info(`Admin interface: ${process.env.ADMIN_URL || 'http://localhost:3000'}`);
|
||||
logger.info(`Frontend: ${process.env.FRONTEND_URL || 'http://localhost:3001'}`);
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error('Failed to start server:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
startServer();
|
||||
|
||||
module.exports = app; // For testing
|
||||
@@ -0,0 +1,132 @@
|
||||
const knex = require('knex');
|
||||
const knexConfig = require('../../knexfile');
|
||||
const logger = require('../utils/logger');
|
||||
|
||||
class ConnectionManager {
|
||||
constructor() {
|
||||
this.db = null;
|
||||
this.reconnectAttempts = 0;
|
||||
this.maxReconnectAttempts = 10;
|
||||
this.reconnectDelay = 5000; // 5 seconds
|
||||
this.isReconnecting = false;
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
try {
|
||||
this.db = knex(knexConfig);
|
||||
|
||||
// Test the connection
|
||||
await this.db.raw('SELECT 1');
|
||||
logger.info('Database connection established successfully');
|
||||
|
||||
// Set up connection error handling
|
||||
this.setupErrorHandling();
|
||||
|
||||
this.reconnectAttempts = 0;
|
||||
return this.db;
|
||||
} catch (error) {
|
||||
logger.error('Failed to initialize database connection:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
setupErrorHandling() {
|
||||
if (!this.db) return;
|
||||
|
||||
// Handle connection errors
|
||||
this.db.on('error', async (error) => {
|
||||
logger.error('Database connection error:', error);
|
||||
|
||||
if (this.shouldReconnect(error)) {
|
||||
await this.reconnect();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
shouldReconnect(error) {
|
||||
const reconnectableErrors = [
|
||||
'ECONNREFUSED',
|
||||
'ETIMEDOUT',
|
||||
'ECONNRESET',
|
||||
'Connection terminated unexpectedly',
|
||||
'Connection terminated'
|
||||
];
|
||||
|
||||
return reconnectableErrors.some(msg =>
|
||||
error.code === msg || error.message?.includes(msg)
|
||||
);
|
||||
}
|
||||
|
||||
async reconnect() {
|
||||
if (this.isReconnecting) {
|
||||
logger.info('Already attempting to reconnect...');
|
||||
return;
|
||||
}
|
||||
|
||||
this.isReconnecting = true;
|
||||
|
||||
while (this.reconnectAttempts < this.maxReconnectAttempts) {
|
||||
this.reconnectAttempts++;
|
||||
|
||||
logger.info(`Attempting to reconnect to database (attempt ${this.reconnectAttempts}/${this.maxReconnectAttempts})...`);
|
||||
|
||||
try {
|
||||
// Destroy the old connection pool
|
||||
if (this.db) {
|
||||
await this.db.destroy();
|
||||
}
|
||||
|
||||
// Create new connection
|
||||
await this.initialize();
|
||||
|
||||
logger.info('Successfully reconnected to database');
|
||||
this.isReconnecting = false;
|
||||
return;
|
||||
} catch (error) {
|
||||
logger.error(`Reconnection attempt ${this.reconnectAttempts} failed:`, error.message);
|
||||
|
||||
if (this.reconnectAttempts < this.maxReconnectAttempts) {
|
||||
await new Promise(resolve => setTimeout(resolve, this.reconnectDelay));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.isReconnecting = false;
|
||||
logger.error('Failed to reconnect to database after maximum attempts');
|
||||
|
||||
// In production, you might want to alert monitoring systems or restart the process
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
logger.error('Exiting process due to database connection failure');
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
getConnection() {
|
||||
if (!this.db) {
|
||||
throw new Error('Database connection not initialized');
|
||||
}
|
||||
return this.db;
|
||||
}
|
||||
|
||||
async healthCheck() {
|
||||
try {
|
||||
await this.db.raw('SELECT 1');
|
||||
return { healthy: true };
|
||||
} catch (error) {
|
||||
logger.error('Database health check failed:', error);
|
||||
return { healthy: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async destroy() {
|
||||
if (this.db) {
|
||||
await this.db.destroy();
|
||||
this.db = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Create singleton instance
|
||||
const connectionManager = new ConnectionManager();
|
||||
|
||||
module.exports = connectionManager;
|
||||
@@ -1,6 +1,7 @@
|
||||
const knex = require('knex');
|
||||
const knexConfig = require('../../knexfile');
|
||||
|
||||
// Create database connection with built-in retry logic
|
||||
const db = knex(knexConfig);
|
||||
|
||||
async function initializeDatabase() {
|
||||
|
||||
@@ -5,6 +5,36 @@ let maintenanceMode = false;
|
||||
let lastCheck = 0;
|
||||
const CACHE_DURATION = 60000; // 1 minute
|
||||
|
||||
// Retry configuration for database queries
|
||||
const MAX_RETRIES = 3;
|
||||
const RETRY_DELAY = 1000; // 1 second
|
||||
|
||||
async function queryWithRetry(queryFn, retries = MAX_RETRIES) {
|
||||
for (let i = 0; i < retries; i++) {
|
||||
try {
|
||||
return await queryFn();
|
||||
} catch (error) {
|
||||
if (i === retries - 1) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
// Check if it's a connection error that might benefit from retry
|
||||
const isConnectionError =
|
||||
error.message?.includes('Connection terminated') ||
|
||||
error.message?.includes('ECONNREFUSED') ||
|
||||
error.message?.includes('ETIMEDOUT') ||
|
||||
error.code === 'ECONNRESET';
|
||||
|
||||
if (isConnectionError) {
|
||||
console.warn(`Database connection error, retrying in ${RETRY_DELAY}ms... (attempt ${i + 1}/${retries})`);
|
||||
await new Promise(resolve => setTimeout(resolve, RETRY_DELAY));
|
||||
} else {
|
||||
throw error; // Don't retry non-connection errors
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function checkMaintenanceMode() {
|
||||
const now = Date.now();
|
||||
|
||||
@@ -14,18 +44,21 @@ async function checkMaintenanceMode() {
|
||||
}
|
||||
|
||||
try {
|
||||
const setting = await db('app_settings')
|
||||
.where('setting_key', 'general_maintenance_mode')
|
||||
.where('setting_type', 'general')
|
||||
.first();
|
||||
const setting = await queryWithRetry(async () => {
|
||||
return await db('app_settings')
|
||||
.where('setting_key', 'general_maintenance_mode')
|
||||
.where('setting_type', 'general')
|
||||
.first();
|
||||
});
|
||||
|
||||
maintenanceMode = setting ? (setting.setting_value === 'true' || setting.setting_value === true) : false;
|
||||
lastCheck = now;
|
||||
|
||||
return maintenanceMode;
|
||||
} catch (error) {
|
||||
console.error('Error checking maintenance mode:', error);
|
||||
return false;
|
||||
console.error('Error checking maintenance mode after retries:', error.message);
|
||||
// Return cached value or false if no cache
|
||||
return maintenanceMode;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,14 +85,19 @@ async function maintenanceMiddleware(req, res, next) {
|
||||
return next();
|
||||
}
|
||||
|
||||
const inMaintenance = await checkMaintenanceMode();
|
||||
|
||||
if (inMaintenance && !isAdminRoute) {
|
||||
return res.status(503).json({
|
||||
error: 'Service Unavailable',
|
||||
message: 'The system is currently undergoing maintenance. Please try again later.',
|
||||
maintenance: true
|
||||
});
|
||||
try {
|
||||
const inMaintenance = await checkMaintenanceMode();
|
||||
|
||||
if (inMaintenance && !isAdminRoute) {
|
||||
return res.status(503).json({
|
||||
error: 'Service Unavailable',
|
||||
message: 'The system is currently undergoing maintenance. Please try again later.',
|
||||
maintenance: true
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
// If we can't check maintenance mode, allow the request to proceed
|
||||
console.error('Failed to check maintenance mode, allowing request:', error.message);
|
||||
}
|
||||
|
||||
next();
|
||||
|
||||
@@ -7,6 +7,11 @@ const sessions = new Map();
|
||||
// Default session timeout (60 minutes)
|
||||
const DEFAULT_SESSION_TIMEOUT = 60 * 60 * 1000;
|
||||
|
||||
// Cache for session timeout setting
|
||||
let cachedTimeout = null;
|
||||
let cacheExpiry = 0;
|
||||
const CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
|
||||
|
||||
// Clean up expired sessions every 5 minutes
|
||||
setInterval(() => {
|
||||
const now = Date.now();
|
||||
@@ -18,20 +23,46 @@ setInterval(() => {
|
||||
}, 5 * 60 * 1000);
|
||||
|
||||
async function getSessionTimeout() {
|
||||
const now = Date.now();
|
||||
|
||||
// Return cached value if still valid
|
||||
if (cachedTimeout && now < cacheExpiry) {
|
||||
return cachedTimeout;
|
||||
}
|
||||
|
||||
try {
|
||||
const setting = await db('app_settings')
|
||||
.where('setting_key', 'security_session_timeout_minutes')
|
||||
.first();
|
||||
.first()
|
||||
.timeout(5000); // 5 second timeout
|
||||
|
||||
if (setting && setting.setting_value) {
|
||||
const minutes = parseInt(JSON.parse(setting.setting_value));
|
||||
return minutes * 60 * 1000; // Convert to milliseconds
|
||||
let value = setting.setting_value;
|
||||
// Handle both string and object values
|
||||
if (typeof value === 'string') {
|
||||
try {
|
||||
value = JSON.parse(value);
|
||||
} catch (e) {
|
||||
// If it's not JSON, try to parse as number directly
|
||||
value = parseInt(value);
|
||||
}
|
||||
}
|
||||
const minutes = parseInt(value);
|
||||
if (!isNaN(minutes) && minutes > 0) {
|
||||
cachedTimeout = minutes * 60 * 1000; // Convert to milliseconds
|
||||
cacheExpiry = now + CACHE_DURATION;
|
||||
return cachedTimeout;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error getting session timeout:', error);
|
||||
// Only log if it's not a connection error (to avoid spam)
|
||||
if (error.code !== 'ECONNRESET' && !error.message?.includes('Connection terminated')) {
|
||||
console.error('Error getting session timeout:', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
return DEFAULT_SESSION_TIMEOUT;
|
||||
// Use cached value if available, otherwise default
|
||||
return cachedTimeout || DEFAULT_SESSION_TIMEOUT;
|
||||
}
|
||||
|
||||
async function sessionTimeoutMiddleware(req, res, next) {
|
||||
|
||||
@@ -122,7 +122,16 @@ router.get('/activity', adminAuth, async (req, res) => {
|
||||
actorType: activity.actor_type,
|
||||
actorName: activity.actor_name,
|
||||
eventName: activity.event_name,
|
||||
metadata: activity.metadata ? JSON.parse(activity.metadata) : {},
|
||||
metadata: (() => {
|
||||
try {
|
||||
if (!activity.metadata) return {};
|
||||
if (typeof activity.metadata === 'object') return activity.metadata;
|
||||
return JSON.parse(activity.metadata);
|
||||
} catch (e) {
|
||||
console.warn('Failed to parse metadata for activity:', activity.id, e.message);
|
||||
return {};
|
||||
}
|
||||
})(),
|
||||
createdAt: activity.created_at
|
||||
}));
|
||||
|
||||
|
||||
@@ -112,17 +112,44 @@ router.post('/test', adminAuth, async (req, res) => {
|
||||
return res.status(400).json({ error: 'Email configuration not found. Please configure SMTP settings first.' });
|
||||
}
|
||||
|
||||
// Create transporter
|
||||
const transporter = nodemailer.createTransport({
|
||||
// Validate SMTP configuration
|
||||
if (!config.smtp_host || !config.smtp_port) {
|
||||
return res.status(400).json({
|
||||
error: 'Incomplete email configuration',
|
||||
details: 'SMTP host and port are required'
|
||||
});
|
||||
}
|
||||
|
||||
// Check if password might be masked (this shouldn't happen when fetching from DB)
|
||||
if (config.smtp_pass === '********') {
|
||||
return res.status(400).json({
|
||||
error: 'Invalid email configuration',
|
||||
details: 'SMTP password appears to be masked. Please reconfigure your email settings.'
|
||||
});
|
||||
}
|
||||
|
||||
// Create transporter with detailed logging
|
||||
const transportConfig = {
|
||||
host: config.smtp_host,
|
||||
port: config.smtp_port,
|
||||
secure: config.smtp_secure,
|
||||
auth: config.smtp_user ? {
|
||||
port: parseInt(config.smtp_port),
|
||||
secure: config.smtp_secure === true || config.smtp_secure === 1,
|
||||
auth: config.smtp_user && config.smtp_pass ? {
|
||||
user: config.smtp_user,
|
||||
pass: config.smtp_pass
|
||||
} : undefined
|
||||
} : undefined,
|
||||
logger: process.env.NODE_ENV === 'development',
|
||||
debug: process.env.NODE_ENV === 'development'
|
||||
};
|
||||
|
||||
console.log('Creating email transporter with config:', {
|
||||
host: transportConfig.host,
|
||||
port: transportConfig.port,
|
||||
secure: transportConfig.secure,
|
||||
auth: transportConfig.auth ? 'configured' : 'none'
|
||||
});
|
||||
|
||||
const transporter = nodemailer.createTransport(transportConfig);
|
||||
|
||||
// Send test email
|
||||
await transporter.sendMail({
|
||||
from: `${config.from_name} <${config.from_email}>`,
|
||||
@@ -145,9 +172,27 @@ router.post('/test', adminAuth, async (req, res) => {
|
||||
res.json({ message: 'Test email sent successfully' });
|
||||
} catch (error) {
|
||||
console.error('Test email error:', error);
|
||||
console.error('Error stack:', error.stack);
|
||||
|
||||
// Provide more specific error messages
|
||||
let errorMessage = 'Failed to send test email';
|
||||
let details = error.message;
|
||||
|
||||
if (error.code === 'ECONNREFUSED') {
|
||||
errorMessage = 'Failed to connect to SMTP server';
|
||||
details = 'Please check your SMTP host and port settings';
|
||||
} else if (error.code === 'EAUTH') {
|
||||
errorMessage = 'SMTP authentication failed';
|
||||
details = 'Please check your SMTP username and password';
|
||||
} else if (error.code === 'ESOCKET') {
|
||||
errorMessage = 'Network error';
|
||||
details = 'Could not establish connection to SMTP server';
|
||||
}
|
||||
|
||||
res.status(500).json({
|
||||
error: 'Failed to send test email',
|
||||
details: error.message
|
||||
error: errorMessage,
|
||||
details: details,
|
||||
code: error.code
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -160,20 +205,44 @@ router.get('/templates', adminAuth, async (req, res) => {
|
||||
.orderBy('template_key');
|
||||
|
||||
// Parse variables JSON and format for multi-language support
|
||||
const formattedTemplates = templates.map(template => ({
|
||||
id: template.id,
|
||||
template_key: template.template_key,
|
||||
// English versions
|
||||
subject_en: template.subject_en || template.subject,
|
||||
body_html_en: template.body_html_en || template.body_html,
|
||||
body_text_en: template.body_text_en || template.body_text,
|
||||
// German versions
|
||||
subject_de: template.subject_de || template.subject_en || template.subject,
|
||||
body_html_de: template.body_html_de || template.body_html_en || template.body_html,
|
||||
body_text_de: template.body_text_de || template.body_text_en || template.body_text,
|
||||
variables: template.variables ? JSON.parse(template.variables) : [],
|
||||
updated_at: template.updated_at
|
||||
}));
|
||||
const formattedTemplates = templates.map(template => {
|
||||
const result = {
|
||||
id: template.id,
|
||||
template_key: template.template_key,
|
||||
variables: (() => {
|
||||
try {
|
||||
if (!template.variables) return [];
|
||||
if (typeof template.variables === 'object') return template.variables;
|
||||
return JSON.parse(template.variables);
|
||||
} catch (e) {
|
||||
console.warn('Failed to parse variables for template:', template.template_key, e.message);
|
||||
return [];
|
||||
}
|
||||
})(),
|
||||
updated_at: template.updated_at
|
||||
};
|
||||
|
||||
// Handle both old and new schema formats
|
||||
if (template.subject_en !== undefined) {
|
||||
// New schema with language columns
|
||||
result.subject_en = template.subject_en;
|
||||
result.body_html_en = template.body_html_en;
|
||||
result.body_text_en = template.body_text_en;
|
||||
result.subject_de = template.subject_de;
|
||||
result.body_html_de = template.body_html_de;
|
||||
result.body_text_de = template.body_text_de;
|
||||
} else {
|
||||
// Old schema - use basic columns for both languages
|
||||
result.subject_en = template.subject;
|
||||
result.body_html_en = template.body_html;
|
||||
result.body_text_en = template.body_text;
|
||||
result.subject_de = template.subject;
|
||||
result.body_html_de = template.body_html;
|
||||
result.body_text_de = template.body_text;
|
||||
}
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
res.json(formattedTemplates);
|
||||
} catch (error) {
|
||||
@@ -193,20 +262,43 @@ router.get('/templates/:key', adminAuth, async (req, res) => {
|
||||
return res.status(404).json({ error: 'Template not found' });
|
||||
}
|
||||
|
||||
res.json({
|
||||
// Handle both old and new schema formats
|
||||
const response = {
|
||||
id: template.id,
|
||||
template_key: template.template_key,
|
||||
// English versions
|
||||
subject_en: template.subject_en || template.subject,
|
||||
body_html_en: template.body_html_en || template.body_html,
|
||||
body_text_en: template.body_text_en || template.body_text,
|
||||
// German versions
|
||||
subject_de: template.subject_de || template.subject_en || template.subject,
|
||||
body_html_de: template.body_html_de || template.body_html_en || template.body_html,
|
||||
body_text_de: template.body_text_de || template.body_text_en || template.body_text,
|
||||
variables: template.variables ? JSON.parse(template.variables) : [],
|
||||
variables: (() => {
|
||||
try {
|
||||
if (!template.variables) return [];
|
||||
if (typeof template.variables === 'object') return template.variables;
|
||||
return JSON.parse(template.variables);
|
||||
} catch (e) {
|
||||
console.warn('Failed to parse variables for template:', template.template_key, e.message);
|
||||
return [];
|
||||
}
|
||||
})(),
|
||||
updated_at: template.updated_at
|
||||
});
|
||||
};
|
||||
|
||||
// Check which columns exist and use them appropriately
|
||||
if (template.subject_en !== undefined) {
|
||||
// New schema with language columns
|
||||
response.subject_en = template.subject_en;
|
||||
response.body_html_en = template.body_html_en;
|
||||
response.body_text_en = template.body_text_en;
|
||||
response.subject_de = template.subject_de;
|
||||
response.body_html_de = template.body_html_de;
|
||||
response.body_text_de = template.body_text_de;
|
||||
} else {
|
||||
// Old schema - use basic columns for both languages
|
||||
response.subject_en = template.subject;
|
||||
response.body_html_en = template.body_html;
|
||||
response.body_text_en = template.body_text;
|
||||
response.subject_de = template.subject;
|
||||
response.body_html_de = template.body_html;
|
||||
response.body_text_de = template.body_text;
|
||||
}
|
||||
|
||||
res.json(response);
|
||||
} catch (error) {
|
||||
console.error('Email template fetch error:', error);
|
||||
res.status(500).json({ error: 'Failed to fetch email template' });
|
||||
@@ -237,13 +329,39 @@ router.put('/templates/:key', [
|
||||
updated_at: new Date()
|
||||
};
|
||||
|
||||
// Only update provided fields
|
||||
if (subject_en !== undefined) updateData.subject_en = subject_en;
|
||||
if (subject_de !== undefined) updateData.subject_de = subject_de;
|
||||
if (body_html_en !== undefined) updateData.body_html_en = body_html_en;
|
||||
if (body_html_de !== undefined) updateData.body_html_de = body_html_de;
|
||||
if (body_text_en !== undefined) updateData.body_text_en = body_text_en || '';
|
||||
if (body_text_de !== undefined) updateData.body_text_de = body_text_de || '';
|
||||
// Check which columns exist in the database
|
||||
const template = await db('email_templates')
|
||||
.where('template_key', req.params.key)
|
||||
.first();
|
||||
|
||||
if (!template) {
|
||||
return res.status(404).json({ error: 'Template not found' });
|
||||
}
|
||||
|
||||
// Determine schema type and update accordingly
|
||||
if (template.subject_en !== undefined) {
|
||||
// New schema with language columns
|
||||
if (subject_en !== undefined) updateData.subject_en = subject_en;
|
||||
if (subject_de !== undefined) updateData.subject_de = subject_de;
|
||||
if (body_html_en !== undefined) updateData.body_html_en = body_html_en;
|
||||
if (body_html_de !== undefined) updateData.body_html_de = body_html_de;
|
||||
if (body_text_en !== undefined) updateData.body_text_en = body_text_en || '';
|
||||
if (body_text_de !== undefined) updateData.body_text_de = body_text_de || '';
|
||||
|
||||
// Also update basic columns if they exist
|
||||
if (template.subject !== undefined) {
|
||||
updateData.subject = subject_en || updateData.subject_en;
|
||||
updateData.body_html = body_html_en || updateData.body_html_en;
|
||||
updateData.body_text = body_text_en || updateData.body_text_en || '';
|
||||
}
|
||||
} else {
|
||||
// Old schema - only update basic columns
|
||||
if (subject_en !== undefined) {
|
||||
updateData.subject = subject_en;
|
||||
updateData.body_html = body_html_en;
|
||||
updateData.body_text = body_text_en || '';
|
||||
}
|
||||
}
|
||||
|
||||
const updated = await db('email_templates')
|
||||
.where('template_key', req.params.key)
|
||||
|
||||
@@ -32,7 +32,16 @@ router.get('/', adminAuth, async (req, res) => {
|
||||
actorName: notification.actor_name,
|
||||
eventName: notification.event_name,
|
||||
eventId: notification.event_id,
|
||||
metadata: notification.metadata ? JSON.parse(notification.metadata) : {},
|
||||
metadata: (() => {
|
||||
try {
|
||||
if (!notification.metadata) return {};
|
||||
if (typeof notification.metadata === 'object') return notification.metadata;
|
||||
return JSON.parse(notification.metadata);
|
||||
} catch (e) {
|
||||
console.warn('Failed to parse metadata for notification:', notification.id, e.message);
|
||||
return {};
|
||||
}
|
||||
})(),
|
||||
createdAt: notification.created_at,
|
||||
readAt: notification.read_at,
|
||||
isRead: !!notification.read_at
|
||||
@@ -91,9 +100,13 @@ router.put('/read-all', adminAuth, async (req, res) => {
|
||||
// Delete old notifications (older than 30 days and read)
|
||||
router.delete('/clear-old', adminAuth, async (req, res) => {
|
||||
try {
|
||||
// Use database-agnostic date calculation
|
||||
const thirtyDaysAgo = new Date();
|
||||
thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
|
||||
|
||||
const deletedCount = await db('activity_logs')
|
||||
.whereNotNull('read_at')
|
||||
.where('created_at', '<', db.raw("datetime('now', '-30 days')"))
|
||||
.where('created_at', '<', thirtyDaysAgo)
|
||||
.delete();
|
||||
|
||||
res.json({
|
||||
|
||||
@@ -35,14 +35,30 @@ router.get('/version', adminAuth, async (req, res) => {
|
||||
// Get comprehensive system status
|
||||
router.get('/status', adminAuth, async (req, res) => {
|
||||
try {
|
||||
// Database size
|
||||
const dbPath = path.join(__dirname, '../../data/photo_sharing.db');
|
||||
// Database size - check if PostgreSQL or SQLite
|
||||
let dbSize = 0;
|
||||
try {
|
||||
const stats = await fs.stat(dbPath);
|
||||
dbSize = stats.size;
|
||||
} catch (error) {
|
||||
console.error('Error getting database size:', error);
|
||||
const dbClient = process.env.DATABASE_CLIENT || 'sqlite3';
|
||||
|
||||
if (dbClient === 'pg') {
|
||||
// PostgreSQL - query database size
|
||||
try {
|
||||
const dbName = process.env.DB_NAME || 'picpeak';
|
||||
const result = await db.raw(`
|
||||
SELECT pg_database_size(?) as size
|
||||
`, [dbName]);
|
||||
dbSize = result.rows[0]?.size || 0;
|
||||
} catch (error) {
|
||||
console.error('Error getting PostgreSQL database size:', error);
|
||||
}
|
||||
} else {
|
||||
// SQLite - check file size
|
||||
const dbPath = path.join(__dirname, '../../data/photo_sharing.db');
|
||||
try {
|
||||
const stats = await fs.stat(dbPath);
|
||||
dbSize = stats.size;
|
||||
} catch (error) {
|
||||
console.error('Error getting SQLite database size:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// Count various entities
|
||||
|
||||
@@ -395,12 +395,15 @@ function stopEmailQueueProcessor() {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize on module load
|
||||
initializeTransporter().then(() => {
|
||||
startEmailQueueProcessor();
|
||||
});
|
||||
// Initialize on module load - DISABLED for production startup
|
||||
// This will be called from server.js after database is ready
|
||||
// initializeTransporter().then(() => {
|
||||
// startEmailQueueProcessor();
|
||||
// });
|
||||
|
||||
module.exports = {
|
||||
initializeTransporter,
|
||||
startEmailQueueProcessor,
|
||||
sendTemplateEmail,
|
||||
processEmailQueue,
|
||||
queueEmail,
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
const { db } = require('./src/database/db');
|
||||
|
||||
async function updateTemplate() {
|
||||
try {
|
||||
const englishBody = `<h2>Gallery Successfully Created</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has been successfully created\!</p>
|
||||
{{welcome_message_section}}
|
||||
<p><strong>Gallery Details:</strong></p>
|
||||
<ul>
|
||||
<li>Event Date: {{event_date}}</li>
|
||||
<li>Gallery Link: <a href="{{gallery_link}}" style="color: #5C8762; text-decoration: none;">{{gallery_link}}</a></li>
|
||||
<li>Password: {{gallery_password}}</li>
|
||||
<li>Valid Until: {{expiry_date}}</li>
|
||||
</ul>
|
||||
<p>Share this link and password with your guests so they can view and download photos.</p>
|
||||
<p><a href="{{gallery_link}}" style="display: inline-block; padding: 10px 20px; background-color: #5C8762; color: white; text-decoration: none; border-radius: 5px;">View Gallery</a></p>`;
|
||||
|
||||
const germanBody = `<h2>Galerie erfolgreich erstellt</h2>
|
||||
<p>Liebe(r) {{host_name}},</p>
|
||||
<p>Ihre Fotogalerie "{{event_name}}" wurde erfolgreich erstellt\!</p>
|
||||
{{welcome_message_section}}
|
||||
<p><strong>Galerie-Details:</strong></p>
|
||||
<ul>
|
||||
<li>Veranstaltungsdatum: {{event_date}}</li>
|
||||
<li>Galerie-Link: <a href="{{gallery_link}}" style="color: #5C8762; text-decoration: none;">{{gallery_link}}</a></li>
|
||||
<li>Passwort: {{gallery_password}}</li>
|
||||
<li>Gültig bis: {{expiry_date}}</li>
|
||||
</ul>
|
||||
<p>Teilen Sie diesen Link und das Passwort mit Ihren Gästen, damit sie Fotos ansehen und herunterladen können.</p>
|
||||
<p><a href="{{gallery_link}}" style="display: inline-block; padding: 10px 20px; background-color: #5C8762; color: white; text-decoration: none; border-radius: 5px;">Galerie anzeigen</a></p>`;
|
||||
|
||||
await db('email_templates')
|
||||
.where('template_key', 'gallery_created')
|
||||
.update({
|
||||
body_html_en: englishBody,
|
||||
body_html_de: germanBody
|
||||
});
|
||||
|
||||
console.log('Email template updated successfully');
|
||||
} catch (error) {
|
||||
console.error('Error updating template:', error);
|
||||
} finally {
|
||||
process.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
updateTemplate();
|
||||
Executable
+29
@@ -0,0 +1,29 @@
|
||||
#!/bin/sh
|
||||
# wait-for-db.sh - Wait for PostgreSQL to be ready before starting the application
|
||||
|
||||
set -e
|
||||
|
||||
host="$DB_HOST"
|
||||
port="${DB_PORT:-5432}"
|
||||
user="${DB_USER:-picpeak}"
|
||||
|
||||
echo "Waiting for PostgreSQL at $host:$port..."
|
||||
|
||||
# Wait for PostgreSQL to be ready
|
||||
until PGPASSWORD=$DB_PASSWORD psql -h "$host" -p "$port" -U "$user" -d "${DB_NAME:-picpeak}" -c '\q' 2>/dev/null; do
|
||||
>&2 echo "PostgreSQL is unavailable - sleeping"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
>&2 echo "PostgreSQL is up - executing command"
|
||||
|
||||
# Run migrations (use safe runner in production)
|
||||
echo "Running database migrations..."
|
||||
if [ "$NODE_ENV" = "production" ]; then
|
||||
npm run migrate:safe
|
||||
else
|
||||
npm run migrate
|
||||
fi
|
||||
|
||||
# Execute the main command
|
||||
exec "$@"
|
||||
@@ -0,0 +1,110 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
backend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-backend:latest'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/storage:/app/storage'
|
||||
- '/mnt/DockerMount/picpeak/data:/app/data'
|
||||
- '/mnt/DockerMount/picpeak/logs:/app/logs'
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Backend API routing WITHOUT path stripping
|
||||
- 'traefik.http.routers.picpeak-backend.rule=(Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)) && PathPrefix(`/api`)'
|
||||
- traefik.http.routers.picpeak-backend.entrypoints=https
|
||||
- traefik.http.routers.picpeak-backend.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-backend.loadbalancer.server.port=3000
|
||||
# Remove the stripprefix middleware - backend expects /api prefix
|
||||
# - traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api
|
||||
# - traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix
|
||||
- traefik.http.routers.picpeak-backend.priority=100
|
||||
- homepage.group=Public Services
|
||||
- homepage.name=PicPeak Backend
|
||||
- homepage.icon=mdi-api
|
||||
- 'homepage.href=https://picpeak.local.nothaft.cloud/api/health'
|
||||
- homepage.description=PicPeak API Backend
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-frontend:latest'
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.http.routers.picpeak.rule=Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak.entrypoints=https
|
||||
- traefik.http.routers.picpeak.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak.loadbalancer.server.port=80
|
||||
- traefik.http.routers.picpeak.priority=10
|
||||
- homepage.group=Public Services
|
||||
- homepage.name=PicPeak
|
||||
- homepage.icon=mdi-photo
|
||||
- 'homepage.href=https://picpeak.local.nothaft.cloud/'
|
||||
- homepage.description=Photo Sharing System
|
||||
|
||||
db:
|
||||
image: 'postgres:14-alpine'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=${PG_AUTH_METHOD:-scram-sha-256}
|
||||
- POSTGRES_INITDB_ARGS=${PG_INIT_ARGS:---auth-host=scram-sha-256 --auth-local=trust}
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/db:/var/lib/postgresql/data'
|
||||
networks:
|
||||
- picpeak
|
||||
command: ${PG_COMMANDS:-postgres -c ssl=off}
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
picpeak:
|
||||
driver: bridge
|
||||
+14
-1
@@ -8,6 +8,8 @@ services:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- db
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- PORT=3000
|
||||
@@ -31,6 +33,10 @@ services:
|
||||
# Analytics
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
# Storage paths
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- ./storage:/app/storage
|
||||
- ./data:/app/data
|
||||
@@ -43,6 +49,8 @@ services:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
- VITE_API_URL=/api
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
@@ -82,10 +90,15 @@ services:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
# Allow connections from any host with password authentication
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- picpeak
|
||||
# Allow connections without SSL requirement from Docker network
|
||||
command: postgres -c ssl=off
|
||||
|
||||
umami:
|
||||
image: ghcr.io/umami-software/umami:postgresql-latest
|
||||
@@ -104,4 +117,4 @@ networks:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
postgres_data:
|
||||
@@ -0,0 +1,131 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
backend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-backend:latest'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/storage:/app/storage'
|
||||
- '/mnt/DockerMount/picpeak/data:/app/data'
|
||||
- '/mnt/DockerMount/picpeak/logs:/app/logs'
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Backend API routing
|
||||
- 'traefik.http.routers.picpeak-backend.rule=(Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)) && PathPrefix(`/api`)'
|
||||
- traefik.http.routers.picpeak-backend.entrypoints=https
|
||||
- traefik.http.routers.picpeak-backend.tls=true
|
||||
- traefik.http.routers.picpeak-backend.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-backend.loadbalancer.server.port=3000
|
||||
# Strip /api prefix when forwarding to backend
|
||||
- traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api
|
||||
- traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix
|
||||
# Higher priority for API routes
|
||||
- traefik.http.routers.picpeak-backend.priority=100
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-frontend:latest'
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Frontend routing (catch-all for non-API routes)
|
||||
- traefik.http.routers.picpeak.rule=Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak.entrypoints=https
|
||||
- traefik.http.routers.picpeak.tls=true
|
||||
- traefik.http.routers.picpeak.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak.loadbalancer.server.port=80
|
||||
# Lower priority than backend to ensure /api routes go to backend
|
||||
- traefik.http.routers.picpeak.priority=10
|
||||
|
||||
db:
|
||||
image: 'postgres:14-alpine'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/db:/var/lib/postgresql/data'
|
||||
# Mount init script to create umami database
|
||||
- ./docker/postgres-init:/docker-entrypoint-initdb.d:ro
|
||||
networks:
|
||||
- picpeak
|
||||
command: postgres -c ssl=off
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
# Optional: Umami analytics
|
||||
umami:
|
||||
image: ghcr.io/umami-software/umami:postgresql-latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${DB_USER:-picpeak}:${DB_PASSWORD}@db:5432/umami
|
||||
DATABASE_TYPE: postgresql
|
||||
HASH_SALT: ${UMAMI_HASH_SALT}
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.http.routers.picpeak-umami.rule=Host(`analytics.picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak-umami.entrypoints=https
|
||||
- traefik.http.routers.picpeak-umami.tls=true
|
||||
- traefik.http.routers.picpeak-umami.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-umami.loadbalancer.server.port=3000
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
picpeak:
|
||||
driver: bridge
|
||||
@@ -0,0 +1,147 @@
|
||||
# docker-compose.traefik.yml - Production configuration for external Traefik
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
backend:
|
||||
image: picpeak-backend:latest
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- db
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.nothaft.cloud
|
||||
# Database
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
# Email
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
# Analytics
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
# Storage paths
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- ./storage:/app/storage
|
||||
- ./data:/app/data
|
||||
- ./logs:/app/logs
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.docker.network=traefik"
|
||||
# Backend API routing
|
||||
- "traefik.http.routers.picpeak-backend.rule=Host(`picpeak.nothaft.cloud`) && PathPrefix(`/api`)"
|
||||
- "traefik.http.routers.picpeak-backend.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-backend.tls=true"
|
||||
- "traefik.http.routers.picpeak-backend.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-backend.loadbalancer.server.port=3000"
|
||||
# Strip /api prefix when forwarding to backend
|
||||
- "traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api"
|
||||
- "traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix"
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
|
||||
frontend:
|
||||
image: picpeak-frontend:latest
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
- VITE_API_URL=/api
|
||||
- VITE_UMAMI_URL=${VITE_UMAMI_URL}
|
||||
- VITE_UMAMI_WEBSITE_ID=${VITE_UMAMI_WEBSITE_ID}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.docker.network=traefik"
|
||||
# Frontend routing (catch-all for non-API routes)
|
||||
- "traefik.http.routers.picpeak-frontend.rule=Host(`picpeak.nothaft.cloud`)"
|
||||
- "traefik.http.routers.picpeak-frontend.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-frontend.tls=true"
|
||||
- "traefik.http.routers.picpeak-frontend.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-frontend.loadbalancer.server.port=80"
|
||||
# Lower priority than backend to ensure /api routes go to backend
|
||||
- "traefik.http.routers.picpeak-frontend.priority=1"
|
||||
|
||||
db:
|
||||
image: postgres:14-alpine
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
# Allow connections from any host with password authentication
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
# Mount init script to create umami database
|
||||
- ./docker/postgres-init:/docker-entrypoint-initdb.d
|
||||
networks:
|
||||
- picpeak
|
||||
# Allow connections without SSL requirement from Docker network
|
||||
command: postgres -c ssl=off
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
umami:
|
||||
image: ghcr.io/umami-software/umami:postgresql-latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${DB_USER:-picpeak}:${DB_PASSWORD}@db:5432/umami
|
||||
DATABASE_TYPE: postgresql
|
||||
HASH_SALT: ${UMAMI_HASH_SALT}
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- picpeak
|
||||
- traefik
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.docker.network=traefik"
|
||||
# Umami analytics routing
|
||||
- "traefik.http.routers.picpeak-umami.rule=Host(`analytics.picpeak.nothaft.cloud`)"
|
||||
- "traefik.http.routers.picpeak-umami.entrypoints=websecure"
|
||||
- "traefik.http.routers.picpeak-umami.tls=true"
|
||||
- "traefik.http.routers.picpeak-umami.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.picpeak-umami.loadbalancer.server.port=3000"
|
||||
|
||||
networks:
|
||||
picpeak:
|
||||
driver: bridge
|
||||
traefik:
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
@@ -0,0 +1,8 @@
|
||||
-- Create umami database if it doesn't exist
|
||||
-- This runs as the postgres superuser during initialization
|
||||
|
||||
SELECT 'CREATE DATABASE umami'
|
||||
WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'umami')\gexec
|
||||
|
||||
-- Grant all privileges on umami database to the application user
|
||||
GRANT ALL PRIVILEGES ON DATABASE umami TO "${POSTGRES_USER}";
|
||||
@@ -0,0 +1,65 @@
|
||||
# Build stage with dynamic API URL
|
||||
FROM node:20-alpine AS builder
|
||||
|
||||
# Accept build args for API URL
|
||||
ARG VITE_API_URL=/api
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
|
||||
# Install dependencies
|
||||
RUN npm ci --legacy-peer-deps
|
||||
|
||||
# Copy source files
|
||||
COPY . .
|
||||
|
||||
# Set environment variable for build
|
||||
ENV VITE_API_URL=$VITE_API_URL
|
||||
|
||||
# Build the application
|
||||
RUN npm run build
|
||||
|
||||
# Production stage
|
||||
FROM nginx:alpine
|
||||
|
||||
# Install runtime dependencies
|
||||
RUN apk add --no-cache curl
|
||||
|
||||
# Remove default nginx config
|
||||
RUN rm -rf /etc/nginx/conf.d/*
|
||||
|
||||
# Copy custom nginx config
|
||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
# Copy built application from builder stage
|
||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
||||
|
||||
# Create a script to inject runtime config
|
||||
RUN cat > /usr/share/nginx/html/config.js << 'EOF'
|
||||
window.__RUNTIME_CONFIG__ = {
|
||||
API_URL: '/api'
|
||||
};
|
||||
EOF
|
||||
|
||||
# Set permissions
|
||||
RUN chown -R nginx:nginx /usr/share/nginx/html && \
|
||||
chown -R nginx:nginx /var/cache/nginx && \
|
||||
chown -R nginx:nginx /var/log/nginx && \
|
||||
touch /var/run/nginx.pid && \
|
||||
chown -R nginx:nginx /var/run/nginx.pid
|
||||
|
||||
# Expose port
|
||||
EXPOSE 80
|
||||
|
||||
# Health check
|
||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
||||
CMD curl -f http://localhost/health || exit 1
|
||||
|
||||
# Switch to non-root user
|
||||
USER nginx
|
||||
|
||||
# Start nginx
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"auditReportVersion": 2,
|
||||
"vulnerabilities": {},
|
||||
"metadata": {
|
||||
"vulnerabilities": {
|
||||
"info": 0,
|
||||
"low": 0,
|
||||
"moderate": 0,
|
||||
"high": 0,
|
||||
"critical": 0,
|
||||
"total": 0
|
||||
},
|
||||
"dependencies": {
|
||||
"prod": 136,
|
||||
"dev": 298,
|
||||
"optional": 47,
|
||||
"peer": 0,
|
||||
"peerOptional": 0,
|
||||
"total": 433
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"dependencies": {
|
||||
"@tanstack/react-query": "^5.0.0",
|
||||
"@tiptap/extension-link": "^2.25.0",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"private": true,
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.21",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -15,7 +15,7 @@ export const GlobalThemeProvider: React.FC<GlobalThemeProviderProps> = ({ childr
|
||||
const { data: settingsData } = useQuery({
|
||||
queryKey: ['global-theme-settings'],
|
||||
queryFn: async () => {
|
||||
const response = await api.get('/api/public/settings');
|
||||
const response = await api.get('/public/settings');
|
||||
return response.data;
|
||||
},
|
||||
staleTime: 5 * 60 * 1000, // Cache for 5 minutes
|
||||
|
||||
@@ -23,7 +23,7 @@ export const MaintenanceMode: React.FC = () => {
|
||||
queryKey: ['public-settings-maintenance'],
|
||||
queryFn: async () => {
|
||||
try {
|
||||
const response = await api.get('/api/public/settings');
|
||||
const response = await api.get('/public/settings');
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
// Return empty object if settings can't be fetched
|
||||
|
||||
@@ -30,7 +30,7 @@ export const MaintenanceWrapper: React.FC<MaintenanceWrapperProps> = ({ children
|
||||
queryFn: async () => {
|
||||
try {
|
||||
// Make a lightweight request to check maintenance status
|
||||
await api.get('/api/public/settings');
|
||||
await api.get('/public/settings');
|
||||
// If successful, maintenance mode is off
|
||||
setMaintenanceMode(false);
|
||||
return { maintenance: false };
|
||||
|
||||
@@ -62,7 +62,7 @@ export const PhotoUpload: React.FC<PhotoUploadProps> = ({ eventId, onUploadCompl
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await api.post(`/api/admin/events/${eventId}/upload`, formData, {
|
||||
const response = await api.post(`/admin/events/${eventId}/upload`, formData, {
|
||||
// Don't set Content-Type header - axios will set it with the boundary
|
||||
onUploadProgress: (progressEvent) => {
|
||||
if (progressEvent.total) {
|
||||
|
||||
@@ -15,7 +15,7 @@ interface SystemVersion {
|
||||
}
|
||||
|
||||
async function fetchSystemVersion(): Promise<SystemVersion> {
|
||||
const response = await api.get<SystemVersion>('/api/admin/system/version');
|
||||
const response = await api.get<SystemVersion>('/admin/system/version');
|
||||
return response.data;
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ export const GalleryView: React.FC<GalleryViewProps> = ({ slug, event }) => {
|
||||
const { data: settingsData } = useQuery({
|
||||
queryKey: ['gallery-settings'],
|
||||
queryFn: async () => {
|
||||
const response = await api.get('/api/public/settings');
|
||||
const response = await api.get('/public/settings');
|
||||
return response.data;
|
||||
},
|
||||
staleTime: 5 * 60 * 1000, // Cache for 5 minutes
|
||||
@@ -195,8 +195,8 @@ export const GalleryView: React.FC<GalleryViewProps> = ({ slug, event }) => {
|
||||
if (watermarkEnabled) {
|
||||
photos = photos.map(photo => ({
|
||||
...photo,
|
||||
url: `/api/gallery/${slug}/photo/${photo.id}`,
|
||||
thumbnail_url: `/api/gallery/${slug}/photo/${photo.id}` // Use watermarked version for thumbnails too
|
||||
url: `/gallery/${slug}/photo/${photo.id}`,
|
||||
thumbnail_url: `/gallery/${slug}/photo/${photo.id}` // Use watermarked version for thumbnails too
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ export const UserPhotoUpload: React.FC<UserPhotoUploadProps> = ({
|
||||
}
|
||||
|
||||
try {
|
||||
await api.post(`/api/gallery/${eventId}/upload`, formData, {
|
||||
await api.post(`/gallery/${eventId}/upload`, formData, {
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
|
||||
@@ -33,7 +33,7 @@ export const GalleryPage: React.FC = () => {
|
||||
const { data: settingsData } = useQuery({
|
||||
queryKey: ['gallery-settings'],
|
||||
queryFn: async () => {
|
||||
const response = await api.get('/api/public/settings');
|
||||
const response = await api.get('/public/settings');
|
||||
return response.data;
|
||||
},
|
||||
staleTime: 5 * 60 * 1000, // Cache for 5 minutes
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user