Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[auth] make cluster aware of username #578

Closed
wants to merge 1 commit into from
Closed

[auth] make cluster aware of username #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions src/cluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub struct ClusterConnection {
slots: RefCell<SlotMap>,
auto_reconnect: RefCell<bool>,
readonly: bool,
username: Option<String>,
password: Option<String>,
read_timeout: RefCell<Option<Duration>>,
write_timeout: RefCell<Option<Duration>>,
Expand All @@ -94,16 +95,22 @@ impl ClusterConnection {
pub(crate) fn new(
initial_nodes: Vec<ConnectionInfo>,
readonly: bool,
username: Option<String>,
password: Option<String>,
) -> RedisResult<ClusterConnection> {
let connections =
Self::create_initial_connections(&initial_nodes, readonly, password.clone())?;
let connections = Self::create_initial_connections(
&initial_nodes,
readonly,
username.clone(),
password.clone(),
)?;

let connection = ClusterConnection {
connections: RefCell::new(connections),
slots: RefCell::new(SlotMap::new()),
auto_reconnect: RefCell::new(true),
readonly,
username,
password,
read_timeout: RefCell::new(None),
write_timeout: RefCell::new(None),
Expand Down Expand Up @@ -195,6 +202,7 @@ impl ClusterConnection {
fn create_initial_connections(
initial_nodes: &[ConnectionInfo],
readonly: bool,
username: Option<String>,
password: Option<String>,
) -> RedisResult<HashMap<String, Connection>> {
let mut connections = HashMap::with_capacity(initial_nodes.len());
Expand All @@ -213,7 +221,9 @@ impl ClusterConnection {
_ => panic!("No reach."),
};

if let Ok(mut conn) = connect(info.clone(), readonly, password.clone()) {
if let Ok(mut conn) =
connect(info.clone(), readonly, username.clone(), password.clone())
{
if conn.check_connection() {
connections.insert(addr, conn);
break;
Expand Down Expand Up @@ -262,9 +272,12 @@ impl ClusterConnection {
}
}

if let Ok(mut conn) =
connect(addr.as_ref(), self.readonly, self.password.clone())
{
if let Ok(mut conn) = connect(
addr.as_ref(),
self.readonly,
self.username.clone(),
self.password.clone(),
) {
if conn.check_connection() {
conn.set_read_timeout(*self.read_timeout.borrow())?;
conn.set_write_timeout(*self.write_timeout.borrow())?;
Expand Down Expand Up @@ -364,7 +377,12 @@ impl ClusterConnection {
} else {
// Create new connection.
// TODO: error handling
let conn = connect(addr, self.readonly, self.password.clone())?;
let conn = connect(
addr,
self.readonly,
self.username.clone(),
self.password.clone(),
)?;
Ok(connections.entry(addr.to_string()).or_insert(conn))
}
}
Expand Down Expand Up @@ -465,6 +483,7 @@ impl ClusterConnection {
let new_connections = Self::create_initial_connections(
&self.initial_nodes,
self.readonly,
self.username.clone(),
self.password.clone(),
)?;
{
Expand Down Expand Up @@ -694,12 +713,14 @@ impl ConnectionLike for ClusterConnection {
fn connect<T: IntoConnectionInfo>(
info: T,
readonly: bool,
username: Option<String>,
password: Option<String>,
) -> RedisResult<Connection>
where
T: std::fmt::Debug,
{
let mut connection_info = info.into_connection_info()?;
connection_info.redis.username = username;
connection_info.redis.password = password;
let client = super::Client::open(connection_info)?;

Expand Down
27 changes: 23 additions & 4 deletions src/cluster_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ use super::{
pub struct ClusterClientBuilder {
initial_nodes: RedisResult<Vec<ConnectionInfo>>,
readonly: bool,
username: Option<String>,
password: Option<String>,
}

impl ClusterClientBuilder {
/// Generate the base configuration for new Client.
pub fn new<T: IntoConnectionInfo>(initial_nodes: Vec<T>) -> ClusterClientBuilder {
let initial_nodes = initial_nodes
.into_iter()
.map(|x| x.into_connection_info())
.collect();

ClusterClientBuilder {
initial_nodes: initial_nodes
.into_iter()
.map(|x| x.into_connection_info())
.collect(),
initial_nodes,
readonly: false,
username: None,
password: None,
}
}
Expand Down Expand Up @@ -55,6 +59,7 @@ impl ClusterClientBuilder {
pub struct ClusterClient {
initial_nodes: Vec<ConnectionInfo>,
readonly: bool,
username: Option<String>,
password: Option<String>,
}

Expand All @@ -81,13 +86,15 @@ impl ClusterClient {
ClusterConnection::new(
self.initial_nodes.clone(),
self.readonly,
self.username.clone(),
self.password.clone(),
)
}

fn build(builder: ClusterClientBuilder) -> RedisResult<ClusterClient> {
let initial_nodes = builder.initial_nodes?;
let mut nodes = Vec::with_capacity(initial_nodes.len());
let mut connection_info_username = None::<String>;
let mut connection_info_password = None::<String>;

for (index, info) in initial_nodes.into_iter().enumerate() {
Expand All @@ -96,6 +103,17 @@ impl ClusterClient {
"This library cannot use unix socket because Redis's cluster command returns only cluster's IP and port.")));
}

if builder.username.is_none() {
if index == 0 {
connection_info_username = info.redis.username.clone();
} else if connection_info_username != info.redis.username {
return Err(RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot use different username among initial nodes.",
)));
}
}

if builder.password.is_none() {
if index == 0 {
connection_info_password = info.redis.password.clone();
Expand All @@ -113,6 +131,7 @@ impl ClusterClient {
Ok(ClusterClient {
initial_nodes: nodes,
readonly: builder.readonly,
username: builder.username.or(connection_info_username),
password: builder.password.or(connection_info_password),
})
}
Expand Down