Minor security fixes (directory access, filenames)

This commit is contained in:
Garvin Hicking
2003-06-20 14:28:30 +00:00
parent 5e348cc25a
commit 9c35c9dd56
2 changed files with 10 additions and 4 deletions

View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-20 Garvin Hicking <me@supergarv.de>
* db_details_importdocsql.php3: Will now NEVER reveal any filename
the docSQL import isn't able to read. Can now only read contents
of the 'docSQL' subdirectory and never be able to go higher than
that level.
2003-06-19 Marc Delisle <lem9@users.sourceforge.net> 2003-06-19 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: analyzer for FOREIGN KEYS * libraries/sqlparser.lib.php3: analyzer for FOREIGN KEYS
* libraries/sqlparser.lib.php3: bug 756861, DEFAULT 0 becomes DEFAULT0 * libraries/sqlparser.lib.php3: bug 756861, DEFAULT 0 becomes DEFAULT0

View File

@@ -99,11 +99,11 @@ global $GLOBALS;
return 1; return 1;
} else { } else {
if ($content != '') { if ($content != 'none') {
echo '<p><font color="orange">' . sprintf($GLOBALS['strIgnoringFile'], ' ' . $file) . '</font></p>' . "\n"; echo '<p><font color="orange">' . sprintf($GLOBALS['strIgnoringFile'], ' ' . $file) . '</font></p>' . "\n";
} else { } else {
// garvin: disabled. Shouldn't impose ANY non-submitted files ever. // garvin: disabled. Shouldn't impose ANY non-submitted files ever.
echo '<p><font color="orange">' . sprintf($GLOBALS['strIgnoringFile'], ' ' . '') . '</font></p>' . "\n"; echo '<p><font color="orange">' . sprintf($GLOBALS['strIgnoringFile'], ' ' . '...') . '</font></p>' . "\n";
} }
return 0; return 0;
} // end working on table } // end working on table
@@ -206,7 +206,7 @@ if (isset($do) && $do == 'import') {
} else { } else {
// echo '<h1>Starting Import</h1>'; // echo '<h1>Starting Import</h1>';
$docpath = $DOCUMENT_ROOT . dirname($PHP_SELF) . '/' . eregi_replace('\.\.*', '.', $docpath); $docpath = $DOCUMENT_ROOT . dirname($PHP_SELF) . '/docSQL/' . eregi_replace('\.\.*', '.', $docpath);
if (substr($docpath, strlen($docpath) - 2, 1) != '/') { if (substr($docpath, strlen($docpath) - 2, 1) != '/') {
$docpath = $docpath . '/'; $docpath = $docpath . '/';
} }
@@ -239,7 +239,7 @@ if (isset($do) && $do == 'import') {
<input type="hidden" name="do" value="import" /> <input type="hidden" name="do" value="import" />
<b><?php echo $strAbsolutePathToDocSqlDir; ?>:</b> <b><?php echo $strAbsolutePathToDocSqlDir; ?>:</b>
<br /><br /> <br /><br />
<?php echo dirname($PHP_SELF); ?>/<input class="textfield" type="text" name="docpath" size="15" value="<?php echo (isset($orig_docpath) ? $orig_docpath : 'docSQL/'); ?>" /> <?php echo dirname($PHP_SELF) . '/docSQL'; ?>/<input class="textfield" type="text" name="docpath" size="15" value="<?php echo (isset($orig_docpath) ? $orig_docpath : ''); ?>" />
<?php <?php
// garvin: displays import dump feature only if file upload available // garvin: displays import dump feature only if file upload available
if ($is_upload) { if ($is_upload) {