dvwa updated
This commit is contained in:
OPSXCQ
parent
8f3c3af4fb
commit
c37af6fc80
84 changed files with 1873 additions and 605 deletions
|
|
@ -44,7 +44,7 @@
|
|||
This level also extends on the medium level, by waiting when there is a failed login but this time it is a random amount of time between two and four seconds.
|
||||
The idea of this is to try and confuse any timing predictions.</p>
|
||||
|
||||
<p>Using a <?php echo dvwaExternalLinkUrlGet( 'http://www.captcha.net/', 'CAPTCHA' ); ?> form could have a similar effect as a CSRF token.</p>
|
||||
<p>Using a <?php echo dvwaExternalLinkUrlGet( 'https://en.wikipedia.org/wiki/CAPTCHA', 'CAPTCHA' ); ?> form could have a similar effect as a CSRF token.</p>
|
||||
|
||||
<br />
|
||||
|
||||
|
|
|
|||
|
|
@ -7,21 +7,22 @@ if( isset( $_GET[ 'Login' ] ) ) {
|
|||
// Sanitise username input
|
||||
$user = $_GET[ 'username' ];
|
||||
$user = stripslashes( $user );
|
||||
$user = mysql_real_escape_string( $user );
|
||||
$user = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $user ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
|
||||
// Sanitise password input
|
||||
$pass = $_GET[ 'password' ];
|
||||
$pass = stripslashes( $pass );
|
||||
$pass = mysql_real_escape_string( $pass );
|
||||
$pass = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $pass ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
$pass = md5( $pass );
|
||||
|
||||
// Check database
|
||||
$query = "SELECT * FROM `users` WHERE user = '$user' AND password = '$pass';";
|
||||
$result = mysql_query( $query ) or die( '<pre>' . mysql_error() . '</pre>' );
|
||||
$result = mysqli_query($GLOBALS["___mysqli_ston"], $query ) or die( '<pre>' . ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)) . '</pre>' );
|
||||
|
||||
if( $result && mysql_num_rows( $result ) == 1 ) {
|
||||
if( $result && mysqli_num_rows( $result ) == 1 ) {
|
||||
// Get users details
|
||||
$avatar = mysql_result( $result, 0, "avatar" );
|
||||
$row = mysqli_fetch_assoc( $result );
|
||||
$avatar = $row["avatar"];
|
||||
|
||||
// Login successful
|
||||
$html .= "<p>Welcome to the password protected area {$user}</p>";
|
||||
|
|
@ -33,7 +34,7 @@ if( isset( $_GET[ 'Login' ] ) ) {
|
|||
$html .= "<pre><br />Username and/or password incorrect.</pre>";
|
||||
}
|
||||
|
||||
mysql_close();
|
||||
((is_null($___mysqli_res = mysqli_close($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
|
||||
}
|
||||
|
||||
// Generate Anti-CSRF token
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<?php
|
||||
|
||||
if( isset( $_POST[ 'Login' ] ) ) {
|
||||
if( isset( $_POST[ 'Login' ] ) && isset ($_POST['username']) && isset ($_POST['password']) ) {
|
||||
// Check Anti-CSRF token
|
||||
checkToken( $_REQUEST[ 'user_token' ], $_SESSION[ 'session_token' ], 'index.php' );
|
||||
|
||||
// Sanitise username input
|
||||
$user = $_POST[ 'username' ];
|
||||
$user = stripslashes( $user );
|
||||
$user = mysql_real_escape_string( $user );
|
||||
$user = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $user ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
|
||||
// Sanitise password input
|
||||
$pass = $_POST[ 'password' ];
|
||||
$pass = stripslashes( $pass );
|
||||
$pass = mysql_real_escape_string( $pass );
|
||||
$pass = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $pass ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
$pass = md5( $pass );
|
||||
|
||||
// Default values
|
||||
|
|
@ -32,14 +32,21 @@ if( isset( $_POST[ 'Login' ] ) ) {
|
|||
//$html .= "<pre><br />This account has been locked due to too many incorrect logins.</pre>";
|
||||
|
||||
// Calculate when the user would be allowed to login again
|
||||
$last_login = $row[ 'last_login' ];
|
||||
$last_login = strtotime( $last_login );
|
||||
$timeout = strtotime( "{$last_login} +{$lockout_time} minutes" );
|
||||
$timenow = strtotime( "now" );
|
||||
$last_login = strtotime( $row[ 'last_login' ] );
|
||||
$timeout = $last_login + ($lockout_time * 60);
|
||||
$timenow = time();
|
||||
|
||||
/*
|
||||
print "The last login was: " . date ("h:i:s", $last_login) . "<br />";
|
||||
print "The timenow is: " . date ("h:i:s", $timenow) . "<br />";
|
||||
print "The timeout is: " . date ("h:i:s", $timeout) . "<br />";
|
||||
*/
|
||||
|
||||
// Check to see if enough time has passed, if it hasn't locked the account
|
||||
if( $timenow > $timeout )
|
||||
if( $timenow < $timeout ) {
|
||||
$account_locked = true;
|
||||
// print "The account is locked<br />";
|
||||
}
|
||||
}
|
||||
|
||||
// Check the database (if username matches the password)
|
||||
|
|
@ -70,8 +77,7 @@ if( isset( $_POST[ 'Login' ] ) ) {
|
|||
$data = $db->prepare( 'UPDATE users SET failed_login = "0" WHERE user = (:user) LIMIT 1;' );
|
||||
$data->bindParam( ':user', $user, PDO::PARAM_STR );
|
||||
$data->execute();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Login failed
|
||||
sleep( rand( 2, 4 ) );
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@ if( isset( $_GET[ 'Login' ] ) ) {
|
|||
|
||||
// Check the database
|
||||
$query = "SELECT * FROM `users` WHERE user = '$user' AND password = '$pass';";
|
||||
$result = mysql_query( $query ) or die( '<pre>' . mysql_error() . '</pre>' );
|
||||
$result = mysqli_query($GLOBALS["___mysqli_ston"], $query ) or die( '<pre>' . ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)) . '</pre>' );
|
||||
|
||||
if( $result && mysql_num_rows( $result ) == 1 ) {
|
||||
if( $result && mysqli_num_rows( $result ) == 1 ) {
|
||||
// Get users details
|
||||
$avatar = mysql_result( $result, 0, "avatar" );
|
||||
$row = mysqli_fetch_assoc( $result );
|
||||
$avatar = $row["avatar"];
|
||||
|
||||
// Login successful
|
||||
$html .= "<p>Welcome to the password protected area {$user}</p>";
|
||||
|
|
@ -25,7 +26,7 @@ if( isset( $_GET[ 'Login' ] ) ) {
|
|||
$html .= "<pre><br />Username and/or password incorrect.</pre>";
|
||||
}
|
||||
|
||||
mysql_close();
|
||||
((is_null($___mysqli_res = mysqli_close($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -3,20 +3,21 @@
|
|||
if( isset( $_GET[ 'Login' ] ) ) {
|
||||
// Sanitise username input
|
||||
$user = $_GET[ 'username' ];
|
||||
$user = mysql_real_escape_string( $user );
|
||||
$user = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $user ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
|
||||
// Sanitise password input
|
||||
$pass = $_GET[ 'password' ];
|
||||
$pass = mysql_real_escape_string( $pass );
|
||||
$pass = ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $pass ) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""));
|
||||
$pass = md5( $pass );
|
||||
|
||||
// Check the database
|
||||
$query = "SELECT * FROM `users` WHERE user = '$user' AND password = '$pass';";
|
||||
$result = mysql_query( $query ) or die( '<pre>' . mysql_error() . '</pre>' );
|
||||
$result = mysqli_query($GLOBALS["___mysqli_ston"], $query ) or die( '<pre>' . ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)) . '</pre>' );
|
||||
|
||||
if( $result && mysql_num_rows( $result ) == 1 ) {
|
||||
if( $result && mysqli_num_rows( $result ) == 1 ) {
|
||||
// Get users details
|
||||
$avatar = mysql_result( $result, 0, "avatar" );
|
||||
$row = mysqli_fetch_assoc( $result );
|
||||
$avatar = $row["avatar"];
|
||||
|
||||
// Login successful
|
||||
$html .= "<p>Welcome to the password protected area {$user}</p>";
|
||||
|
|
@ -28,7 +29,7 @@ if( isset( $_GET[ 'Login' ] ) ) {
|
|||
$html .= "<pre><br />Username and/or password incorrect.</pre>";
|
||||
}
|
||||
|
||||
mysql_close();
|
||||
((is_null($___mysqli_res = mysqli_close($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue