feat: quic

Author: richard-ramos

libp2p/builders.nim

@@ -38,7 +38,7 @@ import services/wildcardresolverservice
 export switch, peerid, peerinfo, connection, multiaddress, crypto, errors
 
 type
-  TransportProvider* {.public.} = proc(upgr: Upgrade): Transport {.gcsafe, raises: [].}
+  TransportProvider* {.public.} = proc(upgr: Upgrade, privateKey: PrivateKey): Transport {.gcsafe, raises: [].}
 
   SecureProtocol* {.pure.} = enum
     Noise
@@ -151,7 +151,7 @@ proc withTransport*(
     let switch = SwitchBuilder
       .new()
       .withTransport(
-        proc(upgr: Upgrade): Transport =
+        proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
           TcpTransport.new(flags, upgr)
       )
       .build()
@@ -162,7 +162,7 @@ proc withTcpTransport*(
     b: SwitchBuilder, flags: set[ServerFlags] = {}
 ): SwitchBuilder {.public.} =
   b.withTransport(
-    proc(upgr: Upgrade): Transport =
+    proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
       TcpTransport.new(flags, upgr)
   )
 
@@ -270,7 +270,7 @@ proc build*(b: SwitchBuilder): Switch {.raises: [LPError], public.} =
   let transports = block:
     var transports: seq[Transport]
     for tProvider in b.transports:
-      transports.add(tProvider(muxedUpgrade))
+      transports.add(tProvider(muxedUpgrade, seckey))
     transports
 
   if b.secureManagers.len == 0:

libp2p/transports/quictransport.nim

@@ -2,13 +2,15 @@ import std/sequtils
 import pkg/chronos
 import pkg/chronicles
 import pkg/quic
+import results
 import ../multiaddress
 import ../multicodec
 import ../stream/connection
 import ../wire
 import ../muxers/muxer
 import ../upgrademngrs/upgrade
 import ./transport
+import tls/certificate
 
 export multiaddress
 export multicodec
@@ -138,20 +140,40 @@ type QuicUpgrade = ref object of Upgrade
 
 type QuicTransport* = ref object of Transport
   listener: Listener
+  privateKey: PrivateKey
   connections: seq[P2PConnection]
 
-func new*(_: type QuicTransport, u: Upgrade): QuicTransport =
-  QuicTransport(upgrader: QuicUpgrade(ms: u.ms))
+func new*(_: type QuicTransport, u: Upgrade, privateKey: PrivateKey): QuicTransport =
+  QuicTransport(
+    upgrader: QuicUpgrade(ms: u.ms),
+    privateKey: privateKey,
+  )
 
-method handles*(transport: QuicTransport, address: MultiAddress): bool =
+method handles*(transport: QuicTransport, address: MultiAddress): bool {.raises:[].} =
   if not procCall Transport(transport).handles(address):
     return false
   QUIC_V1.match(address)
 
 method start*(transport: QuicTransport, addrs: seq[MultiAddress]) {.async.} =
   doAssert transport.listener.isNil, "start() already called"
   #TODO handle multiple addr
-  transport.listener = listen(initTAddress(addrs[0]).tryGet)
+
+  let pubkey = transport.privateKey.getPublicKey().valueOr:
+      doAssert false, "could not obtain public key"
+      return
+
+  let keypair = KeyPair(
+    seckey: transport.privateKey,
+    pubkey: pubkey
+  )
+
+  let certPair = generate(keypair, EncodingFormat.PEM)
+  let tlsConfig = TLSConfig(
+    certificate: certPair[0],
+    key: certPair[1],
+  )
+
+  transport.listener = listen(initTAddress(addrs[0]).tryGet, tlsConfig)
   await procCall Transport(transport).start(addrs)
   transport.addrs[0] =
     MultiAddress.init(transport.listener.localAddress(), IPPROTO_UDP).tryGet() &
@@ -169,7 +191,7 @@ method stop*(transport: QuicTransport) {.async.} =
 
 proc wrapConnection(
     transport: QuicTransport, connection: QuicConnection
-): P2PConnection {.raises: [Defect, TransportOsError, LPError].} =
+): P2PConnection {.raises: [TransportOsError, LPError].} =
   let
     remoteAddr = connection.remoteAddress()
     observedAddr =

libp2p/transports/tortransport.nim

@@ -274,7 +274,7 @@ proc new*(
     flags: set[ServerFlags] = {},
 ): TorSwitch {.raises: [LPError], public.} =
   var builder = SwitchBuilder.new().withRng(rng).withTransport(
-      proc(upgr: Upgrade): Transport =
+      proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
         TorTransport.new(torServer, flags, upgr)
     )
   if addresses.len != 0:

tests/testswitch.nim

@@ -948,7 +948,7 @@ suite "Switch":
         .withRng(crypto.newRng())
         .withMplex()
         .withTransport(
-          proc(upgr: Upgrade): Transport =
+          proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
             WsTransport.new(upgr)
         )
         .withNameResolver(resolver)
@@ -961,7 +961,7 @@ suite "Switch":
         .withRng(crypto.newRng())
         .withMplex()
         .withTransport(
-          proc(upgr: Upgrade): Transport =
+          proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
             WsTransport.new(upgr)
         )
         .withTcpTransport()
@@ -1001,8 +1001,8 @@ suite "Switch":
         .withAddress(quicAddress1)
         .withRng(crypto.newRng())
         .withTransport(
-          proc(upgr: Upgrade): Transport =
-            QuicTransport.new(upgr)
+          proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
+            QuicTransport.new(upgr, privateKey)
         )
         .withNoise()
         .build()
@@ -1012,8 +1012,8 @@ suite "Switch":
         .withAddress(quicAddress2)
         .withRng(crypto.newRng())
         .withTransport(
-          proc(upgr: Upgrade): Transport =
-            QuicTransport.new(upgr)
+          proc(upgr: Upgrade, privateKey: PrivateKey): Transport =
+            QuicTransport.new(upgr, privateKey)
         )
         .withNoise()
         .build()