Merge branch 'port-2021-07-04'

.github/workflows/automerge.yml

+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+# Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
+# This reduces the friction associated with updating with our workflows.
+
+on: [ pull_request ]
+name: Automerge
+
+jobs:
+  automerge-check:
+    if: github.event.pull_request.user.login == 'web3-bot'
+    runs-on: ubuntu-latest
+    outputs:
+      status: ${{ steps.should-automerge.outputs.status }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Check if we should automerge
+      id: should-automerge
+      run: |
+        for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
+          committer=$(git show --format=$'%ce' -s $commit)
+          echo "Committer: $committer"
+          if [[ "$committer" != "web3-bot@users.noreply.github.com" ]]; then
+            echo "Commit $commit wasn't committed by web3-bot, but by $committer."
+            echo "::set-output name=status::false"
+            exit
+          fi
+        done
+        echo "::set-output name=status::true"
+  automerge:
+    needs: automerge-check
+    runs-on: ubuntu-latest
+    if: ${{ needs.automerge-check.outputs.status == 'true' }}
+    steps:
+    - name: Wait on tests
+      uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        wait-interval: 10
+        running-workflow-name: 'automerge' # the name of this job
+    - name: Merge PR
+      uses: pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae # v0.13.1
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        MERGE_LABELS: ""
+        MERGE_METHOD: "squash"
+        MERGE_DELETE_BRANCH: true

.github/workflows/go-check.yml

+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+on: [push, pull_request]
+name: Go Checks
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    name: All
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.16.x"
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0)
+      - name: Check that go.mod is tidy
+        uses: protocol/multiple-go-modules@v1.0
+        with:
+          run: |
+            go mod tidy
+            if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
+              echo "go.sum was added by go mod tidy"
+              exit 1
+            fi
+            git diff --exit-code -- go.sum go.mod
+      - name: gofmt
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
+        run: |
+          out=$(gofmt -s -l .)
+          if [[ -n "$out" ]]; then
+            echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
+            exit 1
+          fi
+      - name: go vet
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
+        uses: protocol/multiple-go-modules@v1.0
+        with:
+          run: go vet ./...
+      - name: staticcheck
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
+        uses: protocol/multiple-go-modules@v1.0
+        with:
+          run: |
+            set -o pipefail
+            staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
+

.github/workflows/go-test.yml

+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+on: [push, pull_request]
+name: Go Test
+
+jobs:
+  unit:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu", "windows", "macos" ]
+        go: [ "1.15.x", "1.16.x" ]
+    runs-on: ${{ matrix.os }}-latest
+    name: ${{ matrix.os}} (go ${{ matrix.go }})
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Go information
+        run: |
+          go version
+          go env
+      - name: Run tests
+        uses: protocol/multiple-go-modules@v1.0
+        with:
+          run: go test -v -coverprofile coverage.txt ./...
+      - name: Run tests (32 bit)
+        if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
+        uses: protocol/multiple-go-modules@v1.0
+        env:
+          GOARCH: 386
+        with:
+          run: go test -v ./...
+      - name: Run tests with race detector
+        if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
+        uses: protocol/multiple-go-modules@v1.0
+        with:
+          run: go test -v -race ./...
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0
+        with:
+          file: coverage.txt
+          env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

.gitlab-ci.yml

+stages:
+  - build
+  - test
+
+variables:
+  BUILD_DIR: "/tmp/$CI_CONCURRENT_PROJECT_ID"
+
+before_script:
+  - mkdir -p $BUILD_DIR/src
+  - cd $BUILD_DIR/src
+  - if [ -d $CI_PROJECT_DIR ]
+  - then
+  -    echo "soft link $CI_PROJECT_DIR exists"
+  - else
+  -    echo "creating soft link $CI_PROJECT_DIR"
+  -    ln -s $CI_PROJECT_DIR
+  - fi
+  - cd $CI_PROJECT_DIR
+
+build:
+  stage: build
+  tags:
+    - testing
+  script:
+    - echo $CI_JOB_STAGE
+    - go build
+
+test:
+  stage: test
+  tags:
+    - testing
+  script:
+    - echo $CI_JOB_STAGE
+    - go test -cover
+  coverage: '/coverage: \d+.\d+% of statements/'

LICENSE

+The MIT License (MIT)
+
+Copyright (c) Protocol Labs, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

-# go-p2p-asn-util
+# go-libp2p-asn-util
 
