refactor!: move insecure transport outside of core

config/config.go

@@ -21,7 +21,7 @@ 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/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	logging "github.com/libp2p/go-libp2p/gologshim"
 	"github.com/libp2p/go-libp2p/p2p/host/autonat"

core/sec/insecure/pb/plaintext.pb.go

@@ -1,134 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.36.6
-// 	protoc        v5.29.2
-// source: core/sec/insecure/pb/plaintext.proto
-
-package pb
-
-import (
-	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-	unsafe "unsafe"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Exchange struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            []byte                 `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-	Pubkey        *pb.PublicKey          `protobuf:"bytes,2,opt,name=pubkey" json:"pubkey,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *Exchange) Reset() {
-	*x = Exchange{}
-	mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *Exchange) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Exchange) ProtoMessage() {}
-
-func (x *Exchange) ProtoReflect() protoreflect.Message {
-	mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Exchange.ProtoReflect.Descriptor instead.
-func (*Exchange) Descriptor() ([]byte, []int) {
-	return file_core_sec_insecure_pb_plaintext_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Exchange) GetId() []byte {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *Exchange) GetPubkey() *pb.PublicKey {
-	if x != nil {
-		return x.Pubkey
-	}
-	return nil
-}
-
-var File_core_sec_insecure_pb_plaintext_proto protoreflect.FileDescriptor
-
-const file_core_sec_insecure_pb_plaintext_proto_rawDesc = "" +
-	"\n" +
-	"$core/sec/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"
-
-var (
-	file_core_sec_insecure_pb_plaintext_proto_rawDescOnce sync.Once
-	file_core_sec_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)))
-	})
-	return file_core_sec_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{
-	(*Exchange)(nil),     // 0: plaintext.pb.Exchange
-	(*pb.PublicKey)(nil), // 1: crypto.pb.PublicKey
-}
-var file_core_sec_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
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	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 {
-		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)),
-			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,
-	}.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
-}

core/sec/insecure/pb/plaintext.proto

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

p2p/net/swarm/dial_worker_test.go

@@ -19,7 +19,7 @@ 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/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"

p2p/net/swarm/testing/testing.go

@@ -15,7 +15,7 @@ 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/p2p/security/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"

p2p/net/upgrader/listener_test.go

@@ -14,7 +14,7 @@ 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/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"
 

p2p/net/upgrader/upgrader_test.go

@@ -13,7 +13,7 @@ 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/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"

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"
 

p2p/security/insecure/pb/plaintext.pb.go

@@ -0,0 +1,159 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        v5.29.2
+// source: plaintext.proto
+
+package pb
+
+import (
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type Exchange struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id     []byte        `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Pubkey *pb.PublicKey `protobuf:"bytes,2,opt,name=pubkey" json:"pubkey,omitempty"`
+}
+
+func (x *Exchange) Reset() {
+	*x = Exchange{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plaintext_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Exchange) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Exchange) ProtoMessage() {}
+
+func (x *Exchange) ProtoReflect() protoreflect.Message {
+	mi := &file_plaintext_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Exchange.ProtoReflect.Descriptor instead.
+func (*Exchange) Descriptor() ([]byte, []int) {
+	return file_plaintext_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Exchange) GetId() []byte {
+	if x != nil {
+		return x.Id
+	}
+	return nil
+}
+
+func (x *Exchange) GetPubkey() *pb.PublicKey {
+	if x != nil {
+		return x.Pubkey
+	}
+	return nil
+}
+
+var File_plaintext_proto protoreflect.FileDescriptor
+
+var file_plaintext_proto_rawDesc = []byte{
+	0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x0c, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x70, 0x62, 0x1a,
+	0x1b, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x2f,
+	0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x48, 0x0a, 0x08,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b,
+	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74,
+	0x6f, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x06,
+	0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x62, 0x70, 0x32, 0x70, 0x2f, 0x67, 0x6f, 0x2d, 0x6c,
+	0x69, 0x62, 0x70, 0x32, 0x70, 0x2f, 0x70, 0x32, 0x70, 0x2f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69,
+	0x74, 0x79, 0x2f, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x2f, 0x70, 0x62,
+}
+
+var (
+	file_plaintext_proto_rawDescOnce sync.Once
+	file_plaintext_proto_rawDescData = file_plaintext_proto_rawDesc
+)
+
+func file_plaintext_proto_rawDescGZIP() []byte {
+	file_plaintext_proto_rawDescOnce.Do(func() {
+		file_plaintext_proto_rawDescData = protoimpl.X.CompressGZIP(file_plaintext_proto_rawDescData)
+	})
+	return file_plaintext_proto_rawDescData
+}
+
+var file_plaintext_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_plaintext_proto_goTypes = []interface{}{
+	(*Exchange)(nil),     // 0: plaintext.pb.Exchange
+	(*pb.PublicKey)(nil), // 1: crypto.pb.PublicKey
+}
+var file_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
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_plaintext_proto_init() }
+func file_plaintext_proto_init() {
+	if File_plaintext_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_plaintext_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Exchange); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_plaintext_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_plaintext_proto_goTypes,
+		DependencyIndexes: file_plaintext_proto_depIdxs,
+		MessageInfos:      file_plaintext_proto_msgTypes,
+	}.Build()
+	File_plaintext_proto = out.File
+	file_plaintext_proto_rawDesc = nil
+	file_plaintext_proto_goTypes = nil
+	file_plaintext_proto_depIdxs = nil
+}

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

p2p/test/negotiation/muxer_test.go

@@ -10,7 +10,7 @@ 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/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	tls "github.com/libp2p/go-libp2p/p2p/security/tls"

p2p/transport/tcp/tcp_test.go

@@ -11,7 +11,7 @@ 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/p2p/security/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"

p2p/transport/websocket/websocket_test.go

@@ -26,7 +26,7 @@ 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/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"

proto_test.go

@@ -9,7 +9,7 @@ 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/security/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"