waitwaitwait i need a restore

README

@@ -16,10 +16,10 @@ Installation:
       USE messenger;
       
       # For new installation:
-      source sql/create.sql
+      source main/create.sql
       
       # For updating existing installation:
-      source sql/migrate.sql
+      source main/migrate.sql
       
       # Create user with password
       CREATE USER 'messenger'@'localhost' IDENTIFIED BY 'your_secure_password';

main/create.sql

@@ -0,0 +1,29 @@
+CREATE TABLE messages (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    username VARCHAR(50) NOT NULL,
+    message TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    signature TEXT,
+    is_encrypted BOOLEAN DEFAULT FALSE,
+    INDEX idx_created_at (created_at)
+);
+
+CREATE TABLE users (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    username VARCHAR(50) NOT NULL UNIQUE,
+    password VARCHAR(255) NOT NULL,
+    pgp_key TEXT,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    is_moderator TINYINT(1) NOT NULL DEFAULT 0,
+    login_attempts INT NOT NULL DEFAULT 0,
+    last_attempt TIMESTAMP NULL,
+    is_blocked TINYINT(1) NOT NULL DEFAULT 0,
+    block_reason TEXT,
+    INDEX idx_username (username)
+);
+
+CREATE TABLE registrations (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_created_at (created_at)
+); 

main/db.sql

@@ -0,0 +1,81 @@
+CREATE TABLE messages (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    username VARCHAR(50) NOT NULL,
+    message TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    signature TEXT,
+    is_encrypted BOOLEAN DEFAULT FALSE,
+    INDEX idx_created_at (created_at)
+);
+
+CREATE TABLE users (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    username VARCHAR(50) NOT NULL UNIQUE,
+    password VARCHAR(255) NOT NULL,
+    pgp_key TEXT,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    is_moderator TINYINT(1) NOT NULL DEFAULT 0,
+    login_attempts INT NOT NULL DEFAULT 0,
+    last_attempt TIMESTAMP NULL,
+    is_blocked TINYINT(1) NOT NULL DEFAULT 0,
+    block_reason TEXT,
+    INDEX idx_username (username)
+);
+
+CREATE TABLE registrations (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_created_at (created_at)
+);
+
+DELIMITER //
+CREATE OR REPLACE PROCEDURE migrate_if_needed()
+BEGIN
+    IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'messages') THEN
+        CREATE TABLE messages (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            username VARCHAR(50) NOT NULL,
+            message TEXT NOT NULL,
+            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+            signature TEXT,
+            is_encrypted BOOLEAN DEFAULT FALSE,
+            INDEX idx_created_at (created_at)
+        );
+    END IF;
+
+    IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'users') THEN
+        CREATE TABLE users (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            username VARCHAR(50) NOT NULL UNIQUE,
+            password VARCHAR(255) NOT NULL,
+            pgp_key TEXT,
+            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+            is_moderator TINYINT(1) NOT NULL DEFAULT 0,
+            login_attempts INT NOT NULL DEFAULT 0,
+            last_attempt TIMESTAMP NULL,
+            is_blocked TINYINT(1) NOT NULL DEFAULT 0,
+            block_reason TEXT,
+            INDEX idx_username (username)
+        );
+    END IF;
+
+    IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'registrations') THEN
+        CREATE TABLE registrations (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+            INDEX idx_created_at (created_at)
+        );
+    END IF;
+
+    IF EXISTS (
+        SELECT * FROM information_schema.columns 
+        WHERE table_name = 'registrations' AND column_name = 'ip'
+    ) THEN
+        DROP INDEX IF EXISTS idx_ip_created ON registrations;
+        ALTER TABLE registrations DROP COLUMN ip;
+    END IF;
+END //
+DELIMITER ;
+
+CALL migrate_if_needed();
+DROP PROCEDURE IF EXISTS migrate_if_needed;

main/login.php

@@ -1,88 +1,124 @@
 <?php
-require_once 'config.php';
-
+ob_start();
+ini_set('session.cookie_httponly', 1);
+ini_set('session.cookie_secure', 1);
+header('X-Content-Type-Options: nosniff');
+header('X-Frame-Options: DENY');
+header('X-XSS-Protection: 1; mode=block');
+header('Content-Security-Policy: default-src \'self\'; style-src \'self\' \'unsafe-inline\';');
+header('Strict-Transport-Security: max-age=31536000; includeSubDomains');
 session_start();
 
