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

decode header bytes only

Browse source
This commit is contained in:
yggverse 2025-03-19 03:23:20 +02:00
parent 6dbf49cea3
commit ab8eb402a8
6 changed files with 61 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/connection/response/certificate.rs
View file

@ -31,7 +31,14 @@ impl Certificate {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::HEADER_LEN {
super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}

9
src/client/connection/response/failure/permanent.rs
View file

@ -42,7 +42,14 @@ impl Permanent {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::super::HEADER_LEN {
super::super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}

9
src/client/connection/response/failure/temporary.rs
View file

@ -42,7 +42,14 @@ impl Temporary {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::super::HEADER_LEN {
super::super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}

33
src/client/connection/response/input.rs
View file

@ -21,7 +21,14 @@ impl Input {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::HEADER_LEN {
super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}
@ -69,17 +76,19 @@ impl std::fmt::Display for Input {
impl std::str::FromStr for Input {
type Err = Error;
fn from_str(header: &str) -> Result<Self, Self::Err> {
if let Some(postfix) = header.strip_prefix("10") {
return Ok(Self::Default {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("11") {
return Ok(Self::Sensitive {
header: header.to_string(),
message: message(postfix),
});
if header.len() <= super::HEADER_LEN {
if let Some(postfix) = header.strip_prefix("10") {
return Ok(Self::Default {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("11") {
return Ok(Self::Sensitive {
header: header.to_string(),
message: message(postfix),
});
}
}
Err(Error::Protocol)
}

9
src/client/connection/response/redirect.rs
View file

@ -19,7 +19,14 @@ impl Redirect {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::HEADER_LEN {
super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}

9
src/client/connection/response/success.rs
View file

@ -14,7 +14,14 @@ impl Success {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
match std::str::from_utf8(buffer) {
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::HEADER_LEN {
super::HEADER_LEN
} else {
len
}],
) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}