Merge pull request #418 from nervosnetwork/change-to-trusted-release

change to trusted release and add peerid filter before dial

Author: driftluo

.github/workflows/release.yaml

@@ -4,19 +4,33 @@ on:
   release:
     types: [created]
 
-permissions:
-  contents: write
-
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write # Required for OIDC token exchange
     steps:
       - uses: actions/checkout@v4
+      - uses: rust-lang/crates-io-auth-action@v1
+        id: auth
       - run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y
-      - name: Publish
-        run: |
-          cargo login ${{ secrets.CARGO_REGISTRY_TOKEN }}
-          cd multiaddr && cargo publish || true
-          cd ../secio && cargo publish || true
-          cd ../yamux && cargo publish || true
-          cd ../tentacle && cargo publish || true
+      - name: Publish multiaddr
+        run: cargo publish || true
+        working-directory: multiaddr
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
+      - name: Publish secio
+        run: cargo publish || true
+        working-directory: secio
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
+      - name: Publish yamux
+        run: cargo publish || true
+        working-directory: yamux
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
+      - name: Publish tentacle
+        run: cargo publish || true
+        working-directory: tentacle
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}

CHANGELOG.md

@@ -1,3 +1,8 @@
+## tentacle 0.7.2
+
+### Features
+- Add peerid filter before dial
+
 ## yamux 0.3.15
 
 ### Bug Fix

tentacle/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tentacle"
-version = "0.7.1"
+version = "0.7.2"
 license = "MIT"
 description = "Minimal implementation for a multiplexed p2p network framework."
 authors = ["piaoliu <driftluo@foxmail.com>", "Nervos Core Dev <dev@nervos.org>"]

tentacle/src/service.rs

@@ -252,16 +252,32 @@ where
     /// Dial the given address, doesn't actually make a request, just generate a future
     pub async fn dial(&mut self, address: Multiaddr, target: TargetProtocol) -> Result<&mut Self> {
         let inner = self.inner_service.as_mut().unwrap();
-        let dial_future = inner.multi_transport.clone().dial(address.clone())?;
+        if !(inner.dial_protocols.contains_key(&address)
+            || extract_peer_id(&address)
+                .map(|peer_id| {
+                    inner.dial_protocols.keys().any(|addr| {
+                        if let Some(addr_peer_id) = extract_peer_id(&addr) {
+                            addr_peer_id == peer_id
+                        } else {
+                            false
+                        }
+                    })
+                })
+                .unwrap_or_default())
+        {
+            let dial_future = inner.multi_transport.clone().dial(address.clone())?;
 
-        match dial_future.await {
-            Ok((addr, incoming)) => {
-                inner.handshake(incoming, SessionType::Outbound, addr, None);
-                inner.dial_protocols.insert(address, target);
-                inner.state.increase();
-                Ok(self)
+            match dial_future.await {
+                Ok((addr, incoming)) => {
+                    inner.handshake(incoming, SessionType::Outbound, addr, None);
+                    inner.dial_protocols.insert(address, target);
+                    inner.state.increase();
+                    Ok(self)
+                }
+                Err(err) => Err(err),
             }
-            Err(err) => Err(err),
+        } else {
+            Ok(self)
         }
     }
 
@@ -1141,7 +1157,19 @@ where
                 self.handle_message(target, proto_id, priority, data).await;
             }
             ServiceTask::Dial { address, target } => {
-                if !self.dial_protocols.contains_key(&address) {
+                if !(self.dial_protocols.contains_key(&address)
+                    || extract_peer_id(&address)
+                        .map(|peer_id| {
+                            self.dial_protocols.keys().any(|addr| {
+                                if let Some(addr_peer_id) = extract_peer_id(&addr) {
+                                    addr_peer_id == peer_id
+                                } else {
+                                    false
+                                }
+                            })
+                        })
+                        .unwrap_or_default())
+                {
                     if let Err(e) = self.dial_inner(address.clone(), target) {
                         let _ignore = self
                             .handle_sender