Merge branch 'master' into tcp-ipv6

Author: vladopajic

libp2p/autotls/service.nim

@@ -197,10 +197,8 @@ when defined(libp2p_autotls_support):
       return false
 
     # generate autotls domain string: "*.{peerID}.{dnsServerURL}"
-    let baseDomain = api.Domain(
-      encodePeerId(self.peerInfo.peerId) & "." & AutoTLSDNSServer &
-        self.config.dnsServerURL
-    )
+    let baseDomain =
+      api.Domain(encodePeerId(self.peerInfo.peerId) & "." & self.config.dnsServerURL)
     let domain = api.Domain("*." & baseDomain)
 
     let acmeClient = self.acmeClient
@@ -260,7 +258,7 @@ when defined(libp2p_autotls_support):
     let derPrivKey = certKeyPair.seckey.rsakey.getBytes.valueOr:
       raise newException(AutoTLSError, "Unable to get TLS private key")
     let pemPrivKey: string = derPrivKey.pemEncode("PRIVATE KEY")
-    debug "autotls cert", pemPrivKey = pemPrivKey, cert = certificate.rawCertificate
+    debug "Autotls cert", pemPrivKey = pemPrivKey, cert = certificate.rawCertificate
 
     trace "Installing certificate"
     let newCert =
@@ -311,7 +309,9 @@ when defined(libp2p_autotls_support):
         await self.tryIssueCertificate()
 
       # AutotlsService will renew the cert 1h before it expires
-      let cert = self.cert.get
+      let cert = self.cert.valueOr:
+        error "Could not issue certificate"
+        return
       let waitTime = cert.expiry - Moment.now - self.config.renewBufferTime
       if waitTime <= self.config.renewBufferTime:
         await self.tryIssueCertificate()

libp2p/builders.nim

@@ -372,7 +372,7 @@ proc build*(b: SwitchBuilder): Switch {.raises: [LPError], public.} =
     muxedUpgrade = MuxedUpgrade.new(b.muxers, secureManagerInstances, ms)
 
   b.autotls.withValue(autotlsService):
-    b.services.insert(autotlsService, 0)
+    b.services.add(autotlsService)
 
   let transports = block:
     var transports: seq[Transport]
@@ -397,7 +397,7 @@ proc build*(b: SwitchBuilder): Switch {.raises: [LPError], public.} =
       PeerStore.new(identify)
 
   if b.enableWildcardResolver:
-    b.services.insert(WildcardAddressResolverService.new(), 0)
+    b.services.add(WildcardAddressResolverService.new())
 
   if not isNil(b.autonatV2Client):
     b.services.add(

tests/testautotls_integration.nim

@@ -78,7 +78,7 @@ when defined(linux) and defined(amd64):
       let ip =
         try:
           getPublicIPAddress()
-        except:
+        except CatchableError:
           skip() # host doesn't have public IPv4 address
           return
 
@@ -100,20 +100,18 @@ when defined(linux) and defined(amd64):
       defer:
         await switch.stop()
 
-      # find autotls in list of services
+      # find autotls service in switch
       var autotls: AutotlsService = nil
       for service in switch.services:
-        try:
+        if service of AutotlsService:
           autotls = AutotlsService(service)
-          break
-        except:
-          continue
-
       if autotls.isNil():
-        raiseAssert "autotls service not found in switch"
+        raiseAssert "No Autotls service in switch"
+        return
 
       # wait for cert to be ready
       await autotls.certReady.wait()
+
       # clear since we'll use it again for renewal
       autotls.certReady.clear()