merge r20713 from branch 2.4 to trunk

bug 2844: improve security on LocalFiles Editor, add pwg_token to avoid CSRF git-svn-id: http://piwigo.org/svn/trunk@20715 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 12, 2013 · 758f29e · 758f29e
1 parent 8a7952a
commit 758f29e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php
@@ -66,6 +66,8 @@
 // +-----------------------------------------------------------------------+
 if (isset($_POST['submit']))
 {
+  check_pwg_token();
+
   if (!is_webmaster())
   {
     array_push($page['errors'], l10n('locfiledit_webmaster_only'));
@@ -140,6 +142,7 @@
 $template->assign(array(
   'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=plugin-LocalFilesEditor-'.$page['tab'],
   'LOCALEDIT_PATH' => LOCALEDIT_PATH,
+  'PWG_TOKEN' => get_pwg_token(),
   'CODEMIRROR_MODE' => @$codemirror_mode
   )
 );

diff --git a/plugins/LocalFilesEditor/template/admin.tpl b/plugins/LocalFilesEditor/template/admin.tpl
@@ -27,6 +27,7 @@ if (document.getElementById("text") != null)
 </div>
 
 <form method="post" class="properties" action="{$F_ACTION}" ENCTYPE="multipart/form-data" name="form">
+<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
 <div id="LocalFilesEditor">