Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b81f0c9e5c | |||
| f8aed4283e |
@@ -27,8 +27,6 @@ $blocks = array_values($blocks); // sequentielle Indizes 0..n-1 sicherstellen
|
||||
-->
|
||||
<form method="post" action="php/controller/createArticle-controller.php" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<main class="editor-main">
|
||||
<?php include_once "includes/alertMessages.php"?>
|
||||
|
||||
|
||||
@@ -18,8 +18,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
|
||||
<form method="post" action="index.php?pfad=profile">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<label class="input-label">Vorname</label>
|
||||
<input type="text"
|
||||
name="vorname"
|
||||
@@ -84,7 +82,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
<br>
|
||||
|
||||
<form action="php/controller/deleteAccount-controller.php" method="POST">
|
||||
<?php csrf_field(); ?>
|
||||
<button type="submit"
|
||||
class="button"
|
||||
onclick="return confirm('Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?');">
|
||||
@@ -158,7 +155,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
</a>
|
||||
|
||||
<form action="php/controller/deleteArticle-controller.php" method="POST">
|
||||
<?php csrf_field(); ?>
|
||||
<input type="hidden"
|
||||
name="id"
|
||||
value="<?php echo htmlspecialchars($userArticle->getID()); ?>">
|
||||
|
||||
+18
-33
@@ -45,31 +45,26 @@ if ($replyAuthor === null) {
|
||||
<!-- Metadaten & Titel -->
|
||||
<div class="article-view-top-section">
|
||||
|
||||
<div class="category-and-likes-row">
|
||||
<?php if (isset($category) && !empty($category)): ?>
|
||||
<span class="article-view-category"><?php echo htmlspecialchars($category); ?></span>
|
||||
<?php endif; ?>
|
||||
<div class="category-and-likes-row">
|
||||
<?php if (isset($category) && !empty($category)): ?>
|
||||
<span class="article-view-category"><?php echo htmlspecialchars($category); ?></span>
|
||||
<?php endif; ?>
|
||||
|
||||
<!-- Like-Anzeige und dynamischer Like-Button -->
|
||||
<?php if (isset($articleObj) && $articleObj !== null): ?>
|
||||
<div class="article-view-likes">
|
||||
<span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
|
||||
<!-- Like-Anzeige und dynamischer Like-Button -->
|
||||
<?php if (isset($articleObj) && $articleObj !== null): ?>
|
||||
<div class="article-view-likes">
|
||||
<span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
|
||||
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
<form method="post"
|
||||
action="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>"
|
||||
class="like-toggle-form">
|
||||
<?php csrf_field(); ?>
|
||||
<button type="submit" class="like-toggle-btn">
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
<a href="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>" class="like-toggle-btn">
|
||||
<?php echo $articleObj->hasLiked($_SESSION["user_email"]) ? '👎 Gefällt mir nicht mehr' : '👍 Gefällt mir'; ?>
|
||||
</button>
|
||||
</form>
|
||||
<?php else: ?>
|
||||
<span class="login-hint">(Anmelden zum Liken)</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<span class="login-hint">(Anmelden zum Liken)</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<h1 class="article-view-title">
|
||||
<?php if (isset($title)) { echo htmlspecialchars($title); } ?>
|
||||
@@ -207,8 +202,6 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -246,8 +239,6 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -343,8 +334,6 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -382,8 +371,6 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -425,8 +412,6 @@ if ($replyAuthor === null) {
|
||||
method="post"
|
||||
action="php/ajax/add-comment.php">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -480,4 +465,4 @@ if ($replyAuthor === null) {
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
</main>
|
||||
</main>
|
||||
|
||||
@@ -27,8 +27,6 @@ $blocks = array_values($blocks);
|
||||
-->
|
||||
<form method="post" action="php/controller/updateArticle-controller.php?id=<?php if(isset($id) && !empty($id)){echo htmlspecialchars($id);}else{$_SESSION["message"] = "missing_id";} ?>" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<main class="editor-main">
|
||||
<?php include_once "includes/alertMessages.php"?>
|
||||
|
||||
|
||||
+1
-27
@@ -250,7 +250,7 @@ CSS für die navbar
|
||||
padding: 2rem 1rem;
|
||||
box-shadow: 2px 0 10px rgba(0,0,0,0.5);
|
||||
overflow-y: auto;
|
||||
|
||||
|
||||
/* Genug Abstand oben rechts, damit Links nicht hinter dem X liegen */
|
||||
padding: 4rem 1.5rem 2rem 1.5rem;
|
||||
}
|
||||
@@ -285,32 +285,6 @@ CSS für die navbar
|
||||
border-bottom: 1px solid #333d43;
|
||||
}
|
||||
|
||||
.nav__logout-form {
|
||||
display: contents;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.nav__logout-form .nav__button {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.nav__mobile-logout-button {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
font-size: 1.2rem;
|
||||
font-weight: 600;
|
||||
display: block;
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
padding: 0.5rem 1rem;
|
||||
border: none;
|
||||
border-bottom: 1px solid #333d43;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.nav__mobile-submenu {
|
||||
display: block;
|
||||
list-style: none;
|
||||
|
||||
@@ -89,12 +89,6 @@
|
||||
Es ist ein Datenbankfehler aufgetreten. Bitte versuche es erneut.
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "invalid_csrf_token"): ?>
|
||||
<p class="alert-message is-error">
|
||||
Deine Sitzung ist abgelaufen oder die Anfrage konnte nicht überprüft werden.
|
||||
Bitte lade die Seite neu und versuche es erneut.
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
unset($_SESSION["message"]);
|
||||
?>
|
||||
?>
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* CSRF-Schutz nach dem Synchronizer-Token-Pattern.
|
||||
*
|
||||
* Pro Session wird ein einziges, zufälliges Token erzeugt,
|
||||
* das in jedem Formular als verstecktes Feld mitgeschickt und bei jeder
|
||||
* zustandsändernden Anfrage serverseitig mit dem Session-Token verglichen
|
||||
* wird.
|
||||
*
|
||||
* @author Niklas Ortmann
|
||||
*/
|
||||
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt das aktuelle CSRF-Token der Session zurück.
|
||||
*
|
||||
* Existiert noch kein Token, wird eines erzeugt und in der Session
|
||||
* gespeichert.
|
||||
*
|
||||
* @return string Das CSRF-Token
|
||||
*/
|
||||
function csrf_token(): string
|
||||
{
|
||||
if (empty($_SESSION["csrf_token"]) || !is_string($_SESSION["csrf_token"])) {
|
||||
$_SESSION["csrf_token"] = bin2hex(random_bytes(32));
|
||||
}
|
||||
|
||||
return $_SESSION["csrf_token"];
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt ein verstecktes Formularfeld mit dem aktuellen CSRF-Token aus.
|
||||
*
|
||||
* Wird in jedem Formular benötigt, das eine zustandsändernde
|
||||
* Aktion auslöst.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function csrf_field(): void
|
||||
{
|
||||
echo '<input type="hidden" name="csrf_token" value="'
|
||||
. htmlspecialchars(csrf_token())
|
||||
. '">';
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft, ob das per POST gesendete CSRF-Token zum Session-Token passt.
|
||||
*
|
||||
* Der Vergleich erfolgt zeitkonstant über hash_equals(), um
|
||||
* Timing-Angriffe auf den Vergleich selbst auszuschließen.
|
||||
*
|
||||
* @return bool true, wenn das Token gültig ist
|
||||
*/
|
||||
function csrf_verify(): bool
|
||||
{
|
||||
$sentToken = $_POST["csrf_token"] ?? "";
|
||||
$sessionToken = $_SESSION["csrf_token"] ?? "";
|
||||
|
||||
if (!is_string($sentToken) || $sentToken === "" || $sessionToken === "") {
|
||||
return false;
|
||||
}
|
||||
|
||||
return hash_equals($sessionToken, $sentToken);
|
||||
}
|
||||
|
||||
/**
|
||||
* Bricht die Anfrage ab und leitet mit einer Fehlermeldung um,
|
||||
* wenn das mitgesendete CSRF-Token ungültig oder nicht vorhanden ist.
|
||||
*
|
||||
* Muss am Anfang jeder zustandsändernden POST-Aktion aufgerufen werden,
|
||||
* bevor irgendeine Änderung an Daten vorgenommen wird.
|
||||
*
|
||||
* @param string $redirectTo Ziel-URL, zu der bei ungültigem Token
|
||||
* weitergeleitet wird
|
||||
* @return void
|
||||
*/
|
||||
function csrf_require_valid(string $redirectTo = "index.php"): void
|
||||
{
|
||||
if (!csrf_verify()) {
|
||||
http_response_code(403);
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("Location: " . $redirectTo);
|
||||
exit();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -179,4 +179,4 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
</nav>
|
||||
</nav>
|
||||
@@ -2,7 +2,6 @@
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
include_once "includes/csrf.php";
|
||||
include_once "php/controller/index-controller.php";
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
|
||||
@@ -109,12 +109,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -143,12 +137,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -199,12 +187,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -233,12 +215,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
|
||||
@@ -4,8 +4,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once "../model/CommentManager.php";
|
||||
require_once "../model/ArticleManager.php";
|
||||
require_once "../../includes/csrf.php";
|
||||
|
||||
/**
|
||||
* Prüft, ob die Anfrage durch JavaScript per AJAX gesendet wurde.
|
||||
@@ -98,17 +96,6 @@ if (!isset($_SESSION["user_email"])) {
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird.
|
||||
*/
|
||||
if (!csrf_verify()) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Deine Sitzung ist abgelaufen. Bitte lade die Seite neu und versuche es erneut.",
|
||||
$articleId !== false ? $articleId : null
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Weitere Formulardaten einlesen.
|
||||
*/
|
||||
@@ -141,18 +128,6 @@ if ($articleId === false || $articleId === null) {
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Der Beitrag muss tatsächlich existieren.
|
||||
*/
|
||||
$existingArticle = ArticleManager::getInstance()->getArticle($articleId);
|
||||
if ($existingArticle === null) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der zugehörige Beitrag wurde nicht gefunden.",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
if ($content === "") {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
@@ -177,30 +152,6 @@ if (
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Falls eine Eltern-ID angegeben wurde, muss dieser Kommentar
|
||||
* tatsächlich existieren und zum selben Beitrag gehören.
|
||||
*/
|
||||
if ($parentCommentId !== null) {
|
||||
$existingComments = CommentManager::getInstance()->getCommentsByArticle($articleId);
|
||||
$parentExists = false;
|
||||
|
||||
foreach ($existingComments as $existingComment) {
|
||||
if ($existingComment->getId() === $parentCommentId) {
|
||||
$parentExists = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$parentExists) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der ausgewählte Kommentar wurde nicht gefunden.",
|
||||
$articleId
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$commentManager = CommentManager::getInstance();
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ require_once '../model/LocalArticleManager.php';
|
||||
require_once '../model/ArticleManager.php';
|
||||
require_once '../validator/article-validator.php';
|
||||
require_once '../../includes/article-block-helper.php';
|
||||
require_once '../../includes/csrf.php';
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -15,13 +14,6 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
$uploadDir = __DIR__ . '/../../uploads/';
|
||||
if (!file_exists($uploadDir)) {
|
||||
mkdir($uploadDir, 0755, true);
|
||||
|
||||
@@ -5,24 +5,12 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
|
||||
require_once __DIR__ . "/../model/UserManager.php";
|
||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("Location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
Deregistrierung
|
||||
Funktion: Entfernt User aus der Datenbank und beendet die Session
|
||||
|
||||
@@ -4,7 +4,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -13,13 +12,6 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (isset($_SESSION["user_email"])) {
|
||||
$user = $_SESSION["user_email"];
|
||||
} else {
|
||||
@@ -30,10 +22,9 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
exit();
|
||||
}
|
||||
|
||||
// Die Beitrags-ID muss eine gültige numerische ID sein.
|
||||
$id = filter_input(INPUT_POST, "id", FILTER_VALIDATE_INT);
|
||||
|
||||
if ($id === false || $id === null) {
|
||||
if (isset($_POST["id"]) && !empty($_POST["id"])) {
|
||||
$id = $_POST["id"];
|
||||
} else {
|
||||
$_SESSION["message"] = "missing_id";
|
||||
header("location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
@@ -53,4 +44,4 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
$_SESSION["message"] = "article_deleted";
|
||||
header("location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once __DIR__ . "/../model/CommentManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
/*
|
||||
* Kommentare dürfen nur über ein POST-Formular gelöscht werden.
|
||||
@@ -45,23 +44,6 @@ if (!isset($_SESSION["user_email"])) {
|
||||
exit();
|
||||
}
|
||||
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["comment_message"] = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu.";
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
|
||||
if ($articleId !== false && $articleId !== null) {
|
||||
header(
|
||||
"Location: index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
} else {
|
||||
header("Location: index.php");
|
||||
}
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
* Kommentar-ID und Beitrags-ID müssen gültige Zahlen sein.
|
||||
*/
|
||||
@@ -120,4 +102,4 @@ header(
|
||||
. "#comments"
|
||||
);
|
||||
|
||||
exit();
|
||||
exit();
|
||||
|
||||
@@ -5,12 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
|
||||
require_once __DIR__ . '/../model/Article.php';
|
||||
require_once __DIR__ . '/../model/ArticleManager.php';
|
||||
require_once __DIR__ . '/../../includes/csrf.php';
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: ../../index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// 2. Prüfen, ob eine gültige Artikel-ID übergeben wurde
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
@@ -23,13 +17,6 @@ if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
exit();
|
||||
}
|
||||
|
||||
// CSRF-Token prüfen, bevor der Like-Status verändert wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("Location: ../../index.php?pfad=showArticle&id=" . $articleId);
|
||||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$articleManager->toggleLike($articleId, $userEmail);
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
<?php
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
$_SESSION = [];
|
||||
session_destroy();
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ require_once "php/model/Article.php";
|
||||
require_once "php/model/ArticleManager.php";
|
||||
require_once "php/model/CommentManager.php";
|
||||
require_once "php/validator/user-validator.php";
|
||||
require_once "includes/csrf.php";
|
||||
|
||||
$error = null;
|
||||
|
||||
@@ -28,7 +27,6 @@ try {
|
||||
}
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST["saveProfile"])) {
|
||||
|
||||
$oldEmail = $_SESSION["user_email"];
|
||||
|
||||
$newEmail = trim($_POST["email"] ?? "");
|
||||
@@ -36,12 +34,7 @@ try {
|
||||
$nachname = trim($_POST["nachname"] ?? "");
|
||||
$password = $_POST["password"] ?? "";
|
||||
|
||||
if (!csrf_verify()) {
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
$error = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu und versuche es erneut.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} elseif (!userEmailValidator($newEmail)) {
|
||||
if (!userEmailValidator($newEmail)) {
|
||||
$error = "Bitte gib eine gültige E-Mail-Adresse ein.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
|
||||
@@ -7,14 +7,10 @@ require_once 'php/model/Article.php';
|
||||
require_once 'php/model/ArticleManager.php';
|
||||
require_once 'php/model/UserManager.php';
|
||||
require_once 'php/model/CommentManager.php';
|
||||
require_once 'php/validator/article-validator.php';
|
||||
|
||||
// Die übergebene ID muss eine gültige, positive Zahl sein, bevor sie
|
||||
// weiterverwendet wird. Vorher wurde jeder nicht-leere Wert akzeptiert.
|
||||
$id = isset($_GET["id"]) ? articleIdValidator($_GET["id"]) : false;
|
||||
|
||||
if ($id !== false) {
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])){
|
||||
try {
|
||||
$id = $_GET["id"];
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$article = $articleManager->getArticle($id);
|
||||
if($article != null){
|
||||
@@ -42,7 +38,7 @@ if ($id !== false) {
|
||||
}
|
||||
|
||||
$commentManager = CommentManager::getInstance();
|
||||
$comments = $commentManager->getCommentsByArticle($id); // NEU: validierte ID statt rohem $_GET["id"]
|
||||
$comments = $commentManager->getCommentsByArticle($_GET["id"]);
|
||||
|
||||
foreach ($comments as $comment) {
|
||||
if ($comment->isReply()) {
|
||||
|
||||
@@ -8,7 +8,6 @@ require_once '../model/ArticleManager.php';
|
||||
require_once '../model/Article.php';
|
||||
require_once '../validator/article-validator.php';
|
||||
require_once '../../includes/article-block-helper.php';
|
||||
require_once '../../includes/csrf.php'; // NEU: CSRF-Schutz
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -17,17 +16,9 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
header("location: ../../index.php?pfad=updateArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
// Die Beitrags-ID muss eine gültige numerische ID sein
|
||||
$id = filter_input(INPUT_GET, "id", FILTER_VALIDATE_INT);
|
||||
|
||||
if ($id === false || $id === null) {
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
$id = $_GET["id"];
|
||||
} else {
|
||||
$_SESSION["message"] = "missing_id";
|
||||
header("location: ../../index.php?pfad=updateArticle");
|
||||
exit();
|
||||
@@ -36,14 +27,6 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
try {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$article = $articleManager->getArticle($id);
|
||||
|
||||
// Existenz des Beitrags prüfen, bevor auf $article zugegriffen wird.
|
||||
if ($article === null) {
|
||||
$_SESSION["message"] = "missing_id";
|
||||
header("location: ../../index.php?pfad=updateArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($article->getAuthor() != $_SESSION["user_email"]) {
|
||||
$_SESSION["message"] = "unauthorized_access";
|
||||
header("location: ../../index.php");
|
||||
|
||||
@@ -5,7 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once "php/model/CommentManager.php";
|
||||
require_once "includes/csrf.php";
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: index.php");
|
||||
@@ -17,14 +16,6 @@ if (!isset($_SESSION["user_email"])) {
|
||||
exit();
|
||||
}
|
||||
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["comment_message"] = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu.";
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
$commentId = filter_input(
|
||||
INPUT_POST,
|
||||
"comment_id",
|
||||
@@ -98,4 +89,4 @@ header(
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
exit();
|
||||
exit();
|
||||
|
||||
@@ -63,9 +63,12 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
VALUES (:title, :content, :author, :category, :tags);";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
// Verknüpft die übergebenen Parameter exakt mit den SQL-Platzhaltern
|
||||
$command->execute([
|
||||
$success = $command->execute([
|
||||
":title" => $title,
|
||||
":content" => $content,
|
||||
":author" => $author,
|
||||
@@ -73,14 +76,14 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
":tags" => $tags
|
||||
]);
|
||||
|
||||
if (!$success) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
return intval($db->lastInsertId());
|
||||
|
||||
} catch (PDOException $e) {
|
||||
// NEU: Die rohe PDO-Fehlermeldung wird nicht mehr direkt in die
|
||||
// eigene Exception übernommen (Kapselung), sondern durch eine
|
||||
// generische, sprechende Meldung ersetzt - analog zu den übrigen
|
||||
// Methoden dieser Klasse und zu DatabaseUserManager.
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
throw new InternalServerErrorException($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,8 +106,11 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([
|
||||
$success = $command->execute([
|
||||
":id" => $id,
|
||||
":title" => $article->getTitle(),
|
||||
":content" => $article->getContent(),
|
||||
@@ -114,7 +120,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
]);
|
||||
|
||||
// rowCount() prüft, ob eine Zeile mit dieser ID existierte und geändert werden konnte
|
||||
if ($command->rowCount() === 0) {
|
||||
if (!$success || $command->rowCount() === 0) {
|
||||
// Falls die ID nicht existiert, prüfen wir, ob sie überhaupt da ist
|
||||
if (!$this->getArticle($id)) {
|
||||
throw new NotFoundException("missing_id");
|
||||
@@ -142,7 +148,13 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "DELETE FROM articles WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
$command->execute([":id" => $id]);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
if (!$command->execute([":id" => $id])) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
} catch (PDOException $exc) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
@@ -155,6 +167,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":id" => $id]);
|
||||
$row = $command->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
@@ -186,6 +202,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles;";
|
||||
|
||||
$command = $db->query($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$articles = [];
|
||||
|
||||
@@ -214,6 +234,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE author = :author;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":author" => $author]);
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
@@ -246,6 +270,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE category = :category;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":category" => $category]);
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
@@ -282,30 +310,37 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
|
||||
try {
|
||||
$db = $this->getConnection();
|
||||
|
||||
|
||||
$sql = "SELECT id, title, content, author, category, tags, created
|
||||
FROM articles
|
||||
WHERE title LIKE :keyword
|
||||
OR content LIKE :keyword
|
||||
OR tags LIKE :keyword";
|
||||
FROM articles
|
||||
WHERE title LIKE :keyword
|
||||
OR content LIKE :keyword
|
||||
OR tags LIKE :keyword;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
// Wildcards für die Suche hinzufügen
|
||||
// Wildcards für die SQL-Suche hinzufügen
|
||||
$searchParam = '%' . $cleankeyword . '%';
|
||||
|
||||
$command->execute([
|
||||
$success = $command->execute([
|
||||
":keyword" => $searchParam
|
||||
]);
|
||||
|
||||
if (!$success) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$likes = $this->getLikesForArticle(intval($row['id']));
|
||||
$articleId = intval($row['id']);
|
||||
$likes = $this->getLikesForArticle($articleId);
|
||||
|
||||
$filteredArticles[] = new Article(
|
||||
intval($row['id']),
|
||||
$articleId,
|
||||
$row['title'] ?? '',
|
||||
$row['content'] ?? '',
|
||||
$row['author'] ?? '',
|
||||
@@ -323,6 +358,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
||||
*
|
||||
|
||||
@@ -1,20 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* NEU: Prüft, ob ein übergebener Wert eine gültige, positive
|
||||
* Beitrags-ID ist. Wird überall dort verwendet, wo eine Artikel-ID
|
||||
* aus $_GET oder $_POST entgegengenommen wird
|
||||
*
|
||||
* @param mixed $id
|
||||
* @return int|false Die validierte ID als int, oder false bei Ungültigkeit
|
||||
*/
|
||||
function articleIdValidator($id)
|
||||
{
|
||||
$options = ["options" => ["min_range" => 1]];
|
||||
|
||||
return filter_var($id, FILTER_VALIDATE_INT, $options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft, ob der Titel die folgenden Bedingungen erfüllt:
|
||||
* Buchstaben von a-z; A-Z
|
||||
|
||||
Reference in New Issue
Block a user