room sever skeleton
This commit is contained in:
Henry
parent
f325ed5cf3
commit
6b90c96a5d
|
|
@ -1,8 +1,8 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
// go-tunsrv hosts the database and p2p server for replication.
|
||||
// go-roomsrv hosts the database and p2p server for replication.
|
||||
// It supplies various flags to contol options.
|
||||
// See 'go-tunsrv -h' for a list and their usage.
|
||||
// See 'go-roomsrv -h' for a list and their usage.
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
@ -10,10 +10,12 @@ import (
|
|||
"encoding/base64"
|
||||
"flag"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
|
|
@ -24,6 +26,10 @@ import (
|
|||
kitlog "github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"github.com/pkg/errors"
|
||||
"go.cryptoscope.co/muxrpc/v2/debug"
|
||||
|
||||
"go.mindeco.de/ssb-rooms/roomsrv"
|
||||
mksrv "go.mindeco.de/ssb-rooms/roomsrv"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
@ -92,13 +98,13 @@ func initFlags() {
|
|||
if err != nil {
|
||||
panic(err) // logging not ready yet...
|
||||
}
|
||||
log = kitlog.NewJSONLogger(logFile)
|
||||
log = kitlog.NewJSONLogger(kitlog.NewSyncWriter(logFile))
|
||||
} else {
|
||||
log = kitlog.NewJSONLogger(os.Stderr)
|
||||
log = kitlog.NewLogfmtLogger(os.Stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func runtunsrv() error {
|
||||
func runroomsrv() error {
|
||||
// DEBUGGING
|
||||
// runtime.SetMutexProfileFraction(1)
|
||||
// runtime.SetBlockProfileRate(1)
|
||||
|
|
@ -118,28 +124,35 @@ func runtunsrv() error {
|
|||
return errors.Wrap(err, "application key")
|
||||
}
|
||||
|
||||
if !flagDisableUNIXSock {
|
||||
// opts = append(opts, mktunsrv.LateOption(mktunsrv.WithUNIXSocket()))
|
||||
opts := []roomsrv.Option{
|
||||
roomsrv.WithLogger(log),
|
||||
roomsrv.WithAppKey(ak),
|
||||
roomsrv.WithRepoPath(repoDir),
|
||||
roomsrv.WithListenAddr(listenAddr),
|
||||
}
|
||||
|
||||
// if dbgLogDir != "" {
|
||||
// opts = append(opts, mktunsrv.WithPostSecureConnWrapper(func(conn net.Conn) (net.Conn, error) {
|
||||
// parts := strings.Split(conn.RemoteAddr().String(), "|")
|
||||
if !flagDisableUNIXSock {
|
||||
opts = append(opts, roomsrv.WithUNIXSocket())
|
||||
}
|
||||
|
||||
// if len(parts) != 2 {
|
||||
// return conn, nil
|
||||
// }
|
||||
if logToFile != "" {
|
||||
opts = append(opts, roomsrv.WithPostSecureConnWrapper(func(conn net.Conn) (net.Conn, error) {
|
||||
parts := strings.Split(conn.RemoteAddr().String(), "|")
|
||||
|
||||
// muxrpcDumpDir := filepath.Join(
|
||||
// repoDir,
|
||||
// dbgLogDir,
|
||||
// parts[1], // key first
|
||||
// parts[0],
|
||||
// )
|
||||
if len(parts) != 2 {
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
// return debug.WrapDump(muxrpcDumpDir, conn)
|
||||
// }))
|
||||
// }
|
||||
muxrpcDumpDir := filepath.Join(
|
||||
repoDir,
|
||||
logToFile,
|
||||
parts[1], // key first
|
||||
parts[0],
|
||||
)
|
||||
|
||||
return debug.WrapDump(muxrpcDumpDir, conn)
|
||||
}))
|
||||
}
|
||||
|
||||
if debugAddr != "" {
|
||||
go func() {
|
||||
|
|
@ -150,7 +163,7 @@ func runtunsrv() error {
|
|||
}()
|
||||
}
|
||||
|
||||
tunsrv, err := makeTunnelServer.New(opts...)
|
||||
roomsrv, err := mksrv.New(opts...)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "failed to instantiate ssb server")
|
||||
}
|
||||
|
|
@ -161,28 +174,28 @@ func runtunsrv() error {
|
|||
sig := <-c
|
||||
level.Warn(log).Log("event", "killed", "msg", "received signal, shutting down", "signal", sig.String())
|
||||
cancel()
|
||||
tunsrv.Shutdown()
|
||||
roomsrv.Shutdown()
|
||||
time.Sleep(2 * time.Second)
|
||||
|
||||
err := tunsrv.Close()
|
||||
err := roomsrv.Close()
|
||||
checkAndLog(err)
|
||||
|
||||
time.Sleep(2 * time.Second)
|
||||
os.Exit(0)
|
||||
}()
|
||||
|
||||
level.Info(log).Log("event", "serving", "ID", id.Ref(), "addr", listenAddr, "version", Version, "build", Build)
|
||||
level.Info(log).Log("event", "serving", "ID", roomsrv.KeyPair.Feed.Ref(), "addr", listenAddr, "version", Version, "build", Build)
|
||||
for {
|
||||
// Note: This is where the serving starts ;)
|
||||
err = tunsrv.Network.Serve(ctx)
|
||||
err = roomsrv.Network.Serve(ctx)
|
||||
if err != nil {
|
||||
level.Warn(log).Log("event", "tunsrv node.Serve returned", "err", err)
|
||||
level.Warn(log).Log("event", "roomsrv node.Serve returned", "err", err)
|
||||
}
|
||||
|
||||
time.Sleep(1 * time.Second)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
err := tunsrv.Close()
|
||||
err := roomsrv.Close()
|
||||
return err
|
||||
default:
|
||||
}
|
||||
|
|
@ -190,7 +203,7 @@ func runtunsrv() error {
|
|||
}
|
||||
|
||||
func main() {
|
||||
if err := runtunsrv(); err != nil {
|
||||
if err := runroomsrv(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "go-ssb-tunnel: %s\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
|
|
|||
11
go.mod
11
go.mod
|
|
@ -1,15 +1,20 @@
|
|||
module go.mindeco.de/ssb-tunnel
|
||||
module go.mindeco.de/ssb-rooms
|
||||
|
||||
go 1.15
|
||||
|
||||
require (
|
||||
github.com/go-kit/kit v0.10.0
|
||||
github.com/gorilla/websocket v1.4.1
|
||||
github.com/keks/nocomment v0.0.0-20181007001506-30c6dcb4a472
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/stretchr/testify v1.6.1
|
||||
go.cryptoscope.co/muxrpc/v2 v2.0.0-20210118124540-d38ef6e0e8c7
|
||||
go.cryptoscope.co/netwrap v0.1.1
|
||||
go.cryptoscope.co/secretstream v1.2.2
|
||||
go.cryptoscope.co/ssb v0.0.0-20201207161753-31d0f24b7a79
|
||||
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870
|
||||
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
|
||||
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect
|
||||
)
|
||||
|
||||
// We need our internal/extra25519 since agl pulled his repo recently.
|
||||
|
|
@ -19,3 +24,5 @@ require (
|
|||
// Background: https://github.com/agl/ed25519/issues/27#issuecomment-591073699
|
||||
// The branch in use: https://github.com/cryptix/golang_x_crypto/tree/non-internal-edwards
|
||||
replace golang.org/x/crypto => github.com/cryptix/golang_x_crypto v0.0.0-20200924101112-886946aabeb8
|
||||
|
||||
replace go.cryptoscope.co/muxrpc/v2 => /home/cryptix/go-repos/muxrpc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,433 @@
|
|||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
github.com/AndreasBriese/bbloom v0.0.0-20170702084017-28f7e881ca57/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
|
||||
github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
|
||||
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
||||
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
|
||||
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
|
||||
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
|
||||
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
|
||||
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
||||
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
|
||||
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
|
||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
|
||||
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
|
||||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
||||
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
|
||||
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
|
||||
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
|
||||
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
|
||||
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
|
||||
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
|
||||
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
|
||||
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
|
||||
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
|
||||
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
||||
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
||||
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
|
||||
github.com/cryptix/go v1.3.1/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70=
|
||||
github.com/cryptix/go v1.3.2/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70=
|
||||
github.com/cryptix/go v1.4.0/go.mod h1:bopBFzjGB7Oqrsvt7HaPZSOX1gJW7hgIb84XNhnOhOY=
|
||||
github.com/cryptix/go v1.5.0 h1:2+g9oKxiTc5ELGISY2E4Q4E7X8FwP3cXyKbb93EUaZY=
|
||||
github.com/cryptix/go v1.5.0/go.mod h1:bopBFzjGB7Oqrsvt7HaPZSOX1gJW7hgIb84XNhnOhOY=
|
||||
github.com/cryptix/golang_x_crypto v0.0.0-20200924101112-886946aabeb8 h1:eJ+NZ2KeNYBPYvshzkPxxKvaWM+h0CgpDyJw0aa6W1Y=
|
||||
github.com/cryptix/golang_x_crypto v0.0.0-20200924101112-886946aabeb8/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgraph-io/badger v1.3.0/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
|
||||
github.com/dgraph-io/badger v1.5.3/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
|
||||
github.com/dgraph-io/badger v1.5.4/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
|
||||
github.com/dgraph-io/badger v2.0.0-rc2+incompatible/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
|
||||
github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
|
||||
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
|
||||
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
|
||||
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
|
||||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
|
||||
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
|
||||
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
|
||||
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/go-kit/kit v0.6.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo=
|
||||
github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
|
||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
|
||||
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
|
||||
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
|
||||
github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
||||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
||||
github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
|
||||
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
|
||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
|
||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
|
||||
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
|
||||
github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
|
||||
github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
|
||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
|
||||
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
|
||||
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
|
||||
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
|
||||
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
|
||||
github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
|
||||
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
|
||||
github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
|
||||
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
|
||||
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
|
||||
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
||||
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
||||
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
|
||||
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
|
||||
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
|
||||
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
|
||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
||||
github.com/karrick/bufpool v1.2.0 h1:AfhYmVv8A62iOzB31RuJrGLTdHlvBbl0+rh8Gvgvybg=
|
||||
github.com/karrick/bufpool v1.2.0/go.mod h1:ZRBxSXJi05b7mfd7kcL1M86UL1x8dTValcwCQp7I7P8=
|
||||
github.com/karrick/gopool v1.1.0/go.mod h1:Llf0mwk3WWtY0AIQoodGWVOU+5xfvUWqJKvck2qNwBU=
|
||||
github.com/karrick/gopool v1.2.2 h1:YcxpjUxiwimrsvxLlIdrMcPPH2mlgLa4XD5z5q90M9U=
|
||||
github.com/karrick/gopool v1.2.2/go.mod h1:5Fng5/Z1F8x09k7QiokCmFB96DKrLra/oub/tKb6mGA=
|
||||
github.com/keks/nocomment v0.0.0-20181007001506-30c6dcb4a472 h1:6nrO82kszcc+rcKPCJGgCj5ACTdmq6aNGav8zE5oYm0=
|
||||
github.com/keks/nocomment v0.0.0-20181007001506-30c6dcb4a472/go.mod h1:oLLUlGld/axGHThR36o8bADQUHG+TKSUdoKqCvnoQB4=
|
||||
github.com/keks/persist v0.0.0-20180731151133-9546f7b3f97e/go.mod h1:KMIOJFEE+0E/mYfYExA9vOpCFDz4TQfzk6mCOtCXR9k=
|
||||
github.com/keks/persist v0.0.0-20181029214439-3af502dad70b/go.mod h1:KMIOJFEE+0E/mYfYExA9vOpCFDz4TQfzk6mCOtCXR9k=
|
||||
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
|
||||
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
|
||||
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
|
||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
||||
github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0/go.mod h1:P6fDJzlxN+cWYR09KbE9/ta+Y6JofX9tAUhJpWkWPaM=
|
||||
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
|
||||
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
|
||||
github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
|
||||
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
|
||||
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
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/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
|
||||
github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
|
||||
github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
|
||||
github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
|
||||
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
|
||||
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
|
||||
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
||||
github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
|
||||
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
|
||||
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
|
||||
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/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
|
||||
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
|
||||
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
|
||||
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||
github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
|
||||
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
|
||||
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
|
||||
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190524125616-8c0b41497736/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0=
|
||||
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
|
||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
|
||||
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
|
||||
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
|
||||
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
|
||||
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
|
||||
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
|
||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
|
||||
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
|
||||
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
|
||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
|
||||
github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||
github.com/shurcooL/go v0.0.0-20190121191506-3fef8c783dec/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||
github.com/shurcooL/go v0.0.0-20190330031554-6713ea532688/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||
github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
|
||||
github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
||||
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
|
||||
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
|
||||
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
|
||||
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
||||
github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
|
||||
github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
|
||||
github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
|
||||
github.com/ugorji/go/codec v0.0.0-20190126102652-8fd0f8d918c8/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA=
|
||||
github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
|
||||
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
|
||||
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||
go.cryptoscope.co/librarian v0.1.0/go.mod h1:dbua5pc7Vq/M0W5CJa/AJYdwlDRlgo2FKrB5tEm2NLc=
|
||||
go.cryptoscope.co/librarian v0.1.1/go.mod h1:cL2xGx4N+lZe6nbBS7vKPyy/rGn0uY2+hP/TwQf6+IM=
|
||||
go.cryptoscope.co/librarian v0.1.2/go.mod h1:U15yqN7eap9RDGqd/wlFUWoGWplXWn3VI3MGStrI3tA=
|
||||
go.cryptoscope.co/luigi v0.0.1/go.mod h1:bdU2SNXp28+MnejXrdgtWyLBd10ODLY5ZHzWSjewS04=
|
||||
go.cryptoscope.co/luigi v0.3.0/go.mod h1:RFlNZMl3Ckc4jIPrLBn3WGwSgpzb0lGDIoGsmBSqEDY=
|
||||
go.cryptoscope.co/luigi v0.3.2/go.mod h1:sKanbHitI0dybhcgijJzqQmKbIT1zu6uwzeobLUnvks=
|
||||
go.cryptoscope.co/luigi v0.3.3/go.mod h1:sKanbHitI0dybhcgijJzqQmKbIT1zu6uwzeobLUnvks=
|
||||
go.cryptoscope.co/luigi v0.3.5 h1:6rrNciUqbuwphT7hIjFd8eVRP3IatDX6HxdHs/Qo+Zw=
|
||||
go.cryptoscope.co/luigi v0.3.5/go.mod h1:vJZOaxKWLWTC5oRWBOGVVW9X+o6nikLZSYUF9bvPd2w=
|
||||
go.cryptoscope.co/margaret v0.0.2/go.mod h1:YyxmwJ16ip+JnH4/M1ANyr8khrC9OnaDH3eOpR14o0M=
|
||||
go.cryptoscope.co/margaret v0.0.5/go.mod h1:W+Q6lvzHIrF8+Yt3dItHHsx2R9/Xvj/NkJGM8QLM2l4=
|
||||
go.cryptoscope.co/margaret v0.0.8/go.mod h1:VbP0bqavqW5osTmdNvgukrqtmqvZC5sXyPSBUW5rzv8=
|
||||
go.cryptoscope.co/margaret v0.0.12-0.20190912103626-34323ad497f4 h1:gLSldWRujtUOfdnpA1XKD71xcCp3Wz1URMnT6xpUPV4=
|
||||
go.cryptoscope.co/margaret v0.0.12-0.20190912103626-34323ad497f4/go.mod h1:3rt+RmZTFZEgfvFxz0ZPDBIWtLJOouWtzV6YbBl6sek=
|
||||
go.cryptoscope.co/netwrap v0.1.0/go.mod h1:7zcYswCa4CT+ct54e9uH9+IIbYYETEMHKDNpzl8Ukew=
|
||||
go.cryptoscope.co/netwrap v0.1.1 h1:JLzzGKEvrUrkKzu3iM0DhpHmt+L/gYqmpcf1lJMUyFs=
|
||||
go.cryptoscope.co/netwrap v0.1.1/go.mod h1:7zcYswCa4CT+ct54e9uH9+IIbYYETEMHKDNpzl8Ukew=
|
||||
go.cryptoscope.co/secretstream v1.2.2 h1:kPxsgWrTDFyS9ZklcD0si1KGljPLz6mmPKnFQjGepMc=
|
||||
go.cryptoscope.co/secretstream v1.2.2/go.mod h1:7nRGZ7fTqSgQAnv2Y4m8xQsS3MFxvB7I0C19reUNlXg=
|
||||
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
|
||||
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870 h1:TCI3AefMAaOYECvppn30+CfEB0Fn8IES1SKvvacc3/c=
|
||||
go.mindeco.de/ssb-refs v0.1.1-0.20210108133850-cf1f44fea870/go.mod h1:OnBnV02ux4lLsZ39LID6yYLqSDp+dqTHb/3miYPkQFs=
|
||||
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
|
||||
go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
|
||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
|
||||
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
|
||||
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
|
||||
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
|
||||
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
|
||||
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180406214816-61147c48b25b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/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-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-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-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
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-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180406135729-3b87a42e500a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190507053917-2953c62de483/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191007154456-ef33b2fb2c41/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
|
||||
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
|
||||
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
|
||||
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
||||
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
|
||||
|
|
@ -19,8 +19,9 @@ import (
|
|||
|
||||
var SecretPerms = os.FileMode(0600)
|
||||
|
||||
// KeyPair contains a seret handshake keypair and the assosicated feed
|
||||
type KeyPair struct {
|
||||
Id *refs.FeedRef
|
||||
Feed *refs.FeedRef
|
||||
Pair secrethandshake.EdKeyPair
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ func NewKeyPair(r io.Reader) (*KeyPair, error) {
|
|||
}
|
||||
|
||||
keyPair := KeyPair{
|
||||
Id: &refs.FeedRef{ID: kp.Public[:], Algo: refs.RefAlgoFeedSSB1},
|
||||
Feed: &refs.FeedRef{ID: kp.Public[:], Algo: refs.RefAlgoFeedSSB1},
|
||||
Pair: *kp,
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +62,7 @@ func NewKeyPair(r io.Reader) (*KeyPair, error) {
|
|||
// SaveKeyPair serializes the passed KeyPair to path.
|
||||
// It errors if path already exists.
|
||||
func SaveKeyPair(kp *KeyPair, path string) error {
|
||||
if err := IsValidFeedFormat(kp.Id); err != nil {
|
||||
if err := IsValidFeedFormat(kp.Feed); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
|
|
@ -91,7 +92,7 @@ func SaveKeyPair(kp *KeyPair, path string) error {
|
|||
func EncodeKeyPairAsJSON(kp *KeyPair, w io.Writer) error {
|
||||
var sec = ssbSecret{
|
||||
Curve: "ed25519",
|
||||
ID: kp.Id,
|
||||
ID: kp.Feed,
|
||||
Private: base64.StdEncoding.EncodeToString(kp.Pair.Secret[:]) + ".ed25519",
|
||||
Public: base64.StdEncoding.EncodeToString(kp.Pair.Public[:]) + ".ed25519",
|
||||
}
|
||||
|
|
@ -154,7 +155,7 @@ func ParseKeyPair(r io.Reader) (*KeyPair, error) {
|
|||
}
|
||||
|
||||
ssbkp := KeyPair{
|
||||
Id: s.ID,
|
||||
Feed: s.ID,
|
||||
Pair: *pair,
|
||||
}
|
||||
return &ssbkp, nil
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package multicloser
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type Closer struct {
|
||||
cs []io.Closer
|
||||
l sync.Mutex
|
||||
}
|
||||
|
||||
func (mc *Closer) Add(c io.Closer) {
|
||||
mc.l.Lock()
|
||||
defer mc.l.Unlock()
|
||||
|
||||
mc.cs = append(mc.cs, c)
|
||||
}
|
||||
|
||||
var _ io.Closer = (*Closer)(nil)
|
||||
|
||||
func (mc *Closer) Close() error {
|
||||
mc.l.Lock()
|
||||
defer mc.l.Unlock()
|
||||
|
||||
var (
|
||||
hasErrs bool
|
||||
errs []error
|
||||
)
|
||||
|
||||
for i, c := range mc.cs {
|
||||
if cerr := c.Close(); cerr != nil {
|
||||
cerr = fmt.Errorf("Closer: c%d failed: %w", i, cerr)
|
||||
errs = append(errs, cerr)
|
||||
hasErrs = true
|
||||
}
|
||||
}
|
||||
|
||||
if !hasErrs {
|
||||
return nil
|
||||
}
|
||||
|
||||
return errList{errs: errs}
|
||||
}
|
||||
|
||||
type errList struct {
|
||||
errs []error
|
||||
}
|
||||
|
||||
func (el errList) Error() string {
|
||||
var str strings.Builder
|
||||
|
||||
if n := len(el.errs); n > 0 {
|
||||
fmt.Fprintf(&str, "multiple errors(%d): ", n)
|
||||
}
|
||||
for i, err := range el.errs {
|
||||
fmt.Fprintf(&str, "(%d): ", i)
|
||||
str.WriteString(err.Error() + " - ")
|
||||
}
|
||||
|
||||
return str.String()
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
package testutils
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"github.com/go-kit/kit/log/term"
|
||||
)
|
||||
|
||||
func NewRelativeTimeLogger(w io.Writer) log.Logger {
|
||||
if w == nil {
|
||||
w = os.Stderr
|
||||
}
|
||||
|
||||
var rtl relTimeLogger
|
||||
rtl.start = time.Now()
|
||||
|
||||
// mainLog := log.NewLogfmtLogger(w)
|
||||
mainLog := term.NewColorLogger(w, log.NewLogfmtLogger, colorFn)
|
||||
return log.With(mainLog, "t", log.Valuer(rtl.diffTime))
|
||||
}
|
||||
|
||||
func colorFn(keyvals ...interface{}) term.FgBgColor {
|
||||
for i := 0; i < len(keyvals); i += 2 {
|
||||
if key, ok := keyvals[i].(string); ok && key == "level" {
|
||||
lvl, ok := keyvals[i+1].(level.Value)
|
||||
if !ok {
|
||||
fmt.Printf("%d: %v %T\n", i+1, lvl, keyvals[i+1])
|
||||
continue
|
||||
}
|
||||
|
||||
var c term.FgBgColor
|
||||
level := lvl.String()
|
||||
switch level {
|
||||
case "error":
|
||||
c.Fg = term.Red
|
||||
case "warn":
|
||||
c.Fg = term.Brown
|
||||
case "debug":
|
||||
c.Fg = term.Gray
|
||||
case "info":
|
||||
c.Fg = term.Green
|
||||
default:
|
||||
panic("unhandled level:" + level)
|
||||
}
|
||||
return c
|
||||
}
|
||||
}
|
||||
return term.FgBgColor{}
|
||||
}
|
||||
|
||||
type relTimeLogger struct {
|
||||
sync.Mutex
|
||||
|
||||
start time.Time
|
||||
}
|
||||
|
||||
func (rtl *relTimeLogger) diffTime() interface{} {
|
||||
rtl.Lock()
|
||||
defer rtl.Unlock()
|
||||
newStart := time.Now()
|
||||
since := newStart.Sub(rtl.start)
|
||||
return since
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package testutils
|
||||
|
||||
import (
|
||||
"sync"
|
||||
)
|
||||
|
||||
// MergeErrorChans is a simple Fan-In for async errors
|
||||
// TODO: should be replaced with x/sync/errgroup
|
||||
func MergeErrorChans(cs ...<-chan error) <-chan error {
|
||||
var wg sync.WaitGroup
|
||||
out := make(chan error, 1)
|
||||
|
||||
output := func(c <-chan error) {
|
||||
for a := range c {
|
||||
out <- a
|
||||
}
|
||||
wg.Done()
|
||||
}
|
||||
|
||||
wg.Add(len(cs))
|
||||
for _, c := range cs {
|
||||
go output(c)
|
||||
}
|
||||
|
||||
go func() {
|
||||
wg.Wait()
|
||||
close(out)
|
||||
}()
|
||||
return out
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
package maybemuxrpc
|
||||
|
||||
import (
|
||||
"net"
|
||||
"sync"
|
||||
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
)
|
||||
|
||||
type Authorizer interface {
|
||||
Authorize(net.Conn) bool
|
||||
}
|
||||
|
||||
type Plugin interface {
|
||||
// Name returns the name and version of the plugin.
|
||||
// format: name-1.0.2
|
||||
Name() string
|
||||
|
||||
// Method returns the preferred method of the call
|
||||
Method() muxrpc.Method
|
||||
|
||||
// Handler returns the muxrpc handler for the plugin
|
||||
Handler() muxrpc.Handler
|
||||
|
||||
Authorizer
|
||||
}
|
||||
|
||||
type PluginManager interface {
|
||||
Register(Plugin)
|
||||
MakeHandler(conn net.Conn) (muxrpc.Handler, error)
|
||||
}
|
||||
|
||||
type pluginManager struct {
|
||||
regLock sync.Mutex // protects the map
|
||||
plugins map[string]Plugin
|
||||
}
|
||||
|
||||
func NewPluginManager() PluginManager {
|
||||
return &pluginManager{
|
||||
plugins: make(map[string]Plugin),
|
||||
}
|
||||
}
|
||||
|
||||
func (pmgr *pluginManager) Register(p Plugin) {
|
||||
// access race
|
||||
pmgr.regLock.Lock()
|
||||
defer pmgr.regLock.Unlock()
|
||||
pmgr.plugins[p.Method().String()] = p
|
||||
}
|
||||
|
||||
func (pmgr *pluginManager) MakeHandler(conn net.Conn) (muxrpc.Handler, error) {
|
||||
|
||||
pmgr.regLock.Lock()
|
||||
defer pmgr.regLock.Unlock()
|
||||
|
||||
h := muxrpc.HandlerMux{}
|
||||
|
||||
for _, p := range pmgr.plugins {
|
||||
if !p.Authorize(conn) {
|
||||
continue
|
||||
}
|
||||
|
||||
h.Register(p.Method(), p.Handler())
|
||||
}
|
||||
|
||||
return &h, nil
|
||||
}
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package network
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"net"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"go.cryptoscope.co/netwrap"
|
||||
"go.cryptoscope.co/secretstream"
|
||||
)
|
||||
|
||||
type connEntry struct {
|
||||
c net.Conn
|
||||
started time.Time
|
||||
done chan struct{}
|
||||
cancel context.CancelFunc
|
||||
}
|
||||
|
||||
type connLookupMap map[[32]byte]connEntry
|
||||
|
||||
func toActive(a net.Addr) [32]byte {
|
||||
var pk [32]byte
|
||||
shs, ok := netwrap.GetAddr(a, "shs-bs").(secretstream.Addr)
|
||||
if !ok {
|
||||
panic("not an SHS connection")
|
||||
}
|
||||
copy(pk[:], shs.PubKey)
|
||||
return pk
|
||||
}
|
||||
|
||||
func NewConnTracker() ConnTracker {
|
||||
return &connTracker{active: make(connLookupMap)}
|
||||
}
|
||||
|
||||
// tracks open connections and refuses to established pubkeys
|
||||
type connTracker struct {
|
||||
activeLock sync.Mutex
|
||||
active connLookupMap
|
||||
}
|
||||
|
||||
func (ct *connTracker) CloseAll() {
|
||||
ct.activeLock.Lock()
|
||||
defer ct.activeLock.Unlock()
|
||||
for k, c := range ct.active {
|
||||
if err := c.c.Close(); err != nil {
|
||||
log.Printf("failed to close %x: %v\n", k[:5], err)
|
||||
}
|
||||
c.cancel()
|
||||
// seems nice but we are holding the lock
|
||||
// <-c.done
|
||||
// delete(ct.active, k)
|
||||
// we must _trust_ the connection is hooked up to OnClose to remove it's entry
|
||||
}
|
||||
}
|
||||
|
||||
func (ct *connTracker) Count() uint {
|
||||
ct.activeLock.Lock()
|
||||
defer ct.activeLock.Unlock()
|
||||
return uint(len(ct.active))
|
||||
}
|
||||
|
||||
func (ct *connTracker) Active(a net.Addr) (bool, time.Duration) {
|
||||
ct.activeLock.Lock()
|
||||
defer ct.activeLock.Unlock()
|
||||
k := toActive(a)
|
||||
l, ok := ct.active[k]
|
||||
if !ok {
|
||||
return false, 0
|
||||
}
|
||||
return true, time.Since(l.started)
|
||||
}
|
||||
|
||||
func (ct *connTracker) OnAccept(ctx context.Context, conn net.Conn) (bool, context.Context) {
|
||||
ct.activeLock.Lock()
|
||||
defer ct.activeLock.Unlock()
|
||||
k := toActive(conn.RemoteAddr())
|
||||
_, ok := ct.active[k]
|
||||
if ok {
|
||||
return false, nil
|
||||
}
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
ct.active[k] = connEntry{
|
||||
c: conn,
|
||||
started: time.Now(),
|
||||
done: make(chan struct{}),
|
||||
cancel: cancel,
|
||||
}
|
||||
return true, ctx
|
||||
}
|
||||
|
||||
func (ct *connTracker) OnClose(conn net.Conn) time.Duration {
|
||||
ct.activeLock.Lock()
|
||||
defer ct.activeLock.Unlock()
|
||||
|
||||
k := toActive(conn.RemoteAddr())
|
||||
who, ok := ct.active[k]
|
||||
if !ok {
|
||||
return 0
|
||||
}
|
||||
close(who.done)
|
||||
delete(ct.active, k)
|
||||
return time.Since(who.started)
|
||||
}
|
||||
|
||||
// NewLastWinsTracker returns a conntracker that just kills the previous connection and let's the new one in.
|
||||
func NewLastWinsTracker() ConnTracker {
|
||||
return &trackerLastWins{connTracker{active: make(connLookupMap)}}
|
||||
}
|
||||
|
||||
type trackerLastWins struct {
|
||||
connTracker
|
||||
}
|
||||
|
||||
func (ct *trackerLastWins) OnAccept(ctx context.Context, newConn net.Conn) (bool, context.Context) {
|
||||
ct.activeLock.Lock()
|
||||
k := toActive(newConn.RemoteAddr())
|
||||
oldConn, ok := ct.active[k]
|
||||
ct.activeLock.Unlock()
|
||||
if ok {
|
||||
oldConn.c.Close()
|
||||
oldConn.cancel()
|
||||
select {
|
||||
case <-oldConn.done:
|
||||
// cleaned up after itself
|
||||
case <-time.After(10 * time.Second):
|
||||
log.Println("[ConnTracker/lastWins] warning: not accepted, would ghost connection:", oldConn.c.RemoteAddr().String(), time.Since(oldConn.started))
|
||||
return false, nil
|
||||
}
|
||||
}
|
||||
ct.activeLock.Lock()
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
ct.active[k] = connEntry{
|
||||
c: newConn,
|
||||
started: time.Now(),
|
||||
done: make(chan struct{}),
|
||||
cancel: cancel,
|
||||
}
|
||||
ct.activeLock.Unlock()
|
||||
return true, ctx
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
package network
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// This just keeps a count and doesn't actually track anything
|
||||
func NewAcceptAllTracker() ConnTracker {
|
||||
return &acceptAllTracker{}
|
||||
}
|
||||
|
||||
type acceptAllTracker struct {
|
||||
countLock sync.Mutex
|
||||
conns []net.Conn
|
||||
}
|
||||
|
||||
func (ct *acceptAllTracker) CloseAll() {
|
||||
ct.countLock.Lock()
|
||||
defer ct.countLock.Unlock()
|
||||
for _, c := range ct.conns {
|
||||
c.Close()
|
||||
}
|
||||
ct.conns = []net.Conn{}
|
||||
}
|
||||
|
||||
func (ct *acceptAllTracker) Count() uint {
|
||||
ct.countLock.Lock()
|
||||
defer ct.countLock.Unlock()
|
||||
return uint(len(ct.conns))
|
||||
}
|
||||
|
||||
func (ct *acceptAllTracker) Active(a net.Addr) (bool, time.Duration) {
|
||||
ct.countLock.Lock()
|
||||
defer ct.countLock.Unlock()
|
||||
for _, c := range ct.conns {
|
||||
if sameByRemote(c, a) {
|
||||
return true, 0
|
||||
}
|
||||
}
|
||||
return false, 0
|
||||
}
|
||||
|
||||
func (ct *acceptAllTracker) OnAccept(ctx context.Context, conn net.Conn) (bool, context.Context) {
|
||||
ct.countLock.Lock()
|
||||
defer ct.countLock.Unlock()
|
||||
ct.conns = append(ct.conns, conn)
|
||||
return true, ctx
|
||||
}
|
||||
|
||||
func (ct *acceptAllTracker) OnClose(conn net.Conn) time.Duration {
|
||||
ct.countLock.Lock()
|
||||
defer ct.countLock.Unlock()
|
||||
for i, c := range ct.conns {
|
||||
|
||||
if sameByRemote(c, conn.RemoteAddr()) {
|
||||
// remove from array, replace style
|
||||
ct.conns[i] = ct.conns[len(ct.conns)-1]
|
||||
ct.conns[len(ct.conns)-1] = nil
|
||||
ct.conns = ct.conns[:len(ct.conns)-1]
|
||||
return 1
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
func sameByRemote(a net.Conn, b net.Addr) bool {
|
||||
return a.RemoteAddr().String() == b.String()
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
package network
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"os"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
func isConnBrokenErr(err error) bool {
|
||||
netErr := new(net.OpError)
|
||||
if errors.As(err, &netErr) {
|
||||
var sysCallErr = new(os.SyscallError)
|
||||
if errors.As(netErr.Err, &sysCallErr) {
|
||||
action := sysCallErr.Unwrap()
|
||||
if action == syscall.ECONNRESET || action == syscall.EPIPE {
|
||||
return true
|
||||
}
|
||||
}
|
||||
if netErr.Err.Error() == "use of closed network connection" {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
package network
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
"go.cryptoscope.co/netwrap"
|
||||
"go.cryptoscope.co/secretstream"
|
||||
refs "go.mindeco.de/ssb-refs"
|
||||
)
|
||||
|
||||
// EndpointStat gives some information about a connected peer
|
||||
type EndpointStat struct {
|
||||
ID *refs.FeedRef
|
||||
Addr net.Addr
|
||||
Since time.Duration
|
||||
Endpoint muxrpc.Endpoint
|
||||
}
|
||||
|
||||
type Network interface {
|
||||
Connect(ctx context.Context, addr net.Addr) error
|
||||
Serve(context.Context, ...muxrpc.HandlerWrapper) error
|
||||
GetListenAddr() net.Addr
|
||||
|
||||
GetAllEndpoints() []EndpointStat
|
||||
GetEndpointFor(*refs.FeedRef) (muxrpc.Endpoint, bool)
|
||||
|
||||
GetConnTracker() ConnTracker
|
||||
|
||||
// websock hack
|
||||
HandleHTTP(handler http.Handler)
|
||||
|
||||
io.Closer
|
||||
}
|
||||
|
||||
// ConnTracker decides if connections should be established and keeps track of them
|
||||
type ConnTracker interface {
|
||||
// Active returns true and since when a peer connection is active
|
||||
Active(net.Addr) (bool, time.Duration)
|
||||
|
||||
// OnAccept receives a new connection as an argument.
|
||||
// If it decides to accept it, it returns true and a context that will be canceled once it should shut down
|
||||
// If it decides to deny it, it returns false (and a nil context)
|
||||
OnAccept(context.Context, net.Conn) (bool, context.Context)
|
||||
|
||||
// OnClose notifies the tracker that a connection was closed
|
||||
OnClose(conn net.Conn) time.Duration
|
||||
|
||||
// Count returns the number of open connections
|
||||
Count() uint
|
||||
|
||||
// CloseAll closes all tracked connections
|
||||
CloseAll()
|
||||
}
|
||||
|
||||
// GetFeedRefFromAddr uses netwrap to get the secretstream address and then uses ParseFeedRef
|
||||
func GetFeedRefFromAddr(addr net.Addr) (*refs.FeedRef, error) {
|
||||
addr = netwrap.GetAddr(addr, secretstream.NetworkString)
|
||||
if addr == nil {
|
||||
return nil, errors.New("no shs-bs address found")
|
||||
}
|
||||
ssAddr := addr.(secretstream.Addr)
|
||||
return refs.ParseFeedRef(ssAddr.String())
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package network_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"net"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/go-kit/kit/log"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
"go.mindeco.de/ssb-rooms/internal/network"
|
||||
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestIsServer(t *testing.T) {
|
||||
r := require.New(t)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
var appkey = make([]byte, 32)
|
||||
rand.Read(appkey)
|
||||
|
||||
logger := log.NewLogfmtLogger(os.Stderr)
|
||||
|
||||
kpClient, err := keys.NewKeyPair(nil)
|
||||
r.NoError(err)
|
||||
|
||||
kpServ, err := keys.NewKeyPair(nil)
|
||||
r.NoError(err)
|
||||
|
||||
client, err := network.New(network.Options{
|
||||
Logger: logger,
|
||||
AppKey: appkey,
|
||||
KeyPair: kpClient,
|
||||
|
||||
MakeHandler: makeServerHandler(t, true),
|
||||
})
|
||||
r.NoError(err)
|
||||
|
||||
server, err := network.New(network.Options{
|
||||
Logger: logger,
|
||||
AppKey: appkey,
|
||||
KeyPair: kpServ,
|
||||
|
||||
ListenAddr: &net.TCPAddr{Port: 0}, // any random port
|
||||
|
||||
MakeHandler: makeServerHandler(t, false),
|
||||
})
|
||||
r.NoError(err)
|
||||
|
||||
go func() {
|
||||
err = server.Serve(ctx)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}()
|
||||
|
||||
err = client.Connect(ctx, server.GetListenAddr())
|
||||
r.NoError(err)
|
||||
|
||||
client.Close()
|
||||
server.Close()
|
||||
}
|
||||
|
||||
type testHandler struct {
|
||||
t *testing.T
|
||||
wantServer bool
|
||||
}
|
||||
|
||||
func (th testHandler) HandleConnect(ctx context.Context, e muxrpc.Endpoint) {
|
||||
require.Equal(th.t, th.wantServer, muxrpc.IsServer(e), "server assertion failed")
|
||||
}
|
||||
|
||||
func (th testHandler) HandleCall(ctx context.Context, req *muxrpc.Request, edp muxrpc.Endpoint) {
|
||||
}
|
||||
|
||||
func makeServerHandler(t *testing.T, wantServer bool) func(net.Conn) (muxrpc.Handler, error) {
|
||||
return func(_ net.Conn) (muxrpc.Handler, error) {
|
||||
return testHandler{t, wantServer}, nil
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,442 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package network
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/ed25519"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
"go.cryptoscope.co/netwrap"
|
||||
"go.cryptoscope.co/secretstream"
|
||||
|
||||
refs "go.mindeco.de/ssb-refs"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
)
|
||||
|
||||
// DefaultPort is the default listening port for ScuttleButt.
|
||||
const DefaultPort = 8008
|
||||
|
||||
type Options struct {
|
||||
Logger log.Logger
|
||||
|
||||
Dialer netwrap.Dialer
|
||||
ListenAddr net.Addr
|
||||
|
||||
KeyPair *keys.KeyPair
|
||||
AppKey []byte
|
||||
MakeHandler func(net.Conn) (muxrpc.Handler, error)
|
||||
|
||||
ConnTracker ConnTracker
|
||||
|
||||
// PreSecureWrappers are applied before the shs+boxstream wrapping takes place
|
||||
// usefull for accessing the sycall.Conn to apply control options on the socket
|
||||
BefreCryptoWrappers []netwrap.ConnWrapper
|
||||
|
||||
// AfterSecureWrappers are applied afterwards, usefull to debug muxrpc content
|
||||
AfterSecureWrappers []netwrap.ConnWrapper
|
||||
|
||||
WebsocketAddr string
|
||||
}
|
||||
|
||||
type node struct {
|
||||
opts Options
|
||||
|
||||
log log.Logger
|
||||
|
||||
listening chan struct{}
|
||||
|
||||
listenerLock sync.Mutex
|
||||
lisClose sync.Once
|
||||
lis net.Listener
|
||||
|
||||
dialer netwrap.Dialer
|
||||
secretServer *secretstream.Server
|
||||
secretClient *secretstream.Client
|
||||
connTracker ConnTracker
|
||||
|
||||
beforeCryptoConnWrappers []netwrap.ConnWrapper
|
||||
afterSecureConnWrappers []netwrap.ConnWrapper
|
||||
|
||||
remotesLock sync.Mutex
|
||||
remotes map[string]muxrpc.Endpoint
|
||||
|
||||
// "ssb-ws"
|
||||
httpLis net.Listener
|
||||
httpHandler http.Handler
|
||||
}
|
||||
|
||||
func New(opts Options) (Network, error) {
|
||||
n := &node{
|
||||
opts: opts,
|
||||
remotes: make(map[string]muxrpc.Endpoint),
|
||||
}
|
||||
|
||||
if opts.ConnTracker == nil {
|
||||
opts.ConnTracker = NewLastWinsTracker()
|
||||
}
|
||||
n.connTracker = opts.ConnTracker
|
||||
|
||||
var err error
|
||||
|
||||
if opts.Dialer != nil {
|
||||
n.dialer = opts.Dialer
|
||||
} else {
|
||||
n.dialer = netwrap.Dial
|
||||
}
|
||||
|
||||
n.secretClient, err = secretstream.NewClient(opts.KeyPair.Pair, opts.AppKey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error creating secretstream.Client: %w", err)
|
||||
}
|
||||
|
||||
n.secretServer, err = secretstream.NewServer(opts.KeyPair.Pair, opts.AppKey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error creating secretstream.Server: %w", err)
|
||||
}
|
||||
|
||||
n.beforeCryptoConnWrappers = opts.BefreCryptoWrappers
|
||||
n.afterSecureConnWrappers = opts.AfterSecureWrappers
|
||||
|
||||
n.listening = make(chan struct{})
|
||||
|
||||
n.log = opts.Logger
|
||||
|
||||
// local websocket
|
||||
wsHandler := websockHandler(n)
|
||||
httpHandler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||
url := req.URL.String()
|
||||
if url == "/" {
|
||||
wsHandler(w, req)
|
||||
return
|
||||
}
|
||||
// n.log.Log("http-url-req", url)
|
||||
if n.httpHandler != nil {
|
||||
n.httpHandler.ServeHTTP(w, req)
|
||||
}
|
||||
})
|
||||
|
||||
if addr := opts.WebsocketAddr; addr != "" {
|
||||
n.httpLis, err = net.Listen("tcp", addr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// TODO: move to serve
|
||||
go func() {
|
||||
err := http.Serve(n.httpLis, httpHandler)
|
||||
level.Error(n.log).Log("conn", "ssb-ws :8998 listen exited", "err", err)
|
||||
}()
|
||||
}
|
||||
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func (n *node) HandleHTTP(h http.Handler) {
|
||||
n.httpHandler = h
|
||||
}
|
||||
|
||||
func (n *node) GetConnTracker() ConnTracker {
|
||||
return n.connTracker
|
||||
}
|
||||
|
||||
// GetEndpointFor returns a muxrpc endpoint to call the remote identified by the passed feed ref
|
||||
// retruns false if there is no such connection
|
||||
// TODO: merge with conntracker
|
||||
func (n *node) GetEndpointFor(ref *refs.FeedRef) (muxrpc.Endpoint, bool) {
|
||||
if ref == nil {
|
||||
return nil, false
|
||||
}
|
||||
n.remotesLock.Lock()
|
||||
defer n.remotesLock.Unlock()
|
||||
|
||||
edp, has := n.remotes[ref.Ref()]
|
||||
return edp, has
|
||||
}
|
||||
|
||||
// TODO: merge with conntracker
|
||||
func (n *node) GetAllEndpoints() []EndpointStat {
|
||||
n.remotesLock.Lock()
|
||||
defer n.remotesLock.Unlock()
|
||||
|
||||
var stats []EndpointStat
|
||||
|
||||
for ref, edp := range n.remotes {
|
||||
id, _ := refs.ParseFeedRef(ref)
|
||||
remote := edp.Remote()
|
||||
ok, durr := n.connTracker.Active(remote)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
stats = append(stats, EndpointStat{
|
||||
ID: id,
|
||||
Addr: remote,
|
||||
Since: durr,
|
||||
Endpoint: edp,
|
||||
})
|
||||
}
|
||||
return stats
|
||||
}
|
||||
|
||||
// TODO: merge with conntracker
|
||||
func (n *node) addRemote(edp muxrpc.Endpoint) {
|
||||
n.remotesLock.Lock()
|
||||
defer n.remotesLock.Unlock()
|
||||
r, err := GetFeedRefFromAddr(edp.Remote())
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// ref := r.Ref()
|
||||
// if oldEdp, has := n.remotes[ref]; has {
|
||||
// n.log.Log("remotes", "previous active", "ref", ref)
|
||||
// c := client.FromEndpoint(oldEdp)
|
||||
// _, err := c.Whoami()
|
||||
// if err == nil {
|
||||
// // old one still works
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
// replace with new
|
||||
n.remotes[r.Ref()] = edp
|
||||
}
|
||||
|
||||
// TODO: merge with conntracker
|
||||
func (n *node) removeRemote(edp muxrpc.Endpoint) {
|
||||
n.remotesLock.Lock()
|
||||
defer n.remotesLock.Unlock()
|
||||
r, err := GetFeedRefFromAddr(edp.Remote())
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
delete(n.remotes, r.Ref())
|
||||
}
|
||||
|
||||
func (n *node) handleConnection(ctx context.Context, origConn net.Conn, isServer bool, hws ...muxrpc.HandlerWrapper) {
|
||||
// TODO: overhaul events and logging levels
|
||||
conn, err := n.applyConnWrappers(origConn)
|
||||
if err != nil {
|
||||
origConn.Close()
|
||||
level.Error(n.log).Log("msg", "node/Serve: failed to wrap connection", "err", err)
|
||||
return
|
||||
}
|
||||
|
||||
// TODO: obfuscate the remote address by nulling bytes in it before printing ip and pubkey in full
|
||||
remoteRef, err := GetFeedRefFromAddr(conn.RemoteAddr())
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
level.Error(n.log).Log("conn", "not shs authorized", "err", err)
|
||||
return
|
||||
}
|
||||
rLogger := log.With(n.log, "peer", remoteRef.ShortRef())
|
||||
|
||||
ok, ctx := n.connTracker.OnAccept(ctx, conn)
|
||||
if !ok {
|
||||
err := conn.Close()
|
||||
level.Debug(rLogger).Log("conn", "ignored", "err", err)
|
||||
return
|
||||
}
|
||||
|
||||
defer func() {
|
||||
n.connTracker.OnClose(conn)
|
||||
conn.Close()
|
||||
origConn.Close()
|
||||
}()
|
||||
|
||||
h, err := n.opts.MakeHandler(conn)
|
||||
if err != nil {
|
||||
level.Debug(rLogger).Log("conn", "mkHandler", "err", err)
|
||||
return
|
||||
}
|
||||
|
||||
for _, hw := range hws {
|
||||
h = hw(h)
|
||||
}
|
||||
|
||||
pkr := muxrpc.NewPacker(conn)
|
||||
filtered := level.NewFilter(n.log, level.AllowInfo())
|
||||
edp := muxrpc.Handle(pkr, h,
|
||||
muxrpc.WithContext(ctx),
|
||||
muxrpc.WithLogger(filtered),
|
||||
// _isServer_ defines _are we a server_.
|
||||
// the muxrpc option asks are we _talking_ to a server > inverted
|
||||
muxrpc.WithIsServer(!isServer),
|
||||
)
|
||||
n.addRemote(edp)
|
||||
|
||||
srv := edp.(muxrpc.Server)
|
||||
|
||||
err = srv.Serve()
|
||||
// level.Warn(n.log).Log("conn", "serve-return", "err", err)
|
||||
if err != nil && !isConnBrokenErr(err) && !errors.Is(err, context.Canceled) {
|
||||
level.Debug(rLogger).Log("conn", "serve exited", "err", err)
|
||||
}
|
||||
n.removeRemote(edp)
|
||||
|
||||
// panic("serve exited")
|
||||
err = edp.Terminate()
|
||||
// level.Error(n.log).Log("conn", "serve-defer-terminate", "err", err)
|
||||
}
|
||||
|
||||
// Serve starts the network listener and configured resources like local discovery.
|
||||
// Canceling the passed context makes the function return. Defers take care of stopping these resources.
|
||||
func (n *node) Serve(ctx context.Context, wrappers ...muxrpc.HandlerWrapper) error {
|
||||
// TODO: make multiple listeners (localhost:8008 should not restrict or kill connections)
|
||||
lisWrap := netwrap.NewListenerWrapper(n.secretServer.Addr(), append(n.opts.BefreCryptoWrappers, n.secretServer.ConnWrapper())...)
|
||||
var err error
|
||||
|
||||
n.listenerLock.Lock()
|
||||
n.lis, err = netwrap.Listen(n.opts.ListenAddr, lisWrap)
|
||||
if err != nil {
|
||||
n.listenerLock.Unlock()
|
||||
return fmt.Errorf("error creating listener: %w", err)
|
||||
}
|
||||
n.lisClose = sync.Once{} // reset once
|
||||
close(n.listening)
|
||||
n.listenerLock.Unlock()
|
||||
|
||||
defer func() { // refresh listener to re-call
|
||||
n.lisClose.Do(func() {
|
||||
n.listenerLock.Lock()
|
||||
n.lis.Close()
|
||||
n.lis = nil
|
||||
n.listenerLock.Unlock()
|
||||
})
|
||||
n.listening = make(chan struct{})
|
||||
}()
|
||||
|
||||
// accept in a goroutine so that we can react to context cancel and close the listener
|
||||
newConn := make(chan net.Conn)
|
||||
go func() {
|
||||
defer close(newConn)
|
||||
for {
|
||||
n.listenerLock.Lock()
|
||||
if n.lis == nil {
|
||||
n.listenerLock.Unlock()
|
||||
return
|
||||
}
|
||||
n.listenerLock.Unlock()
|
||||
conn, err := n.lis.Accept()
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "use of closed network connection") {
|
||||
// yikes way of handling this
|
||||
// but means this needs to be restarted anyway
|
||||
return
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
newConn <- conn
|
||||
}
|
||||
}()
|
||||
|
||||
defer level.Debug(n.log).Log("event", "network listen loop exited")
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
case conn := <-newConn:
|
||||
if conn == nil {
|
||||
return nil
|
||||
}
|
||||
go n.handleConnection(ctx, conn, true, wrappers...)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (n *node) Connect(ctx context.Context, addr net.Addr) error {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
shsAddr := netwrap.GetAddr(addr, "shs-bs")
|
||||
if shsAddr == nil {
|
||||
return errors.New("node/connect: expected an address containing an shs-bs addr")
|
||||
}
|
||||
|
||||
var pubKey = make(ed25519.PublicKey, ed25519.PublicKeySize)
|
||||
if shsAddr, ok := shsAddr.(secretstream.Addr); ok {
|
||||
copy(pubKey[:], shsAddr.PubKey)
|
||||
} else {
|
||||
return errors.New("node/connect: expected shs-bs address to be of type secretstream.Addr")
|
||||
}
|
||||
|
||||
conn, err := n.dialer(netwrap.GetAddr(addr, "tcp"), append(n.beforeCryptoConnWrappers,
|
||||
n.secretClient.ConnWrapper(pubKey))...)
|
||||
if err != nil {
|
||||
if conn != nil {
|
||||
conn.Close()
|
||||
}
|
||||
return fmt.Errorf("node/connect: error dialing: %w", err)
|
||||
}
|
||||
|
||||
go func(c net.Conn) {
|
||||
n.handleConnection(ctx, c, false)
|
||||
}(conn)
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetListenAddr waits for Serve() to be called!
|
||||
func (n *node) GetListenAddr() net.Addr {
|
||||
_, ok := <-n.listening
|
||||
if !ok {
|
||||
return n.lis.Addr()
|
||||
}
|
||||
level.Error(n.log).Log("msg", "listener not ready")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n *node) applyConnWrappers(conn net.Conn) (net.Conn, error) {
|
||||
for i, cw := range n.afterSecureConnWrappers {
|
||||
var err error
|
||||
conn, err = cw(conn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error applying connection wrapper #%d: %w", i, err)
|
||||
}
|
||||
}
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
func (n *node) Close() error {
|
||||
if n.httpLis != nil {
|
||||
err := n.httpLis.Close()
|
||||
if err != nil {
|
||||
return fmt.Errorf("ssb: failed to close http listener: %w", err)
|
||||
}
|
||||
}
|
||||
n.listenerLock.Lock()
|
||||
defer n.listenerLock.Unlock()
|
||||
if n.lis != nil {
|
||||
var closeErr error
|
||||
n.lisClose.Do(func() {
|
||||
closeErr = n.lis.Close()
|
||||
})
|
||||
if closeErr != nil && !strings.Contains(closeErr.Error(), "use of closed network connection") {
|
||||
return fmt.Errorf("ssb: network node failed to close it's listener: %w", closeErr)
|
||||
}
|
||||
}
|
||||
|
||||
n.remotesLock.Lock()
|
||||
defer n.remotesLock.Unlock()
|
||||
for addr, edp := range n.remotes {
|
||||
if err := edp.Terminate(); err != nil {
|
||||
n.log.Log("event", "failed to terminate endpoint", "addr", addr, "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
if cnt := n.connTracker.Count(); cnt > 0 {
|
||||
n.log.Log("event", "warning", "msg", "still open connections", "count", cnt)
|
||||
n.connTracker.CloseAll()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -0,0 +1,159 @@
|
|||
package network
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"github.com/gorilla/websocket"
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
)
|
||||
|
||||
func websockHandler(n *node) http.HandlerFunc {
|
||||
var upgrader = websocket.Upgrader{
|
||||
ReadBufferSize: 1024 * 4,
|
||||
WriteBufferSize: 1024 * 4,
|
||||
CheckOrigin: func(_ *http.Request) bool {
|
||||
return true
|
||||
},
|
||||
EnableCompression: false,
|
||||
}
|
||||
return func(w http.ResponseWriter, req *http.Request) {
|
||||
remoteAddr, err := net.ResolveTCPAddr("tcp", req.RemoteAddr)
|
||||
if err != nil {
|
||||
n.log.Log("warning", "failed wrap", "err", err, "remote", remoteAddr)
|
||||
return
|
||||
}
|
||||
wsConn, err := upgrader.Upgrade(w, req, nil)
|
||||
if err != nil {
|
||||
n.log.Log("warning", "failed wrap", "err", err, "remote", remoteAddr)
|
||||
return
|
||||
}
|
||||
|
||||
var wc net.Conn
|
||||
wc = &wrappedConn{
|
||||
remote: remoteAddr,
|
||||
local: &net.TCPAddr{
|
||||
IP: nil,
|
||||
Port: 8989,
|
||||
},
|
||||
wsc: wsConn,
|
||||
}
|
||||
|
||||
// comment out this block to get `noauth` instead of `shs`
|
||||
// TODO:
|
||||
// netwrap.WrapAddr(remoteAddr, secretstream.Addr{
|
||||
// PubKey: n.opts.KeyPair.Id.ID,
|
||||
// })
|
||||
cw := n.secretServer.ConnWrapper()
|
||||
wc, err = cw(wc)
|
||||
if err != nil {
|
||||
level.Error(n.log).Log("warning", "failed to crypt", "err", err, "remote", remoteAddr)
|
||||
wsConn.Close()
|
||||
return
|
||||
}
|
||||
|
||||
// debugging copy of all muxrpc frames
|
||||
// can be handy for reversing applications
|
||||
// wrapped, err := debug.WrapDump("webmux", cryptoConn)
|
||||
// if err != nil {
|
||||
// level.Error(n.log).Log("warning", "failed wrap", "err", err, "remote", remoteAddr)
|
||||
// wsConn.Close()
|
||||
// return
|
||||
// }
|
||||
|
||||
pkr := muxrpc.NewPacker(wc)
|
||||
|
||||
h, err := n.opts.MakeHandler(wc)
|
||||
if err != nil {
|
||||
err = fmt.Errorf("unix sock make handler: %w", err)
|
||||
level.Error(n.log).Log("warn", err)
|
||||
wsConn.Close()
|
||||
return
|
||||
}
|
||||
|
||||
edp := muxrpc.Handle(pkr, h,
|
||||
muxrpc.WithContext(req.Context()),
|
||||
muxrpc.WithRemoteAddr(wc.RemoteAddr()))
|
||||
|
||||
srv := edp.(muxrpc.Server)
|
||||
// TODO: bundle root and connection context
|
||||
if err := srv.Serve(); err != nil {
|
||||
level.Error(n.log).Log("conn", "serve exited", "err", err, "peer", remoteAddr)
|
||||
}
|
||||
wsConn.Close()
|
||||
}
|
||||
}
|
||||
|
||||
type wrappedConn struct {
|
||||
remote net.Addr
|
||||
local net.Addr
|
||||
|
||||
r io.Reader
|
||||
wsc *websocket.Conn
|
||||
}
|
||||
|
||||
func (conn *wrappedConn) Read(data []byte) (int, error) {
|
||||
if conn.r == nil {
|
||||
if err := conn.renewReader(); err != nil {
|
||||
return -1, err
|
||||
}
|
||||
|
||||
}
|
||||
n, err := conn.r.Read(data)
|
||||
if err == io.EOF {
|
||||
if err := conn.renewReader(); err != nil {
|
||||
return -1, err
|
||||
}
|
||||
return conn.Read(data)
|
||||
}
|
||||
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (wc *wrappedConn) renewReader() error {
|
||||
mt, r, err := wc.wsc.NextReader()
|
||||
if err != nil {
|
||||
return fmt.Errorf("wsConn: failed to get reader: %w", err)
|
||||
}
|
||||
|
||||
if mt != websocket.BinaryMessage {
|
||||
return fmt.Errorf("wsConn: not binary message: %v", mt)
|
||||
|
||||
}
|
||||
wc.r = r
|
||||
return nil
|
||||
}
|
||||
|
||||
func (conn wrappedConn) Write(data []byte) (int, error) {
|
||||
writeCloser, err := conn.wsc.NextWriter(websocket.BinaryMessage)
|
||||
if err != nil {
|
||||
return -1, fmt.Errorf("wsConn: failed to create Reader: %w", err)
|
||||
}
|
||||
|
||||
n, err := io.Copy(writeCloser, bytes.NewReader(data))
|
||||
if err != nil {
|
||||
return -1, fmt.Errorf("wsConn: failed to copy data: %w", err)
|
||||
}
|
||||
return int(n), writeCloser.Close()
|
||||
}
|
||||
|
||||
func (conn wrappedConn) Close() error {
|
||||
return conn.wsc.Close()
|
||||
}
|
||||
|
||||
func (c wrappedConn) LocalAddr() net.Addr { return c.local }
|
||||
func (c wrappedConn) RemoteAddr() net.Addr { return c.remote }
|
||||
func (c wrappedConn) SetDeadline(t time.Time) error {
|
||||
return nil // c.conn.SetDeadline(t)
|
||||
}
|
||||
func (c wrappedConn) SetReadDeadline(t time.Time) error {
|
||||
return nil // c.conn.SetReadDeadline(t)
|
||||
}
|
||||
func (c wrappedConn) SetWriteDeadline(t time.Time) error {
|
||||
return nil // c.conn.SetWriteDeadline(t)
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package netwraputil
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
|
||||
"go.cryptoscope.co/netwrap"
|
||||
"go.cryptoscope.co/secretstream"
|
||||
)
|
||||
|
||||
// SpoofRemoteAddress wraps the connection with the passed reference
|
||||
// as if it was a secret-handshake connection
|
||||
// warning: should only be used where auth is established otherwise,
|
||||
// like for testing or local client access over unixsock
|
||||
func SpoofRemoteAddress(pubKey []byte) netwrap.ConnWrapper {
|
||||
if len(pubKey) != 32 {
|
||||
return func(_ net.Conn) (net.Conn, error) {
|
||||
return nil, errors.New("invalid public key length")
|
||||
}
|
||||
}
|
||||
var spoofedAddr secretstream.Addr
|
||||
spoofedAddr.PubKey = pubKey
|
||||
return func(c net.Conn) (net.Conn, error) {
|
||||
sc := SpoofedConn{
|
||||
Conn: c,
|
||||
spoofedRemote: netwrap.WrapAddr(c.RemoteAddr(), spoofedAddr),
|
||||
}
|
||||
return sc, nil
|
||||
}
|
||||
}
|
||||
|
||||
type SpoofedConn struct {
|
||||
net.Conn
|
||||
|
||||
spoofedRemote net.Addr
|
||||
}
|
||||
|
||||
func (sc SpoofedConn) RemoteAddr() net.Addr {
|
||||
return sc.spoofedRemote
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package netwraputil
|
||||
|
||||
import (
|
||||
"net"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
"go.mindeco.de/ssb-rooms/internal/network"
|
||||
)
|
||||
|
||||
func TestSpoof(t *testing.T) {
|
||||
r := require.New(t)
|
||||
|
||||
rc, wc := net.Pipe()
|
||||
|
||||
kp, err := keys.NewKeyPair(nil)
|
||||
r.NoError(err)
|
||||
|
||||
wrap := SpoofRemoteAddress(kp.Feed.PubKey())
|
||||
|
||||
wrapped, err := wrap(wc)
|
||||
r.NoError(err)
|
||||
|
||||
ref, err := network.GetFeedRefFromAddr(wrapped.RemoteAddr())
|
||||
r.NoError(err)
|
||||
r.True(ref.Equal(kp.Feed))
|
||||
|
||||
wc.Close()
|
||||
rc.Close()
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package repo
|
||||
|
||||
import "path/filepath"
|
||||
|
||||
type Interface interface {
|
||||
GetPath(...string) string
|
||||
}
|
||||
|
||||
var _ Interface = repo{}
|
||||
|
||||
// New creates a new repository value, it opens the keypair and database from basePath if it is already existing
|
||||
func New(basePath string) Interface {
|
||||
return repo{basePath: basePath}
|
||||
}
|
||||
|
||||
type repo struct {
|
||||
basePath string
|
||||
}
|
||||
|
||||
func (r repo) GetPath(rel ...string) string {
|
||||
return filepath.Join(append([]string{r.basePath}, rel...)...)
|
||||
}
|
||||
|
|
@ -9,38 +9,38 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"go.cryptoscope.co/ssb"
|
||||
refs "go.mindeco.de/ssb-refs"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
)
|
||||
|
||||
func DefaultKeyPair(r Interface) (*ssb.KeyPair, error) {
|
||||
func DefaultKeyPair(r Interface) (*keys.KeyPair, error) {
|
||||
secPath := r.GetPath("secret")
|
||||
keyPair, err := ssb.LoadKeyPair(secPath)
|
||||
keyPair, err := keys.LoadKeyPair(secPath)
|
||||
if err != nil {
|
||||
if !os.IsNotExist(err) {
|
||||
return nil, fmt.Errorf("repo: error opening key pair: %w", err)
|
||||
}
|
||||
keyPair, err = ssb.NewKeyPair(nil)
|
||||
keyPair, err = keys.NewKeyPair(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("repo: no keypair but couldn't create one either: %w", err)
|
||||
}
|
||||
if err := ssb.SaveKeyPair(keyPair, secPath); err != nil {
|
||||
if err := keys.SaveKeyPair(keyPair, secPath); err != nil {
|
||||
return nil, fmt.Errorf("repo: error saving new identity file: %w", err)
|
||||
}
|
||||
log.Printf("saved identity %s to %s", keyPair.Id.Ref(), secPath)
|
||||
log.Printf("saved identity %s to %s", keyPair.Feed.Ref(), secPath)
|
||||
}
|
||||
return keyPair, nil
|
||||
}
|
||||
|
||||
func NewKeyPair(r Interface, name, algo string) (*ssb.KeyPair, error) {
|
||||
func NewKeyPair(r Interface, name, algo string) (*keys.KeyPair, error) {
|
||||
return newKeyPair(r, name, algo, nil)
|
||||
}
|
||||
|
||||
func NewKeyPairFromSeed(r Interface, name, algo string, seed io.Reader) (*ssb.KeyPair, error) {
|
||||
func NewKeyPairFromSeed(r Interface, name, algo string, seed io.Reader) (*keys.KeyPair, error) {
|
||||
return newKeyPair(r, name, algo, seed)
|
||||
}
|
||||
|
||||
func newKeyPair(r Interface, name, algo string, seed io.Reader) (*ssb.KeyPair, error) {
|
||||
func newKeyPair(r Interface, name, algo string, seed io.Reader) (*keys.KeyPair, error) {
|
||||
var secPath string
|
||||
if name == "-" {
|
||||
secPath = r.GetPath("secret")
|
||||
|
|
@ -54,32 +54,32 @@ func newKeyPair(r Interface, name, algo string, seed io.Reader) (*ssb.KeyPair, e
|
|||
if algo != refs.RefAlgoFeedSSB1 && algo != refs.RefAlgoFeedGabby { // enums would be nice
|
||||
return nil, fmt.Errorf("invalid feed refrence algo")
|
||||
}
|
||||
if _, err := ssb.LoadKeyPair(secPath); err == nil {
|
||||
if _, err := keys.LoadKeyPair(secPath); err == nil {
|
||||
return nil, fmt.Errorf("new key-pair name already taken")
|
||||
}
|
||||
keyPair, err := ssb.NewKeyPair(seed)
|
||||
keyPair, err := keys.NewKeyPair(seed)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("repo: no keypair but couldn't create one either: %w", err)
|
||||
}
|
||||
keyPair.Id.Algo = algo
|
||||
if err := ssb.SaveKeyPair(keyPair, secPath); err != nil {
|
||||
keyPair.Feed.Algo = algo
|
||||
if err := keys.SaveKeyPair(keyPair, secPath); err != nil {
|
||||
return nil, fmt.Errorf("repo: error saving new identity file: %w", err)
|
||||
}
|
||||
log.Printf("saved identity %s to %s", keyPair.Id.Ref(), secPath)
|
||||
log.Printf("saved identity %s to %s", keyPair.Feed.Ref(), secPath)
|
||||
return keyPair, nil
|
||||
}
|
||||
|
||||
func LoadKeyPair(r Interface, name string) (*ssb.KeyPair, error) {
|
||||
func LoadKeyPair(r Interface, name string) (*keys.KeyPair, error) {
|
||||
secPath := r.GetPath("secrets", name)
|
||||
keyPair, err := ssb.LoadKeyPair(secPath)
|
||||
keyPair, err := keys.LoadKeyPair(secPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Load: failed to open %q: %w", secPath, err)
|
||||
}
|
||||
return keyPair, nil
|
||||
}
|
||||
|
||||
func AllKeyPairs(r Interface) (map[string]*ssb.KeyPair, error) {
|
||||
kps := make(map[string]*ssb.KeyPair)
|
||||
func AllKeyPairs(r Interface) (map[string]*keys.KeyPair, error) {
|
||||
kps := make(map[string]*keys.KeyPair)
|
||||
err := filepath.Walk(r.GetPath("secrets"), func(path string, info os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
|
|
@ -90,7 +90,7 @@ func AllKeyPairs(r Interface) (map[string]*ssb.KeyPair, error) {
|
|||
if info.IsDir() {
|
||||
return nil
|
||||
}
|
||||
if kp, err := ssb.LoadKeyPair(path); err == nil {
|
||||
if kp, err := keys.LoadKeyPair(path); err == nil {
|
||||
kps[filepath.Base(path)] = kp
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
package roomsrv
|
||||
|
||||
import "fmt"
|
||||
|
||||
func (s *Server) init() error {
|
||||
return fmt.Errorf("TODO:srv:init")
|
||||
}
|
||||
|
|
@ -1,12 +1,17 @@
|
|||
package tunsrv
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package roomsrv
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
|
||||
"go.mindeco.de/ssb-tunnel/internal/keys"
|
||||
"go.mindeco.de/ssb-tunnel/internal/repo"
|
||||
kitlog "github.com/go-kit/kit/log"
|
||||
"go.cryptoscope.co/netwrap"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
"go.mindeco.de/ssb-rooms/internal/repo"
|
||||
)
|
||||
|
||||
type Option func(srv *Server) error
|
||||
|
|
@ -65,10 +70,10 @@ func WithKeyPair(kp *keys.KeyPair) Option {
|
|||
}
|
||||
}
|
||||
|
||||
// WithInfo changes the info/warn/debug loging output.
|
||||
func WithInfo(log kitlog.Logger) Option {
|
||||
// WithLogger changes the info/warn/debug loging output.
|
||||
func WithLogger(log kitlog.Logger) Option {
|
||||
return func(s *Server) error {
|
||||
s.info = log
|
||||
s.logger = log
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
|
@ -78,7 +83,39 @@ func WithInfo(log kitlog.Logger) Option {
|
|||
// Canceling the context also shuts down indexing. If no context is passed sbot.Shutdown() can be used.
|
||||
func WithContext(ctx context.Context) Option {
|
||||
return func(s *Server) error {
|
||||
s.rootCtx, s.Shutdown = ShutdownContext(ctx)
|
||||
s.rootCtx, s.Shutdown = context.WithCancel(ctx)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: remove all this network stuff and make them options on network
|
||||
|
||||
// WithListenAddr changes the muxrpc listener address. By default it listens to ':8008'.
|
||||
func WithListenAddr(addr string) Option {
|
||||
return func(s *Server) error {
|
||||
var err error
|
||||
s.listenAddr, err = net.ResolveTCPAddr("tcp", addr)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse tcp listen addr: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// WithPreSecureConnWrapper wrapps the connection after it is encrypted.
|
||||
// Usefull for debugging and measuring traffic.
|
||||
func WithPreSecureConnWrapper(cw netwrap.ConnWrapper) Option {
|
||||
return func(s *Server) error {
|
||||
s.preSecureWrappers = append(s.preSecureWrappers, cw)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// WithPostSecureConnWrapper wrapps the connection before it is encrypted.
|
||||
// Usefull to insepct the muxrpc frames before they go into boxstream.
|
||||
func WithPostSecureConnWrapper(cw netwrap.ConnWrapper) Option {
|
||||
return func(s *Server) error {
|
||||
s.postSecureWrappers = append(s.postSecureWrappers, cw)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package roomsrv
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
kitlog "github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"go.cryptoscope.co/netwrap"
|
||||
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/keys"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/multicloser"
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemuxrpc"
|
||||
"go.mindeco.de/ssb-rooms/internal/network"
|
||||
"go.mindeco.de/ssb-rooms/internal/repo"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
logger kitlog.Logger
|
||||
|
||||
rootCtx context.Context
|
||||
Shutdown context.CancelFunc
|
||||
closers multicloser.Closer
|
||||
|
||||
closed bool
|
||||
closedMu sync.Mutex
|
||||
closeErr error
|
||||
|
||||
Network network.Network
|
||||
appKey []byte
|
||||
listenAddr net.Addr
|
||||
dialer netwrap.Dialer
|
||||
|
||||
repoPath string
|
||||
KeyPair *keys.KeyPair
|
||||
|
||||
networkConnTracker network.ConnTracker
|
||||
preSecureWrappers []netwrap.ConnWrapper
|
||||
postSecureWrappers []netwrap.ConnWrapper
|
||||
|
||||
public maybemuxrpc.PluginManager
|
||||
master maybemuxrpc.PluginManager
|
||||
|
||||
authorizer maybemuxrpc.Authorizer
|
||||
}
|
||||
|
||||
func New(opts ...Option) (*Server, error) {
|
||||
var s Server
|
||||
|
||||
s.public = maybemuxrpc.NewPluginManager()
|
||||
s.master = maybemuxrpc.NewPluginManager()
|
||||
|
||||
for i, opt := range opts {
|
||||
err := opt(&s)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error applying option #%d: %w", i, err)
|
||||
}
|
||||
}
|
||||
|
||||
if s.repoPath == "" {
|
||||
u, err := user.Current()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error getting info on current user: %w", err)
|
||||
}
|
||||
|
||||
s.repoPath = filepath.Join(u.HomeDir, ".ssb-go")
|
||||
}
|
||||
|
||||
if s.appKey == nil {
|
||||
ak, err := base64.StdEncoding.DecodeString("1KHLiKZvAvjbY1ziZEHMXawbCEIM6qwjCDm3VYRan/s=")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to decode default appkey: %w", err)
|
||||
}
|
||||
s.appKey = ak
|
||||
}
|
||||
|
||||
if s.dialer == nil {
|
||||
s.dialer = netwrap.Dial
|
||||
}
|
||||
|
||||
if s.listenAddr == nil {
|
||||
s.listenAddr = &net.TCPAddr{Port: network.DefaultPort}
|
||||
}
|
||||
|
||||
if s.logger == nil {
|
||||
logger := kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stdout))
|
||||
logger = kitlog.With(logger, "ts", kitlog.DefaultTimestampUTC, "caller", kitlog.DefaultCaller)
|
||||
s.logger = logger
|
||||
}
|
||||
|
||||
if s.rootCtx == nil {
|
||||
s.rootCtx, s.Shutdown = context.WithCancel(context.Background())
|
||||
}
|
||||
|
||||
r := repo.New(s.repoPath)
|
||||
|
||||
if s.KeyPair == nil {
|
||||
var err error
|
||||
s.KeyPair, err = repo.DefaultKeyPair(r)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sbot: failed to get keypair: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := s.init(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &s, nil
|
||||
}
|
||||
|
||||
// Close closes the bot by stopping network connections and closing the internal databases
|
||||
func (s *Server) Close() error {
|
||||
s.closedMu.Lock()
|
||||
defer s.closedMu.Unlock()
|
||||
|
||||
if s.closed {
|
||||
return s.closeErr
|
||||
}
|
||||
|
||||
closeEvt := kitlog.With(s.logger, "event", "tunserv closing")
|
||||
s.closed = true
|
||||
|
||||
if s.Network != nil {
|
||||
if err := s.Network.Close(); err != nil {
|
||||
s.closeErr = fmt.Errorf("sbot: failed to close own network node: %w", err)
|
||||
return s.closeErr
|
||||
}
|
||||
s.Network.GetConnTracker().CloseAll()
|
||||
level.Debug(closeEvt).Log("msg", "connections closed")
|
||||
}
|
||||
|
||||
if err := s.closers.Close(); err != nil {
|
||||
s.closeErr = err
|
||||
return s.closeErr
|
||||
}
|
||||
|
||||
level.Info(closeEvt).Log("msg", "closers closed")
|
||||
return nil
|
||||
}
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package roomsrv
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
kitlog "github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"go.cryptoscope.co/muxrpc/v2"
|
||||
|
||||
"go.mindeco.de/ssb-rooms/internal/netwraputil"
|
||||
"go.mindeco.de/ssb-rooms/internal/repo"
|
||||
)
|
||||
|
||||
// WithUNIXSocket enables listening for muxrpc connections on a unix socket files ($repo/socket).
|
||||
// This socket is not encrypted or authenticated since access to it is mediated by filesystem ownership.
|
||||
func WithUNIXSocket() Option {
|
||||
return func(s *Server) error {
|
||||
// this races because sbot might not be done with init yet
|
||||
// TODO: refactor network peer code and make unixsock implement that (those will be inited late anyway)
|
||||
if s.KeyPair == nil {
|
||||
return fmt.Errorf("sbot/unixsock: keypair is nil. please use unixSocket with LateOption")
|
||||
}
|
||||
spoofWrapper := netwraputil.SpoofRemoteAddress(s.KeyPair.Feed.ID)
|
||||
|
||||
r := repo.New(s.repoPath)
|
||||
sockPath := r.GetPath("socket")
|
||||
|
||||
// local clients (not using network package because we don't want conn limiting or advertising)
|
||||
c, err := net.Dial("unix", sockPath)
|
||||
if err == nil {
|
||||
c.Close()
|
||||
return fmt.Errorf("sbot: repo already in use, socket accepted connection")
|
||||
}
|
||||
os.Remove(sockPath)
|
||||
os.MkdirAll(filepath.Dir(sockPath), 0700)
|
||||
|
||||
uxLis, err := net.Listen("unix", sockPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
s.closers.Add(uxLis)
|
||||
|
||||
go func() {
|
||||
|
||||
for {
|
||||
c, err := uxLis.Accept()
|
||||
if err != nil {
|
||||
if nerr, ok := err.(*net.OpError); ok {
|
||||
if nerr.Err.Error() == "use of closed network connection" {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
level.Warn(s.logger).Log("event", "unix sock accept failed", "err", err)
|
||||
continue
|
||||
}
|
||||
|
||||
wc, err := spoofWrapper(c)
|
||||
if err != nil {
|
||||
c.Close()
|
||||
continue
|
||||
}
|
||||
for _, w := range s.postSecureWrappers {
|
||||
var err error
|
||||
wc, err = w(wc)
|
||||
if err != nil {
|
||||
level.Warn(s.logger).Log("err", err)
|
||||
c.Close()
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
go func(conn net.Conn) {
|
||||
defer conn.Close()
|
||||
|
||||
pkr := muxrpc.NewPacker(conn)
|
||||
|
||||
h, err := s.master.MakeHandler(conn)
|
||||
if err != nil {
|
||||
level.Warn(s.logger).Log("event", "unix sock make handler", "err", err)
|
||||
return
|
||||
}
|
||||
|
||||
edp := muxrpc.Handle(pkr, h,
|
||||
muxrpc.WithContext(s.rootCtx),
|
||||
muxrpc.WithLogger(kitlog.NewNopLogger()),
|
||||
)
|
||||
|
||||
srv := edp.(muxrpc.Server)
|
||||
if err := srv.Serve(); err != nil {
|
||||
level.Warn(s.logger).Log("conn", "serve exited", "err", err, "peer", conn.RemoteAddr())
|
||||
}
|
||||
edp.Terminate()
|
||||
|
||||
}(wc)
|
||||
}
|
||||
}()
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
package go_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/stretchr/testify/require"
|
||||
"go.cryptoscope.co/muxrpc/v2/debug"
|
||||
"golang.org/x/sync/errgroup"
|
||||
|
||||
"go.mindeco.de/ssb-rooms/internal/maybemod/multicloser/testutils"
|
||||
"go.mindeco.de/ssb-rooms/roomsrv"
|
||||
)
|
||||
|
||||
func TestTunnelServerSimple(t *testing.T) {
|
||||
// defer leakcheck.Check(t)
|
||||
r := require.New(t)
|
||||
if testing.Short() {
|
||||
return
|
||||
}
|
||||
ctx, cancel := context.WithCancel(context.TODO())
|
||||
botgroup, ctx := errgroup.WithContext(ctx)
|
||||
|
||||
info := testutils.NewRelativeTimeLogger(nil)
|
||||
bs := newBotServer(ctx, info)
|
||||
|
||||
os.RemoveAll("testrun")
|
||||
|
||||
appKey := make([]byte, 32)
|
||||
rand.Read(appKey)
|
||||
hmacKey := make([]byte, 32)
|
||||
rand.Read(hmacKey)
|
||||
|
||||
srvLog := log.With(info, "peer", "srv")
|
||||
srv, err := roomsrv.New(
|
||||
roomsrv.WithAppKey(appKey),
|
||||
roomsrv.WithContext(ctx),
|
||||
roomsrv.WithLogger(srvLog),
|
||||
roomsrv.WithPostSecureConnWrapper(func(conn net.Conn) (net.Conn, error) {
|
||||
return debug.WrapDump(filepath.Join("testrun", t.Name(), "muxdump"), conn)
|
||||
}),
|
||||
roomsrv.WithRepoPath(filepath.Join("testrun", t.Name(), "srv")),
|
||||
roomsrv.WithListenAddr(":0"),
|
||||
)
|
||||
r.NoError(err)
|
||||
botgroup.Go(bs.Serve(srv))
|
||||
|
||||
bobLog := log.With(info, "peer", "bob")
|
||||
bob, err := roomsrv.New(
|
||||
roomsrv.WithAppKey(appKey),
|
||||
roomsrv.WithContext(ctx),
|
||||
roomsrv.WithLogger(bobLog),
|
||||
roomsrv.WithRepoPath(filepath.Join("testrun", t.Name(), "bob")),
|
||||
roomsrv.WithListenAddr(":0"),
|
||||
)
|
||||
r.NoError(err)
|
||||
botgroup.Go(bs.Serve(bob))
|
||||
|
||||
// TODO
|
||||
// srv.Replicate(bob.KeyPair.Id)
|
||||
// bob.Replicate(srv.KeyPair.Id)
|
||||
|
||||
sess := &simpleSession{
|
||||
ctx: ctx,
|
||||
srv: srv,
|
||||
bob: bob,
|
||||
redial: func(t *testing.T) {
|
||||
t.Log("noop")
|
||||
},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
tf func(t *testing.T)
|
||||
}{
|
||||
{"empty", sess.simple},
|
||||
// {"justMe", sess.wantFirst},
|
||||
// {"eachOne", sess.eachOne},
|
||||
// {"eachOneConnet", sess.eachOneConnet},
|
||||
// {"eachOneBothWant", sess.eachOnBothWant},
|
||||
}
|
||||
|
||||
// all on a single connection
|
||||
r.NoError(err)
|
||||
for _, tc := range tests {
|
||||
t.Run("noop/"+tc.name, tc.tf)
|
||||
}
|
||||
|
||||
srv.Shutdown()
|
||||
bob.Shutdown()
|
||||
cancel()
|
||||
|
||||
r.NoError(srv.Close())
|
||||
r.NoError(bob.Close())
|
||||
r.NoError(botgroup.Wait())
|
||||
}
|
||||
|
||||
type simpleSession struct {
|
||||
ctx context.Context
|
||||
|
||||
redial func(t *testing.T)
|
||||
|
||||
srv, bob *roomsrv.Server
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package go_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/go-kit/kit/log/level"
|
||||
"go.mindeco.de/ssb-rooms/roomsrv"
|
||||
)
|
||||
|
||||
type botServer struct {
|
||||
ctx context.Context
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
func newBotServer(ctx context.Context, log log.Logger) botServer {
|
||||
return botServer{ctx, log}
|
||||
}
|
||||
|
||||
func (bs botServer) Serve(s *roomsrv.Server) func() error {
|
||||
return func() error {
|
||||
err := s.Network.Serve(bs.ctx)
|
||||
if err != nil {
|
||||
if errors.Is(err, io.EOF) || errors.Is(err, context.Canceled) {
|
||||
return nil
|
||||
}
|
||||
level.Warn(bs.log).Log("event", "bot serve exited", "err", err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
package tunsrv
|
||||
|
||||
type Server struct{}
|
||||
Loading…
Reference in New Issue