Initial commit - Project start (July 17, 2025)
Mirror to GitHub / mirror (push) Successful in 26s
Test and Lint / backend-test (push) Successful in 1m11s
continuous-integration/drone/push Build is passing
Test and Lint / frontend-test (push) Successful in 2m28s
Version and Release / version-bump (push) Successful in 32s
Version and Release / trigger-drone (push) Has been skipped
Mirror to GitHub / mirror (push) Successful in 26s
Test and Lint / backend-test (push) Successful in 1m11s
continuous-integration/drone/push Build is passing
Test and Lint / frontend-test (push) Successful in 2m28s
Version and Release / version-bump (push) Successful in 32s
Version and Release / trigger-drone (push) Has been skipped
Original: feat: enhance security logging and ensure rate limit blocks are properly tracked - Add comprehensive logging for rate limit blocks with full request details - IP address (with proper proxy detection), user agent, headers, timestamps - Rate limit info (current count, limit, remaining, reset time) - Separate tracking for auth vs general endpoints - Enhance authentication failure logging - JWT validation failures with detailed error info - Admin auth attempts without token - Failed token validation with user context - All events include IP, path, method, user agent - Improve Winston logger configuration for production - Add automatic log rotation (10MB errors, 50MB combined) - Create separate security.log for auth/rate limit events - Ensure logs directory exists automatically - Add structured JSON format for log aggregation - Support container logging with LOG_TO_CONSOLE env var - Create comprehensive documentation - Security logging guide with examples - Monitoring recommendations - Configuration reference - Add test script to verify logging functionality All rate limit settings remain configurable via admin panel: - Window duration, max requests, auth limits - Skip authenticated requests option - Public endpoints only option 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -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;
|
||||
@@ -0,0 +1,228 @@
|
||||
const knex = require('knex');
|
||||
const knexConfig = require('../../knexfile');
|
||||
|
||||
// Create database connection with built-in retry logic
|
||||
const db = knex(knexConfig);
|
||||
|
||||
async function initializeDatabase() {
|
||||
// Events table
|
||||
const hasEventsTable = await db.schema.hasTable('events');
|
||||
if (!hasEventsTable) {
|
||||
await db.schema.createTable('events', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('slug').unique().notNullable();
|
||||
table.string('event_type').notNullable();
|
||||
table.string('event_name').notNullable();
|
||||
table.date('event_date').notNullable();
|
||||
table.string('host_email').notNullable();
|
||||
table.string('admin_email').notNullable();
|
||||
table.string('password_hash').notNullable();
|
||||
table.text('welcome_message');
|
||||
table.text('color_theme');
|
||||
table.string('share_link').unique().notNullable();
|
||||
table.datetime('created_at').defaultTo(db.fn.now());
|
||||
table.datetime('expires_at').notNullable();
|
||||
table.boolean('is_active').defaultTo(true);
|
||||
table.boolean('is_archived').defaultTo(false);
|
||||
table.string('archive_path');
|
||||
table.datetime('archived_at');
|
||||
});
|
||||
} else {
|
||||
// Check if color_theme needs to be updated to TEXT type
|
||||
// This is needed for larger theme configurations
|
||||
const isPostgres = knexConfig.client === 'pg';
|
||||
|
||||
if (!isPostgres) {
|
||||
// SQLite-specific migration
|
||||
try {
|
||||
await db.raw(`
|
||||
CREATE TABLE IF NOT EXISTS events_new (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
slug TEXT UNIQUE NOT NULL,
|
||||
event_type TEXT NOT NULL,
|
||||
event_name TEXT NOT NULL,
|
||||
event_date DATE NOT NULL,
|
||||
host_email TEXT NOT NULL,
|
||||
admin_email TEXT NOT NULL,
|
||||
password_hash TEXT NOT NULL,
|
||||
welcome_message TEXT,
|
||||
color_theme TEXT,
|
||||
share_link TEXT UNIQUE NOT NULL,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
expires_at DATETIME NOT NULL,
|
||||
is_active BOOLEAN DEFAULT 1,
|
||||
is_archived BOOLEAN DEFAULT 0,
|
||||
archive_path TEXT,
|
||||
archived_at DATETIME,
|
||||
allow_user_uploads BOOLEAN DEFAULT 0,
|
||||
upload_category_id INTEGER
|
||||
)
|
||||
`);
|
||||
|
||||
await db.raw('INSERT INTO events_new SELECT * FROM events');
|
||||
await db.raw('DROP TABLE events');
|
||||
await db.raw('ALTER TABLE events_new RENAME TO events');
|
||||
} catch (error) {
|
||||
// If the migration fails, it might already have been applied
|
||||
console.log('Color theme migration may have already been applied');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Photo metadata table
|
||||
const hasPhotosTable = await db.schema.hasTable('photos');
|
||||
if (!hasPhotosTable) {
|
||||
await db.schema.createTable('photos', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.integer('event_id').references('id').inTable('events').onDelete('CASCADE');
|
||||
table.string('filename').notNullable();
|
||||
table.string('path').notNullable();
|
||||
table.string('thumbnail_path');
|
||||
table.string('type').notNullable(); // 'collage' or 'individual'
|
||||
table.integer('size_bytes');
|
||||
table.datetime('uploaded_at').defaultTo(db.fn.now());
|
||||
table.integer('view_count').defaultTo(0);
|
||||
table.integer('download_count').defaultTo(0);
|
||||
});
|
||||
}
|
||||
|
||||
// Access logs table
|
||||
const hasAccessLogsTable = await db.schema.hasTable('access_logs');
|
||||
if (!hasAccessLogsTable) {
|
||||
await db.schema.createTable('access_logs', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.integer('event_id').references('id').inTable('events');
|
||||
table.string('ip_address');
|
||||
table.string('user_agent');
|
||||
table.string('action'); // 'view', 'download', 'login_success', 'login_fail'
|
||||
table.string('photo_id');
|
||||
table.datetime('timestamp').defaultTo(db.fn.now());
|
||||
});
|
||||
}
|
||||
|
||||
// Email queue table
|
||||
const hasEmailQueueTable = await db.schema.hasTable('email_queue');
|
||||
if (!hasEmailQueueTable) {
|
||||
await db.schema.createTable('email_queue', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.integer('event_id').references('id').inTable('events');
|
||||
table.string('recipient_email').notNullable();
|
||||
table.string('email_type').notNullable(); // 'creation', 'warning', 'expiration', 'archive_complete'
|
||||
table.json('email_data');
|
||||
table.string('status').defaultTo('pending'); // 'pending', 'sent', 'failed'
|
||||
table.datetime('scheduled_at').defaultTo(db.fn.now());
|
||||
table.datetime('sent_at');
|
||||
table.text('error_message');
|
||||
table.integer('retry_count').defaultTo(0);
|
||||
});
|
||||
}
|
||||
|
||||
// Admin users table
|
||||
const hasAdminUsersTable = await db.schema.hasTable('admin_users');
|
||||
if (!hasAdminUsersTable) {
|
||||
await db.schema.createTable('admin_users', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('username').unique().notNullable();
|
||||
table.string('email').unique().notNullable();
|
||||
table.string('password_hash').notNullable();
|
||||
table.boolean('is_active').defaultTo(true);
|
||||
table.datetime('created_at').defaultTo(db.fn.now());
|
||||
table.datetime('updated_at').defaultTo(db.fn.now());
|
||||
table.datetime('last_login');
|
||||
});
|
||||
} else {
|
||||
// Check if updated_at column exists
|
||||
const hasUpdatedAt = await db.schema.hasColumn('admin_users', 'updated_at');
|
||||
if (!hasUpdatedAt) {
|
||||
await db.schema.table('admin_users', (table) => {
|
||||
table.datetime('updated_at');
|
||||
});
|
||||
// Set default value for existing rows
|
||||
await db('admin_users').update({ updated_at: new Date() });
|
||||
}
|
||||
}
|
||||
|
||||
// Email configuration table
|
||||
const hasEmailConfigTable = await db.schema.hasTable('email_configs');
|
||||
if (!hasEmailConfigTable) {
|
||||
await db.schema.createTable('email_configs', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('smtp_host').notNullable();
|
||||
table.integer('smtp_port').notNullable();
|
||||
table.boolean('smtp_secure').defaultTo(false);
|
||||
table.string('smtp_user');
|
||||
table.string('smtp_pass');
|
||||
table.string('from_email').notNullable();
|
||||
table.string('from_name');
|
||||
table.datetime('updated_at').defaultTo(db.fn.now());
|
||||
});
|
||||
}
|
||||
|
||||
// Email templates table
|
||||
const hasEmailTemplatesTable = await db.schema.hasTable('email_templates');
|
||||
if (!hasEmailTemplatesTable) {
|
||||
await db.schema.createTable('email_templates', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('template_key').unique().notNullable(); // 'gallery_created', 'expiration_warning', etc.
|
||||
table.string('subject').notNullable();
|
||||
table.text('body_html').notNullable();
|
||||
table.text('body_text');
|
||||
table.json('variables'); // Available template variables
|
||||
table.datetime('updated_at').defaultTo(db.fn.now());
|
||||
});
|
||||
}
|
||||
|
||||
// App settings table
|
||||
const hasAppSettingsTable = await db.schema.hasTable('app_settings');
|
||||
if (!hasAppSettingsTable) {
|
||||
await db.schema.createTable('app_settings', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('setting_key').unique().notNullable();
|
||||
table.json('setting_value');
|
||||
table.string('setting_type'); // 'branding', 'theme', 'general'
|
||||
table.datetime('updated_at').defaultTo(db.fn.now());
|
||||
});
|
||||
}
|
||||
|
||||
// Activity logs table
|
||||
const hasActivityLogsTable = await db.schema.hasTable('activity_logs');
|
||||
if (!hasActivityLogsTable) {
|
||||
await db.schema.createTable('activity_logs', (table) => {
|
||||
table.increments('id').primary();
|
||||
table.string('activity_type').notNullable(); // 'event_created', 'photos_uploaded', etc.
|
||||
table.string('actor_type'); // 'admin', 'system', 'guest'
|
||||
table.integer('actor_id');
|
||||
table.string('actor_name');
|
||||
table.json('metadata'); // Additional data about the activity
|
||||
table.integer('event_id').references('id').inTable('events');
|
||||
table.datetime('created_at').defaultTo(db.fn.now());
|
||||
table.datetime('read_at').nullable();
|
||||
});
|
||||
} else {
|
||||
// Check if read_at column exists
|
||||
const hasReadAt = await db.schema.hasColumn('activity_logs', 'read_at');
|
||||
if (!hasReadAt) {
|
||||
await db.schema.table('activity_logs', (table) => {
|
||||
table.datetime('read_at').nullable();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Helper function to log activities
|
||||
async function logActivity(activityType, metadata = {}, eventId = null, actor = null) {
|
||||
try {
|
||||
await db('activity_logs').insert({
|
||||
activity_type: activityType,
|
||||
actor_type: actor?.type || 'system',
|
||||
actor_id: actor?.id || null,
|
||||
actor_name: actor?.name || null,
|
||||
metadata: JSON.stringify(metadata),
|
||||
event_id: eventId
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to log activity:', error);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { db, initializeDatabase, logActivity };
|
||||
Reference in New Issue
Block a user