@@ -432,7 +432,7 @@ where
432
432
433
433
let code = match read. read_u8 ( ) . await {
434
434
Ok ( p) => p,
435
- Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password code from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ,
435
+ Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password code from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ,
436
436
} ;
437
437
438
438
// PasswordMessage
@@ -445,14 +445,14 @@ where
445
445
446
446
let len = match read. read_i32 ( ) . await {
447
447
Ok ( len) => len,
448
- Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password message length from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ,
448
+ Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password message length from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ,
449
449
} ;
450
450
451
451
let mut password_response = vec ! [ 0u8 ; ( len - 4 ) as usize ] ;
452
452
453
453
match read. read_exact ( & mut password_response) . await {
454
454
Ok ( _) => ( ) ,
455
- Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password message from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ,
455
+ Err ( _) => return Err ( Error :: SocketError ( format ! ( "Error reading password message from client {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ,
456
456
} ;
457
457
458
458
// Authenticate admin user.
@@ -466,10 +466,10 @@ where
466
466
) ;
467
467
468
468
if password_hash != password_response {
469
- warn ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ;
469
+ warn ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ;
470
470
wrong_password ( & mut write, username) . await ?;
471
471
472
- return Err ( Error :: ClientError ( format ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ;
472
+ return Err ( Error :: ClientError ( format ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ;
473
473
}
474
474
475
475
( false , generate_server_info_for_admin ( ) )
@@ -488,18 +488,18 @@ where
488
488
)
489
489
. await ?;
490
490
491
- return Err ( Error :: ClientError ( format ! ( "Invalid pool name {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ;
491
+ return Err ( Error :: ClientError ( format ! ( "Invalid pool name {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ;
492
492
}
493
493
} ;
494
494
495
495
// Compare server and client hashes.
496
496
let password_hash = md5_hash_password ( username, & pool. settings . user . password , & salt) ;
497
497
498
498
if password_hash != password_response {
499
- warn ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ;
499
+ warn ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ;
500
500
wrong_password ( & mut write, username) . await ?;
501
501
502
- return Err ( Error :: ClientError ( format ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , pool_name , username , application_name) ) ) ;
502
+ return Err ( Error :: ClientError ( format ! ( "Invalid password {{ username: {:?}, pool_name: {:?}, application_name: {:?} }}" , username , pool_name , application_name) ) ) ;
503
503
}
504
504
505
505
let transaction_mode = pool. settings . pool_mode == PoolMode :: Transaction ;
0 commit comments