zishuo/go-libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p.git synced 2025-12-24 13:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor!: move insecure transport outside of core

Browse Source
This commit is contained in:
Marco Munizaga
2025-09-04 10:02:00 -07:00
parent 403c42ee72
commit 758bbd29a1
15 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@@ -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"

12
core/sec/insecure/pb/plaintext.proto
View File

@@ -1,12 +0,0 @@
syntax = "proto2";
package plaintext.pb;
import "core/crypto/pb/crypto.proto";
option go_package = "github.com/libp2p/go-libp2p/core/sec/insecure/pb";
message Exchange {
optional bytes id = 1;
optional crypto.pb.PublicKey pubkey = 2;
}

2
p2p/net/swarm/dial_worker_test.go
View File

@@ -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"

2
p2p/net/swarm/testing/testing.go
View File

@@ -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"

2
p2p/net/upgrader/listener_test.go
View File

@@ -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"

2
p2p/net/upgrader/upgrader_test.go
View File

@@ -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"

4
core/sec/insecure/insecure.go → p2p/security/insecure/insecure.go
View File

@@ -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"

0
core/sec/insecure/insecure_test.go → p2p/security/insecure/insecure_test.go
View File

54
core/sec/insecure/pb/plaintext.pb.go → p2p/security/insecure/pb/plaintext.pb.go
View File

