From a2db4a67513cdd4e97d67c73bb430b257180ba27 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Fri, 8 Jul 2022 03:00:43 +0000 Subject: [PATCH 01/31] upgrade to latest go version and dependencies, and migrate from circleci to GHA Signed-off-by: Hsn723 --- .circleci/config.yml | 3 +- .github/workflows/main.yml | 54 +++ .gitignore | 3 - README.md | 2 +- go.mod | 34 +- go.sum | 852 +++++++++++++++++++++++++++++++++++++ 6 files changed, 938 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/main.yml create mode 100644 go.sum diff --git a/.circleci/config.yml b/.circleci/config.yml index 25d2f50..70df2f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,9 +2,10 @@ version: 2 jobs: build: docker: - - image: quay.io/cybozu/golang:1.15-bionic + - image: quay.io/cybozu/golang:1.18-focal working_directory: /work steps: + - run: git config --global --add safe.directory /tmp/_circleci_local_build_repo - checkout - run: test -z "$(gofmt -s -l . | grep -v '^vendor' | tee /dev/stderr)" - run: golint -set_exit_status . diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..b780a54 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,54 @@ +name: main +on: + pull_request: + push: + branches: + - 'master' +env: + go-version: 1.18 +jobs: + fmt: + name: Fmt + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.go-version }} + - run: test -z "$(gofmt -s -l . | grep -v '^vendor' | tee /dev/stderr)" + lint: + name: Lint + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.go-version }} + - run: golint -set_exit_status . + build: + name: Build + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.go-version }} + - run: go build ./... + test: + name: Test + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.go-version }} + - run: NO_PROXY= go test -race -v -coverprofile cover.out ./... + vet: + name: Vet + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.go-version }} + - run: go vet ./... diff --git a/.gitignore b/.gitignore index ce8abec..25edb18 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,3 @@ _testmain.go *.exe *.test *.prof - -# Ignore go.sum -/go.sum diff --git a/README.md b/README.md index 353d30b..1cd9d64 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Features Install ------- -Use Go 1.7 or better. +Use a recent version of Go. ``` go get -u github.com/cybozu-go/usocksd/... diff --git a/go.mod b/go.mod index bff1077..6ab2cf7 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,34 @@ module github.com/cybozu-go/usocksd require ( - github.com/BurntSushi/toml v0.3.1 - github.com/cybozu-go/log v1.6.0 - github.com/cybozu-go/netutil v1.2.0 - github.com/cybozu-go/well v1.10.0 + github.com/BurntSushi/toml v1.1.0 + github.com/cybozu-go/log v1.6.1 + github.com/cybozu-go/netutil v1.4.2 + github.com/cybozu-go/well v1.11.0 ) -go 1.13 +require ( + github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/onsi/gomega v1.19.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect + github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.12.0 // indirect + github.com/subosito/gotenv v1.4.0 // indirect + github.com/vishvananda/netlink v1.1.0 // indirect + github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect + golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 // indirect + golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/ini.v1 v1.66.6 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +go 1.18 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..1c5db01 --- /dev/null +++ b/go.sum @@ -0,0 +1,852 @@ +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= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= +github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +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/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +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-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cybozu-go/log v1.6.1 h1:m5cllWuOckvyLpH3TJAOMC76dydP6fVFjtrU/9NhQUA= +github.com/cybozu-go/log v1.6.1/go.mod h1:U342hYYWUxWPOw0g5EhiS5BaO/c8c5YT+A14xQRbEd8= +github.com/cybozu-go/netutil v1.4.2 h1:EMYBS6ifb+gkzC/0YMWjl8BXdScKSU89LD7R/NtZDl0= +github.com/cybozu-go/netutil v1.4.2/go.mod h1:XJIodENSBDGg7ddH6BOLAGQ9CpmHtXrii0n6qvwJ3ds= +github.com/cybozu-go/well v1.11.0 h1:0UzPpgH6Ahmf5Px0wBuHBqYivixSsnwt07J7HWGR0Zc= +github.com/cybozu-go/well v1.11.0/go.mod h1:oj+Asf0LJqNNHzdVp/gmaNOCS9qlPMU00AK6AZLmPEo= +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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +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-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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +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/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/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/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/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/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +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/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/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +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/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +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/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +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/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.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/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +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/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= +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/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +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/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/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/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg= +github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +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-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +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-20190108225652-1e06a53dbb7e/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-20190501004415-9ce7a6920f09/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-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-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 h1:8NSylCMxLW4JvserAndSgFL7aPli6A68yf0bYFTcWCM= +golang.org/x/net v0.0.0-20220706163947-c90051bbdb60/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +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/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +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/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/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-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-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +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= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +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-20190418145605-e7d98fc518a7/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-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +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/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +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/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +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.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/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= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From 4f5a1d34d239757638e56e193178640e89906894 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 01:46:45 +0000 Subject: [PATCH 02/31] use golangci-lint as a replacement to golint Signed-off-by: Hsn723 --- .github/workflows/main.yml | 2 +- .golangci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b780a54..e864403 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: ${{ env.go-version }} - - run: golint -set_exit_status . + - uses: golangci/golangci-lint-action@v3 build: name: Build runs-on: ubuntu-20.04 diff --git a/.golangci.yml b/.golangci.yml index a0e23db..6607fb2 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,6 +3,6 @@ linters: - dupl - goconst - gofmt - - golint + - revive - typecheck - unparam From a201f0fd5eaf8524d7baee77121389962bff0911 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Fri, 8 Jul 2022 06:38:57 +0000 Subject: [PATCH 03/31] add metrics server Signed-off-by: Hsn723 --- .circleci/config.yml | 2 +- .gitignore | 1 + cmd/usocksd/main.go | 15 ++++++++-- config.go | 5 +++- go.mod | 9 ++++++ go.sum | 10 +++++++ metrics/server.go | 68 ++++++++++++++++++++++++++++++++++++++++++ metrics/server_test.go | 49 ++++++++++++++++++++++++++++++ server.go | 12 ++++++++ 9 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 metrics/server.go create mode 100644 metrics/server_test.go diff --git a/.circleci/config.yml b/.circleci/config.yml index 70df2f6..5dab03a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - run: test -z "$(gofmt -s -l . | grep -v '^vendor' | tee /dev/stderr)" - run: golint -set_exit_status . - run: go build ./... - - run: NO_PROXY= go test -race -v ./... + - run: NO_PROXY= go test -race -v -coverprofile cover.out ./... - run: go vet ./... workflows: diff --git a/.gitignore b/.gitignore index 25edb18..7ef185d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ _testmain.go *.exe *.test *.prof +*.out diff --git a/cmd/usocksd/main.go b/cmd/usocksd/main.go index 179a299..54045cc 100644 --- a/cmd/usocksd/main.go +++ b/cmd/usocksd/main.go @@ -18,13 +18,24 @@ var ( optFile = flag.String("f", "", "configuration file name") ) +func serveMetrics(c *usocksd.Config) { + metricsServer := usocksd.NewMetricsServer(c) + mln, err := usocksd.MetricsListener(c) + if err != nil { + _ = log.Warn("could not initialize metrics server, but will proceed without it", map[string]interface{}{ + "error": err.Error(), + }) + } + metricsServer.Serve(mln) +} + func serve(lns []net.Listener, c *usocksd.Config) { socksServer := usocksd.NewServer(c) for _, ln := range lns { socksServer.Serve(ln) } - err := well.Wait() - if err != nil && !well.IsSignaled(err) { + serveMetrics(c) + if err := well.Wait(); err != nil && !well.IsSignaled(err) { log.ErrorExit(err) } } diff --git a/config.go b/config.go index 2111f75..7077126 100644 --- a/config.go +++ b/config.go @@ -10,12 +10,14 @@ import ( ) const ( - defaultPort = 1080 + defaultPort = 1080 + defaultMetricsPort = 1081 ) // IncomingConfig is a set of configurations to accept clients. type IncomingConfig struct { Port int + MetricsPort int Addresses []net.IP AllowFrom []string `toml:"allow_from"` allowSubnets []*net.IPNet @@ -42,6 +44,7 @@ type Config struct { func NewConfig() *Config { c := new(Config) c.Incoming.Port = defaultPort + c.Incoming.MetricsPort = defaultMetricsPort return c } diff --git a/go.mod b/go.mod index 6ab2cf7..81d2be0 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,24 @@ require ( github.com/cybozu-go/log v1.6.1 github.com/cybozu-go/netutil v1.4.2 github.com/cybozu-go/well v1.11.0 + github.com/prometheus/client_golang v1.4.0 ) require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/magiconair/properties v1.8.6 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/onsi/gomega v1.19.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.2 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.9.1 // indirect + github.com/prometheus/procfs v0.0.8 // indirect github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -26,6 +34,7 @@ require ( golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 // indirect golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect golang.org/x/text v0.3.7 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1c5db01..0331eae 100644 --- a/go.sum +++ b/go.sum @@ -68,12 +68,14 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= 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 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -165,6 +167,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -278,6 +281,7 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= 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/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= @@ -324,15 +328,19 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0 h1:YVIb/fVcOTMSqtqZWSKnHpSLBxu8DKgxq8z6RuBZwqI= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -816,6 +824,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= diff --git a/metrics/server.go b/metrics/server.go new file mode 100644 index 0000000..5c4ebbf --- /dev/null +++ b/metrics/server.go @@ -0,0 +1,68 @@ +package metrics + +import ( + "net" + "net/http" + "sync" + "time" + + "github.com/cybozu-go/log" + "github.com/cybozu-go/well" + "github.com/prometheus/client_golang/prometheus" + + "github.com/prometheus/client_golang/prometheus/promhttp" +) + +const ( + // Namespace provides a common namespace for metrics. + Namespace = "usocksd" +) + +var ( + // Registry provides a common registry for metrics. + Registry = prometheus.NewRegistry() + metricsHandler = promhttp.HandlerFor(Registry, promhttp.HandlerOpts{ + ErrorHandling: promhttp.ContinueOnError, + EnableOpenMetrics: true, + }) +) + +// Server implements a metrics server. +type Server struct { + // Logger can be used to provide a custom logger. + // If nil, the default logger is used. + Logger *log.Logger + + // ShutdownTimeout is the maximum duration the server waits for + // all connections to be closed before shutdown. + // + // Zero duration disables timeout. + ShutdownTimeout time.Duration + + // Env is the environment where this server runs. + // + // The global environment is used if Env is nil. + Env *well.Environment + + once sync.Once + server well.HTTPServer +} + +func (s *Server) init() { + if s.Logger == nil { + s.Logger = log.DefaultLogger() + } + s.server.ShutdownTimeout = s.ShutdownTimeout + s.server.Env = s.Env + s.server.Server = &http.Server{ + Handler: metricsHandler, + } +} + +// Serve starts a goroutine to accept connections. +// This returns immediately. l will be closed when s.Env is canceled. +// See https://godoc.org/github.com/cybozu-go/well#Server.Serve +func (s *Server) Serve(ln net.Listener) { + s.once.Do(s.init) + s.server.Serve(ln) +} diff --git a/metrics/server_test.go b/metrics/server_test.go new file mode 100644 index 0000000..92ecdec --- /dev/null +++ b/metrics/server_test.go @@ -0,0 +1,49 @@ +package metrics + +import ( + "context" + "io/ioutil" + "net" + "net/http" + "strings" + "testing" + + "github.com/cybozu-go/well" + "github.com/prometheus/client_golang/prometheus" +) + +func TestMetricsServer(t *testing.T) { + t.Parallel() + + addr := "http://localhost:30080/metrics" + env := well.NewEnvironment(context.Background()) + s := &Server{ + Env: env, + } + ln, err := net.Listen("tcp", ":30080") + if err != nil { + t.Skip(err) + } + s.Serve(ln) + dummyMetric := prometheus.NewCounter(prometheus.CounterOpts{ + Name: "dummy_counter", + }) + if err := Registry.Register(dummyMetric); err != nil { + t.Error(err) + } + dummyMetric.Add(1) + + resp, err := http.Get(addr) + if err != nil { + t.Error(err) + } + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + t.Error(err) + } + output := string(body) + if !strings.Contains(output, "dummy_counter 1") { + t.Errorf("could not get expected metric, got: %s", output) + } +} diff --git a/server.go b/server.go index 8948222..0ea6b78 100644 --- a/server.go +++ b/server.go @@ -4,6 +4,7 @@ import ( "net" "strconv" + "github.com/cybozu-go/usocksd/metrics" "github.com/cybozu-go/usocksd/socks" ) @@ -32,6 +33,12 @@ func Listeners(c *Config) ([]net.Listener, error) { return lns, nil } +// MetricsListener returns a listener for the metrics server. +func MetricsListener(c *Config) (net.Listener, error) { + addr := net.JoinHostPort("0.0.0.0", strconv.Itoa(c.Incoming.MetricsPort)) + return net.Listen("tcp", addr) +} + // NewServer creates a new socks.Server. func NewServer(c *Config) *socks.Server { return &socks.Server{ @@ -39,3 +46,8 @@ func NewServer(c *Config) *socks.Server { Dialer: createDialer(c), } } + +// NewMetricsServer creates a new metrics.Server. +func NewMetricsServer(c *Config) *metrics.Server { + return &metrics.Server{} +} From 4257d992cb97fe4dd0b515972ffffd16bb426154 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Fri, 8 Jul 2022 08:22:46 +0000 Subject: [PATCH 04/31] instrument usocksd with some metrics Signed-off-by: Hsn723 --- go.mod | 6 +++--- go.sum | 31 ++++++++++++++++++++++++++++--- socks/metrics.go | 29 +++++++++++++++++++++++++++++ socks/server.go | 6 +++++- socks/socks4.go | 6 ++++++ socks/socks5.go | 6 ++++++ 6 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 socks/metrics.go diff --git a/go.mod b/go.mod index 81d2be0..9949b08 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/cybozu-go/log v1.6.1 github.com/cybozu-go/netutil v1.4.2 github.com/cybozu-go/well v1.11.0 - github.com/prometheus/client_golang v1.4.0 + github.com/prometheus/client_golang v1.12.2 ) require ( @@ -21,8 +21,8 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.9.1 // indirect - github.com/prometheus/procfs v0.0.8 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/go.sum b/go.sum index 0331eae..1566943 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy 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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= 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= @@ -130,8 +131,10 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= 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/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= 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/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -248,16 +251,20 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= 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/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= 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= @@ -300,6 +307,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -328,20 +336,29 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0 h1:YVIb/fVcOTMSqtqZWSKnHpSLBxu8DKgxq8z6RuBZwqI= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= @@ -350,6 +367,7 @@ github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= 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/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -495,6 +513,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -555,6 +574,7 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -570,6 +590,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -578,6 +600,7 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -590,6 +613,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -602,6 +626,7 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/socks/metrics.go b/socks/metrics.go new file mode 100644 index 0000000..1ce73a6 --- /dev/null +++ b/socks/metrics.go @@ -0,0 +1,29 @@ +package socks + +import ( + "github.com/cybozu-go/usocksd/metrics" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" +) + +var ( + proxyElapsedHist = promauto.With(metrics.Registry).NewHistogramVec(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "elapsed", + Help: "provides the time elapsed, in seconds, between proxy start and end", + }, []string{"result"}) + proxyRequestsInflightGauge = promauto.With(metrics.Registry).NewGauge(prometheus.GaugeOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "requests_inflight", + Help: "provides the number of requests currently in-flight", + }) + + socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "socks", + Name: "response", + Help: "socks responses", + }, []string{"version", "status"}) +) diff --git a/socks/server.go b/socks/server.go index 0adebbd..6abd204 100644 --- a/socks/server.go +++ b/socks/server.go @@ -192,12 +192,16 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { err = env.Wait() fields := well.FieldsFromContext(ctx) - fields["elapsed"] = time.Since(st).Seconds() + elapsed := time.Since(st).Seconds() + fields["elapsed"] = elapsed + proxyRequestsInflightGauge.Sub(1) if err != nil { fields[log.FnError] = err.Error() s.Logger.Error("proxy ends with an error", fields) + proxyElapsedHist.WithLabelValues("error").Observe(elapsed) return } + proxyElapsedHist.WithLabelValues("success").Observe(elapsed) if s.SilenceLogs { s.Logger.Debug("proxy ends", fields) } else { diff --git a/socks/socks4.go b/socks/socks4.go index f4857c8..5ad68ea 100644 --- a/socks/socks4.go +++ b/socks/socks4.go @@ -5,6 +5,7 @@ import ( "encoding/binary" "io" "net" + "strings" "github.com/cybozu-go/log" "github.com/cybozu-go/well" @@ -24,6 +25,9 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields[log.FnError] = err.Error() } s.Logger.Error(msg, fields) + rawStatus := socks4ResponseStatus(responseData[1]) + status := strings.ReplaceAll(rawStatus.String(), " ", "_") + socksResponseCounter.WithLabelValues("socks4", status).Inc() return nil } @@ -90,6 +94,8 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() + socksResponseCounter.WithLabelValues("socks4", Status4Granted.String()).Inc() + proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { s.Logger.Debug("proxy starts", fields) } else { diff --git a/socks/socks5.go b/socks/socks5.go index da0c476..124a6d1 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -5,6 +5,7 @@ import ( "encoding/binary" "io" "net" + "strings" "github.com/cybozu-go/log" "github.com/cybozu-go/netutil" @@ -45,6 +46,9 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne errFunc := func(msg string) net.Conn { conn.Write(response) s.Logger.Error(msg, fields) + rawStatus := socks5ResponseStatus(response[1]) + status := strings.ReplaceAll(rawStatus.String(), " ", "_") + socksResponseCounter.WithLabelValues("socks5", status).Inc() return nil } @@ -84,6 +88,8 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() + socksResponseCounter.WithLabelValues("socks5", Status5Granted.String()).Inc() + proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { s.Logger.Debug("proxy starts", fields) } else { From b3213f31bd46a0f4a3dad992360a87d85552a7e1 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 01:31:53 +0000 Subject: [PATCH 05/31] fix typo in Status5DeniedByRuleset string Signed-off-by: Hsn723 --- socks/defs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socks/defs.go b/socks/defs.go index 69d0ee8..8efe84f 100644 --- a/socks/defs.go +++ b/socks/defs.go @@ -127,7 +127,7 @@ func (s socks5ResponseStatus) String() string { case Status5Failure: return "failure" case Status5DeniedByRuleset: - return "now allowed" + return "not allowed" case Status5NetworkUnreachable: return "network unreachable" case Status5HostUnreachable: From a3458f7c1bcdd96594857324cb0540ca502a137a Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 02:59:30 +0000 Subject: [PATCH 06/31] refactor: fix lint issues without modifying original behavior Signed-off-by: Hsn723 --- .golangci.yml | 3 +++ address_group.go | 2 +- metrics/server.go | 2 +- ruleset.go | 6 +++--- socks/defs.go | 4 ++++ socks/server.go | 22 +++++++++++----------- socks/server_test.go | 16 +++++++++++----- socks/socks4.go | 10 +++++----- socks/socks5.go | 34 +++++++++++++++++----------------- 9 files changed, 56 insertions(+), 43 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6607fb2..7058442 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,3 +6,6 @@ linters: - revive - typecheck - unparam +linters-settings: + staticcheck: + checks: ["all", "-SA6002"] diff --git a/address_group.go b/address_group.go index 5f79826..9bf717c 100644 --- a/address_group.go +++ b/address_group.go @@ -70,7 +70,7 @@ func (a *AddressGroup) detectInvalid() { } a.lock.Lock() if len(invalids) > 0 && len(a.invalids) != len(invalids) { - log.Warn("detect black-listed IP", map[string]interface{}{ + _ = log.Warn("detect black-listed IP", map[string]interface{}{ "_bad_ips": toStringList(invalids), }) } diff --git a/metrics/server.go b/metrics/server.go index 5c4ebbf..2628625 100644 --- a/metrics/server.go +++ b/metrics/server.go @@ -64,5 +64,5 @@ func (s *Server) init() { // See https://godoc.org/github.com/cybozu-go/well#Server.Serve func (s *Server) Serve(ln net.Listener) { s.once.Do(s.init) - s.server.Serve(ln) + _ = s.server.Serve(ln) } diff --git a/ruleset.go b/ruleset.go index 2fbd5a3..c20ea76 100644 --- a/ruleset.go +++ b/ruleset.go @@ -16,7 +16,7 @@ func (ru ruleSet) Match(r *socks.Request) bool { tca, ok := clientAddr.(*net.TCPAddr) if !ru.allowFQDN(r.Hostname) { - log.Warn("denied access", map[string]interface{}{ + _ = log.Warn("denied access", map[string]interface{}{ "client_addr": clientAddr.String(), "fqdn": r.Hostname, }) @@ -24,14 +24,14 @@ func (ru ruleSet) Match(r *socks.Request) bool { } if ok && !ru.allowIP(tca.IP) { - log.Warn("denied access", map[string]interface{}{ + _ = log.Warn("denied access", map[string]interface{}{ "client_addr": clientAddr.String(), }) return false } if !ru.allowPort(r.Port) { - log.Warn("denied access", map[string]interface{}{ + _ = log.Warn("denied access", map[string]interface{}{ "client_addr": clientAddr.String(), "dest_port": r.Port, }) diff --git a/socks/defs.go b/socks/defs.go index 8efe84f..71ac994 100644 --- a/socks/defs.go +++ b/socks/defs.go @@ -143,3 +143,7 @@ func (s socks5ResponseStatus) String() string { } return "" } + +const ( + logFieldType = "access" +) diff --git a/socks/server.go b/socks/server.go index 6abd204..549c847 100644 --- a/socks/server.go +++ b/socks/server.go @@ -123,7 +123,7 @@ func (s *Server) dial(ctx context.Context, r *Request, network string) (net.Conn // handleConnection implements SOCKS protocol. func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { - conn.SetDeadline(time.Now().Add(negotiationTimeout)) + _ = conn.SetDeadline(time.Now().Add(negotiationTimeout)) var preamble [2]byte _, err := io.ReadFull(conn, preamble[:]) @@ -131,7 +131,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { fields := well.FieldsFromContext(ctx) fields["client_addr"] = conn.RemoteAddr().String() fields[log.FnError] = err.Error() - s.Logger.Error("failed to read preamble", fields) + _ = s.Logger.Error("failed to read preamble", fields) return } @@ -151,7 +151,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { default: fields := well.FieldsFromContext(ctx) fields["client_addr"] = conn.RemoteAddr().String() - s.Logger.Error("unknown SOCKS version", fields) + _ = s.Logger.Error("unknown SOCKS version", fields) return } defer destConn.Close() @@ -159,7 +159,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { // negotiation completed. var zeroTime time.Time - conn.SetDeadline(zeroTime) + _ = conn.SetDeadline(zeroTime) // do proxy st := time.Now() @@ -169,10 +169,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _, err := io.CopyBuffer(destConn, conn, buf) s.pool.Put(buf) if hc, ok := destConn.(netutil.HalfCloser); ok { - hc.CloseWrite() + _ = hc.CloseWrite() } if hc, ok := conn.(netutil.HalfCloser); ok { - hc.CloseRead() + _ = hc.CloseRead() } return err }) @@ -181,10 +181,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _, err := io.CopyBuffer(conn, destConn, buf) s.pool.Put(buf) if hc, ok := conn.(netutil.HalfCloser); ok { - hc.CloseWrite() + _ = hc.CloseWrite() } if hc, ok := destConn.(netutil.HalfCloser); ok { - hc.CloseRead() + _ = hc.CloseRead() } return err }) @@ -197,14 +197,14 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { proxyRequestsInflightGauge.Sub(1) if err != nil { fields[log.FnError] = err.Error() - s.Logger.Error("proxy ends with an error", fields) + _ = s.Logger.Error("proxy ends with an error", fields) proxyElapsedHist.WithLabelValues("error").Observe(elapsed) return } proxyElapsedHist.WithLabelValues("success").Observe(elapsed) if s.SilenceLogs { - s.Logger.Debug("proxy ends", fields) + _ = s.Logger.Debug("proxy ends", fields) } else { - s.Logger.Info("proxy ends", fields) + _ = s.Logger.Info("proxy ends", fields) } } diff --git a/socks/server_test.go b/socks/server_test.go index ec30949..12c9f5b 100644 --- a/socks/server_test.go +++ b/socks/server_test.go @@ -49,7 +49,9 @@ func TestServerBasic(t *testing.T) { Addr: ":20081", Handler: mux, } - go hs.ListenAndServe() + go func() { + _ = hs.ListenAndServe() + }() time.Sleep(10 * time.Millisecond) @@ -146,7 +148,9 @@ func TestServerAuth(t *testing.T) { Addr: ":20083", Handler: mux, } - go hs.ListenAndServe() + go func() { + _ = hs.ListenAndServe() + }() time.Sleep(10 * time.Millisecond) @@ -192,13 +196,13 @@ func TestServerAuth(t *testing.T) { } curl = exec.Command("curl", "-4", "-I", "-U", "user:", "--socks5", addr, url1) - out, err = curl.CombinedOutput() + _, err = curl.CombinedOutput() if err == nil { t.Error("authentication should fail") } curl = exec.Command("curl", "-4", "-I", "-U", "user:bad", "--socks5", addr, url1) - out, err = curl.CombinedOutput() + _, err = curl.CombinedOutput() if err == nil { t.Error("authentication should fail") } @@ -255,7 +259,9 @@ func TestServerRules(t *testing.T) { Addr: ":20085", Handler: mux, } - go hs.ListenAndServe() + go func() { + _ = hs.ListenAndServe() + }() time.Sleep(10 * time.Millisecond) diff --git a/socks/socks4.go b/socks/socks4.go index 5ad68ea..b9ce52c 100644 --- a/socks/socks4.go +++ b/socks/socks4.go @@ -15,16 +15,16 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) var responseData [8]byte responseData[1] = byte(Status4Rejected) fields := well.FieldsFromContext(ctx) - fields[log.FnType] = "access" + fields[log.FnType] = logFieldType fields[log.FnProtocol] = SOCKS4.String() fields["client_addr"] = conn.RemoteAddr().String() errFunc := func(msg string, err error) net.Conn { - conn.Write(responseData[:]) + _, _ = conn.Write(responseData[:]) if err != nil { fields[log.FnError] = err.Error() } - s.Logger.Error(msg, fields) + _ = s.Logger.Error(msg, fields) rawStatus := socks4ResponseStatus(responseData[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") socksResponseCounter.WithLabelValues("socks4", status).Inc() @@ -97,9 +97,9 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) socksResponseCounter.WithLabelValues("socks4", Status4Granted.String()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { - s.Logger.Debug("proxy starts", fields) + _ = s.Logger.Debug("proxy starts", fields) } else { - s.Logger.Info("proxy starts", fields) + _ = s.Logger.Info("proxy starts", fields) } return destConn } diff --git a/socks/socks5.go b/socks/socks5.go index 124a6d1..153a330 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -26,14 +26,14 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne } if s.Logger.Enabled(log.LvDebug) { - s.Logger.Debug("request info", map[string]interface{}{ + _ = s.Logger.Debug("request info", map[string]interface{}{ "request": r, }) } response := makeSOCKS5Response(r) fields := well.FieldsFromContext(ctx) - fields[log.FnType] = "access" + fields[log.FnType] = logFieldType fields[log.FnProtocol] = SOCKS5.String() fields["client_addr"] = conn.RemoteAddr().String() fields["command"] = r.Command.String() @@ -44,8 +44,8 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne } errFunc := func(msg string) net.Conn { - conn.Write(response) - s.Logger.Error(msg, fields) + _, _ = conn.Write(response) + _ = s.Logger.Error(msg, fields) rawStatus := socks5ResponseStatus(response[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") socksResponseCounter.WithLabelValues("socks5", status).Inc() @@ -91,9 +91,9 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne socksResponseCounter.WithLabelValues("socks5", Status5Granted.String()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { - s.Logger.Debug("proxy starts", fields) + _ = s.Logger.Debug("proxy starts", fields) } else { - s.Logger.Info("proxy starts", fields) + _ = s.Logger.Info("proxy starts", fields) } return destConn } @@ -110,13 +110,13 @@ func hasAuth(t authType, methods []byte) bool { func (s *Server) negotiateAuth(r *Request, nauth int) bool { logError := func(msg string, err error) { fields := well.FieldsFromContext(r.ctx) - fields[log.FnType] = "access" + fields[log.FnType] = logFieldType fields[log.FnProtocol] = SOCKS5.String() fields["client_addr"] = r.Conn.RemoteAddr().String() if err != nil { fields[log.FnError] = err.Error() } - s.Logger.Error(msg, fields) + _ = s.Logger.Error(msg, fields) } methods := make([]byte, nauth) @@ -144,12 +144,12 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { var preamble [2]byte _, err = io.ReadFull(r.Conn, preamble[:]) if err != nil { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("failed to read username/password", err) return false } if preamble[0] != 0x01 { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("invalid auth version", nil) return false } @@ -159,7 +159,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { username := make([]byte, usernameLength) _, err := io.ReadFull(r.Conn, username) if err != nil { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("failed to read username", err) return false } @@ -169,7 +169,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { var oneByte [1]byte _, err = io.ReadFull(r.Conn, oneByte[:]) if err != nil { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("failed to read password length", err) return false } @@ -177,7 +177,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { password := make([]byte, oneByte[0]) _, err := io.ReadFull(r.Conn, password) if err != nil { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("failed to read password", err) return false } @@ -185,7 +185,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { } if s.Auth != nil && !s.Auth.Authenticate(r) { - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("authentication failure", nil) return false } @@ -219,7 +219,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { // unacceptable authentication method FAIL: response[1] = 0xff - r.Conn.Write(response[:]) + _, _ = r.Conn.Write(response[:]) logError("no acceptable auth methods", nil) return false } @@ -227,13 +227,13 @@ FAIL: func (s *Server) readAddress(r *Request) bool { logError := func(msg string, err error) { fields := well.FieldsFromContext(r.ctx) - fields[log.FnType] = "access" + fields[log.FnType] = logFieldType fields[log.FnProtocol] = SOCKS5.String() fields["client_addr"] = r.Conn.RemoteAddr().String() if err != nil { fields[log.FnError] = err.Error() } - s.Logger.Error(msg, fields) + _ = s.Logger.Error(msg, fields) } var addrData [4]byte From c4c00ca85ddc272b15d00b47478478a71ae367d5 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 04:26:36 +0000 Subject: [PATCH 07/31] add metrics for proxy Signed-off-by: Hsn723 --- socks/metrics.go | 24 ++++++++++++++++++++++++ socks/server.go | 12 ++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 1ce73a6..eef41b0 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -19,6 +19,30 @@ var ( Name: "requests_inflight", Help: "provides the number of requests currently in-flight", }) + proxyBytesTxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "bytes_tx", + Help: "bytes copied from the source connection to the destination connection", + }) + proxyBytesRxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "bytes_rx", + Help: "bytes copied from the destination connection to the source connection", + }) + proxyErrSrcCopyCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "error_copy_src", + Help: "number of errors encountered copying from source to destination", + }) + proxyErrDestCopyCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "error_copy_dest", + Help: "number of errors encountered copying from destination to source", + }) socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, diff --git a/socks/server.go b/socks/server.go index 549c847..2f13014 100644 --- a/socks/server.go +++ b/socks/server.go @@ -166,7 +166,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { env := well.NewEnvironment(ctx) env.Go(func(ctx context.Context) error { buf := s.pool.Get().([]byte) - _, err := io.CopyBuffer(destConn, conn, buf) + b, err := io.CopyBuffer(destConn, conn, buf) s.pool.Put(buf) if hc, ok := destConn.(netutil.HalfCloser); ok { _ = hc.CloseWrite() @@ -174,11 +174,15 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { if hc, ok := conn.(netutil.HalfCloser); ok { _ = hc.CloseRead() } + proxyBytesTxHist.Observe(float64(b)) + if err != nil { + proxyErrSrcCopyCount.Inc() + } return err }) env.Go(func(ctx context.Context) error { buf := s.pool.Get().([]byte) - _, err := io.CopyBuffer(conn, destConn, buf) + b, err := io.CopyBuffer(conn, destConn, buf) s.pool.Put(buf) if hc, ok := conn.(netutil.HalfCloser); ok { _ = hc.CloseWrite() @@ -186,6 +190,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { if hc, ok := destConn.(netutil.HalfCloser); ok { _ = hc.CloseRead() } + proxyBytesRxHist.Observe(float64(b)) + if err != nil { + proxyErrDestCopyCount.Inc() + } return err }) env.Stop() From ccc7fbb41d41bb3dbb2f607ef4fd5c5f15566e4e Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 04:33:51 +0000 Subject: [PATCH 08/31] remove circleci Signed-off-by: Hsn723 --- .circleci/config.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 5dab03a..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: quay.io/cybozu/golang:1.18-focal - working_directory: /work - steps: - - run: git config --global --add safe.directory /tmp/_circleci_local_build_repo - - checkout - - run: test -z "$(gofmt -s -l . | grep -v '^vendor' | tee /dev/stderr)" - - run: golint -set_exit_status . - - run: go build ./... - - run: NO_PROXY= go test -race -v -coverprofile cover.out ./... - - run: go vet ./... - -workflows: - version: 2 - main: - jobs: - - build From 7cca6ba1463af267d7d617bfc453b03594ee18ea Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Mon, 11 Jul 2022 05:03:00 +0000 Subject: [PATCH 09/31] instrument time spent copying to/from buffers Signed-off-by: Hsn723 --- socks/metrics.go | 12 ++++++++++++ socks/server.go | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/socks/metrics.go b/socks/metrics.go index eef41b0..7021435 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -43,6 +43,18 @@ var ( Name: "error_copy_dest", Help: "number of errors encountered copying from destination to source", }) + proxySrcCopyElapsedHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "copy_src_elapsed", + Help: "time spent copying from source to destination", + }) + proxyDestCopyElapsedHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "copy_dest_elapsed", + Help: "time spent copying from destination to source", + }) socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, diff --git a/socks/server.go b/socks/server.go index 2f13014..987b2c0 100644 --- a/socks/server.go +++ b/socks/server.go @@ -165,6 +165,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { st := time.Now() env := well.NewEnvironment(ctx) env.Go(func(ctx context.Context) error { + sst := time.Now() buf := s.pool.Get().([]byte) b, err := io.CopyBuffer(destConn, conn, buf) s.pool.Put(buf) @@ -174,6 +175,8 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { if hc, ok := conn.(netutil.HalfCloser); ok { _ = hc.CloseRead() } + elapsed := time.Since(sst).Seconds() + proxySrcCopyElapsedHist.Observe(elapsed) proxyBytesTxHist.Observe(float64(b)) if err != nil { proxyErrSrcCopyCount.Inc() @@ -181,6 +184,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { return err }) env.Go(func(ctx context.Context) error { + sst := time.Now() buf := s.pool.Get().([]byte) b, err := io.CopyBuffer(conn, destConn, buf) s.pool.Put(buf) @@ -190,6 +194,8 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { if hc, ok := destConn.(netutil.HalfCloser); ok { _ = hc.CloseRead() } + elapsed := time.Since(sst).Seconds() + proxyDestCopyElapsedHist.Observe(elapsed) proxyBytesRxHist.Observe(float64(b)) if err != nil { proxyErrDestCopyCount.Inc() From 706f71391f922c5dcea33caa1a1a0567b71fa805 Mon Sep 17 00:00:00 2001 From: Hsn723 Date: Tue, 19 Jul 2022 07:31:53 +0000 Subject: [PATCH 10/31] instrument auth negotiation and address reading, refactor metrics Signed-off-by: Hsn723 --- socks/metrics.go | 28 +++++++++++++++++++++++++++- socks/socks4.go | 4 ++-- socks/socks5.go | 12 ++++++++++-- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 7021435..88582b3 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -56,10 +56,36 @@ var ( Help: "time spent copying from destination to source", }) + authNegotiateFailureCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "auth", + Name: "negotiate_failure", + Help: "auth negotiation failures", + }, []string{"type", "reason"}) + authNegotiateSuccessCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "socks5", + Name: "auth_negotiate_success", + Help: "auth negotiation successes", + }, []string{"type"}) + + addressReadFailureCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "socks5", + Name: "address_read_failure", + Help: "address read failures", + }, []string{"reason"}) + addressReadSuccessCounter = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "socks5", + Name: "address_read_success", + Help: "address read successes", + }) + socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "socks", Name: "response", Help: "socks responses", - }, []string{"version", "status"}) + }, []string{"version", "status", "reason"}) ) diff --git a/socks/socks4.go b/socks/socks4.go index b9ce52c..cc0bac7 100644 --- a/socks/socks4.go +++ b/socks/socks4.go @@ -27,7 +27,7 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) _ = s.Logger.Error(msg, fields) rawStatus := socks4ResponseStatus(responseData[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") - socksResponseCounter.WithLabelValues("socks4", status).Inc() + socksResponseCounter.WithLabelValues(SOCKS4.String(), status, msg).Inc() return nil } @@ -94,7 +94,7 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - socksResponseCounter.WithLabelValues("socks4", Status4Granted.String()).Inc() + socksResponseCounter.WithLabelValues(SOCKS4.String(), Status4Granted.String(), "").Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) diff --git a/socks/socks5.go b/socks/socks5.go index 153a330..ceb4956 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -48,7 +48,7 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne _ = s.Logger.Error(msg, fields) rawStatus := socks5ResponseStatus(response[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") - socksResponseCounter.WithLabelValues("socks5", status).Inc() + socksResponseCounter.WithLabelValues(SOCKS5.String(), status, msg).Inc() return nil } @@ -88,7 +88,7 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - socksResponseCounter.WithLabelValues("socks5", Status5Granted.String()).Inc() + socksResponseCounter.WithLabelValues(SOCKS5.String(), Status5Granted.String(), "").Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) @@ -108,6 +108,7 @@ func hasAuth(t authType, methods []byte) bool { } func (s *Server) negotiateAuth(r *Request, nauth int) bool { + var chosenAuthMethod string logError := func(msg string, err error) { fields := well.FieldsFromContext(r.ctx) fields[log.FnType] = logFieldType @@ -117,6 +118,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) + authNegotiateFailureCounter.WithLabelValues(chosenAuthMethod, msg).Inc() } methods := make([]byte, nauth) @@ -130,6 +132,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { response[0] = byte(SOCKS5) if hasAuth(AuthBasic, methods) { + chosenAuthMethod = AuthBasic.String() response[1] = byte(AuthBasic) _, err = r.Conn.Write(response[:]) if err != nil { @@ -197,10 +200,12 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { return false } + authNegotiateSuccessCounter.WithLabelValues(chosenAuthMethod).Inc() return true } if hasAuth(AuthNo, methods) { + chosenAuthMethod = AuthNo.String() if s.Auth != nil && !s.Auth.Authenticate(r) { // No authentication method still need to be checked // by s.Auth if given. @@ -213,6 +218,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { logError("failed to negotiate auth method", err) return false } + authNegotiateSuccessCounter.WithLabelValues(chosenAuthMethod).Inc() return true } @@ -234,6 +240,7 @@ func (s *Server) readAddress(r *Request) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) + addressReadFailureCounter.WithLabelValues(msg).Inc() } var addrData [4]byte @@ -294,6 +301,7 @@ func (s *Server) readAddress(r *Request) bool { } r.Port = int(binary.BigEndian.Uint16(portData[:])) + addressReadSuccessCounter.Inc() return true } From ce792e31e26d52749bd6e58e915c61ecaef5adda Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 06:27:17 +0000 Subject: [PATCH 11/31] remove duplicated jobs --- .github/workflows/main.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e864403..d539691 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,15 +7,6 @@ on: env: go-version: 1.18 jobs: - fmt: - name: Fmt - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version: ${{ env.go-version }} - - run: test -z "$(gofmt -s -l . | grep -v '^vendor' | tee /dev/stderr)" lint: name: Lint runs-on: ubuntu-20.04 @@ -43,12 +34,3 @@ jobs: with: go-version: ${{ env.go-version }} - run: NO_PROXY= go test -race -v -coverprofile cover.out ./... - vet: - name: Vet - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version: ${{ env.go-version }} - - run: go vet ./... From 155e6052160764a8c33e0afcb7770f5bec86da96 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 06:32:16 +0000 Subject: [PATCH 12/31] fix inconsistent metric name --- socks/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socks/metrics.go b/socks/metrics.go index 88582b3..3db67cf 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -58,7 +58,7 @@ var ( authNegotiateFailureCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, - Subsystem: "auth", + Subsystem: "socks5", Name: "negotiate_failure", Help: "auth negotiation failures", }, []string{"type", "reason"}) From 9da58bad26ed880b990a547de65f27cccc01e14d Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 06:36:47 +0000 Subject: [PATCH 13/31] do not listen when creating listner is failed --- cmd/usocksd/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/usocksd/main.go b/cmd/usocksd/main.go index 54045cc..b4d4c4c 100644 --- a/cmd/usocksd/main.go +++ b/cmd/usocksd/main.go @@ -25,6 +25,7 @@ func serveMetrics(c *usocksd.Config) { _ = log.Warn("could not initialize metrics server, but will proceed without it", map[string]interface{}{ "error": err.Error(), }) + return } metricsServer.Serve(mln) } From 5d75409f929a4e4b772307b4ba9bf919ed3cb600 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 06:42:28 +0000 Subject: [PATCH 14/31] upgrade go to 1.20.1 --- .github/workflows/main.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d539691..5b756eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: branches: - 'master' env: - go-version: 1.18 + go-version: 1.20.1 jobs: lint: name: Lint diff --git a/go.mod b/go.mod index 9949b08..67dc142 100644 --- a/go.mod +++ b/go.mod @@ -40,4 +40,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.18 +go 1.19 From 05787bcd21056833e94909d2bb2bab401f194826 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 06:50:03 +0000 Subject: [PATCH 15/31] use io instead of ioutil --- metrics/server_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metrics/server_test.go b/metrics/server_test.go index 92ecdec..9b077f1 100644 --- a/metrics/server_test.go +++ b/metrics/server_test.go @@ -2,7 +2,7 @@ package metrics import ( "context" - "io/ioutil" + "io" "net" "net/http" "strings" @@ -38,7 +38,7 @@ func TestMetricsServer(t *testing.T) { t.Error(err) } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { t.Error(err) } From 65ab49252531a291fe3fa521963ea0fe5cde6f5a Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Fri, 3 Mar 2023 07:32:49 +0000 Subject: [PATCH 16/31] gofmt --- socks/doc.go | 1 - 1 file changed, 1 deletion(-) diff --git a/socks/doc.go b/socks/doc.go index 769350c..2beb8e1 100644 --- a/socks/doc.go +++ b/socks/doc.go @@ -6,6 +6,5 @@ Features: * Username/password authentication. * CONNECT command (BIND and UDP ASSOCIATE is not supported). * Graceful stop (thanks to github.com/cybozu-go/well package). - */ package socks From a13e8d99746e505c004f8f42329a3b0622a07cea Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 8 Mar 2023 05:16:10 +0000 Subject: [PATCH 17/31] build with -trimpath --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b756eb..3e9e51b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: ${{ env.go-version }} - - run: go build ./... + - run: go build -trimpath ./... test: name: Test runs-on: ubuntu-20.04 From 3904468f6ae43d35f0f7d0618b69f3ec5fe1dfe5 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 8 Mar 2023 05:21:19 +0000 Subject: [PATCH 18/31] exit by ErrorExit when serving metrics server failed --- cmd/usocksd/main.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/usocksd/main.go b/cmd/usocksd/main.go index b4d4c4c..7693722 100644 --- a/cmd/usocksd/main.go +++ b/cmd/usocksd/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "fmt" "net" "os" @@ -18,16 +19,14 @@ var ( optFile = flag.String("f", "", "configuration file name") ) -func serveMetrics(c *usocksd.Config) { +func serveMetrics(c *usocksd.Config) error { metricsServer := usocksd.NewMetricsServer(c) mln, err := usocksd.MetricsListener(c) if err != nil { - _ = log.Warn("could not initialize metrics server, but will proceed without it", map[string]interface{}{ - "error": err.Error(), - }) - return + return fmt.Errorf("could not initialize metrics server: %w", err) } metricsServer.Serve(mln) + return nil } func serve(lns []net.Listener, c *usocksd.Config) { @@ -35,7 +34,9 @@ func serve(lns []net.Listener, c *usocksd.Config) { for _, ln := range lns { socksServer.Serve(ln) } - serveMetrics(c) + if err := serveMetrics(c); err != nil { + log.ErrorExit(err) + } if err := well.Wait(); err != nil && !well.IsSignaled(err) { log.ErrorExit(err) } From e0954872c0316ef635783ff36ed43225f95d2875 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 8 Mar 2023 05:26:41 +0000 Subject: [PATCH 19/31] metrics server now listens on ipv4/ipv6 addr --- server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.go b/server.go index 0ea6b78..1010b89 100644 --- a/server.go +++ b/server.go @@ -1,6 +1,7 @@ package usocksd import ( + "fmt" "net" "strconv" @@ -35,7 +36,7 @@ func Listeners(c *Config) ([]net.Listener, error) { // MetricsListener returns a listener for the metrics server. func MetricsListener(c *Config) (net.Listener, error) { - addr := net.JoinHostPort("0.0.0.0", strconv.Itoa(c.Incoming.MetricsPort)) + addr := fmt.Sprintf(":%d", c.Incoming.MetricsPort) return net.Listen("tcp", addr) } From 0c796be6c0ecb421e2832edd6d52293106959d38 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Mon, 13 Mar 2023 02:45:28 +0000 Subject: [PATCH 20/31] fix metric names --- socks/metrics.go | 70 +++++++++++++++++------------------------------- socks/server.go | 8 +++--- socks/socks5.go | 18 +++++++++---- 3 files changed, 41 insertions(+), 55 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 3db67cf..94d71dc 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -10,82 +10,60 @@ var ( proxyElapsedHist = promauto.With(metrics.Registry).NewHistogramVec(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "elapsed", + Name: "process_seconds", Help: "provides the time elapsed, in seconds, between proxy start and end", }, []string{"result"}) proxyRequestsInflightGauge = promauto.With(metrics.Registry).NewGauge(prometheus.GaugeOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "requests_inflight", + Name: "inflight_requests", Help: "provides the number of requests currently in-flight", }) proxyBytesTxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "bytes_tx", + Name: "tx_bytes", Help: "bytes copied from the source connection to the destination connection", }) proxyBytesRxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "bytes_rx", + Name: "rx_bytes", Help: "bytes copied from the destination connection to the source connection", }) - proxyErrSrcCopyCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ - Namespace: metrics.Namespace, - Subsystem: "proxy", - Name: "error_copy_src", - Help: "number of errors encountered copying from source to destination", - }) - proxyErrDestCopyCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ - Namespace: metrics.Namespace, - Subsystem: "proxy", - Name: "error_copy_dest", - Help: "number of errors encountered copying from destination to source", - }) - proxySrcCopyElapsedHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + + proxyCopyErrCount = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "copy_src_elapsed", - Help: "time spent copying from source to destination", - }) - proxyDestCopyElapsedHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Name: "copy_errors_total", + Help: "number of errors encountered copying from source/destination to destination/source", + }, []string{"from"}) + + proxyCopyElapsedHist = promauto.With(metrics.Registry).NewHistogramVec(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "copy_dest_elapsed", - Help: "time spent copying from destination to source", - }) + Name: "copy_seconds", + Help: "time spent copying from source/destination to destination/source", + }, []string{"from"}) - authNegotiateFailureCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ - Namespace: metrics.Namespace, - Subsystem: "socks5", - Name: "negotiate_failure", - Help: "auth negotiation failures", - }, []string{"type", "reason"}) - authNegotiateSuccessCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + authNegotiateCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "socks5", - Name: "auth_negotiate_success", - Help: "auth negotiation successes", - }, []string{"type"}) + Name: "auth_negotiated_total", + Help: "number of auth negotiation", + }, []string{"type", "reason", "result"}) - addressReadFailureCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + addressReadCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "socks5", - Name: "address_read_failure", - Help: "address read failures", - }, []string{"reason"}) - addressReadSuccessCounter = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ - Namespace: metrics.Namespace, - Subsystem: "socks5", - Name: "address_read_success", - Help: "address read successes", - }) + Name: "address_read_total", + Help: "address read total count", + }, []string{"reason", "result"}) socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "socks", - Name: "response", - Help: "socks responses", + Name: "responses_total", + Help: "number of socks responses", }, []string{"version", "status", "reason"}) ) diff --git a/socks/server.go b/socks/server.go index 987b2c0..e468280 100644 --- a/socks/server.go +++ b/socks/server.go @@ -176,10 +176,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _ = hc.CloseRead() } elapsed := time.Since(sst).Seconds() - proxySrcCopyElapsedHist.Observe(elapsed) + proxyCopyElapsedHist.WithLabelValues("src").Observe(elapsed) proxyBytesTxHist.Observe(float64(b)) if err != nil { - proxyErrSrcCopyCount.Inc() + proxyCopyErrCount.WithLabelValues("src").Inc() } return err }) @@ -195,10 +195,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _ = hc.CloseRead() } elapsed := time.Since(sst).Seconds() - proxyDestCopyElapsedHist.Observe(elapsed) + proxyCopyElapsedHist.WithLabelValues("dest").Observe(elapsed) proxyBytesRxHist.Observe(float64(b)) if err != nil { - proxyErrDestCopyCount.Inc() + proxyCopyErrCount.WithLabelValues("dest").Inc() } return err }) diff --git a/socks/socks5.go b/socks/socks5.go index ceb4956..231b2c8 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -12,6 +12,14 @@ import ( "github.com/cybozu-go/well" ) +const ( + authResultOk = "ok" + authResultFailed = "failed" + + addressReadOk = "ok" + addressReadFailed = "failed" +) + func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) net.Conn { r := &Request{ Version: SOCKS5, @@ -118,7 +126,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - authNegotiateFailureCounter.WithLabelValues(chosenAuthMethod, msg).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, msg, authResultFailed).Inc() } methods := make([]byte, nauth) @@ -200,7 +208,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { return false } - authNegotiateSuccessCounter.WithLabelValues(chosenAuthMethod).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, "", authResultOk).Inc() return true } @@ -218,7 +226,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { logError("failed to negotiate auth method", err) return false } - authNegotiateSuccessCounter.WithLabelValues(chosenAuthMethod).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, "", authResultOk).Inc() return true } @@ -240,7 +248,7 @@ func (s *Server) readAddress(r *Request) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - addressReadFailureCounter.WithLabelValues(msg).Inc() + addressReadCounter.WithLabelValues(msg, addressReadFailed).Inc() } var addrData [4]byte @@ -301,7 +309,7 @@ func (s *Server) readAddress(r *Request) bool { } r.Port = int(binary.BigEndian.Uint16(portData[:])) - addressReadSuccessCounter.Inc() + addressReadCounter.WithLabelValues("", addressReadOk).Inc() return true } From 03fb5bd4d4c5c5e61658581c1b3bee67e18be65e Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Tue, 14 Mar 2023 00:36:38 +0000 Subject: [PATCH 21/31] fix error handring on serving metrics server --- cmd/usocksd/main.go | 3 +-- metrics/server.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/usocksd/main.go b/cmd/usocksd/main.go index 7693722..5f3d78e 100644 --- a/cmd/usocksd/main.go +++ b/cmd/usocksd/main.go @@ -25,8 +25,7 @@ func serveMetrics(c *usocksd.Config) error { if err != nil { return fmt.Errorf("could not initialize metrics server: %w", err) } - metricsServer.Serve(mln) - return nil + return metricsServer.Serve(mln) } func serve(lns []net.Listener, c *usocksd.Config) { diff --git a/metrics/server.go b/metrics/server.go index 2628625..2f6dae5 100644 --- a/metrics/server.go +++ b/metrics/server.go @@ -62,7 +62,7 @@ func (s *Server) init() { // Serve starts a goroutine to accept connections. // This returns immediately. l will be closed when s.Env is canceled. // See https://godoc.org/github.com/cybozu-go/well#Server.Serve -func (s *Server) Serve(ln net.Listener) { +func (s *Server) Serve(ln net.Listener) error { s.once.Do(s.init) - _ = s.server.Serve(ln) + return s.server.Serve(ln) } From 866a5c22b0d59e34d4c7d86731fa062bbad9d013 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Tue, 14 Mar 2023 01:11:16 +0000 Subject: [PATCH 22/31] fix metric names --- socks/metrics.go | 32 +++++++++++++++++++++++--------- socks/server.go | 8 ++++---- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 94d71dc..214c991 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -10,7 +10,7 @@ var ( proxyElapsedHist = promauto.With(metrics.Registry).NewHistogramVec(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "process_seconds", + Name: "elapsed_seconds", Help: "provides the time elapsed, in seconds, between proxy start and end", }, []string{"result"}) proxyRequestsInflightGauge = promauto.With(metrics.Registry).NewGauge(prometheus.GaugeOpts{ @@ -32,19 +32,33 @@ var ( Help: "bytes copied from the destination connection to the source connection", }) - proxyCopyErrCount = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + proxyErrTxCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "copy_errors_total", - Help: "number of errors encountered copying from source/destination to destination/source", - }, []string{"from"}) + Name: "tx_errors_total", + Help: "number of errors encountered copying from source to destination", + }) + + proxyErrRxCount = promauto.With(metrics.Registry).NewCounter(prometheus.CounterOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "rx_errors_total", + Help: "number of errors encountered copying from destination to source", + }) - proxyCopyElapsedHist = promauto.With(metrics.Registry).NewHistogramVec(prometheus.HistogramOpts{ + proxyElapsedTxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ Namespace: metrics.Namespace, Subsystem: "proxy", - Name: "copy_seconds", - Help: "time spent copying from source/destination to destination/source", - }, []string{"from"}) + Name: "tx_seconds", + Help: "time spent copying from source to destination", + }) + + proxyElapsedRxHist = promauto.With(metrics.Registry).NewHistogram(prometheus.HistogramOpts{ + Namespace: metrics.Namespace, + Subsystem: "proxy", + Name: "rx_seconds", + Help: "time spent copying from destination to source", + }) authNegotiateCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, diff --git a/socks/server.go b/socks/server.go index e468280..2b636b1 100644 --- a/socks/server.go +++ b/socks/server.go @@ -176,10 +176,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _ = hc.CloseRead() } elapsed := time.Since(sst).Seconds() - proxyCopyElapsedHist.WithLabelValues("src").Observe(elapsed) + proxyElapsedTxHist.Observe(elapsed) proxyBytesTxHist.Observe(float64(b)) if err != nil { - proxyCopyErrCount.WithLabelValues("src").Inc() + proxyErrTxCount.Inc() } return err }) @@ -195,10 +195,10 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _ = hc.CloseRead() } elapsed := time.Since(sst).Seconds() - proxyCopyElapsedHist.WithLabelValues("dest").Observe(elapsed) + proxyElapsedRxHist.Observe(elapsed) proxyBytesRxHist.Observe(float64(b)) if err != nil { - proxyCopyErrCount.WithLabelValues("dest").Inc() + proxyErrRxCount.Inc() } return err }) From 4a7bdc74e4bcfd0e365dd24c919376cd332e064e Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Tue, 14 Mar 2023 01:18:44 +0000 Subject: [PATCH 23/31] fix test --- metrics/server_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/metrics/server_test.go b/metrics/server_test.go index 9b077f1..6066aaf 100644 --- a/metrics/server_test.go +++ b/metrics/server_test.go @@ -22,9 +22,11 @@ func TestMetricsServer(t *testing.T) { } ln, err := net.Listen("tcp", ":30080") if err != nil { - t.Skip(err) + t.Fatal(err) + } + if err := s.Serve(ln); err != nil { + t.Fatal(err) } - s.Serve(ln) dummyMetric := prometheus.NewCounter(prometheus.CounterOpts{ Name: "dummy_counter", }) From cb5f044b7fc4d361cbb658f8fc177ab6eba77dc2 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 15 Mar 2023 07:59:20 +0000 Subject: [PATCH 24/31] collect all connections count --- socks/metrics.go | 9 ++++----- socks/server.go | 2 ++ socks/socks4.go | 4 ++-- socks/socks5.go | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 214c991..1e960dc 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -74,10 +74,9 @@ var ( Help: "address read total count", }, []string{"reason", "result"}) - socksResponseCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ + connectionCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, - Subsystem: "socks", - Name: "responses_total", - Help: "number of socks responses", - }, []string{"version", "status", "reason"}) + Name: "connections_total", + Help: "number of TCP connections", + }, []string{"version", "status"}) ) diff --git a/socks/server.go b/socks/server.go index 2b636b1..aa997a1 100644 --- a/socks/server.go +++ b/socks/server.go @@ -132,6 +132,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { fields["client_addr"] = conn.RemoteAddr().String() fields[log.FnError] = err.Error() _ = s.Logger.Error("failed to read preamble", fields) + connectionCounter.WithLabelValues("unknown", "invalid_request").Inc() return } @@ -152,6 +153,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { fields := well.FieldsFromContext(ctx) fields["client_addr"] = conn.RemoteAddr().String() _ = s.Logger.Error("unknown SOCKS version", fields) + connectionCounter.WithLabelValues("unknown", "unknown_version").Inc() return } defer destConn.Close() diff --git a/socks/socks4.go b/socks/socks4.go index cc0bac7..f13b8c0 100644 --- a/socks/socks4.go +++ b/socks/socks4.go @@ -27,7 +27,7 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) _ = s.Logger.Error(msg, fields) rawStatus := socks4ResponseStatus(responseData[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") - socksResponseCounter.WithLabelValues(SOCKS4.String(), status, msg).Inc() + connectionCounter.WithLabelValues(SOCKS4.String(), status).Inc() return nil } @@ -94,7 +94,7 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - socksResponseCounter.WithLabelValues(SOCKS4.String(), Status4Granted.String(), "").Inc() + connectionCounter.WithLabelValues(SOCKS4.String(), Status4Granted.String()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) diff --git a/socks/socks5.go b/socks/socks5.go index 231b2c8..d666ba3 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -56,7 +56,7 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne _ = s.Logger.Error(msg, fields) rawStatus := socks5ResponseStatus(response[1]) status := strings.ReplaceAll(rawStatus.String(), " ", "_") - socksResponseCounter.WithLabelValues(SOCKS5.String(), status, msg).Inc() + connectionCounter.WithLabelValues(SOCKS5.String(), status).Inc() return nil } @@ -96,7 +96,7 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - socksResponseCounter.WithLabelValues(SOCKS5.String(), Status5Granted.String(), "").Inc() + connectionCounter.WithLabelValues(SOCKS5.String(), Status5Granted.String()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) From fbc06d14ae3230d5ebd5f0ccca8087b1c8b12e33 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 15 Mar 2023 08:00:51 +0000 Subject: [PATCH 25/31] remove reason labels --- socks/metrics.go | 4 ++-- socks/socks5.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/socks/metrics.go b/socks/metrics.go index 1e960dc..a566275 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -65,14 +65,14 @@ var ( Subsystem: "socks5", Name: "auth_negotiated_total", Help: "number of auth negotiation", - }, []string{"type", "reason", "result"}) + }, []string{"type", "result"}) addressReadCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, Subsystem: "socks5", Name: "address_read_total", Help: "address read total count", - }, []string{"reason", "result"}) + }, []string{"result"}) connectionCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, diff --git a/socks/socks5.go b/socks/socks5.go index d666ba3..7835856 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -126,7 +126,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - authNegotiateCounter.WithLabelValues(chosenAuthMethod, msg, authResultFailed).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultFailed).Inc() } methods := make([]byte, nauth) @@ -208,7 +208,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { return false } - authNegotiateCounter.WithLabelValues(chosenAuthMethod, "", authResultOk).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultOk).Inc() return true } @@ -226,7 +226,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { logError("failed to negotiate auth method", err) return false } - authNegotiateCounter.WithLabelValues(chosenAuthMethod, "", authResultOk).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultOk).Inc() return true } @@ -248,7 +248,7 @@ func (s *Server) readAddress(r *Request) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - addressReadCounter.WithLabelValues(msg, addressReadFailed).Inc() + addressReadCounter.WithLabelValues(addressReadFailed).Inc() } var addrData [4]byte @@ -309,7 +309,7 @@ func (s *Server) readAddress(r *Request) bool { } r.Port = int(binary.BigEndian.Uint16(portData[:])) - addressReadCounter.WithLabelValues("", addressReadOk).Inc() + addressReadCounter.WithLabelValues(addressReadOk).Inc() return true } From e0a3f108f4108c5a50d37aa62904afa3c3ea088f Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 15 Mar 2023 09:05:21 +0000 Subject: [PATCH 26/31] add type label for address read counter --- socks/defs.go | 2 ++ socks/metrics.go | 2 +- socks/socks5.go | 8 ++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/socks/defs.go b/socks/defs.go index 71ac994..3ec739d 100644 --- a/socks/defs.go +++ b/socks/defs.go @@ -1,5 +1,7 @@ package socks +import "strings" + type version byte // SOCKS versions. diff --git a/socks/metrics.go b/socks/metrics.go index a566275..718354c 100644 --- a/socks/metrics.go +++ b/socks/metrics.go @@ -72,7 +72,7 @@ var ( Subsystem: "socks5", Name: "address_read_total", Help: "address read total count", - }, []string{"result"}) + }, []string{"type", "result"}) connectionCounter = promauto.With(metrics.Registry).NewCounterVec(prometheus.CounterOpts{ Namespace: metrics.Namespace, diff --git a/socks/socks5.go b/socks/socks5.go index 7835856..b5ab68a 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -239,6 +239,7 @@ FAIL: } func (s *Server) readAddress(r *Request) bool { + var addrType addressType logError := func(msg string, err error) { fields := well.FieldsFromContext(r.ctx) fields[log.FnType] = logFieldType @@ -248,7 +249,7 @@ func (s *Server) readAddress(r *Request) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - addressReadCounter.WithLabelValues(addressReadFailed).Inc() + addressReadCounter.WithLabelValues(addrType.LabelValue(), addressReadFailed).Inc() } var addrData [4]byte @@ -265,6 +266,7 @@ func (s *Server) readAddress(r *Request) bool { switch addressType(addrData[3]) { case AddrIPv4: + addrType = AddrIPv4 var ipv4Data [4]byte _, err := io.ReadFull(r.Conn, ipv4Data[:]) if err != nil { @@ -273,6 +275,7 @@ func (s *Server) readAddress(r *Request) bool { } r.IP = net.IPv4(ipv4Data[0], ipv4Data[1], ipv4Data[2], ipv4Data[3]) case AddrIPv6: + addrType = AddrIPv6 ipv6Data := make([]byte, 16) _, err := io.ReadFull(r.Conn, ipv6Data) if err != nil { @@ -281,6 +284,7 @@ func (s *Server) readAddress(r *Request) bool { } r.IP = net.IP(ipv6Data) case AddrDomain: + addrType = AddrDomain var nameLen [1]byte _, err := io.ReadFull(r.Conn, nameLen[:]) if err != nil { @@ -309,7 +313,7 @@ func (s *Server) readAddress(r *Request) bool { } r.Port = int(binary.BigEndian.Uint16(portData[:])) - addressReadCounter.WithLabelValues(addressReadOk).Inc() + addressReadCounter.WithLabelValues(addrType.LabelValue(), addressReadOk).Inc() return true } From 89c1f9ff3b29a54bc82a2a3c8f1e2e4c6435fb05 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 15 Mar 2023 09:16:25 +0000 Subject: [PATCH 27/31] add LabelValue for each type --- socks/defs.go | 40 ++++++++++++++++++++++++++++++++++++++++ socks/server.go | 11 ++++++++--- socks/socks4.go | 8 +++----- socks/socks5.go | 22 +++++++++++----------- 4 files changed, 62 insertions(+), 19 deletions(-) diff --git a/socks/defs.go b/socks/defs.go index 3ec739d..a3deb13 100644 --- a/socks/defs.go +++ b/socks/defs.go @@ -20,6 +20,14 @@ func (v version) String() string { return "" } +func (v version) LabelValue() string { + raw := v.String() + if raw == "" { + return "unknown" + } + return strings.ReplaceAll(raw, "/", "_") +} + type commandType byte // SOCKS commands. @@ -62,6 +70,14 @@ func (at addressType) String() string { return "" } +func (at addressType) LabelValue() string { + raw := at.String() + if raw == "" { + return "unknown" + } + return strings.ReplaceAll(raw, " ", "_") +} + type authType byte // SOCKS authentication types. @@ -83,6 +99,14 @@ func (a authType) String() string { return "" } +func (a authType) LabelValue() string { + raw := a.String() + if raw == "" { + return "unknown" + } + return strings.ReplaceAll(raw, " ", "_") +} + type socks4ResponseStatus byte // SOCKS4 response status codes. @@ -107,6 +131,14 @@ func (s socks4ResponseStatus) String() string { return "" } +func (s socks4ResponseStatus) LabelValue() string { + raw := s.String() + if raw == "" { + return "unknown" + } + return strings.ReplaceAll(raw, " ", "_") +} + type socks5ResponseStatus byte // SOCKS5 response status codes. @@ -146,6 +178,14 @@ func (s socks5ResponseStatus) String() string { return "" } +func (s socks5ResponseStatus) LabelValue() string { + raw := s.String() + if raw == "" { + return "unknown" + } + return strings.ReplaceAll(raw, " ", "_") +} + const ( logFieldType = "access" ) diff --git a/socks/server.go b/socks/server.go index aa997a1..e9195c9 100644 --- a/socks/server.go +++ b/socks/server.go @@ -125,14 +125,17 @@ func (s *Server) dial(ctx context.Context, r *Request, network string) (net.Conn func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { _ = conn.SetDeadline(time.Now().Add(negotiationTimeout)) - var preamble [2]byte + var ( + preamble [2]byte + socksVer version + ) _, err := io.ReadFull(conn, preamble[:]) if err != nil { fields := well.FieldsFromContext(ctx) fields["client_addr"] = conn.RemoteAddr().String() fields[log.FnError] = err.Error() _ = s.Logger.Error("failed to read preamble", fields) - connectionCounter.WithLabelValues("unknown", "invalid_request").Inc() + connectionCounter.WithLabelValues(socksVer.LabelValue(), "invalid_request").Inc() return } @@ -140,11 +143,13 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { var destConn net.Conn switch connVer { case SOCKS4: + socksVer = SOCKS4 destConn = s.handleSOCKS4(ctx, conn, preamble[1]) if destConn == nil { return } case SOCKS5: + socksVer = SOCKS5 destConn = s.handleSOCKS5(ctx, conn, preamble[1]) if destConn == nil { return @@ -153,7 +158,7 @@ func (s *Server) handleConnection(ctx context.Context, conn net.Conn) { fields := well.FieldsFromContext(ctx) fields["client_addr"] = conn.RemoteAddr().String() _ = s.Logger.Error("unknown SOCKS version", fields) - connectionCounter.WithLabelValues("unknown", "unknown_version").Inc() + connectionCounter.WithLabelValues(socksVer.LabelValue(), "unknown_version").Inc() return } defer destConn.Close() diff --git a/socks/socks4.go b/socks/socks4.go index f13b8c0..5c50828 100644 --- a/socks/socks4.go +++ b/socks/socks4.go @@ -5,7 +5,6 @@ import ( "encoding/binary" "io" "net" - "strings" "github.com/cybozu-go/log" "github.com/cybozu-go/well" @@ -25,9 +24,8 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - rawStatus := socks4ResponseStatus(responseData[1]) - status := strings.ReplaceAll(rawStatus.String(), " ", "_") - connectionCounter.WithLabelValues(SOCKS4.String(), status).Inc() + status := socks4ResponseStatus(responseData[1]) + connectionCounter.WithLabelValues(SOCKS4.LabelValue(), status.LabelValue()).Inc() return nil } @@ -94,7 +92,7 @@ func (s *Server) handleSOCKS4(ctx context.Context, conn net.Conn, cmdByte byte) fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - connectionCounter.WithLabelValues(SOCKS4.String(), Status4Granted.String()).Inc() + connectionCounter.WithLabelValues(SOCKS4.LabelValue(), Status4Granted.LabelValue()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) diff --git a/socks/socks5.go b/socks/socks5.go index b5ab68a..7417ace 100644 --- a/socks/socks5.go +++ b/socks/socks5.go @@ -5,7 +5,6 @@ import ( "encoding/binary" "io" "net" - "strings" "github.com/cybozu-go/log" "github.com/cybozu-go/netutil" @@ -27,9 +26,11 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne ctx: ctx, } if !s.negotiateAuth(r, int(nauth)) { + connectionCounter.WithLabelValues(SOCKS5.LabelValue(), "authentication_failure").Inc() return nil } if !s.readAddress(r) { + connectionCounter.WithLabelValues(SOCKS5.LabelValue(), "address_read_failure").Inc() return nil } @@ -54,9 +55,8 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne errFunc := func(msg string) net.Conn { _, _ = conn.Write(response) _ = s.Logger.Error(msg, fields) - rawStatus := socks5ResponseStatus(response[1]) - status := strings.ReplaceAll(rawStatus.String(), " ", "_") - connectionCounter.WithLabelValues(SOCKS5.String(), status).Inc() + status := socks5ResponseStatus(response[1]) + connectionCounter.WithLabelValues(SOCKS5.LabelValue(), status.LabelValue()).Inc() return nil } @@ -96,7 +96,7 @@ func (s *Server) handleSOCKS5(ctx context.Context, conn net.Conn, nauth byte) ne fields["dest_addr"] = destConn.RemoteAddr().String() fields["src_addr"] = destConn.LocalAddr().String() - connectionCounter.WithLabelValues(SOCKS5.String(), Status5Granted.String()).Inc() + connectionCounter.WithLabelValues(SOCKS5.LabelValue(), Status5Granted.LabelValue()).Inc() proxyRequestsInflightGauge.Add(1) if s.SilenceLogs { _ = s.Logger.Debug("proxy starts", fields) @@ -116,7 +116,7 @@ func hasAuth(t authType, methods []byte) bool { } func (s *Server) negotiateAuth(r *Request, nauth int) bool { - var chosenAuthMethod string + var chosenAuthMethod authType logError := func(msg string, err error) { fields := well.FieldsFromContext(r.ctx) fields[log.FnType] = logFieldType @@ -126,7 +126,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { fields[log.FnError] = err.Error() } _ = s.Logger.Error(msg, fields) - authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultFailed).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod.LabelValue(), authResultFailed).Inc() } methods := make([]byte, nauth) @@ -140,7 +140,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { response[0] = byte(SOCKS5) if hasAuth(AuthBasic, methods) { - chosenAuthMethod = AuthBasic.String() + chosenAuthMethod = AuthBasic response[1] = byte(AuthBasic) _, err = r.Conn.Write(response[:]) if err != nil { @@ -208,12 +208,12 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { return false } - authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultOk).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod.LabelValue(), authResultOk).Inc() return true } if hasAuth(AuthNo, methods) { - chosenAuthMethod = AuthNo.String() + chosenAuthMethod = AuthNo if s.Auth != nil && !s.Auth.Authenticate(r) { // No authentication method still need to be checked // by s.Auth if given. @@ -226,7 +226,7 @@ func (s *Server) negotiateAuth(r *Request, nauth int) bool { logError("failed to negotiate auth method", err) return false } - authNegotiateCounter.WithLabelValues(chosenAuthMethod, authResultOk).Inc() + authNegotiateCounter.WithLabelValues(chosenAuthMethod.LabelValue(), authResultOk).Inc() return true } From dc642c2f42a8cf5245d6ae9751bbb3795d351188 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 15 Mar 2023 09:18:35 +0000 Subject: [PATCH 28/31] make unknown as const --- socks/defs.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/socks/defs.go b/socks/defs.go index a3deb13..d446b3e 100644 --- a/socks/defs.go +++ b/socks/defs.go @@ -2,6 +2,8 @@ package socks import "strings" +const UNKNOWN = "unknown" + type version byte // SOCKS versions. @@ -23,7 +25,7 @@ func (v version) String() string { func (v version) LabelValue() string { raw := v.String() if raw == "" { - return "unknown" + return UNKNOWN } return strings.ReplaceAll(raw, "/", "_") } @@ -73,7 +75,7 @@ func (at addressType) String() string { func (at addressType) LabelValue() string { raw := at.String() if raw == "" { - return "unknown" + return UNKNOWN } return strings.ReplaceAll(raw, " ", "_") } @@ -102,7 +104,7 @@ func (a authType) String() string { func (a authType) LabelValue() string { raw := a.String() if raw == "" { - return "unknown" + return UNKNOWN } return strings.ReplaceAll(raw, " ", "_") } @@ -134,7 +136,7 @@ func (s socks4ResponseStatus) String() string { func (s socks4ResponseStatus) LabelValue() string { raw := s.String() if raw == "" { - return "unknown" + return UNKNOWN } return strings.ReplaceAll(raw, " ", "_") } @@ -181,7 +183,7 @@ func (s socks5ResponseStatus) String() string { func (s socks5ResponseStatus) LabelValue() string { raw := s.String() if raw == "" { - return "unknown" + return UNKNOWN } return strings.ReplaceAll(raw, " ", "_") } From 593e0de5218cfddff194c1f1ed2a0c92fef31a18 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 22 Mar 2023 08:48:58 +0000 Subject: [PATCH 29/31] add toml tag --- config.go | 2 +- config_test.go | 3 +++ test/test1.toml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index 7077126..315c86f 100644 --- a/config.go +++ b/config.go @@ -17,7 +17,7 @@ const ( // IncomingConfig is a set of configurations to accept clients. type IncomingConfig struct { Port int - MetricsPort int + MetricsPort int `toml:"metrics_port"` Addresses []net.IP AllowFrom []string `toml:"allow_from"` allowSubnets []*net.IPNet diff --git a/config_test.go b/config_test.go index efaa385..33f367d 100644 --- a/config_test.go +++ b/config_test.go @@ -30,6 +30,9 @@ func TestConfig(t *testing.T) { if c.Incoming.Port != 1080 { t.Error("incoming.port != 1080") } + if c.Incoming.MetricsPort != 8081 { + t.Error("incoming.port != 1080") + } if len(c.Incoming.Addresses) != 1 { t.Error("empty incoming.addresses") } else { diff --git a/test/test1.toml b/test/test1.toml index 037a852..bc51a67 100644 --- a/test/test1.toml +++ b/test/test1.toml @@ -1,5 +1,6 @@ [incoming] port = 1080 +metrics_port = 8081 addresses = ['127.0.0.1'] # List of listening IP addresses allow_from = ['10.0.0.0/8', '192.168.1.1'] From f0975209b1337e528e3b4d5d44d19deb3e9534ca Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Wed, 22 Mar 2023 09:07:36 +0000 Subject: [PATCH 30/31] fix fot lint --- server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.go b/server.go index 1010b89..81e63e7 100644 --- a/server.go +++ b/server.go @@ -49,6 +49,6 @@ func NewServer(c *Config) *socks.Server { } // NewMetricsServer creates a new metrics.Server. -func NewMetricsServer(c *Config) *metrics.Server { +func NewMetricsServer(_ *Config) *metrics.Server { return &metrics.Server{} } From 7d3b32339b8eca903eee3b838bdd3ffcea9a2227 Mon Sep 17 00:00:00 2001 From: Shoma Kokuryo Date: Thu, 23 Mar 2023 07:12:01 +0000 Subject: [PATCH 31/31] fix test --- config_test.go | 100 +++++++++++++++++++++++++++++-------------------- go.mod | 1 + go.sum | 1 + 3 files changed, 62 insertions(+), 40 deletions(-) diff --git a/config_test.go b/config_test.go index 33f367d..fadba62 100644 --- a/config_test.go +++ b/config_test.go @@ -3,17 +3,29 @@ package usocksd import ( "net" "testing" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" ) func TestEmptyConfig(t *testing.T) { t.Parallel() c := NewConfig() - if c.Incoming.Port != defaultPort { - t.Errorf("default port != %d", defaultPort) + expected := &Config{ + Incoming: IncomingConfig{ + Port: defaultPort, + MetricsPort: defaultMetricsPort, + }, + Outgoing: OutgoingConfig{}, + } + options := []cmp.Option{ + cmpopts.IgnoreUnexported(Config{}), + cmpopts.IgnoreUnexported(IncomingConfig{}), + cmpopts.IgnoreUnexported(OutgoingConfig{}), } - if len(c.Outgoing.Addresses) != 0 { - t.Error("outgoing.addresses must be empty") + if diff := cmp.Diff(c, expected, options...); diff != "" { + t.Fatalf("unexpected config (-actual +expected):\n%s", diff) } if !c.allowPort(443) { t.Error("port 443 must be allowed") @@ -27,32 +39,50 @@ func TestConfig(t *testing.T) { if err := c.Load("test/test1.toml"); err != nil { t.Fatal(err) } - if c.Incoming.Port != 1080 { - t.Error("incoming.port != 1080") - } - if c.Incoming.MetricsPort != 8081 { - t.Error("incoming.port != 1080") - } - if len(c.Incoming.Addresses) != 1 { - t.Error("empty incoming.addresses") - } else { - ip1 := net.ParseIP("127.0.0.1") - if !c.Incoming.Addresses[0].Equal(ip1) { - t.Error(`c.incoming.addresses != ["127.0.0.1"]`) - } - } - if len(c.Incoming.allowSubnets) == 0 { - t.Error("empty incoming.allow_from") - } else { - if !c.allowIP(net.ParseIP("10.1.32.4")) { - t.Error("10.1.32.4 is not allowed") - } - if !c.allowIP(net.ParseIP("192.168.1.1")) { - t.Error("192.168.1.1 is not allowed") - } - if c.allowIP(net.ParseIP("12.34.56.78")) { - t.Error("12.34.56.78 shout not be allowed") - } + expected := &Config{ + Incoming: IncomingConfig{ + Port: 1080, + MetricsPort: 8081, + Addresses: []net.IP{ + net.ParseIP("127.0.0.1"), + }, + AllowFrom: []string{ + "10.0.0.0/8", + "192.168.1.1", + }, + }, + Outgoing: OutgoingConfig{ + AllowSites: []string{ + "www.amazon.com", + ".google.com", + }, + DenySites: []string{ + ".2ch.net", + "bad.google.com", + }, + Addresses: []net.IP{ + net.ParseIP("12.34.56.78"), + }, + DenyPorts: []int{22, 25}, + DNSBLDomain: "zen.spamhaus.org", + }, + } + options := []cmp.Option{ + cmpopts.IgnoreUnexported(Config{}), + cmpopts.IgnoreUnexported(IncomingConfig{}), + cmpopts.IgnoreUnexported(OutgoingConfig{}), + } + if diff := cmp.Diff(c, expected, options...); diff != "" { + t.Fatalf("unexpected config (-actual +expected):\n%s", diff) + } + if !c.allowIP(net.ParseIP("10.1.32.4")) { + t.Error("10.1.32.4 is not allowed") + } + if !c.allowIP(net.ParseIP("192.168.1.1")) { + t.Error("192.168.1.1 is not allowed") + } + if c.allowIP(net.ParseIP("12.34.56.78")) { + t.Error("12.34.56.78 shout not be allowed") } if !c.allowFQDN("www.amazon.com") { t.Error("www.amazon.com should be allowed") @@ -72,16 +102,6 @@ func TestConfig(t *testing.T) { if !c.allowPort(443) { t.Error("port 443 must be allowed") } - if len(c.Outgoing.Addresses) != 1 { - t.Error("empty outgoing.addresses") - } else { - if c.Outgoing.Addresses[0].String() != "12.34.56.78" { - t.Error("failed to parse 12.34.56.78") - } - } - if c.Outgoing.DNSBLDomain != "zen.spamhaus.org" { - t.Error(`outgoing.dnsbl_domain != "zen.spamhaus.org"`) - } } func TestConfigFail(t *testing.T) { diff --git a/go.mod b/go.mod index 67dc142..fe26f53 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ require ( github.com/cybozu-go/log v1.6.1 github.com/cybozu-go/netutil v1.4.2 github.com/cybozu-go/well v1.11.0 + github.com/google/go-cmp v0.5.8 github.com/prometheus/client_golang v1.12.2 ) diff --git a/go.sum b/go.sum index 1566943..0db2efe 100644 --- a/go.sum +++ b/go.sum @@ -188,6 +188,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=