Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #3

Merged
merged 33 commits into from
Aug 7, 2024

Commits on Nov 13, 2023

  1. Swap closing order in inAxfr and inIxfr (miekg#1511)

    * Fix closing order
    
    * Comment to make clear that the close order is deliberate
    
    ---------
    
    Co-authored-by: Tim Scheuermann <[email protected]>
    noxer and Tim Scheuermann authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    3d593a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. feat: add support for ReuseAddr (miekg#1510)

    * feat: add support for ReuseAddr
    
    * Update listen_reuseport.go
    
    * Update listen_reuseport.go
    
    * fixup! feat: add support for ReuseAddr
    
    ---------
    
    Co-authored-by: Miek Gieben <[email protected]>
    jimlambrt and miekg authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    257e89e View commit details
    Browse the repository at this point in the history
  2. Release 1.1.57

    miekg committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    836bea2 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Try explaining duplicate RCODEs

    Add extra link to the docs for the duplicate Rcode entries
    
    See miekg#1523
    
    Signed-off-by: Miek Gieben <[email protected]>
    miekg committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    9bbcd24 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Configuration menu
    Copy the full SHA
    f206faa View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Allow use of fs.FS for $INCLUDE and wrap errors (miekg#1526)

    * Allow use of fs.FS for $INCLUDE and wrap errors
    
    This adds ZoneParser.SetIncludeAllowedFS, to specify an fs.FS when
    enabling support for $INCLUDE, for reading included files from
    somewhere other than the local filesystem.
    
    I've also modified ParseError to support wrapping another error, such
    as errors encountered while opening the $INCLUDE target.  This allows
    for much more robust handling, using errors.Is() instead of testing
    for particular strings (which may not be identical between fs.FS
    implementations).
    
    ParseError was being constructed in a lot of places using positional
    instead of named members.  Updating ParseError initialization after
    the new member field was added makes this change seem a lot larger
    than it actually is.
    
    The changes here should be completely backwards compatible.  The
    ParseError change should be invisible to anyone not trying to unwrap
    it, and ZoneParser will continue to use os.Open if the existing
    SetIncludeAllowed method is called instead of the new
    SetIncludeAllowedFS method.
    
    * Don't duplicate SetIncludeAllowed; clarify edge cases
    
    Rather than duplicate functionality between SetIncludeAllowed and
    SetIncludeAllowedFS, have a method SetIncludeFS, which only sets the
    fs.FS.
    
    I've improved the documentation to point out some considerations for
    users hoping to use fs.FS as a security boundary.
    
    Per the fs.ValidPath documentation, fs.FS implementations must use
    path (not filepath) semantics, with slash as a separator (even on
    Windows).  Some, like os.DirFS, also require all paths to be relative.
    I've clarified this in the documentation, made the includePath
    manipulation more robust to edge cases, and added some additional
    tests for relative and absolute paths.
    dpifke authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    50fbccd View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Bump golang.org/x/net from 0.17.0 to 0.19.0 (miekg#1520)

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.19.0.
    - [Commits](golang/net@v0.17.0...v0.19.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    be7d6e5 View commit details
    Browse the repository at this point in the history
  2. Bump golang.org/x/sys from 0.13.0 to 0.15.0 (miekg#1518)

    Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.13.0 to 0.15.0.
    - [Commits](golang/sys@v0.13.0...v0.15.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/sys
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e7aed24 View commit details
    Browse the repository at this point in the history
  3. Add NXT record (miekg#1516)

    This add the NXT record (2535) to implement all records from the RFC.
    
    Also does a s/RFC RFC/RFC/ as I happen to bumb into that will editing
    the comments.
    
    Signed-off-by: Miek Gieben <[email protected]>
    miekg authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4c06a1b View commit details
    Browse the repository at this point in the history
  4. Add ISDN record (miekg#1515)

    We had the type code, this add the rest. Other RRs from 1183 are also
    fully impl. don't know why this one wasn't.
    
    Signed-off-by: Miek Gieben <[email protected]>
    miekg authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    8ad6d5b View commit details
    Browse the repository at this point in the history
  5. Bump golang.org/x/tools from 0.13.0 to 0.17.0 (miekg#1529)

    Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.13.0 to 0.17.0.
    - [Release notes](https://github.com/golang/tools/releases)
    - [Commits](golang/tools@v0.13.0...v0.17.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/tools
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fd91c6a View commit details
    Browse the repository at this point in the history
  6. Release 1.1.58

    miekg committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a493770 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Improve NewRR documentation (miekg#1531)

    In particular, document the default origin.
    gibson042 authored Jan 21, 2024
    Configuration menu
    Copy the full SHA
    21ba49c View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Configuration menu
    Copy the full SHA
    982d149 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Add option to do a zone transfer via TLS (miekg#1533)

    * New func InTLS
    
    Perform zone transfer via TLS
    
    * Test xfr via TLS
    
    * New field TLS, used to transfer via TLS
    
    ---------
    
    Co-authored-by: Cesar Kuroiwa <[email protected]>
    cesarkuroiwa and Cesar Kuroiwa authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    57dcd27 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. IsDomainName: check for escape as last character (miekg#1532)

    Keep track if the escape, if still true when returning isDomainName
    should return false.
    
    TODO:
    - Should still be done in packDomainName as well.
    - And that should be tested
    - Some tests now fail
    
    There are multiple other places that supposedly also check for this, but
    they are not called in the parsing.
    
    Fixes: miekg#1528
    
    Signed-off-by: Miek Gieben <[email protected]>
    miekg authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    2230854 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Bump golang.org/x/sys from 0.16.0 to 0.17.0 (miekg#1541)

    Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.16.0 to 0.17.0.
    - [Commits](golang/sys@v0.16.0...v0.17.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/sys
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d51366b View commit details
    Browse the repository at this point in the history
  2. Bump golang.org/x/net from 0.20.0 to 0.21.0 (miekg#1542)

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.21.0.
    - [Commits](golang/net@v0.20.0...v0.21.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    ad46f23 View commit details
    Browse the repository at this point in the history
  3. Bump golang.org/x/tools from 0.17.0 to 0.19.0 (miekg#1551)

    Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.17.0 to 0.19.0.
    - [Release notes](https://github.com/golang/tools/releases)
    - [Commits](golang/tools@v0.17.0...v0.19.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/tools
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    96cf8ba View commit details
    Browse the repository at this point in the history
  4. chore: fix some comments (miekg#1547)

    Signed-off-by: xiaoxiangxianzi <[email protected]>
    xiaoxiangxianzi authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    1c6c796 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    ba039c8 View commit details
    Browse the repository at this point in the history
  2. Fix counting of escape sequences when splitting TXT strings (miekg#1540)

    `endingToTxtSlice`, used by TXT, SPF and a few other types, parses a
    string such as `"hello world"` from an RR's content in a zone file.
    These strings are limited to 255 characters, and `endingToTxtSlice`
    automatically splits them if they're longer than that. However, it
    didn't count the length correctly: escape sequences such as `\\` or
    `\123` were counted as multiple characters (2 and 4 respectively in
    these examples), but they should only count as one character because
    they represent a single byte in wire format (which is where this 255
    character limit comes from). This commit fixes that.
    janik-cloudflare authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e4ef594 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Fix possible out-of-bounds read in endingToTxtSlice (miekg#1557)

    * Update escapedStringOffset to improve readability
    
    This function was, admittedly, a little difficult to follow. This new
    version is slightly more verbose, but, in my opinion, easier to
    understand.
    
    * Fix possible out-of-bounds read in endingToTxtSlice caused by escapedStringOffset
    
    If the input had a trailing backslash (normally the start of an escape
    sequence) with nothing following it, `escapedStringOffset` would return
    the length of the input, plus one (!), as the result index, causing an
    out-of-bounds read and panic in `endingToTxtSlice`.
    
    Consistent with, e.g., commit 2230854,
    I've decided to make this an error since it definitely indicates that
    the string isn't valid.
    
    Credit to OSS-Fuzz -- thank you!
    janik-cloudflare authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    76926c7 View commit details
    Browse the repository at this point in the history
  2. Bump golang.org/x/sys from 0.18.0 to 0.20.0 (miekg#1571)

    Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.18.0 to 0.20.0.
    - [Commits](golang/sys@v0.18.0...v0.20.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/sys
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d945412 View commit details
    Browse the repository at this point in the history
  3. Bump golang.org/x/net from 0.22.0 to 0.25.0 (miekg#1569)

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.25.0.
    - [Commits](golang/net@v0.22.0...v0.25.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f89100d View commit details
    Browse the repository at this point in the history
  4. Bump golang.org/x/tools from 0.19.0 to 0.22.0 (miekg#1574)

    Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.19.0 to 0.22.0.
    - [Release notes](https://github.com/golang/tools/releases)
    - [Commits](golang/tools@v0.19.0...v0.22.0)
    
    ---
    updated-dependencies:
    - dependency-name: golang.org/x/tools
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    32f0e18 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2b89f28 View commit details
    Browse the repository at this point in the history
  6. Add a hook to catch invalid messages (miekg#1568)

    * Add a hook to catch invalid messages
    
    Currently there are hooks for reading messages off the wire (DecorateReader),
    checking if they comply with policy (MsgAcceptFunc), and generating responses
    (Handler).  However, there is no hook that notifies the server when a message is
    dropped or rejected due to a syntax error.  That makes it hard to monitor these
    packets without repeating the parsing process.
    
    This PR adds a hook for notifications about invalid packets.
    
    * s/InvalidMsg/MsgInvalid/g
    bemasc authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    eada9c9 View commit details
    Browse the repository at this point in the history
  7. These two too

    Signed-off-by: Miek Gieben <[email protected]>
    miekg committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c3301c3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a1ef7a6 View commit details
    Browse the repository at this point in the history
  9. update list of RFCs

    Signed-off-by: Miek Gieben <[email protected]>
    miekg committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e5a40bc View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    870b1c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Configuration menu
    Copy the full SHA
    f46bd31 View commit details
    Browse the repository at this point in the history