@@ -2,7 +2,7 @@
// versions:
// protoc-gen-go v1.36.6
// protoc v5.29.2
// source: core/sec/insecure/pb/plaintext.proto
// source: p2p/security/insecure/pb/plaintext.proto
package pb
@@ -32,7 +32,7 @@ type Exchange struct {
func (x *Exchange) Reset() {
*x = Exchange{}
mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
mi := &file_p2p_security_insecure_pb_plaintext_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -44,7 +44,7 @@ func (x *Exchange) String() string {
func (*Exchange) ProtoMessage() {}
func (x *Exchange) ProtoReflect() protoreflect.Message {
mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
mi := &file_p2p_security_insecure_pb_plaintext_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -57,7 +57,7 @@ func (x *Exchange) ProtoReflect() protoreflect.Message {
// Deprecated: Use Exchange.ProtoReflect.Descriptor instead.
func (*Exchange) Descriptor() ([]byte, []int) {
return file_core_sec_insecure_pb_plaintext_proto_rawDescGZIP(), []int{0}
return file_p2p_security_insecure_pb_plaintext_proto_rawDescGZIP(), []int{0}
}
func (x *Exchange) GetId() []byte {
@@ -74,33 +74,33 @@ func (x *Exchange) GetPubkey() *pb.PublicKey {
return nil
}
var File_core_sec_insecure_pb_plaintext_proto protoreflect.FileDescriptor
var File_p2p_security_insecure_pb_plaintext_proto protoreflect.FileDescriptor
const file_core_sec_insecure_pb_plaintext_proto_rawDesc = "" +
const file_p2p_security_insecure_pb_plaintext_proto_rawDesc = "" +
"\n" +
"$core/sec/insecure/pb/plaintext.proto\x12\fplaintext.pb\x1a\x1bcore/crypto/pb/crypto.proto\"H\n" +
"(p2p/security/insecure/pb/plaintext.proto\x12\fplaintext.pb\x1a\x1bcore/crypto/pb/crypto.proto\"H\n" +
"\bExchange\x12\x0e\n" +
"\x02id\x18\x01 \x01(\fR\x02id\x12,\n" +
"\x06pubkey\x18\x02 \x01(\v2\x14.crypto.pb.PublicKeyR\x06pubkeyB2Z0github.com/libp2p/go-libp2p/core/sec/insecure/pb"
"\x06pubkey\x18\x02 \x01(\v2\x14.crypto.pb.PublicKeyR\x06pubkeyB6Z4github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
var (
file_core_sec_insecure_pb_plaintext_proto_rawDescOnce sync.Once
file_core_sec_insecure_pb_plaintext_proto_rawDescData []byte
file_p2p_security_insecure_pb_plaintext_proto_rawDescOnce sync.Once
file_p2p_security_insecure_pb_plaintext_proto_rawDescData []byte
)
func file_core_sec_insecure_pb_plaintext_proto_rawDescGZIP() []byte {
file_core_sec_insecure_pb_plaintext_proto_rawDescOnce.Do(func() {
file_core_sec_insecure_pb_plaintext_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_core_sec_insecure_pb_plaintext_proto_rawDesc), len(file_core_sec_insecure_pb_plaintext_proto_rawDesc)))
func file_p2p_security_insecure_pb_plaintext_proto_rawDescGZIP() []byte {
file_p2p_security_insecure_pb_plaintext_proto_rawDescOnce.Do(func() {
file_p2p_security_insecure_pb_plaintext_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_p2p_security_insecure_pb_plaintext_proto_rawDesc), len(file_p2p_security_insecure_pb_plaintext_proto_rawDesc)))
})
return file_core_sec_insecure_pb_plaintext_proto_rawDescData
return file_p2p_security_insecure_pb_plaintext_proto_rawDescData
}
var file_core_sec_insecure_pb_plaintext_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_core_sec_insecure_pb_plaintext_proto_goTypes = []any{
var file_p2p_security_insecure_pb_plaintext_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_p2p_security_insecure_pb_plaintext_proto_goTypes = []any{
(*Exchange)(nil), // 0: plaintext.pb.Exchange
(*pb.PublicKey)(nil), // 1: crypto.pb.PublicKey
}
var file_core_sec_insecure_pb_plaintext_proto_depIdxs = []int32{
var file_p2p_security_insecure_pb_plaintext_proto_depIdxs = []int32{
1, // 0: plaintext.pb.Exchange.pubkey:type_name -> crypto.pb.PublicKey
1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type
@@ -109,26 +109,26 @@ var file_core_sec_insecure_pb_plaintext_proto_depIdxs = []int32{
0, // [0:1] is the sub-list for field type_name
}
func init() { file_core_sec_insecure_pb_plaintext_proto_init() }
func file_core_sec_insecure_pb_plaintext_proto_init() {
if File_core_sec_insecure_pb_plaintext_proto != nil {
func init() { file_p2p_security_insecure_pb_plaintext_proto_init() }
func file_p2p_security_insecure_pb_plaintext_proto_init() {
if File_p2p_security_insecure_pb_plaintext_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_core_sec_insecure_pb_plaintext_proto_rawDesc), len(file_core_sec_insecure_pb_plaintext_proto_rawDesc)),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_p2p_security_insecure_pb_plaintext_proto_rawDesc), len(file_p2p_security_insecure_pb_plaintext_proto_rawDesc)),
NumEnums: 0,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_core_sec_insecure_pb_plaintext_proto_goTypes,
DependencyIndexes: file_core_sec_insecure_pb_plaintext_proto_depIdxs,
MessageInfos: file_core_sec_insecure_pb_plaintext_proto_msgTypes,
GoTypes: file_p2p_security_insecure_pb_plaintext_proto_goTypes,
DependencyIndexes: file_p2p_security_insecure_pb_plaintext_proto_depIdxs,
MessageInfos: file_p2p_security_insecure_pb_plaintext_proto_msgTypes,
}.Build()
File_core_sec_insecure_pb_plaintext_proto = out.File
file_core_sec_insecure_pb_plaintext_proto_goTypes = nil
file_core_sec_insecure_pb_plaintext_proto_depIdxs = nil
File_p2p_security_insecure_pb_plaintext_proto = out.File
file_p2p_security_insecure_pb_plaintext_proto_goTypes = nil
file_p2p_security_insecure_pb_plaintext_proto_depIdxs = nil
}

12
p2p/security/insecure/pb/plaintext.proto Normal file
View File

@@ -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;
}

2
p2p/test/negotiation/muxer_test.go
View File

@@ -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"

2
p2p/transport/tcp/tcp_test.go
View File

@@ -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"

2
p2p/transport/websocket/websocket_test.go
View File

@@ -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"

2
proto_test.go
View File

@@ -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"

2
scripts/gen-proto.sh
View File

@@ -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