Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1397) +++ branches/2.8.x/CHANGELOG (revision 1398) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +20 Jan-2011 Build 1398 Frank Heyne (FrankH) +# Security fix in admin/admintools and admin/groups 20 Jan-2011 Build 1397 Dietmar Woellbrink (Luisehahne) ! recoded rediect timer in print_success (tks to Chio) 19 Jan-2011 Build 1396 Werner von den Decken (DarkViper) Index: branches/2.8.x/wb/admin/groups/get_permissions.php =================================================================== --- branches/2.8.x/wb/admin/groups/get_permissions.php (revision 1397) +++ branches/2.8.x/wb/admin/groups/get_permissions.php (revision 1398) @@ -1,28 +1,22 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - if(!defined('WB_PATH')) { exit('Direct access to this file is not allowed'); } // Get system permissions Index: branches/2.8.x/wb/admin/groups/save.php =================================================================== --- branches/2.8.x/wb/admin/groups/save.php (revision 1397) +++ branches/2.8.x/wb/admin/groups/save.php (revision 1398) @@ -1,35 +1,31 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Print admin header require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Access', 'groups_modify'); -// Create new database object -// $database = new database(); +if (!$admin->checkFTAN()) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); + exit(); +} // Check if group group_id is a valid number and doesnt equal 1 if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) { Index: branches/2.8.x/wb/admin/groups/groups.php =================================================================== --- branches/2.8.x/wb/admin/groups/groups.php (revision 1397) +++ branches/2.8.x/wb/admin/groups/groups.php (revision 1398) @@ -43,6 +43,12 @@ if($_POST['action'] == 'modify') { // Create new admin object $admin = new admin('Access', 'groups_modify', false); + + if (!$admin->checkFTAN()) + { + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); + exit(); + } // Print header $admin->print_header(); // Get existing values @@ -53,13 +59,13 @@ $template->set_file('page', 'groups_form.htt'); $template->set_block('page', 'main_block', 'main'); $template->set_var( array( - 'ACTION_URL' => ADMIN_URL.'/groups/save.php', - 'SUBMIT_TITLE' => $TEXT['SAVE'], - 'GROUP_ID' => $group['group_id'], - 'GROUP_NAME' => $group['name'], - 'ADVANCED_ACTION' => 'groups.php' - ) - ); + 'ACTION_URL' => ADMIN_URL.'/groups/save.php', + 'SUBMIT_TITLE' => $TEXT['SAVE'], + 'GROUP_ID' => $group['group_id'], + 'GROUP_NAME' => $group['name'], + 'ADVANCED_ACTION' => 'groups.php', + 'FTAN' => $admin->getFTAN() + )); // Tell the browser whether or not to show advanced options if( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) { $template->set_var('DISPLAY_ADVANCED', ''); @@ -118,46 +124,45 @@ // Insert language text and messages $template->set_var(array( - 'TEXT_RESET' => $TEXT['RESET'], - 'TEXT_ACTIVE' => $TEXT['ACTIVE'], - 'TEXT_DISABLED' => $TEXT['DISABLED'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TEXT_USERNAME' => $TEXT['USERNAME'], - 'TEXT_PASSWORD' => $TEXT['PASSWORD'], - 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], - 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], - 'TEXT_EMAIL' => $TEXT['EMAIL'], - 'TEXT_GROUP' => $TEXT['GROUP'], - 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], - 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], - 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], - 'TEXT_NAME' => $TEXT['NAME'], - 'SECTION_PAGES' => $MENU['PAGES'], - 'SECTION_MEDIA' => $MENU['MEDIA'], - 'SECTION_MODULES' => $MENU['MODULES'], - 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], - 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], - 'SECTION_SETTINGS' => $MENU['SETTINGS'], - 'SECTION_USERS' => $MENU['USERS'], - 'SECTION_GROUPS' => $MENU['GROUPS'], - 'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'], - 'TEXT_VIEW' => $TEXT['VIEW'], - 'TEXT_ADD' => $TEXT['ADD'], - 'TEXT_LEVEL' => $TEXT['LEVEL'], - 'TEXT_MODIFY' => $TEXT['MODIFY'], - 'TEXT_DELETE' => $TEXT['DELETE'], - 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], - 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], - 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], - 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], - 'TEXT_RENAME' => $TEXT['RENAME'], - 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], - 'TEXT_BASIC' => $TEXT['BASIC'], - 'TEXT_ADVANCED' => $TEXT['ADVANCED'], - 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'], - 'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP'] - ) - ); + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], + 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], + 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], + 'TEXT_NAME' => $TEXT['NAME'], + 'SECTION_PAGES' => $MENU['PAGES'], + 'SECTION_MEDIA' => $MENU['MEDIA'], + 'SECTION_MODULES' => $MENU['MODULES'], + 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], + 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], + 'SECTION_SETTINGS' => $MENU['SETTINGS'], + 'SECTION_USERS' => $MENU['USERS'], + 'SECTION_GROUPS' => $MENU['GROUPS'], + 'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'], + 'TEXT_VIEW' => $TEXT['VIEW'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_LEVEL' => $TEXT['LEVEL'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], + 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], + 'TEXT_BASIC' => $TEXT['BASIC'], + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'], + 'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP'], + )); // Parse template object $template->parse('main', 'main_block', false); @@ -165,6 +170,13 @@ } elseif($_POST['action'] == 'delete') { // Create new admin object $admin = new admin('Access', 'groups_delete', false); + + if (!$admin->checkFTAN()) + { + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); + exit(); + } + // Print header $admin->print_header(); // Delete the group Index: branches/2.8.x/wb/admin/groups/index.php =================================================================== --- branches/2.8.x/wb/admin/groups/index.php (revision 1397) +++ branches/2.8.x/wb/admin/groups/index.php (revision 1398) @@ -20,6 +20,7 @@ require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Access', 'groups'); +$ftan = $admin->getFTAN(); // Create new template object for the modify/remove menu $template = new Template(THEME_PATH.'/templates'); @@ -30,7 +31,8 @@ $template->set_var(array( 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL + 'THEME_URL' => THEME_URL, + 'FTAN' => $ftan ) ); @@ -183,7 +185,8 @@ 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, 'WB_PATH' => WB_PATH, - 'THEME_URL' => THEME_URL + 'THEME_URL' => THEME_URL, + 'FTAN' => $ftan ) ); Index: branches/2.8.x/wb/admin/groups/add.php =================================================================== --- branches/2.8.x/wb/admin/groups/add.php (revision 1397) +++ branches/2.8.x/wb/admin/groups/add.php (revision 1398) @@ -1,35 +1,31 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - // Print admin header require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Access', 'groups_add'); -// Create new database object -// $database = new database(); +if (!$admin->checkFTAN()) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); + exit(); +} // Gather details entered $group_name = $admin->get_post('group_name'); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1397) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1398) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC5'); -if(!defined('REVISION')) define('REVISION', '1397'); +if(!defined('REVISION')) define('REVISION', '1398'); ?> Index: branches/2.8.x/wb/admin/admintools/tool.php =================================================================== --- branches/2.8.x/wb/admin/admintools/tool.php (revision 1397) +++ branches/2.8.x/wb/admin/admintools/tool.php (revision 1398) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); require_once(WB_PATH.'/framework/functions.php'); @@ -35,7 +28,7 @@ } // Check if tool is installed -$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".$admin->add_slashes($_GET['tool'])."'"); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $_GET['tool'])."'"); if($result->numRows() == 0) { header("Location: index.php"); exit(0); Index: branches/2.8.x/wb/admin/admintools/index.php =================================================================== --- branches/2.8.x/wb/admin/admintools/index.php (revision 1397) +++ branches/2.8.x/wb/admin/admintools/index.php (revision 1398) @@ -1,28 +1,21 @@ - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('admintools', 'admintools'); Index: branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt (revision 1397) +++ branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt (revision 1398) @@ -5,10 +5,10 @@
- +{FTAN} - + @@ -283,6 +283,7 @@ + {FTAN} Index: branches/2.8.x/wb/templates/wb_theme/templates/groups.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/groups.htt (revision 1397) +++ branches/2.8.x/wb/templates/wb_theme/templates/groups.htt (revision 1398) @@ -1,9 +1,8 @@ - - +{FTAN}
{TEXT_NAME}:{TEXT_NAME}:
Index: branches/2.8.x/wb/templates/argos_theme/templates/groups.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/groups.htt (revision 1397) +++ branches/2.8.x/wb/templates/argos_theme/templates/groups.htt (revision 1398) @@ -2,7 +2,7 @@ - + {FTAN} Index: branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt (revision 1397) +++ branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt (revision 1398) @@ -4,7 +4,7 @@ - +{FTAN}

{HEADING_MODIFY_DELETE_GROUP}
@@ -265,6 +265,7 @@ +{FTAN}
{TEXT_NAME}:
Index: branches/2.8.x/wb =================================================================== --- branches/2.8.x/wb (revision 1397) +++ branches/2.8.x/wb (revision 1398) Property changes on: branches/2.8.x/wb ___________________________________________________________________ Modified: svn:ignore ## -1 +1,3 ## config.php +media +pages