Skip to content

GitLab

Commit 18217cd0 authored by ale's avatar ale
Browse files
Options

Merge branch 'renovate/github.com-oschwald-maxminddb-golang-0.x' into 'master' 

Update module oschwald/maxminddb-golang to v0.2.0

See merge request !14
parents 9ddab3f6 3f7867d8
Pipeline #10691 passed with stages
        in 52 seconds
        Expand all Hide whitespace changes
        Inline Side-by-side
        Showing with 487 additions and 943 deletions
        go.mod
        View file @ 18217cd0
        ......@@ -14,7 +14,7 @@ require (
        github.com/jonboulle/clockwork v0.2.2 // indirect
        github.com/mattermost/xml-roundtrip-validator v0.0.0-20201219040909-8fd2afad43d1 // indirect
        github.com/mssola/user_agent v0.0.0-20170906152553-a2f39d5a9b15
        github.com/oschwald/maxminddb-golang v0.0.0-20170901134056-26fe5ace1c70
        github.com/oschwald/maxminddb-golang v0.2.0
        github.com/prometheus/client_golang v1.9.0
        github.com/rs/cors v0.0.0-20190613161432-33ffc0734c60
        github.com/tstranex/u2f v1.0.0
        ......
        vendor/github.com/oschwald/maxminddb-golang/.gitmodules
        View file @ 18217cd0
        [submodule "test-data"]
        path = test-data
        url = https://github.com/maxmind/MaxMind-DB.git
        url = git://github.com/maxmind/MaxMind-DB.git
        vendor/github.com/oschwald/maxminddb-golang/.travis.yml
        View file @ 18217cd0
        language: go
        go:
        - 1.4
        - 1.5
        - 1.6
        - 1.7
        - 1.8
        - 1.1
        - 1.2
        - 1.3
        - release
        - tip
        before_install:
        - "if [[ $TRAVIS_GO_VERSION == 1.7 ]]; then go get -v github.com/golang/lint/golint; fi"
        install:
        - go get -v -t ./...
        script:
        - go test -race -cpu 1,4 -v
        - go test -race -v -tags appengine
        - "if [[ $TRAVIS_GO_VERSION == 1.7 ]]; then go vet ./...; fi"
        - "if [[ $TRAVIS_GO_VERSION == 1.7 ]]; then golint .; fi"
        sudo: false
        - go get launchpad.net/gocheck
        vendor/github.com/oschwald/maxminddb-golang/LICENSE
        View file @ 18217cd0
        ISC License
        Copyright (c) 2015, Gregory J. Oschwald <oschwald@gmail.com>
        Apache License
        Version 2.0, January 2004
        http://www.apache.org/licenses/
        Permission to use, copy, modify, and/or distribute this software for any
        purpose with or without fee is hereby granted, provided that the above
        copyright notice and this permission notice appear in all copies.
        TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
        THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
        REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
        AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
        INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
        LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
        OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
        PERFORMANCE OF THIS SOFTWARE.
        1. Definitions.
        "License" shall mean the terms and conditions for use, reproduction,
        and distribution as defined by Sections 1 through 9 of this document.
        "Licensor" shall mean the copyright owner or entity authorized by
        the copyright owner that is granting the License.
        "Legal Entity" shall mean the union of the acting entity and all
        other entities that control, are controlled by, or are under common
        control with that entity. For the purposes of this definition,
        "control" means (i) the power, direct or indirect, to cause the
        direction or management of such entity, whether by contract or
        otherwise, or (ii) ownership of fifty percent (50%) or more of the
        outstanding shares, or (iii) beneficial ownership of such entity.
        "You" (or "Your") shall mean an individual or Legal Entity
        exercising permissions granted by this License.
        "Source" form shall mean the preferred form for making modifications,
        including but not limited to software source code, documentation
        source, and configuration files.
        "Object" form shall mean any form resulting from mechanical
        transformation or translation of a Source form, including but
        not limited to compiled object code, generated documentation,
        and conversions to other media types.
        "Work" shall mean the work of authorship, whether in Source or
        Object form, made available under the License, as indicated by a
        copyright notice that is included in or attached to the work
        (an example is provided in the Appendix below).
        "Derivative Works" shall mean any work, whether in Source or Object
        form, that is based on (or derived from) the Work and for which the
        editorial revisions, annotations, elaborations, or other modifications
        represent, as a whole, an original work of authorship. For the purposes
        of this License, Derivative Works shall not include works that remain
        separable from, or merely link (or bind by name) to the interfaces of,
        the Work and Derivative Works thereof.
        "Contribution" shall mean any work of authorship, including
        the original version of the Work and any modifications or additions
        to that Work or Derivative Works thereof, that is intentionally
        submitted to Licensor for inclusion in the Work by the copyright owner
        or by an individual or Legal Entity authorized to submit on behalf of
        the copyright owner. For the purposes of this definition, "submitted"
        means any form of electronic, verbal, or written communication sent
        to the Licensor or its representatives, including but not limited to
        communication on electronic mailing lists, source code control systems,
        and issue tracking systems that are managed by, or on behalf of, the
        Licensor for the purpose of discussing and improving the Work, but
        excluding communication that is conspicuously marked or otherwise
        designated in writing by the copyright owner as "Not a Contribution."
        "Contributor" shall mean Licensor and any individual or Legal Entity
        on behalf of whom a Contribution has been received by Licensor and
        subsequently incorporated within the Work.
        2. Grant of Copyright License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        copyright license to reproduce, prepare Derivative Works of,
        publicly display, publicly perform, sublicense, and distribute the
        Work and such Derivative Works in Source or Object form.
        3. Grant of Patent License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        (except as stated in this section) patent license to make, have made,
        use, offer to sell, sell, import, and otherwise transfer the Work,
        where such license applies only to those patent claims licensable
        by such Contributor that are necessarily infringed by their
        Contribution(s) alone or by combination of their Contribution(s)
        with the Work to which such Contribution(s) was submitted. If You
        institute patent litigation against any entity (including a
        cross-claim or counterclaim in a lawsuit) alleging that the Work
        or a Contribution incorporated within the Work constitutes direct
        or contributory patent infringement, then any patent licenses
        granted to You under this License for that Work shall terminate
        as of the date such litigation is filed.
        4. Redistribution. You may reproduce and distribute copies of the
        Work or Derivative Works thereof in any medium, with or without
        modifications, and in Source or Object form, provided that You
        meet the following conditions:
        (a) You must give any other recipients of the Work or
        Derivative Works a copy of this License; and
        (b) You must cause any modified files to carry prominent notices
        stating that You changed the files; and
        (c) You must retain, in the Source form of any Derivative Works
        that You distribute, all copyright, patent, trademark, and
        attribution notices from the Source form of the Work,
        excluding those notices that do not pertain to any part of
        the Derivative Works; and
        (d) If the Work includes a "NOTICE" text file as part of its
        distribution, then any Derivative Works that You distribute must
        include a readable copy of the attribution notices contained
        within such NOTICE file, excluding those notices that do not
        pertain to any part of the Derivative Works, in at least one
        of the following places: within a NOTICE text file distributed
        as part of the Derivative Works; within the Source form or
        documentation, if provided along with the Derivative Works; or,
        within a display generated by the Derivative Works, if and
        wherever such third-party notices normally appear. The contents
        of the NOTICE file are for informational purposes only and
        do not modify the License. You may add Your own attribution
        notices within Derivative Works that You distribute, alongside
        or as an addendum to the NOTICE text from the Work, provided
        that such additional attribution notices cannot be construed
        as modifying the License.
        You may add Your own copyright statement to Your modifications and
        may provide additional or different license terms and conditions
        for use, reproduction, or distribution of Your modifications, or
        for any such Derivative Works as a whole, provided Your use,
        reproduction, and distribution of the Work otherwise complies with
        the conditions stated in this License.
        5. Submission of Contributions. Unless You explicitly state otherwise,
        any Contribution intentionally submitted for inclusion in the Work
        by You to the Licensor shall be under the terms and conditions of
        this License, without any additional terms or conditions.
        Notwithstanding the above, nothing herein shall supersede or modify
        the terms of any separate license agreement you may have executed
        with Licensor regarding such Contributions.
        6. Trademarks. This License does not grant permission to use the trade
        names, trademarks, service marks, or product names of the Licensor,
        except as required for reasonable and customary use in describing the
        origin of the Work and reproducing the content of the NOTICE file.
        7. Disclaimer of Warranty. Unless required by applicable law or
        agreed to in writing, Licensor provides the Work (and each
        Contributor provides its Contributions) on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
        implied, including, without limitation, any warranties or conditions
        of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
        PARTICULAR PURPOSE. You are solely responsible for determining the
        appropriateness of using or redistributing the Work and assume any
        risks associated with Your exercise of permissions under this License.
        8. Limitation of Liability. In no event and under no legal theory,
        whether in tort (including negligence), contract, or otherwise,
        unless required by applicable law (such as deliberate and grossly
        negligent acts) or agreed to in writing, shall any Contributor be
        liable to You for damages, including any direct, indirect, special,
        incidental, or consequential damages of any character arising as a
        result of this License or out of the use or inability to use the
        Work (including but not limited to damages for loss of goodwill,
        work stoppage, computer failure or malfunction, or any and all
        other commercial damages or losses), even if such Contributor
        has been advised of the possibility of such damages.
        9. Accepting Warranty or Additional Liability. While redistributing
        the Work or Derivative Works thereof, You may choose to offer,
        and charge a fee for, acceptance of support, warranty, indemnity,
        or other liability obligations and/or rights consistent with this
        License. However, in accepting such obligations, You may act only
        on Your own behalf and on Your sole responsibility, not on behalf
        of any other Contributor, and only if You agree to indemnify,
        defend, and hold each Contributor harmless for any liability
        incurred by, or claims asserted against, such Contributor by reason
        of your accepting any such warranty or additional liability.
        END OF TERMS AND CONDITIONS
        APPENDIX: How to apply the Apache License to your work.
        To apply the Apache License to your work, attach the following
        boilerplate notice, with the fields enclosed by brackets "[]"
        replaced with your own identifying information. (Don't include
        the brackets!) The text should be enclosed in the appropriate
        comment syntax for the file format. We also recommend that a
        file or class name and description of purpose be included on the
        same "printed page" as the copyright notice for easier
        identification within third-party archives.
        Copyright [yyyy] [name of copyright owner]
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
        You may obtain a copy of the License at
        http://www.apache.org/licenses/LICENSE-2.0
        Unless required by applicable law or agreed to in writing, software
        distributed under the License is distributed on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
        See the License for the specific language governing permissions and
        limitations under the License.
        vendor/github.com/oschwald/maxminddb-golang/README.md
        View file @ 18217cd0
        # MaxMind DB Reader for Go #
        [![Build Status](https://travis-ci.org/oschwald/maxminddb-golang.png?branch=master)](https://travis-ci.org/oschwald/maxminddb-golang)
        [![Windows Build Status](https://ci.appveyor.com/api/projects/status/4j2f9oep8nnfrmov/branch/master?svg=true)](https://ci.appveyor.com/project/oschwald/maxminddb-golang/branch/master)
        [![GoDoc](https://godoc.org/github.com/oschwald/maxminddb-golang?status.png)](https://godoc.org/github.com/oschwald/maxminddb-golang)
        This is a Go reader for the MaxMind DB format. Although this can be used to
        read [GeoLite2](http://dev.maxmind.com/geoip/geoip2/geolite2/) and
        [GeoIP2](https://www.maxmind.com/en/geoip2-databases) databases,
        [geoip2](https://github.com/oschwald/geoip2-golang) provides a higher-level
        API for doing so.
        This is a Go reader for the MaxMind DB format. This can be used to read
        [GeoLite2](http://dev.maxmind.com/geoip/geoip2/geolite2/) and
        [GeoIP2](http://www.maxmind.com/en/geolocation_landing) databases.
        This is not an official MaxMind API.
        ......@@ -35,4 +33,4 @@ with your changes.
        ## License ##
        This is free software, licensed under the ISC License.
        This is free software, licensed under the Apache License, Version 2.0.
        vendor/github.com/oschwald/maxminddb-golang/appveyor.yml deleted 100644 → 0
        View file @ 9ddab3f6
        version: "{build}"
        os: Windows Server 2012 R2
        clone_folder: c:\gopath\src\github.com\oschwald\maxminddb-golang
        environment:
        GOPATH: c:\gopath
        install:
        - echo %PATH%
        - echo %GOPATH%
        - git submodule update --init --recursive
        - go version
        - go env
        - go get -v -t ./...
        build_script:
        - go test -v ./...
        vendor/github.com/oschwald/maxminddb-golang/build.cmd 0 → 100644
        View file @ 18217cd0
        set GOPATH=%BuildFolder%
        go get -v ./...
        go test -v ./...
        vendor/github.com/oschwald/maxminddb-golang/errors.go deleted 100644 → 0
        View file @ 9ddab3f6
        package maxminddb
        import (
        "fmt"
        "reflect"
        )
        // InvalidDatabaseError is returned when the database contains invalid data
        // and cannot be parsed.
        type InvalidDatabaseError struct {
        message string
        }
        func newOffsetError() InvalidDatabaseError {
        return InvalidDatabaseError{"unexpected end of database"}
        }
        func newInvalidDatabaseError(format string, args ...interface{}) InvalidDatabaseError {
        return InvalidDatabaseError{fmt.Sprintf(format, args...)}
        }
        func (e InvalidDatabaseError) Error() string {
        return e.message
        }
        // UnmarshalTypeError is returned when the value in the database cannot be
        // assigned to the specified data type.
        type UnmarshalTypeError struct {
        Value string // stringified copy of the database value that caused the error
        Type reflect.Type // type of the value that could not be assign to
        }
        func newUnmarshalTypeError(value interface{}, rType reflect.Type) UnmarshalTypeError {
        return UnmarshalTypeError{
        Value: fmt.Sprintf("%v", value),
        Type: rType,
        }
        }
        func (e UnmarshalTypeError) Error() string {
        return fmt.Sprintf("maxminddb: cannot unmarshal %s into type %s", e.Value, e.Type.String())
        }
        vendor/github.com/oschwald/maxminddb-golang/reader.go
        View file @ 18217cd0
        ......@@ -5,16 +5,11 @@ import (
        "errors"
        "fmt"
        "net"
        "os"
        "reflect"
        )
        const (
        // NotFound is returned by LookupOffset when a matched root record offset
        // cannot be found.
        NotFound = ^uintptr(0)
        dataSectionSeparatorSize = 16
        )
        const dataSectionSeparatorSize = 16
        var metadataStartMarker = []byte("\xAB\xCD\xEFMaxMind.com")
        ......@@ -44,42 +39,62 @@ type Metadata struct {
        RecordSize uint `maxminddb:"record_size"`
        }
        // Open takes a string path to a MaxMind DB file and returns a Reader
        // structure or an error. The database file is opened using a memory map. Use
        // the Close method on the Reader object to return the resources to the
        // system.
        func Open(file string) (*Reader, error) {
        mapFile, err := os.Open(file)
        if err != nil {
        return nil, err
        }
        defer mapFile.Close()
        stats, err := mapFile.Stat()
        if err != nil {
        return nil, err
        }
        fileSize := int(stats.Size())
        mmap, err := mmap(int(mapFile.Fd()), fileSize)
        if err != nil {
        return nil, err
        }
        reader, err := FromBytes(mmap)
        if err != nil {
        munmap(mmap)
        return nil, err
        }
        reader.hasMappedFile = true
        return reader, nil
        }
        // FromBytes takes a byte slice corresponding to a MaxMind DB file and returns
        // a Reader structure or an error.
        func FromBytes(buffer []byte) (*Reader, error) {
        metadataStart := bytes.LastIndex(buffer, metadataStartMarker)
        if metadataStart == -1 {
        return nil, newInvalidDatabaseError("error opening database: invalid MaxMind DB file")
        return nil, fmt.Errorf("error opening database file: invalid MaxMind DB file")
        }
        metadataStart += len(metadataStartMarker)
        metadataDecoder := decoder{buffer[metadataStart:]}
        metadataDecoder := decoder{buffer, uint(metadataStart)}
        var metadata Metadata
        rvMetdata := reflect.ValueOf(&metadata)
        _, err := metadataDecoder.decode(0, rvMetdata, 0)
        _, err := metadataDecoder.decode(uint(metadataStart), rvMetdata)
        if err != nil {
        return nil, err
        }
        searchTreeSize := metadata.NodeCount * metadata.RecordSize / 4
        dataSectionStart := searchTreeSize + dataSectionSeparatorSize
        dataSectionEnd := uint(metadataStart - len(metadataStartMarker))
        if dataSectionStart > dataSectionEnd {
        return nil, newInvalidDatabaseError("the MaxMind DB contains invalid metadata")
        }
        d := decoder{
        buffer[searchTreeSize+dataSectionSeparatorSize : metadataStart-len(metadataStartMarker)],
        }
        decoder := decoder{buffer, searchTreeSize + dataSectionSeparatorSize}
        reader := &Reader{
        buffer: buffer,
        decoder: d,
        Metadata: metadata,
        ipv4Start: 0,
        }
        reader := &Reader{buffer: buffer, decoder: decoder, Metadata: metadata, ipv4Start: 0}
        reader.ipv4Start, err = reader.startNode()
        ......@@ -105,57 +120,22 @@ func (r *Reader) startNode() (uint, error) {
        }
        // Lookup takes an IP address as a net.IP structure and a pointer to the
        // result value to Decode into.
        func (r *Reader) Lookup(ipAddress net.IP, result interface{}) error {
        pointer, err := r.lookupPointer(ipAddress)
        if pointer == 0 || err != nil {
        return err
        }
        return r.retrieveData(pointer, result)
        }
        // LookupOffset maps an argument net.IP to a corresponding record offset in the
        // database. NotFound is returned if no such record is found, and a record may
        // otherwise be extracted by passing the returned offset to Decode. LookupOffset
        // is an advanced API, which exists to provide clients with a means to cache
        // previously-decoded records.
        func (r *Reader) LookupOffset(ipAddress net.IP) (uintptr, error) {
        pointer, err := r.lookupPointer(ipAddress)
        if pointer == 0 || err != nil {
        return NotFound, err
        }
        return r.resolveDataPointer(pointer)
        }
        // Decode the record at |offset| into |result|. The result value pointed to
        // must be a data value that corresponds to a record in the database. This may
        // include a struct representation of the data, a map capable of holding the
        // data or an empty interface{} value.
        // result value to decode into. The result value pointed to must be a data
        // value that corresponds to a record in the database. This may include a
        // struct representation of the data, a map capable of holding the data or an
        // empty interface{} value.
        //
        // If result is a pointer to a struct, the struct need not include a field
        // for every value that may be in the database. If a field is not present in
        // the structure, the decoder will not decode that field, reducing the time
        // required to decode the record.
        //
        // As a special case, a struct field of type uintptr will be used to capture
        // the offset of the value. Decode may later be used to extract the stored
        // value from the offset. MaxMind DBs are highly normalized: for example in
        // the City database, all records of the same country will reference a
        // single representative record for that country. This uintptr behavior allows
        // clients to leverage this normalization in their own sub-record caching.
        func (r *Reader) Decode(offset uintptr, result interface{}) error {
        rv := reflect.ValueOf(result)
        if rv.Kind() != reflect.Ptr || rv.IsNil() {
        return errors.New("result param must be a pointer")
        }
        _, err := r.decoder.decode(uint(offset), reflect.ValueOf(result), 0)
        return err
        }
        func (r *Reader) lookupPointer(ipAddress net.IP) (uint, error) {
        // Currently the decoder expect most data types to correspond exactly (e.g.,
        // a uint64 database type must be decoded into a uint64 Go type). In the
        // future, this may be made more flexible.
        func (r *Reader) Lookup(ipAddress net.IP, result interface{}) error {
        if ipAddress == nil {
        return 0, errors.New("ipAddress passed to Lookup cannot be nil")
        return errors.New("ipAddress passed to Lookup cannot be nil")
        }
        ipV4Address := ipAddress.To4()
        ......@@ -163,10 +143,20 @@ func (r *Reader) lookupPointer(ipAddress net.IP) (uint, error) {
        ipAddress = ipV4Address
        }
        if len(ipAddress) == 16 && r.Metadata.IPVersion == 4 {
        return 0, fmt.Errorf("error looking up '%s': you attempted to look up an IPv6 address in an IPv4-only database", ipAddress.String())
        return fmt.Errorf("error looking up '%s': you attempted to look up an IPv6 address in an IPv4-only database", ipAddress.String())
        }
        pointer, err := r.findAddressInTree(ipAddress)
        if pointer == 0 {
        return err
        }
        return r.findAddressInTree(ipAddress)
        rv := reflect.ValueOf(result)
        if rv.Kind() != reflect.Ptr || rv.IsNil() {
        return errors.New("result param for Lookup must be a pointer")
        }
        return r.resolveDataPointer(pointer, rv)
        }
        func (r *Reader) findAddressInTree(ipAddress net.IP) (uint, error) {
        ......@@ -196,7 +186,7 @@ func (r *Reader) findAddressInTree(ipAddress net.IP) (uint, error) {
        return node, nil
        }
        return 0, newInvalidDatabaseError("invalid node in search tree")
        return 0, errors.New("invalid node in search tree")
        }
        func (r *Reader) readNode(nodeNumber uint, index uint) (uint, error) {
        ......@@ -205,13 +195,13 @@ func (r *Reader) readNode(nodeNumber uint, index uint) (uint, error) {
        baseOffset := nodeNumber * RecordSize / 4
        var nodeBytes []byte
        var prefix uint
        var prefix uint64
        switch RecordSize {
        case 24:
        offset := baseOffset + index*3
        nodeBytes = r.buffer[offset : offset+3]
        case 28:
        prefix = uint(r.buffer[baseOffset+3])
        prefix = uint64(r.buffer[baseOffset+3])
        if index != 0 {
        prefix &= 0x0F
        } else {
        ......@@ -223,24 +213,31 @@ func (r *Reader) readNode(nodeNumber uint, index uint) (uint, error) {
        offset := baseOffset + index*4
        nodeBytes = r.buffer[offset : offset+4]
        default:
        return 0, newInvalidDatabaseError("unknown record size: %d", RecordSize)
        return 0, fmt.Errorf("unknown record size: %d", RecordSize)
        }
        return uintFromBytes(prefix, nodeBytes), nil
        return uint(uintFromBytes(prefix, nodeBytes)), nil
        }
        func (r *Reader) retrieveData(pointer uint, result interface{}) error {
        offset, err := r.resolveDataPointer(pointer)
        if err != nil {
        return err
        func (r *Reader) resolveDataPointer(pointer uint, result reflect.Value) error {
        nodeCount := r.Metadata.NodeCount
        searchTreeSize := r.Metadata.RecordSize * nodeCount / 4
        resolved := pointer - nodeCount + searchTreeSize