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

node: Skip trusted peers that aren't local

This commit is contained in:
Alexis Sellier 2023-04-18 14:49:13 +02:00
parent b2f9ca61d5
commit 0d98b84861
No known key found for this signature in database
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
radicle-node/src/worker/fetch.rs
View File

@ -10,7 +10,7 @@ use radicle::crypto::{PublicKey, Unverified, Verified};
use radicle::git::url; use radicle::git::url;
use radicle::prelude::{Doc, Id, NodeId}; use radicle::prelude::{Doc, Id, NodeId};
use radicle::storage::git::Repository; use radicle::storage::git::Repository;
use radicle::storage::refs::{SignedRefs, IDENTITY_BRANCH}; use radicle::storage::refs::IDENTITY_BRANCH;
use radicle::storage::{Namespaces, RefUpdate, Remote, RemoteId}; use radicle::storage::{Namespaces, RefUpdate, Remote, RemoteId};
use radicle::storage::{ReadRepository, ReadStorage, WriteRepository, WriteStorage}; use radicle::storage::{ReadRepository, ReadStorage, WriteRepository, WriteStorage};
use radicle::{git, Storage}; use radicle::{git, Storage};
@ -354,19 +354,11 @@ impl<'a> StagingPhaseFinal<'a> {
fn remotes(&self) -> impl Iterator<Item = Remote> + '_ { fn remotes(&self) -> impl Iterator<Item = Remote> + '_ {
self.trusted self.trusted
.iter() .iter()
.filter_map(|remote| match SignedRefs::load(remote, self.repo.deref()) { .filter_map(|remote| self.repo.remote(remote).ok())
Ok(refs) => Some(Remote::new(*remote, refs)),
Err(err) => {
log::warn!(target: "worker", "{remote} failed rad/sigrefs verification: {err}");
None
}
})
} }
fn verify(&self) -> BTreeMap<RemoteId, VerifiedRemote> { fn verify(&self) -> BTreeMap<RemoteId, VerifiedRemote> {
self.trusted self.remotes()
.iter()
.filter_map(|remote| self.repo.remote(remote).ok())
.map(|remote| { .map(|remote| {
let remote_id = remote.id; let remote_id = remote.id;
let verification = match self.repo.identity_doc_of(&remote_id) { let verification = match self.repo.identity_doc_of(&remote_id) {