YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-03-31 17:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make new_tls_client_connection public, update comments

Browse source
This commit is contained in:
yggverse 2024-12-01 09:23:23 +02:00
parent e442a2880a
commit 8947052718
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/client/connection.rs
View file

@ -15,7 +15,7 @@ use glib::{
pub struct Connection { pub struct Connection {
pub socket_connection: SocketConnection, pub socket_connection: SocketConnection,
pub tls_client_connection: Option<TlsClientConnection>, pub tls_client_connection: Option<TlsClientConnection>, // is user certificate session
} }
impl Connection { impl Connection {
@ -75,26 +75,30 @@ impl Connection {
// Getters // Getters
/// Get [IOStream](https://docs.gtk.org/gio/class.IOStream.html) /// Cast [IOStream](https://docs.gtk.org/gio/class.IOStream.html)
/// for [SocketConnection](https://docs.gtk.org/gio/class.SocketConnection.html) /// for [SocketConnection](https://docs.gtk.org/gio/class.SocketConnection.html)
/// or [TlsClientConnection](https://docs.gtk.org/gio/iface.TlsClientConnection.html) (if available) /// or [TlsClientConnection](https://docs.gtk.org/gio/iface.TlsClientConnection.html) (if available)
/// * compatible with user (certificate) and guest (certificate-less) connection type /// * compatible with user (certificate) and guest (certificate-less) connection type
/// * useful also to keep `Connection` active in async I/O context /// * useful to keep `Connection` reference active in async I/O context
pub fn stream(&self) -> impl IsA<IOStream> { pub fn stream(&self) -> impl IsA<IOStream> {
// * do not replace with `tls_client_connection.base_io_stream()`
// as it will not work properly for user certificate sessions!
match self.tls_client_connection.is_some() { match self.tls_client_connection.is_some() {
// is user session
true => self true => self
.tls_client_connection .tls_client_connection
.clone() .clone()
.unwrap() .unwrap()
.upcast::<IOStream>(), // is user session .upcast::<IOStream>(),
false => self.socket_connection.clone().upcast::<IOStream>(), // is guest session // is guest session
false => self.socket_connection.clone().upcast::<IOStream>(),
} }
} }
} }
fn new_tls_client_connection( // Helpers
/// Setup new [TlsClientConnection](https://docs.gtk.org/gio/iface.TlsClientConnection.html)
/// wrapper for [SocketConnection](https://docs.gtk.org/gio/class.SocketConnection.html)
pub fn new_tls_client_connection(
socket_connection: &SocketConnection, socket_connection: &SocketConnection,
server_identity: Option<&NetworkAddress>, server_identity: Option<&NetworkAddress>,
) -> Result<TlsClientConnection, Error> { ) -> Result<TlsClientConnection, Error> {
@ -110,6 +114,7 @@ fn new_tls_client_connection(
// @TODO validate // @TODO validate
// https://geminiprotocol.net/docs/protocol-specification.gmi#tls-server-certificate-validation // https://geminiprotocol.net/docs/protocol-specification.gmi#tls-server-certificate-validation
tls_client_connection.connect_accept_certificate(|_, _, _| true); tls_client_connection.connect_accept_certificate(|_, _, _| true);
Ok(tls_client_connection) Ok(tls_client_connection)
} }
Err(e) => Err(Error::TlsClientConnection(e)), Err(e) => Err(Error::TlsClientConnection(e)),