-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    $username = $_POST['username'] ?? '';
-    $password = $_POST['password'] ?? '';
+$debug = [];
+try {
+    $config = require 'config.php';
+    $debug[] = "Config loaded";
     
-    try {
-        $pdo = new PDO(
-            "mysql:host={$config['db_host']};dbname={$config['db_name']};charset=utf8mb4",
-            $config['db_user'],
-            $config['db_pass'],
-            [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]
+    $db = new PDO(
+        "mysql:host={$config['db']['host']};dbname={$config['db']['name']}", 
+        $config['db']['user'], 
+        $config['db']['pass']
     );
+    $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    $debug[] = "Database connected";
+} catch (PDOException $e) {
+    $debug[] = "Database error: " . $e->getMessage();
+    die("Database connection error: " . $e->getMessage());
+}
 
-        $stmt = $pdo->prepare("SELECT * FROM users WHERE username = ?");
+$error = '';
+$success = '';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $username = filter_input(INPUT_POST, 'username', FILTER_SANITIZE_STRING);
+    $password = filter_input(INPUT_POST, 'password', FILTER_SANITIZE_STRING);
+    
+    $debug[] = "Login attempt for: " . $username;
+
+    if ($username && $password) {
+        try {
+            $stmt = $db->prepare('SELECT id, password, is_blocked, login_attempts, last_attempt FROM users WHERE username = ?');
             $stmt->execute([$username]);
-        $user = $stmt->fetch();
+            $user = $stmt->fetch(PDO::FETCH_ASSOC);
             
-        if ($user && password_verify($password, $user['password'])) {
-            if ($user['is_blocked']) {
-                $error = "Аккаунт заблокирован: " . htmlspecialchars($user['block_reason']);
-            } else {
-                $_SESSION['user_id'] = $user['id'];
-                $_SESSION['username'] = $user['username'];
-                $_SESSION['is_moderator'] = $user['is_moderator'];
+            $debug[] = "User found: " . ($user ? 'yes' : 'no');
 
-                $stmt = $pdo->prepare("UPDATE users SET login_attempts = 0, last_attempt = NULL WHERE id = ?");
-                $stmt->execute([$user['id']]);
-                
-                header("Location: index.php");
-                exit;
-            }
-        } else {
             if ($user) {
-                $stmt = $pdo->prepare("UPDATE users SET login_attempts = login_attempts + 1, last_attempt = CURRENT_TIMESTAMP WHERE id = ?");
+                if ($user['is_blocked']) {
+                    $error = 'Account is blocked';
+                    $debug[] = "Account blocked";
+                } else if ($user['login_attempts'] >= 5 && strtotime($user['last_attempt']) > strtotime('-15 minutes')) {
+                    $error = 'Too many login attempts';
+                    $debug[] = "Too many attempts";
+                } else if (password_verify($password, $user['password'])) {
+                    $stmt = $db->prepare('UPDATE users SET login_attempts = 0, last_attempt = NOW() WHERE id = ?');
                     $stmt->execute([$user['id']]);
-                
-                if ($user['login_attempts'] >= 4) {
-                    $stmt = $pdo->prepare("UPDATE users SET is_blocked = 1, block_reason = 'Превышено количество попыток входа' WHERE id = ?");
-                    $stmt->execute([$user['id']]);
-                    $error = "Аккаунт заблокирован из-за превышения количества попыток входа";
+                    $_SESSION['user_id'] = $user['id'];
+                    $_SESSION['username'] = $username;
+                    $debug[] = "Login successful";
+                    header('Location: index.php');
+                    exit;
                 } else {
-                    $error = "Неверный пароль";
+                    $stmt = $db->prepare('UPDATE users SET login_attempts = login_attempts + 1, last_attempt = NOW() WHERE id = ?');
+                    $stmt->execute([$user['id']]);
+                    $error = 'Invalid password';
+                    $debug[] = "Invalid password";
                 }
             } else {
-                $error = "Пользователь не найден";
-            }
+                $error = 'User not found';
+                $debug[] = "User not found";
             }
         } catch (PDOException $e) {
-        $error = "Ошибка сервера";
+            $error = 'Server error';
+            $debug[] = "SQL Error: " . $e->getMessage();
+            $debug[] = "SQL State: " . $e->getCode();
+        }
     }
 }
 ?>
 <!DOCTYPE html>
-<html lang="ru">
+<html>
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Вход</title>
-    <link rel="stylesheet" href="style.css">
+    <meta charset="utf-8">
+    <title>Text0Nly - Login</title>
+    <style>
+        body { font-family: Arial, sans-serif; max-width: 400px; margin: 20px auto; padding: 20px; }
+        .form-group { margin: 10px 0; }
+        input { width: 100%; padding: 8px; margin: 5px 0; }
+        button { width: 100%; padding: 10px; background: #2196F3; color: white; border: none; cursor: pointer; }
+        .error { color: red; }
+        .success { color: green; }
+        .debug { background: #f5f5f5; padding: 10px; margin: 10px 0; font-family: monospace; }
+    </style>
 </head>
 <body>
-    <div class="container">
-        <h1>Вход</h1>
-        <?php if (isset($error)): ?>
-            <div class="error"><?php echo $error; ?></div>
+    <h2>Login</h2>
+    <?php if ($error): ?>
+        <div class="error"><?= htmlspecialchars($error) ?></div>
     <?php endif; ?>
-        <?php if (isset($success)): ?>
-            <div class="success"><?php echo $success; ?></div>
+    <?php if ($success): ?>
+        <div class="success"><?= htmlspecialchars($success) ?></div>
     <?php endif; ?>
-        <form method="POST" action="">
+    
+    <form method="post">
         <div class="form-group">
-                <label for="username">Имя пользователя:</label>
-                <input type="text" id="username" name="username" required>
+            <input type="text" name="username" placeholder="Username" required>
         </div>
         <div class="form-group">
-                <label for="password">Пароль:</label>
-                <input type="password" id="password" name="password" required>
+            <input type="password" name="password" placeholder="Password" required>
         </div>
-            <button type="submit">Войти</button>
+        <button type="submit">Login</button>
     </form>
-        <p>Нет аккаунта? <a href="register.php">Зарегистрироваться</a></p>
+    <p><a href="register.php">Register</a> | <a href="index.php">Back to chat</a></p>
+    
+    <?php if (!empty($debug)): ?>
+        <div class="debug">
+            <strong>Debug info:</strong><br>
+            <?php foreach ($debug as $line): ?>
+                <?= htmlspecialchars($line) ?><br>
+            <?php endforeach; ?>
         </div>
+    <?php endif; ?>
 </body>
 </html>
+<?php ob_end_flush(); ?> 

main/migrate.sql

@@ -0,0 +1,24 @@
+DELIMITER //
+CREATE OR REPLACE PROCEDURE migrate_if_needed()
+BEGIN
+    IF EXISTS (
+        SELECT * FROM information_schema.columns 
+        WHERE table_name = 'registrations' AND column_name = 'ip'
+    ) THEN
+        DROP INDEX IF EXISTS idx_ip_created ON registrations;
+        ALTER TABLE registrations DROP COLUMN ip;
+    END IF;
+
+    IF NOT EXISTS (
+        SELECT * FROM information_schema.columns 
+        WHERE table_name = 'users' AND column_name = 'is_blocked'
+    ) THEN
+        ALTER TABLE users 
+        ADD COLUMN is_blocked TINYINT(1) NOT NULL DEFAULT 0,
+        ADD COLUMN block_reason TEXT;
+    END IF;
+END //
+DELIMITER ;
+
+CALL migrate_if_needed();
+DROP PROCEDURE IF EXISTS migrate_if_needed; 

main/register.php

@@ -1,83 +1,100 @@
 <?php
-require_once 'config.php';
-require_once 'functions.php';
-
+ob_start();
+ini_set('session.cookie_httponly', 1);
+ini_set('session.cookie_secure', 1);
+header('X-Content-Type-Options: nosniff');
+header('X-Frame-Options: DENY');
+header('X-XSS-Protection: 1; mode=block');
+header('Content-Security-Policy: default-src \'self\'; style-src \'self\' \'unsafe-inline\';');
+header('Strict-Transport-Security: max-age=31536000; includeSubDomains');
 session_start();
 
+$config = require 'config.php';
+$db = new PDO(
+    "mysql:host={$config['db']['host']};dbname={$config['db']['name']}", 
+    $config['db']['user'], 
+    $config['db']['pass']
+);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+$error = '';
+$success = '';
+
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    $username = $_POST['username'] ?? '';
-    $password = $_POST['password'] ?? '';
-    $pgp_key = $_POST['pgp_key'] ?? '';
+    $username = filter_input(INPUT_POST, 'username', FILTER_SANITIZE_STRING);
+    $password = filter_input(INPUT_POST, 'password', FILTER_SANITIZE_STRING);
+    $pgp_key = filter_input(INPUT_POST, 'pgp_key', FILTER_SANITIZE_STRING);
 
+    if ($username && $password) {
+        if (strlen($username) > 50 || strlen($password) < 8 || !preg_match('/^[a-zA-Z0-9_]+$/', $username)) {
+            $error = 'Invalid data';
+        } else if (strlen($pgp_key) > 4096) {
+            $error = 'PGP key is too long';
+        } else {
+            $stmt = $db->prepare('SELECT COUNT(*) FROM registrations WHERE created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)');
+            $stmt->execute();
+            $count = $stmt->fetchColumn();
+
+            if ($count >= 20) {
+                $error = 'Registration limit exceeded';
+            } else {
                 try {
-        $pdo = new PDO(
-            "mysql:host={$config['db_host']};dbname={$config['db_name']};charset=utf8mb4",
-            $config['db_user'],
-            $config['db_pass'],
-            [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]
-        );
+                    $stmt = $db->prepare('INSERT INTO users (username, password, pgp_key, login_attempts, last_attempt) VALUES (?, ?, ?, 0, NOW())');
+                    $stmt->execute([
+                        $username, 
+                        password_hash($password, PASSWORD_DEFAULT, ['cost' => 12]), 
+                        $pgp_key
+                    ]);
                     
-        $stmt = $pdo->prepare("SELECT COUNT(*) FROM registrations WHERE created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)");
-        $stmt->execute();
-        $recent_registrations = $stmt->fetchColumn();
-        
-        if ($recent_registrations >= 3) {
-            $error = "Слишком много регистраций за последний час. Попробуйте позже.";
-        } else {
-            $stmt = $pdo->prepare("SELECT COUNT(*) FROM users WHERE username = ?");
-            $stmt->execute([$username]);
-            if ($stmt->fetchColumn() > 0) {
-                $error = "Пользователь с таким именем уже существует";
-            } else {
-                $hashed_password = password_hash($password, PASSWORD_DEFAULT);
-                
-                $stmt = $pdo->prepare("INSERT INTO users (username, password, pgp_key) VALUES (?, ?, ?)");
-                $stmt->execute([$username, $hashed_password, $pgp_key]);
-                
-                $stmt = $pdo->prepare("INSERT INTO registrations (created_at) VALUES (NOW())");
+                    $stmt = $db->prepare('INSERT INTO registrations () VALUES ()');
                     $stmt->execute();
                     
-                $success = "Регистрация успешна! Теперь вы можете войти.";
-            }
-        }
+                    $success = 'Registration successful';
                 } catch (PDOException $e) {
-        $error = "Ошибка сервера";
+                    $error = 'Username already exists';
+                }
+            }
+        }
     }
 }
 ?>
 <!DOCTYPE html>
-<html lang="ru">
+<html>
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Регистрация</title>
-    <link rel="stylesheet" href="style.css">
+    <meta charset="utf-8">
+    <title>Text0Nly - Registration</title>
+    <style>
+        body { font-family: Arial, sans-serif; max-width: 400px; margin: 20px auto; padding: 20px; }
+        .form-group { margin: 10px 0; }
+        input, textarea { width: 100%; padding: 8px; margin: 5px 0; }
+        textarea { height: 100px; }
+        button { width: 100%; padding: 10px; background: #2196F3; color: white; border: none; cursor: pointer; }
+        .error { color: red; }
+        .success { color: green; }
+    </style>
 </head>
 <body>
-    <div class="container">
-        <h1>Регистрация</h1>
-        <?php if (isset($error)): ?>
-            <div class="error"><?php echo $error; ?></div>
+    <h2>Registration</h2>
+    <?php if ($error): ?>
+        <div class="error"><?= htmlspecialchars($error) ?></div>
     <?php endif; ?>
-        <?php if (isset($success)): ?>
-            <div class="success"><?php echo $success; ?></div>
+    <?php if ($success): ?>
+        <div class="success"><?= htmlspecialchars($success) ?></div>
     <?php endif; ?>
-        <form method="POST" action="">
+    
+    <form method="post">
         <div class="form-group">
-                <label for="username">Имя пользователя:</label>
-                <input type="text" id="username" name="username" required>
+            <input type="text" name="username" placeholder="Username" required maxlength="50">
         </div>
         <div class="form-group">
-                <label for="password">Пароль:</label>
-                <input type="password" id="password" name="password" required>
+            <input type="password" name="password" placeholder="Password (min 8 characters)" required minlength="8">
         </div>
         <div class="form-group">
-                <label for="pgp_key">PGP ключ (опционально):</label>
-                <textarea id="pgp_key" name="pgp_key" rows="5"></textarea>
+            <textarea name="pgp_key" placeholder="PGP key (optional)"></textarea>
         </div>
-            <button type="submit">Зарегистрироваться</button>
+        <button type="submit">Register</button>
     </form>
-        <p>Уже есть аккаунт? <a href="login.php">Войти</a></p>
-    </div>
+    <p><a href="index.php">Back to chat</a></p>
 </body>
 </html>
+<?php ob_end_flush(); ?>