Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: caddyserver/caddy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.8.1
Choose a base ref
...
head repository: caddyserver/caddy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.8.2
Choose a head ref
  • 5 commits
  • 7 files changed
  • 4 contributors

Commits on Jun 1, 2024

  1. build(deps): bump golangci/golangci-lint-action from 5 to 6 (#6361)

    Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5 to 6.
    - [Release notes](https://github.com/golangci/golangci-lint-action/releases)
    - [Commits](golangci/golangci-lint-action@v5...v6)
    
    ---
    updated-dependencies:
    - dependency-name: golangci/golangci-lint-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    a63767d View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Configuration menu
    Copy the full SHA
    b7280e6 View commit details
    Browse the repository at this point in the history
  2. I'm so tired of typos

    mholt committed Jun 2, 2024
    8 Configuration menu
    Copy the full SHA
    01308b4 View commit details
    Browse the repository at this point in the history
  3. caddyhttp: properly sanitize requests for root path (#6360)

    SanitizePathJoin protects against directory traversal attacks by
    checking for requests whose URL path look like they are trying to
    request something other than a local file, and returns the root
    directory in those cases.
    
    The method is also careful to ensure that requests which contain a
    trailing slash include a trailing slash in the returned value.  However,
    for requests that contain only a slash (requests for the root path), the
    IsLocal check returns early before the matching trailing slash is
    re-added.
    
    This change updates SanitizePathJoin to only perform the
    filepath.IsLocal check if the cleaned request URL path is non-empty.
    
    ---
    
    This change also updates the existing SanitizePathJoin tests to use
    filepath.FromSlash rather than filepath.Join. This makes the expected
    value a little easier to read, but also has the advantage of not being
    processed by filepath.Clean like filepath.Join is. This means that the
    exact expect value will be compared, not the result of first cleaning
    it.
    
    Fixes #6352
    willnorris authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    f8a2c60 View commit details
    Browse the repository at this point in the history
  4. cmd: fix auto-detetction of .caddyfile extension (#6356)

    * cmd: fix auto-detetction of .caddyfile extension
    
    Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
    
    * move conditions around and add clarifying comment
    
    Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
    
    * reject ambiguous config file name
    
    Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
    
    ---------
    
    Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
    mohammed90 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    15faeac View commit details
    Browse the repository at this point in the history
Loading