mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: add tracking-scope option 

The radicle-node was forced into using Scope::Trusted for its default
scope.

Allow the Scope to be specified at the command line using a
`--tracking-scope` option.

Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com>
X-Clacks-Overhead: GNU Terry Pratchett
This commit is contained in:
Fintan Halpenny 2023-03-13 09:48:51 +00:00 committed by Alexis Sellier
parent 8e5627d28a
commit 646376828d
No known key found for this signature in database
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
radicle-node/src/main.rs
View File

@ -9,7 +9,7 @@ use radicle::prelude::Signer;
use radicle::profile; use radicle::profile;
use radicle_node::crypto::ssh::keystore::{Keystore, MemorySigner}; use radicle_node::crypto::ssh::keystore::{Keystore, MemorySigner};
use radicle_node::prelude::{Address, NodeId}; use radicle_node::prelude::{Address, NodeId};
use radicle_node::service::tracking::Policy; use radicle_node::service::tracking::{Policy, Scope};
use radicle_node::Runtime; use radicle_node::Runtime;
use radicle_node::{logger, service, signals}; use radicle_node::{logger, service, signals};
use radicle_term as term; use radicle_term as term;
@ -25,6 +25,7 @@ Options
--external-address <address> Publicly accessible address (default 0.0.0.0:8776) --external-address <address> Publicly accessible address (default 0.0.0.0:8776)
--git-daemon <address> Address to bind git-daemon to (default 0.0.0.0:9418) --git-daemon <address> Address to bind git-daemon to (default 0.0.0.0:9418)
--tracking-policy (track|block) Default tracking policy --tracking-policy (track|block) Default tracking policy
--tracking-scope (trusted|all) Default scope for tracking policies
--help Print help --help Print help
--listen <address> Address to listen on --listen <address> Address to listen on
@ -38,6 +39,7 @@ struct Options {
limits: service::config::Limits, limits: service::config::Limits,
listen: Vec<net::SocketAddr>, listen: Vec<net::SocketAddr>,
tracking_policy: Policy, tracking_policy: Policy,
tracking_scope: Scope,
} }
impl Options { impl Options {
@ -51,6 +53,7 @@ impl Options {
let mut listen = Vec::new(); let mut listen = Vec::new();
let mut daemon = None; let mut daemon = None;
let mut tracking_policy = Policy::default(); let mut tracking_policy = Policy::default();
let mut tracking_scope = Scope::default();
while let Some(arg) = parser.next()? { while let Some(arg) = parser.next()? {
match arg { match arg {
@ -73,6 +76,13 @@ impl Options {
.map_err(|s| anyhow!("unknown tracking policy {:?}", s))?; .map_err(|s| anyhow!("unknown tracking policy {:?}", s))?;
tracking_policy = policy; tracking_policy = policy;
} }
Long("tracking-scope") => {
let scope = parser
.value()?
.parse()
.map_err(|s| anyhow!("unknown tracking scope {:?}", s))?;
tracking_scope = scope;
}
Long("limit-routing-max-age") => { Long("limit-routing-max-age") => {
let secs: u64 = parser.value()?.parse()?; let secs: u64 = parser.value()?.parse()?;
limits.routing_max_age = LocalDuration::from_secs(secs); limits.routing_max_age = LocalDuration::from_secs(secs);
@ -106,6 +116,7 @@ impl Options {
limits, limits,
listen, listen,
tracking_policy, tracking_policy,
tracking_scope,
}) })
} }
} }
@ -132,6 +143,7 @@ fn execute() -> anyhow::Result<()> {
external_addresses: options.external_addresses, external_addresses: options.external_addresses,
limits: options.limits, limits: options.limits,
policy: options.tracking_policy, policy: options.tracking_policy,
scope: options.tracking_scope,
..service::Config::default() ..service::Config::default()
}; };
let proxy = net::SocketAddr::new(net::Ipv4Addr::LOCALHOST.into(), 9050); let proxy = net::SocketAddr::new(net::Ipv4Addr::LOCALHOST.into(), 9050);