Mar 3, 2024 · Mar 3, 2024 · Mar 3, 2024 · Mar 3, 2024 · Mar 3, 2024
diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
    Any,
    /// The session must allow writes.
    ReadWrite,
    /// The session allow only reads.
    ReadOnly,
 }

 /// TLS configuration.
                let target_session_attrs = match value {
                    "any" => TargetSessionAttrs::Any,
                    "read-write" => TargetSessionAttrs::ReadWrite,
                    "read-only" => TargetSessionAttrs::ReadOnly,
                    _ => {
                        return Err(Error::config_parse(Box::new(InvalidValue(
                            "target_session_attrs",
diff --git a/tokio-postgres/src/connect.rs b/tokio-postgres/src/connect.rs
    let has_hostname = hostname.is_some();
    let (mut client, mut connection) = connect_raw(socket, tls, has_hostname, config).await?;

    ifletTargetSessionAttrs::ReadWrite = config.target_session_attrs {
    ifconfig.target_session_attrs !=TargetSessionAttrs::Any {
        let rows = client.simple_query_raw("SHOW transaction_read_only");
        pin_mut!(rows);


            match next.await.transpose()? {
                Some(SimpleQueryMessage::Row(row)) => {
                    if row.try_get(0)? == Some("on") {
                    let read_only_result = row.try_get(0)?;
                    if read_only_result == Some("on")
                        && config.target_session_attrs == TargetSessionAttrs::ReadWrite
                    {
                        return Err(Error::connect(io::Error::new(
                            io::ErrorKind::PermissionDenied,
                            "database does not allow writes",
                        )));
                    } else if read_only_result == Some("off")
                        && config.target_session_attrs == TargetSessionAttrs::ReadOnly
                    {
                        return Err(Error::connect(io::Error::new(
                            io::ErrorKind::PermissionDenied,
                            "database is not read only",
                        )));
                    } else {
                        break;
                    }
diff --git a/tokio-postgres/tests/test/parse.rs b/tokio-postgres/tests/test/parse.rs
            .keepalives_idle(Duration::from_secs(30))
            .target_session_attrs(TargetSessionAttrs::ReadWrite),
    );
    check(
        "connect_timeout=3 keepalives=0 keepalives_idle=30 target_session_attrs=read-only",
        Config::new()
            .connect_timeout(Duration::from_secs(3))
            .keepalives(false)
            .keepalives_idle(Duration::from_secs(30))
            .target_session_attrs(TargetSessionAttrs::ReadOnly),
    );
 }

 #[test]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,6 +34,8 @@ pub enum TargetSessionAttrs {
		Any,
		/// The session must allow writes.
		ReadWrite,
		/// The session allow only reads.
		ReadOnly,
Copy link Collaborator sfacklerMar 3, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This presumably needs to be used somewhere in the connection code. Copy link ContributorAuthor chandr-andrMar 3, 2024• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @sfackler Sry, haven't committed my latest changes. Please have a look.
		}

		/// TLS configuration.
Expand DownExpand Up		@@ -622,6 +624,7 @@ impl Config {
		let target_session_attrs = match value {
		"any" => TargetSessionAttrs::Any,
		"read-write" => TargetSessionAttrs::ReadWrite,
		"read-only" => TargetSessionAttrs::ReadOnly,
		_ => {
		return Err(Error::config_parse(Box::new(InvalidValue(
		"target_session_attrs",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,7 +160,7 @@ where
		let has_hostname = hostname.is_some();
		let (mut client, mut connection) = connect_raw(socket, tls, has_hostname, config).await?;

		ifletTargetSessionAttrs::ReadWrite = config.target_session_attrs {
		ifconfig.target_session_attrs !=TargetSessionAttrs::Any {
		let rows = client.simple_query_raw("SHOW transaction_read_only");
		pin_mut!(rows);

Expand All		@@ -185,11 +185,21 @@ where

		match next.await.transpose()? {
		Some(SimpleQueryMessage::Row(row)) => {
		if row.try_get(0)? == Some("on") {
		let read_only_result = row.try_get(0)?;
		if read_only_result == Some("on")
		&& config.target_session_attrs == TargetSessionAttrs::ReadWrite
		{
		return Err(Error::connect(io::Error::new(
		io::ErrorKind::PermissionDenied,
		"database does not allow writes",
		)));
		} else if read_only_result == Some("off")
		&& config.target_session_attrs == TargetSessionAttrs::ReadOnly
		{
		return Err(Error::connect(io::Error::new(
		io::ErrorKind::PermissionDenied,
		"database is not read only",
		)));
		} else {
		break;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,6 +34,14 @@ fn settings() {
		.keepalives_idle(Duration::from_secs(30))
		.target_session_attrs(TargetSessionAttrs::ReadWrite),
		);
		check(
		"connect_timeout=3 keepalives=0 keepalives_idle=30 target_session_attrs=read-only",
		Config::new()
		.connect_timeout(Duration::from_secs(3))
		.keepalives(false)
		.keepalives_idle(Duration::from_secs(30))
		.target_session_attrs(TargetSessionAttrs::ReadOnly),
		);
		}

		#[test]
Expand Down