Skip to content

Commit d81a744

Browse files
authored
Fix logging mistakes (#313)
Mistakenly logging username as poolname and poolname as username
1 parent cc63c95 commit d81a744

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/client.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ where
432432

433433
let code = match read.read_u8().await {
434434
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))),
436436
};
437437

438438
// PasswordMessage
@@ -445,14 +445,14 @@ where
445445

446446
let len = match read.read_i32().await {
447447
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))),
449449
};
450450

451451
let mut password_response = vec![0u8; (len - 4) as usize];
452452

453453
match read.read_exact(&mut password_response).await {
454454
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))),
456456
};
457457

458458
// Authenticate admin user.
@@ -466,10 +466,10 @@ where
466466
);
467467

468468
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);
470470
wrong_password(&mut write, username).await?;
471471

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)));
473473
}
474474

475475
(false, generate_server_info_for_admin())
@@ -488,18 +488,18 @@ where
488488
)
489489
.await?;
490490

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)));
492492
}
493493
};
494494

495495
// Compare server and client hashes.
496496
let password_hash = md5_hash_password(username, &pool.settings.user.password, &salt);
497497

498498
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);
500500
wrong_password(&mut write, username).await?;
501501

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)));
503503
}
504504

505505
let transaction_mode = pool.settings.pool_mode == PoolMode::Transaction;

0 commit comments

Comments
 (0)