diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7692b26472..322a03dad7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -63,9 +63,9 @@ steps: - bazel build //:scion //:scion-ci >/dev/null 2>&1 - tar -kxf bazel-bin/scion.tar -C bin --overwrite - tar -kxf bazel-bin/scion-ci.tar -C bin --overwrite - - ./scion.sh topology + - ./scion.sh topology -t - ./scion.sh run && sleep 10 - - ./bin/end2end_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/end2end_integration -log.console warn - ./integration/revocation_test.sh key: revocation_tests artifact_paths: @@ -79,12 +79,12 @@ steps: - bazel build //:scion //:scion-ci >/dev/null 2>&1 - tar -kxf bazel-bin/scion.tar -C bin --overwrite - tar -kxf bazel-bin/scion-ci.tar -C bin --overwrite - - ./scion.sh topology + - ./scion.sh topology -t - ./scion.sh run && sleep 10 - - ./bin/cert_req_integration -log.console warn - - ./bin/pp_integration -log.console warn - - ./bin/scmp_integration -log.console warn - - ./bin/end2end_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/cert_req_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/pp_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/scmp_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/end2end_integration -log.console warn artifact_paths: - "artifacts.out/**/*" timeout_in_minutes: 10 @@ -98,9 +98,9 @@ steps: - bazel build //:scion //:scion-ci >/dev/null 2>&1 - tar -kxf bazel-bin/scion.tar -C bin --overwrite - tar -kxf bazel-bin/scion-ci.tar -C bin --overwrite - - ./scion.sh topology --monolith + - ./scion.sh topology -t --monolith - ./scion.sh run && sleep 10 - - ./bin/end2end_integration -log.console warn + - QUIC_GO_LOG_LEVEL=info ./bin/end2end_integration -log.console warn artifact_paths: - "artifacts.out/**/*" timeout_in_minutes: 10 diff --git a/WORKSPACE b/WORKSPACE index 5ac5be4463..207fc0775a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -26,10 +26,10 @@ go_register_toolchains(nogo = "@//:nogo") http_archive( name = "bazel_gazelle", urls = [ - "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.0/bazel-gazelle-v0.19.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.0/bazel-gazelle-v0.19.0.tar.gz", + "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz", ], - sha256 = "41bff2a0b32b02f20c227d234aa25ef3783998e5453f7eade929704dcff7cd4b", + sha256 = "86c6d481b3f7aedc1d60c1c211c6f76da282ae197c3b3160f54bd3a8f847896f", ) load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index b60fa90705..130422fa79 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -59,7 +59,7 @@ RUN set -ex ; \ bazel fetch --noshow_progress //:fetch 2>&1 ; \ rm -rf /home/scion/.cache/bazel/_bazel_scion/*/external/*/\.git ; \ sudo tar czf /scioncache/bazel.tar.gz --owner=scion -C ~ .cache/bazel; \ - sudo rm -r ~/.cache/bazel; \ + sudo rm -r ~/.cache; \ sudo rm -r ./* # Install docker and docker-compose diff --git a/go.mod b/go.mod index 5a91cf522c..aa42bff8a8 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,6 @@ require ( github.com/antlr/antlr4 v0.0.0-20181218183524-be58ebffde8e github.com/buildkite/go-buildkite v2.2.1-0.20190413010238-568b6651b687+incompatible github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 // indirect - github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b // indirect github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect github.com/dchest/cmac v0.0.0-20150527144652-62ff55a1048c github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333 @@ -17,8 +15,7 @@ require ( github.com/inconshreveable/log15 v0.0.0-20161013181240-944cbfb97b44 github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/kormat/fmt15 v0.0.0-20181112140556-ee69fecb2656 - github.com/lucas-clemente/quic-go v0.7.1-0.20190212114006-fd7246d7ed6e - github.com/marten-seemann/qtls v0.0.0-20190207043627-591c71538704 // indirect + github.com/lucas-clemente/quic-go v0.14.0 github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.8 github.com/mattn/go-sqlite3 v1.9.1-0.20180719091609-b3511bfdd742 @@ -41,10 +38,10 @@ require ( github.com/vishvananda/netlink v0.0.0-20170924180554-177f1ceba557 github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7 // indirect go.uber.org/atomic v1.5.1 // indirect - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 golang.org/x/net v0.0.0-20191105084925-a882066a44e0 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c - gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 + gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/restruct.v1 v1.0.0-20151213023948-80ede2e57cc2 gopkg.in/yaml.v2 v2.2.4 zombiezen.com/go/capnproto2 v0.0.0-20190813022230-ddfb9bb855fa diff --git a/go.sum b/go.sum index 5a3e8ee269..89ba3b5fd1 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY= +github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antlr/antlr4 v0.0.0-20181218183524-be58ebffde8e h1:yxMh4HIdsSh2EqxUESWvzszYMNzOugRyYCeohfwNULM= @@ -12,10 +14,8 @@ github.com/buildkite/go-buildkite v2.2.1-0.20190413010238-568b6651b687+incompati github.com/buildkite/go-buildkite v2.2.1-0.20190413010238-568b6651b687+incompatible/go.mod h1:WTV0aX5KnQ9ofsKMg2CLUBLJNsQ0RwOEKPhrXXZWPcE= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 h1:a1zrFsLFac2xoM6zG1u72DWJwZG3ayttYLfmLbxVETk= -github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= -github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b h1:pqwbJdj1rgMkE38tDSNnP97wdMYHzV+Lt/aLL2qw2LQ= -github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b/go.mod h1:o/DcCuWFr9jFzwO+c3y1hhwqKHHKfJ7HvLhWUwRnqfo= +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -31,9 +31,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333 h1:T7BbTPTeAnatnqlwwWt+77l0YF8UBKcWf1GEK5M9YQ8= github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333/go.mod h1:L3bP22mxdfCUHSUVMs+SPJMx55FrxQew7MSXT11Q86g= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -67,10 +69,13 @@ github.com/kormat/goconvey v0.0.0-20191113114839-63cc4eee0dbc/go.mod h1:syvi0/a8 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/lucas-clemente/quic-go v0.7.1-0.20190212114006-fd7246d7ed6e h1:Y07tY5Q2/7WwkwZHxYlQC4mQeD1kM6BQLk/6S64KHY4= -github.com/lucas-clemente/quic-go v0.7.1-0.20190212114006-fd7246d7ed6e/go.mod h1:wuD+2XqEx8G9jtwx5ou2BEYBsE+whgQmlj0Vz/77PrY= -github.com/marten-seemann/qtls v0.0.0-20190207043627-591c71538704 h1:7Fx1paF8onfPhcIMlwgznBklz62TrCZjOjoBbUod/3Y= -github.com/marten-seemann/qtls v0.0.0-20190207043627-591c71538704/go.mod h1:DWDPNN1eWKaT5wsnMz2LR336Zh9hlw/YSRXxqEukrT8= +github.com/lucas-clemente/quic-go v0.14.0 h1:xmWt9+sRgvAAXmi2S9lrikUtNUPwxeOy400LD+I3Qw0= +github.com/lucas-clemente/quic-go v0.14.0/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU= +github.com/marten-seemann/chacha20 v0.2.0 h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ= +github.com/marten-seemann/chacha20 v0.2.0/go.mod h1:HSdjFau7GzYRj+ahFNwsO3ouVJr1HFkWoEwNDb4TMtE= +github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= +github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gtbkks= +github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= @@ -85,8 +90,10 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= @@ -150,6 +157,8 @@ go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= +golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -157,7 +166,9 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191105084925-a882066a44e0 h1:QPlSTtPE2k6PZPasQUbzuK3p9JbS+vMXYVto8g/yrsg= @@ -171,8 +182,11 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd h1:DBH9mDw0zluJT/R+nGuV3jWFWLFaHyYZWD4tOT+cjn0= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -183,13 +197,14 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 h1:AFxeG48hTWHhDTQDk/m2gorfVHUEa9vo3tp3D7TzwjI= -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/restruct.v1 v1.0.0-20151213023948-80ede2e57cc2 h1:pqzOumCQ6icMR4sIIYRe2w7xCERvcPOFx22W9jSRsWg= gopkg.in/restruct.v1 v1.0.0-20151213023948-80ede2e57cc2/go.mod h1:WJaLhyHHEQFOgwIxu/SJxvUHJA18glYsMETBTMIySTY= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/go/examples/pingpong/pingpong.go b/go/examples/pingpong/pingpong.go index 7b89a7d4c7..da4cdeea52 100644 --- a/go/examples/pingpong/pingpong.go +++ b/go/examples/pingpong/pingpong.go @@ -246,7 +246,7 @@ func (c *client) run() { LogFatal("Unable to dial", "err", err) } - qstream, err := c.qsess.OpenStreamSync() + qstream, err := c.qsess.OpenStreamSync(context.Background()) if err != nil { LogFatal("quic OpenStream failed", "err", err) } @@ -372,7 +372,7 @@ func (s server) run() { } log.Info("Listening", "local", qsock.Addr()) for { - qsess, err := qsock.Accept() + qsess, err := qsock.Accept(context.Background()) if err != nil { log.Error("Unable to accept quic session", "err", err) // Accept failing means the socket is unusable. @@ -388,7 +388,8 @@ func (s server) run() { func (s server) handleClient(qsess quic.Session) { defer qsess.Close() - qstream, err := qsess.AcceptStream() + + qstream, err := qsess.AcceptStream(context.Background()) if err != nil { log.Error("Unable to accept quic stream", "err", err) return diff --git a/go/lib/infra/infraenv/infraenv.go b/go/lib/infra/infraenv/infraenv.go index b41dc32af0..3bf4c158c9 100644 --- a/go/lib/infra/infraenv/infraenv.go +++ b/go/lib/infra/infraenv/infraenv.go @@ -236,6 +236,7 @@ func (nc *NetworkConfig) buildQUICConfig(conn net.PacketConn) (*messenger.QUICCo TLSConfig: &tls.Config{ Certificates: []tls.Certificate{cert}, InsecureSkipVerify: true, + NextProtos: []string{"SCION"}, }, }, nil } diff --git a/go/lib/infra/rpc/rpc.go b/go/lib/infra/rpc/rpc.go index c41f6881b9..0a5817d7aa 100644 --- a/go/lib/infra/rpc/rpc.go +++ b/go/lib/infra/rpc/rpc.go @@ -63,7 +63,7 @@ func (s *Server) ListenAndServe() error { return err } for { - session, err := s.listener.Accept() + session, err := s.listener.Accept(context.Background()) if err != nil { if strings.Contains(err.Error(), "server closed") { return err @@ -105,7 +105,7 @@ func (s *Server) Close() error { } func (s *Server) handleQUICSession(session quic.Session) error { - stream, err := session.AcceptStream() + stream, err := session.AcceptStream(context.Background()) if err != nil { return err } diff --git a/go/lib/infra/rpc/rpc_test.go b/go/lib/infra/rpc/rpc_test.go index 683f681c74..8cad65d517 100644 --- a/go/lib/infra/rpc/rpc_test.go +++ b/go/lib/infra/rpc/rpc_test.go @@ -58,6 +58,7 @@ func TestServer(t *testing.T) { Certificates: []tls.Certificate{ MustLoadCertificate(defPemPath, defKeyPath), }, + NextProtos: []string{"SCION"}, }, Handler: &handler{t: t}, } @@ -106,8 +107,11 @@ func getCliSrv(t testing.TB, cliPort, srvPort int) (*Client, *Server, func()) { srvConn.Close() } client := &Client{ - Conn: cliConn, - TLSConfig: &tls.Config{InsecureSkipVerify: true}, + Conn: cliConn, + TLSConfig: &tls.Config{ + InsecureSkipVerify: true, + NextProtos: []string{"SCION"}, + }, } server := &Server{ Conn: srvConn, @@ -115,6 +119,7 @@ func getCliSrv(t testing.TB, cliPort, srvPort int) (*Client, *Server, func()) { Certificates: []tls.Certificate{ MustLoadCertificate(defPemPath, defKeyPath), }, + NextProtos: []string{"SCION"}, }, Handler: &handler{t: t}, } diff --git a/go/lib/snet/squic/squic.go b/go/lib/snet/squic/squic.go index 933900a616..55fc6c0faf 100644 --- a/go/lib/snet/squic/squic.go +++ b/go/lib/snet/squic/squic.go @@ -36,8 +36,8 @@ const ( var ( // Don't verify the server's cert, as we are not using the TLS PKI. - cliTlsCfg = &tls.Config{InsecureSkipVerify: true} - srvTlsCfg = &tls.Config{} + cliTlsCfg = &tls.Config{InsecureSkipVerify: true, NextProtos: []string{"SCION"}} + srvTlsCfg = &tls.Config{NextProtos: []string{"SCION"}} ) func Init(keyPath, pemPath string) error { diff --git a/go_deps.bzl b/go_deps.bzl index f16c67f37d..00512246c7 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -2,6 +2,12 @@ load("@bazel_gazelle//:deps.bzl", "go_repository") def go_deps(): + go_repository( + name = "com_github_alangpierce_go_forceexport", + importpath = "github.com/alangpierce/go-forceexport", + sum = "h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY=", + version = "v0.0.0-20160317203124-8f1d6941cd75", + ) go_repository( name = "com_github_alecthomas_template", importpath = "github.com/alecthomas/template", @@ -47,14 +53,8 @@ def go_deps(): go_repository( name = "com_github_cheekybits_genny", importpath = "github.com/cheekybits/genny", - sum = "h1:a1zrFsLFac2xoM6zG1u72DWJwZG3ayttYLfmLbxVETk=", - version = "v0.0.0-20170328200008-9127e812e1e9", - ) - go_repository( - name = "com_github_cloudflare_sidh", - importpath = "github.com/cloudflare/sidh", - sum = "h1:pqwbJdj1rgMkE38tDSNnP97wdMYHzV+Lt/aLL2qw2LQ=", - version = "v0.0.0-20181111220428-fc8e6378752b", + sum = "h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=", + version = "v1.0.0", ) go_repository( name = "com_github_codahale_hdrhistogram", @@ -215,14 +215,26 @@ def go_deps(): go_repository( name = "com_github_lucas_clemente_quic_go", importpath = "github.com/lucas-clemente/quic-go", - sum = "h1:Y07tY5Q2/7WwkwZHxYlQC4mQeD1kM6BQLk/6S64KHY4=", - version = "v0.7.1-0.20190212114006-fd7246d7ed6e", + sum = "h1:xmWt9+sRgvAAXmi2S9lrikUtNUPwxeOy400LD+I3Qw0=", + version = "v0.14.0", + ) + go_repository( + name = "com_github_marten_seemann_chacha20", + importpath = "github.com/marten-seemann/chacha20", + sum = "h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ=", + version = "v0.2.0", + ) + go_repository( + name = "com_github_marten_seemann_qpack", + importpath = "github.com/marten-seemann/qpack", + sum = "h1:/0M7lkda/6mus9B8u34Asqm8ZhHAAt9Ho0vniNuVSVg=", + version = "v0.1.0", ) go_repository( name = "com_github_marten_seemann_qtls", importpath = "github.com/marten-seemann/qtls", - sum = "h1:7Fx1paF8onfPhcIMlwgznBklz62TrCZjOjoBbUod/3Y=", - version = "v0.0.0-20190207043627-591c71538704", + sum = "h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gtbkks=", + version = "v0.4.1", ) go_repository( name = "com_github_mattn_go_colorable", @@ -450,8 +462,8 @@ def go_deps(): go_repository( name = "in_gopkg_natefinch_lumberjack_v2", importpath = "gopkg.in/natefinch/lumberjack.v2", - sum = "h1:AFxeG48hTWHhDTQDk/m2gorfVHUEa9vo3tp3D7TzwjI=", - version = "v2.0.0-20170531160350-a96e63847dc3", + sum = "h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=", + version = "v2.0.0", ) go_repository( name = "in_gopkg_restruct_v1", @@ -477,11 +489,17 @@ def go_deps(): sum = "h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=", version = "v1.4.0", ) + go_repository( + name = "org_golang_google_genproto", + importpath = "google.golang.org/genproto", + sum = "h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw=", + version = "v0.0.0-20180831171423-11092d34479b", + ) go_repository( name = "org_golang_x_crypto", importpath = "golang.org/x/crypto", - sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=", - version = "v0.0.0-20190308221718-c2843e01d9a2", + sum = "h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM=", + version = "v0.0.0-20190829043050-9756ffdc2472", ) go_repository( name = "org_golang_x_lint", @@ -504,8 +522,8 @@ def go_deps(): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0=", - version = "v0.0.0-20190801041406-cbf593c0f2f3", + sum = "h1:DBH9mDw0zluJT/R+nGuV3jWFWLFaHyYZWD4tOT+cjn0=", + version = "v0.0.0-20190904154756-749cb33beabd", ) go_repository( name = "org_golang_x_text", diff --git a/nogo.json b/nogo.json index 3e21379155..d32636eb4e 100644 --- a/nogo.json +++ b/nogo.json @@ -33,7 +33,9 @@ "exclude_files": { "gazelle/pathtools/path.go": "", "/com_github_antlr_antlr4/runtime/Go/antlr/": "", - "/com_github_uber_jaeger_client_go": "" + "/com_github_uber_jaeger_client_go": "", + "/com_github_marten_seemann_qtls": "", + "/com_github_hpcloud_tail": "" } }, "unsafeptr": { diff --git a/python/topology/supervisor.py b/python/topology/supervisor.py index 970586588e..b0cde35127 100755 --- a/python/topology/supervisor.py +++ b/python/topology/supervisor.py @@ -173,7 +173,7 @@ def _common_entry(self, name, cmd_args, elem_dir=None): entry = { 'autostart': 'false', 'autorestart': 'false', - 'environment': 'TZ=UTC', + 'environment': 'TZ=UTC,QUIC_GO_LOG_LEVEL=info', 'stdout_logfile': "NONE", 'stderr_logfile': "NONE", 'startretries': 0, diff --git a/tools/fetch.sh b/tools/fetch.sh index e2f8ae8c87..5e7f5da4c3 100755 --- a/tools/fetch.sh +++ b/tools/fetch.sh @@ -94,7 +94,8 @@ for q in $(bazel query "kind('go_repository rule', //external:*)" --noshow_progr -e "org_golang_google_appengine" \ -e "com_github_google_go_containerregistry" \ -e "com_github_onsi_ginkgo" \ - -e "com_github_onsi_gomega" + -e "com_github_onsi_gomega" \ + -e "org_golang_google_genproto" then continue fi