mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-12 05:50:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor protocol extensions

Browse source
This commit is contained in:
Toshit Chawda 2024-10-24 19:47:38 -07:00
parent 1ae3986a82
commit 36fddc8943
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
10 changed files with 289 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/src/config.rs
View file

@ -162,9 +162,11 @@ pub struct WispConfig {
#[serde(skip_serializing_if = "HashMap::is_empty")]
/// Wisp version 2 password authentication extension username/passwords.
pub password_extension_users: HashMap<String, String>,
pub password_extension_required: bool,
#[serde(skip_serializing_if = "Vec::is_empty")]
/// Wisp version 2 certificate authentication extension public ed25519 pem keys.
pub certificate_extension_keys: Vec<PathBuf>,
pub certificate_extension_required: bool,
#[serde(skip_serializing_if = "is_default_motd")]
/// Wisp version 2 MOTD extension message.
@ -334,7 +336,9 @@ impl Default for WispConfig {
auth_extension: None,
password_extension_users: HashMap::new(),
password_extension_required: true,
certificate_extension_keys: Vec::new(),
certificate_extension_required: true,
motd_extension: default_motd(),
}
@ -364,18 +368,24 @@ impl WispConfig {
extensions.push(AnyProtocolExtensionBuilder::new(
PasswordProtocolExtensionBuilder::new_server(
self.password_extension_users.clone(),
self.password_extension_required,
),
));
required_extensions.push(PasswordProtocolExtension::ID);
if self.password_extension_required {
required_extensions.push(PasswordProtocolExtension::ID);
}
}
Some(ProtocolExtensionAuth::Certificate) => {
extensions.push(AnyProtocolExtensionBuilder::new(
CertAuthProtocolExtensionBuilder::new_server(
get_certificates_from_paths(self.certificate_extension_keys.clone())
.await?,
self.certificate_extension_required,
),
));
required_extensions.push(CertAuthProtocolExtension::ID);
if self.certificate_extension_required {
required_extensions.push(CertAuthProtocolExtension::ID);
}
}
None => {}
}

8
server/src/handle/wisp/twisp.rs
View file

@ -80,12 +80,6 @@ impl ProtocolExtension for TWispServerProtocolExtension {
}
}
impl From<TWispServerProtocolExtension> for AnyProtocolExtension {
fn from(value: TWispServerProtocolExtension) -> Self {
AnyProtocolExtension::new(value)
}
}
pub struct TWispServerProtocolExtensionBuilder(TwispMap);
impl ProtocolExtensionBuilder for TWispServerProtocolExtensionBuilder {
@ -124,7 +118,7 @@ pub fn new_map() -> TwispMap {
}
pub fn new_ext(map: TwispMap) -> AnyProtocolExtensionBuilder {
AnyProtocolExtensionBuilder::new(TWispServerProtocolExtensionBuilder(map))
TWispServerProtocolExtensionBuilder(map).into()
}
pub async fn handle_twisp(