refactor!: move insecure transport outside of core

MarcoPolo · MarcoPolo · commit 758bbd29a106 · 2025-09-26T09:32:51.000-07:00
diff --git a/config/config.go b/config/config.go
@@ -21,7 +21,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/routing"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	logging "github.com/libp2p/go-libp2p/gologshim"
 	"github.com/libp2p/go-libp2p/p2p/host/autonat"
@@ -40,6 +39,7 @@ import (
 	relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
 	"github.com/libp2p/go-libp2p/p2p/protocol/holepunch"
 	"github.com/libp2p/go-libp2p/p2p/protocol/identify"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
 	libp2pwebrtc "github.com/libp2p/go-libp2p/p2p/transport/webrtc"
diff --git a/core/sec/insecure/pb/plaintext.proto b/core/sec/insecure/pb/plaintext.proto
diff --git a/p2p/net/swarm/dial_worker_test.go b/p2p/net/swarm/dial_worker_test.go
@@ -19,13 +19,13 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/net/swarm/testing/testing.go b/p2p/net/swarm/testing/testing.go
@@ -15,13 +15,13 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/net/upgrader/listener_test.go b/p2p/net/upgrader/listener_test.go
@@ -14,9 +14,9 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
diff --git a/p2p/net/upgrader/upgrader_test.go b/p2p/net/upgrader/upgrader_test.go
@@ -13,10 +13,10 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
diff --git a/p2p/security/insecure/insecure.go b/p2p/security/insecure/insecure.go
@@ -1,6 +1,6 @@
 // Package insecure provides an insecure, unencrypted implementation of the SecureConn and SecureTransport interfaces.
 //
-// Recommended only for testing and other non-production usage.
+// Not Recommended
 package insecure
 
 import (
@@ -14,7 +14,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure/pb"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
 
 	"github.com/libp2p/go-msgio"
 
diff --git a/p2p/security/insecure/insecure_test.go b/p2p/security/insecure/insecure_test.go
diff --git a/p2p/security/insecure/pb/plaintext.pb.go b/p2p/security/insecure/pb/plaintext.pb.go
diff --git a/p2p/security/insecure/pb/plaintext.proto b/p2p/security/insecure/pb/plaintext.proto
@@ -0,0 +1,12 @@
+syntax = "proto2";
+
+package plaintext.pb;
+
+import "core/crypto/pb/crypto.proto";
+
+option go_package = "github.com/libp2p/go-libp2p/p2p/security/insecure/pb";
+
+message Exchange {
+  optional bytes id = 1;
+  optional crypto.pb.PublicKey pubkey = 2;
+}
diff --git a/p2p/test/negotiation/muxer_test.go b/p2p/test/negotiation/muxer_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	tls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/transport/tcp/tcp_test.go b/p2p/transport/tcp/tcp_test.go
@@ -11,10 +11,10 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
 	ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"
 
diff --git a/p2p/transport/websocket/websocket_test.go b/p2p/transport/websocket/websocket_test.go
@@ -26,11 +26,11 @@ import (
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"
 
diff --git a/proto_test.go b/proto_test.go
@@ -9,13 +9,13 @@ import (
 	_ "github.com/libp2p/go-libp2p/core/crypto/pb"
 	_ "github.com/libp2p/go-libp2p/core/peer/pb"
 	_ "github.com/libp2p/go-libp2p/core/record/pb"
-	_ "github.com/libp2p/go-libp2p/core/sec/insecure/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/host/autonat/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/autonatv2/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/holepunch/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/identify/pb"
+	_ "github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/security/noise/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/transport/webrtc/pb"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/scripts/gen-proto.sh b/scripts/gen-proto.sh
@@ -7,7 +7,7 @@ proto_array=(
   core/crypto/pb/crypto.proto
   core/record/pb/envelope.proto
   core/peer/pb/peer_record.proto
-  core/sec/insecure/pb/plaintext.proto
+  p2p/security/insecure/pb/plaintext.proto
   p2p/host/autonat/pb/autonat.proto
   p2p/security/noise/pb/payload.proto
   p2p/transport/webrtc/pb/message.proto
