From be6b7b0f1dcbb861115a385b07f8c814a2b40a1a Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Thu, 25 May 2006 01:33:53 +0000
Subject: [PATCH] prevent execution of scripts from files directory
---
INSTALL.txt | 7 +++++++
includes/file.inc | 12 ++++++++++++
2 files changed, 19 insertions(+)
diff --git a/INSTALL.txt b/INSTALL.txt
index 61e1b66b34a8..d13cb101f821 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -144,6 +144,13 @@ INSTALLATION
by the Drupal server process. You can change the name of this
subdirectory at "Administer > Settings > File system settings".
+ SECURITY NOTICE: Certain Apache configurations can be vulnerable
+ to a security exploit allowing arbitrary code execution. Drupal
+ will attempt to automatically create a .htaccess file in your
+ "files" directory to protect you. If you already have a .htaccess
+ file in that location, please add the following line:
+ SetHandler This_is_a_Drupal_security_line_do_not_remove
+
You can now launch your browser and point it to your Drupal site.
Create an account and login. The first account will automatically
diff --git a/includes/file.inc b/includes/file.inc
index 51012e45fa77..802df5656ea2 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -112,6 +112,18 @@ function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
}
}
+ if ((file_directory_path() == $directory || file_directory_temp() == $directory) && !is_file("$directory/.htaccess")) {
+ if (($fp = fopen("$directory/.htaccess", 'w')) && fputs($fp, 'SetHandler This_is_a_Drupal_security_line_do_not_remove')) {
+ fclose($fp);
+ }
+ else {
+ $message = t("Security warning: Couldn't write .htaccess. Please create a .htaccess file in your %directory directory which contains the following line: <code>SetHandler This_is_a_Drupal_security_line_do_not_remove</code>", array('%directory' => $directory));
+ form_set_error($form_item, $message);
+ watchdog('file system', $message, WATCHDOG_ERROR);
+ }
+ }
+
+
return true;
}
--
GitLab