summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerhard Killesreiter2006-05-25 01:34:20 +0000
committerGerhard Killesreiter2006-05-25 01:34:20 +0000
commit6dd4c35ea7ab2c6e6c922c9690e1f9f8634d944f (patch)
tree9d6f3562a5a47a3b8a2f9cb5567eb459568170da
parente122b009dcc2a7a5a7befd8f99b6306047e7b205 (diff)
prevent execution of scripts from files directory4.7.1
-rw-r--r--INSTALL.txt7
-rw-r--r--includes/file.inc12
2 files changed, 19 insertions, 0 deletions
diff --git a/INSTALL.txt b/INSTALL.txt
index a555128..e23b9d0 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 196d6c1..252fec6 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;
}