foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

chore(ext/node): cleanup net blocklist ops (#24299)

Browse source
This commit is contained in:
Divy Srivastava 2024-06-21 11:40:01 +05:30 committed by GitHub
parent c012c202af
commit 496428b82e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ext/node/ops/blocklist.rs
View file

@ -1,6 +1,5 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
use std::cell::RefCell;
use std::collections::HashSet;
use std::net::IpAddr;
use std::net::Ipv4Addr;
@ -18,12 +17,6 @@ use ipnetwork::Ipv4Network;
use ipnetwork::Ipv6Network;
use serde::Serialize;
pub struct BlockListResource {
blocklist: RefCell<BlockList>,
}
impl deno_core::GcResource for BlockListResource {}
#[derive(Serialize)]
struct SocketAddressSerialization(String, String);
@ -66,52 +59,51 @@ pub fn op_socket_address_get_serialization(
#[op2]
#[cppgc]
pub fn op_blocklist_new() -> BlockListResource {
let blocklist = BlockList::new();
BlockListResource {
blocklist: RefCell::new(blocklist),
}
pub fn op_blocklist_new() -> BlockList {
BlockList::new()
}
#[op2(fast)]
pub fn op_blocklist_add_address(
#[cppgc] wrap: &BlockListResource,
#[cppgc] blocklist: &mut BlockList,
#[string] addr: &str,
) -> Result<(), AnyError> {
wrap.blocklist.borrow_mut().add_address(addr)
blocklist.add_address(addr)
}
#[op2(fast)]
pub fn op_blocklist_add_range(
#[cppgc] wrap: &BlockListResource,
#[cppgc] blocklist: &mut BlockList,
#[string] start: &str,
#[string] end: &str,
) -> Result<bool, AnyError> {
wrap.blocklist.borrow_mut().add_range(start, end)
blocklist.add_range(start, end)
}
#[op2(fast)]
pub fn op_blocklist_add_subnet(
#[cppgc] wrap: &BlockListResource,
#[cppgc] blocklist: &mut BlockList,
#[string] addr: &str,
#[smi] prefix: u8,
) -> Result<(), AnyError> {
wrap.blocklist.borrow_mut().add_subnet(addr, prefix)
blocklist.add_subnet(addr, prefix)
}
#[op2(fast)]
pub fn op_blocklist_check(
#[cppgc] wrap: &BlockListResource,
#[cppgc] blocklist: &BlockList,
#[string] addr: &str,
#[string] r#type: &str,
#[string] type_: &str,
) -> Result<bool, AnyError> {
wrap.blocklist.borrow().check(addr, r#type)
blocklist.check(addr, type_)
}
struct BlockList {
rules: HashSet<IpNetwork>,
}
impl deno_core::GcResource for BlockList {}
impl BlockList {
pub fn new() -> Self {
BlockList {