-dms3 p2p go-libp2p-asn-util
+[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://protocol.ai)
\ No newline at end of file
+[![](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](http://github.com/libp2p/libp2p)
+
+A library to lookup the ASN(Autonomous System Number) for an IP address. It uses the IPv6 to ASN database downloaded from https://iptoasn.com/.
+Supports ONLY IPv6 addresses for now.   
+
+## Table of Contents
+
+- [Install](#install)
+- [Usage](#usage)
+- [Documentation](#documentation)
+- [Contribute](#contribute)
+- [License](#license)
+
+## Install
+
+```
+go get github.com/libp2p/go-libp2p-asn-util
+```
+
+## Usage
+
+```go
+import (
+    asn "github.com/libp2p/go-libp2p-asn-util"
+)
+
+func main() {
+   store, err := asn.NewAsnStore()
+
+   asNumber,err := store.AsnForIP(net.ParseIP("2a03:2880:f003:c07:face:b00c::2"))
+ }
+```
+
+## Contribute
+
+Feel free to join in. All welcome. Open an [issue](https://github.com/libp2p/go-libp2p-asn/issues)!
+
+This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
+
+## License
+
+MIT
+
+---

asn.go

+package asnutil
+
+import (
+	"errors"
+	"fmt"
+	"net"
+
+	"gitlab.dms3.io/p2p/go-cidranger"
+)
+
+var Store *indirectAsnStore
+
+func init() {
+	Store = newIndirectAsnStore()
+}
+
+type networkWithAsn struct {
+	nn  net.IPNet
+	asn string
+}
+
+func (e *networkWithAsn) Network() net.IPNet {
+	return e.nn
+}
+
+type asnStore struct {
+	cr cidranger.Ranger
+}
+
+// AsnForIPv6 returns the AS number for the given IPv6 address.
+// If no mapping exists for the given IP, this function will
+// return an empty ASN and a nil error.
+func (a *asnStore) AsnForIPv6(ip net.IP) (string, error) {
+	if ip.To16() == nil {
+		return "", errors.New("ONLY IPv6 addresses supported for now")
+	}
+
+	ns, err := a.cr.ContainingNetworks(ip)
+	if err != nil {
+		return "", fmt.Errorf("failed to find matching networks for the given ip: %w", err)
+	}
+
+	if len(ns) == 0 {
+		return "", nil
+	}
+
+	// longest prefix match
+	n := ns[len(ns)-1].(*networkWithAsn)
+	return n.asn, nil
+}
+
+func newAsnStore() (*asnStore, error) {
+	cr := cidranger.NewPCTrieRanger()
+
+	for k, v := range ipv6CidrToAsnMap {
+		_, nn, err := net.ParseCIDR(k)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse CIDR %s: %w", k, err)
+		}
+
+		if err := cr.Insert(&networkWithAsn{*nn, v}); err != nil {
+			return nil, fmt.Errorf("failed to insert CIDR %s in Trie store: %w", k, err)
+		}
+	}
+
+	return &asnStore{cr}, nil
+}
+
+type indirectAsnStore struct {
+	store       *asnStore
+	doneLoading chan struct{}
+}
+
+// AsnForIPv6 returns the AS number for the given IPv6 address.
+// If no mapping exists for the given IP, this function will
+// return an empty ASN and a nil error.
+func (a *indirectAsnStore) AsnForIPv6(ip net.IP) (string, error) {
+	<-a.doneLoading
+	return a.store.AsnForIPv6(ip)
+}
+
+func newIndirectAsnStore() *indirectAsnStore {
+	a := &indirectAsnStore{
+		doneLoading: make(chan struct{}),
+	}
+
+	go func() {
+		defer close(a.doneLoading)
+		store, err := newAsnStore()
+		if err != nil {
+			panic(err)
+		}
+		a.store = store
+	}()
+
+	return a
+}

asn_test.go

+package asnutil
+
+import (
+	"net"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestAsnIpv6(t *testing.T) {
+	tcs := map[string]struct {
+		ip          net.IP
+		expectedASN string
+	}{
+		"google": {
+			ip:          net.ParseIP("2001:4860:4860::8888"),
+			expectedASN: "15169",
+		},
+		"facebook": {
+			ip:          net.ParseIP("2a03:2880:f003:c07:face:b00c::2"),
+			expectedASN: "32934",
+		},
+		"comcast": {
+			ip:          net.ParseIP("2601::"),
+			expectedASN: "7922",
+		},
+		"does not exist": {
+			ip:          net.ParseIP("::"),
+			expectedASN: "",
+		},
+	}
+
+	for name, tc := range tcs {
+		require.NotEmpty(t, tc.ip, name)
+		n, err := Store.AsnForIPv6(tc.ip)
+		require.NoError(t, err)
+		require.Equal(t, tc.expectedASN, n, name)
+	}
+}

generate/main.go

+package main
+
+import (
+	"encoding/csv"
+	"errors"
+	"fmt"
+	"io"
+	"math/bits"
+	"net"
+	"os"
+
+	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+)
+
+const (
+	pkgName        = "asnutil"
+	ipv6OutputFile = "ipv6_asn_map.gen.go"
+	ipv6MapName    = "ipv6CidrToAsnMap"
+)
+
+func main() {
+	// file with the ASN mappings for IPv6 CIDRs.
+	// See ipv6_asn.tsv
+	ipv6File := os.Getenv("ASN_IPV6_FILE")
+
+	if len(ipv6File) == 0 {
+		panic(errors.New("environment vars must be provided"))
+	}
+
+	ipv6CidrToAsnMap := readMappingFile(ipv6File)
+	f, err := os.Create(ipv6OutputFile)
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+	writeMappingToFile(f, ipv6CidrToAsnMap, ipv6MapName)
+}
+
+func writeMappingToFile(f *os.File, m map[string]string, mapName string) {
+	printf := func(s string, args ...interface{}) {
+		_, err := fmt.Fprintf(f, s, args...)
+		if err != nil {
+			panic(err)
+		}
+	}
+	printf("package %s\n\n", pkgName)
+	printf("// Code generated by generate/main.go DO NOT EDIT\n")
+	printf("var %s = map[string]string {", mapName)
+	for k, v := range m {
+		printf("\n\t \"%s\": \"%s\",", k, v)
+	}
+	printf("\n}")
+}
+
+func readMappingFile(path string) map[string]string {
+	m := make(map[string]string)
+	f, err := os.Open(path)
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+	r := csv.NewReader(f)
+	r.Comma = '\t'
+	for {
+		record, err := r.Read()
+		// Stop at EOF.
+		if err == io.EOF {
+			return m
+		}
+
+		startIP := record[0]
+		endIP := record[1]
+		asn := record[2]
+		if asn == "0" {
+			continue
+		}
+
+		s := net.ParseIP(startIP)
+		e := net.ParseIP(endIP)
+		if s.To16() == nil || e.To16() == nil {
+			panic(errors.New("IP should be v6"))
+		}
+
+		prefixLen := zeroPrefixLen(u.XOR(s.To16(), e.To16()))
+		cn := fmt.Sprintf("%s/%d", startIP, prefixLen)
+		m[cn] = asn
+	}
+
+}
+
+func zeroPrefixLen(id []byte) int {
+	for i, b := range id {
+		if b != 0 {
+			return i*8 + bits.LeadingZeros8(uint8(b))
+		}
+	}
+	return len(id) * 8
+}

go.mod

+module gitlab.dms3.io/p2p/go-p2p-asn-util
+
+go 1.15
+
+require (
+	github.com/stretchr/testify v1.4.0
+	gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1
+	gitlab.dms3.io/p2p/go-cidranger v0.0.1
+)

go.sum

+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
+github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
+github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
+github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
+github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
+github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
+github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
+github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
+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/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+gitlab.dms3.io/dms3/public/go-detect-race v0.0.1 h1:njXKVicy8gRJxyKtG8znbzxpqzxDQBSlzlLTXOna2dU=
+gitlab.dms3.io/dms3/public/go-detect-race v0.0.1/go.mod h1:NcJv8mYRyNhzWxY9ry4uRt0iD+0f7AvunqCKLgqJpwI=
+gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1 h1:Gd+kJl1Rc+ZEUb9CIS1ZctQnF9G1oruNFyxUC//QBUQ=
+gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1/go.mod h1:ymlwtzTNMq8Ug+gVtPAMxXKCKTXwXJAzXS+SUihfKgo=
+gitlab.dms3.io/p2p/go-cidranger v0.0.1 h1:zhadrhyY0vjccSDL9ll+BuuXd2H6G4H6Cyl9KvFUFQY=
+gitlab.dms3.io/p2p/go-cidranger v0.0.1/go.mod h1:A+ojkOQgs+1hYdTPhp0QS0L1pzHAIMDEejKAOyzyk3w=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=