SyntheticBird/cuprate-hinto-janai
1
0
Fork 0
mirror of https://github.com/hinto-janai/cuprate.git synced 2024-12-22 19:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bans
Some checks failed
Deny / audit (push) Has been cancelled
Details

Browse source
This commit is contained in:
hinto.janai 2024-11-26 21:05:57 -05:00
parent 1a079c856e
commit a3fa638d91
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
binaries/cuprated/src/rpc/json.rs
View file

@ -552,7 +552,7 @@ async fn set_bans(
// <https://architecture.cuprate.org/oddities/le-ipv4.html> // <https://architecture.cuprate.org/oddities/le-ipv4.html>
let [a, b, c, d] = peer.ip.to_le_bytes(); let [a, b, c, d] = peer.ip.to_le_bytes();
let ip = Ipv4Addr::new(a, b, c, d); let ip = Ipv4Addr::new(a, b, c, d);
let address = SocketAddr::V4(SocketAddrV4::new(ip, todo!("p2p port?"))); let address = SocketAddr::V4(SocketAddrV4::new(ip, 0));
let ban = if peer.ban { let ban = if peer.ban {
Some(Duration::from_secs(peer.seconds.into())) Some(Duration::from_secs(peer.seconds.into()))
@ -579,7 +579,7 @@ async fn get_bans(state: CupratedRpcHandler, _: GetBansRequest) -> Result<GetBan
let bans = address_book::get_bans::<ClearNet>(&mut DummyAddressBook) let bans = address_book::get_bans::<ClearNet>(&mut DummyAddressBook)
.await? .await?
.into_iter() .into_iter()
.map(|ban| { .filter_map(|ban| {
let seconds = if let Some(instant) = ban.unban_instant { let seconds = if let Some(instant) = ban.unban_instant {
instant instant
.checked_duration_since(now) .checked_duration_since(now)
@ -594,14 +594,14 @@ async fn get_bans(state: CupratedRpcHandler, _: GetBansRequest) -> Result<GetBan
// <https://architecture.cuprate.org/oddities/le-ipv4.html> // <https://architecture.cuprate.org/oddities/le-ipv4.html>
let ip = match ban.address.ip() { let ip = match ban.address.ip() {
IpAddr::V4(v4) => u32::from_le_bytes(v4.octets()), IpAddr::V4(v4) => u32::from_le_bytes(v4.octets()),
IpAddr::V6(v6) => todo!(), IpAddr::V6(v6) => return None,
}; };
GetBan { Some(GetBan {
host: ban.address.to_string(), host: ban.address.to_string(),
ip, ip,
seconds, seconds,
} })
}) })
.collect(); .collect();