docker/pgcat
1
0
Fork 0
mirror of https://github.com/postgresml/pgcat.git synced 2026-03-26 10:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send proper server parameters to clients using admin db (#103)

Browse Source 
* Send proper server parameters to clients using admin db

* clean up

* fix python test

* build

* Add python

* missing &

* debug ls

* fix tests

* fix tests

* fix

* Fix warning

* Address comments
This commit is contained in:
Mostafa Abdelraouf
2022-07-31 21:52:23 -05:00
committed by GitHub
parent 35381ba8fd
commit 1b648ca00e
7 changed files with 86 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/client.rs
View File

@@ -5,7 +5,7 @@ use std::collections::HashMap;
use tokio::io::{split, AsyncReadExt, BufReader, ReadHalf, WriteHalf};
use tokio::net::TcpStream;
use crate::admin::handle_admin;
use crate::admin::{generate_server_info_for_admin, handle_admin};
use crate::config::get_config;
use crate::constants::*;
use crate::errors::Error;
@@ -311,10 +311,7 @@ where
Err(_) => return Err(Error::SocketError),
};
let mut target_pool: ConnectionPool = ConnectionPool::default();
let mut transaction_mode = false;
if admin {
let (target_pool, transaction_mode, server_info) = if admin {
let correct_user = config.general.admin_username.as_str();
let correct_password = config.general.admin_password.as_str();
@@ -325,8 +322,13 @@ where
wrong_password(&mut write, user).await?;
return Err(Error::ClientError);
}
(
ConnectionPool::default(),
false,
generate_server_info_for_admin(),
)
} else {
target_pool = match get_pool(database.clone(), user.clone()) {
let target_pool = match get_pool(database.clone(), user.clone()) {
Some(pool) => pool,
None => {
error_response(
@@ -340,8 +342,8 @@ where
return Err(Error::ClientError);
}
};
transaction_mode = target_pool.settings.pool_mode == "transaction";
let transaction_mode = target_pool.settings.pool_mode == "transaction";
let server_info = target_pool.server_info();
// Compare server and client hashes.
let correct_password = target_pool.settings.user.password.as_str();
let password_hash = md5_hash_password(user, correct_password, &salt);
@@ -351,12 +353,13 @@ where
wrong_password(&mut write, user).await?;
return Err(Error::ClientError);
}
}
(target_pool, transaction_mode, server_info)
};
debug!("Password authentication successful");
auth_ok(&mut write).await?;
write_all(&mut write, target_pool.server_info()).await?;
write_all(&mut write, server_info).await?;
backend_key_data(&mut write, process_id, secret_key).await?;
ready_for_query(&mut write).await?;