From 7cb09c2aeaa47da48ca45e9d868c7462126a0ecd Mon Sep 17 00:00:00 2001 From: Jorropo Date: Fri, 28 Aug 2020 23:02:01 +0200 Subject: [PATCH 1/4] Deprecate secio to noise. Closes #1214 --- clusterhost.go | 4 ++-- go.mod | 1 + go.sum | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clusterhost.go b/clusterhost.go index cc5f6867..86272d1a 100644 --- a/clusterhost.go +++ b/clusterhost.go @@ -17,10 +17,10 @@ import ( routing "github.com/libp2p/go-libp2p-core/routing" dht "github.com/libp2p/go-libp2p-kad-dht" dual "github.com/libp2p/go-libp2p-kad-dht/dual" + noise "github.com/libp2p/go-libp2p-noise" pubsub "github.com/libp2p/go-libp2p-pubsub" libp2pquic "github.com/libp2p/go-libp2p-quic-transport" record "github.com/libp2p/go-libp2p-record" - secio "github.com/libp2p/go-libp2p-secio" libp2ptls "github.com/libp2p/go-libp2p-tls" routedhost "github.com/libp2p/go-libp2p/p2p/host/routed" identify "github.com/libp2p/go-libp2p/p2p/protocol/identify" @@ -118,7 +118,7 @@ func baseOpts(psk corepnet.PSK) []libp2p.Option { libp2p.PrivateNetwork(psk), libp2p.EnableNATService(), libp2p.Security(libp2ptls.ID, libp2ptls.New), - libp2p.Security(secio.ID, secio.New), + libp2p.Security(noise.ID, noise.New), // TODO: quic does not support private networks // libp2p.Transport(libp2pquic.NewTransport), libp2p.DefaultTransports, diff --git a/go.mod b/go.mod index a8167a18..fd7e8684 100644 --- a/go.mod +++ b/go.mod @@ -48,6 +48,7 @@ require ( github.com/libp2p/go-libp2p-gostream v0.2.1 github.com/libp2p/go-libp2p-http v0.1.5 github.com/libp2p/go-libp2p-kad-dht v0.8.3 + github.com/libp2p/go-libp2p-noise v0.1.1 github.com/libp2p/go-libp2p-peerstore v0.2.6 github.com/libp2p/go-libp2p-pubsub v0.3.4 github.com/libp2p/go-libp2p-quic-transport v0.8.0 diff --git a/go.sum b/go.sum index 348e5a1d..bd1a1c29 100644 --- a/go.sum +++ b/go.sum @@ -151,6 +151,8 @@ github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as= +github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 h1:WXb3TSNmHp2vHoCroCIB1foO/yQ36swABL8aOVeDpgg= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= @@ -528,6 +530,7 @@ github.com/libp2p/go-libp2p v0.6.0/go.mod h1:mfKWI7Soz3ABX+XEBR61lGbg+ewyMtJHVt0 github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54= github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k= github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw= +github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o= github.com/libp2p/go-libp2p v0.8.3/go.mod h1:EsH1A+8yoWK+L4iKcbPYu6MPluZ+CHWI9El8cTaefiM= github.com/libp2p/go-libp2p v0.10.0 h1:7ooOvK1wi8eLpyTppy8TeH43UHy5uI75GAHGJxenUi0= github.com/libp2p/go-libp2p v0.10.0/go.mod h1:yBJNpb+mGJdgrwbKAKrhPU0u3ogyNFTfjJ6bdM+Q/G8= @@ -640,6 +643,8 @@ github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8 github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q= github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ= github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU= +github.com/libp2p/go-libp2p-noise v0.1.1 h1:vqYQWvnIcHpIoWJKC7Al4D6Hgj0H012TuXRhPwSMGpQ= +github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM= github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo= github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es= github.com/libp2p/go-libp2p-peer v0.2.0 h1:EQ8kMjaCUwt/Y5uLgjT8iY2qg0mGUT0N1zUjer50DsY= From cd0553d2cdf14cde99895ffb535c8a921a2546c1 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Sat, 29 Aug 2020 10:43:29 +0200 Subject: [PATCH 2/4] Fix docker build. --- Dockerfile | 2 +- Dockerfile-bundle | 2 +- Dockerfile-test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3cbc8dc..e07c3753 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15-stretch AS builder +FROM golang:1.15-buster AS builder MAINTAINER Hector Sanjuan # This dockerfile builds and runs ipfs-cluster-service. diff --git a/Dockerfile-bundle b/Dockerfile-bundle index f99bf451..6b80b3cc 100644 --- a/Dockerfile-bundle +++ b/Dockerfile-bundle @@ -1,4 +1,4 @@ -FROM golang:1.15-stretch AS builder +FROM golang:1.15-buster AS builder MAINTAINER Hector Sanjuan # This dockerfile builds cluster and runs it along with go-ipfs. diff --git a/Dockerfile-test b/Dockerfile-test index edcd30a4..b99bfd90 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,4 +1,4 @@ -FROM golang:1.15-stretch AS builder +FROM golang:1.15-buster AS builder MAINTAINER Hector Sanjuan # This build state just builds the cluster binaries From 0393c0c6e97ff36c22e17924c7089c85daffe307 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Sun, 30 Aug 2020 14:17:13 +0200 Subject: [PATCH 3/4] Fix security priorities. --- clusterhost.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusterhost.go b/clusterhost.go index 86272d1a..bae57243 100644 --- a/clusterhost.go +++ b/clusterhost.go @@ -117,8 +117,8 @@ func baseOpts(psk corepnet.PSK) []libp2p.Option { return []libp2p.Option{ libp2p.PrivateNetwork(psk), libp2p.EnableNATService(), - libp2p.Security(libp2ptls.ID, libp2ptls.New), libp2p.Security(noise.ID, noise.New), + libp2p.Security(libp2ptls.ID, libp2ptls.New), // TODO: quic does not support private networks // libp2p.Transport(libp2pquic.NewTransport), libp2p.DefaultTransports, From 4bca0c31c62bc5bc66ba3af18539e5a28ea6e4f5 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Mon, 31 Aug 2020 02:01:36 +0200 Subject: [PATCH 4/4] Fixing Docker-test --- Dockerfile-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-test b/Dockerfile-test index b99bfd90..cf949b12 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -51,7 +51,7 @@ COPY --from=builder /tmp/jq-linux64 /usr/local/bin/jq # Add bash COPY --from=builder /bin/bash /bin/bash -COPY --from=builder /lib/x86_64-linux-gnu/libtinfo.so.5 /lib64/libtinfo.so.5 +COPY --from=builder /lib/x86_64-linux-gnu/libtinfo.so* /lib64/ USER root