Skip to content

fix http regex string to add support for cas.v2 http requests #663

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.

Sign up for GitHub

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

Open
HunterCrosland wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix http regex string to add support for cas.v2 http requests #663

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
419913a
fix http regex string to add support for cas.v2 http requests
hcroslandnvda May 26, 2023
b0f7693
fix remainder of "cas" only references in http.go
hcroslandnvda May 26, 2023
3c60a63
fix regex string
hcroslandnvda May 26, 2023
4b60a43
fix ac matching in regex
hcroslandnvda May 26, 2023
7b83c64
use raw string for regex match
hcroslandnvda May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
syncpool "github.com/mostynb/zstdpool-syncpool"
)

var blobNameSHA256 = regexp.MustCompile("^/?(.*/)?(ac/|cas/)([a-f0-9]{64})$")
var blobNameSHA256 = regexp.MustCompile("^/?(.*/)?((?:ac|cas(?:\\.v2)?)/)([a-f0-9]{64})$")

var decoder, _ = zstd.NewReader(nil) // TODO: raise WithDecoderConcurrency ?

Expand Down Expand Up @@ -100,14 +100,14 @@ func parseRequestURL(url string, validateAC bool) (kind cache.EntryKind, hash st

parts := m[2:]
if len(parts) != 2 {
err := fmt.Errorf("the path '%s' is invalid. expected (ac/|cas/)sha256",
err := fmt.Errorf("the path '%s' is invalid. expected (ac/|cas(.v2)?/)sha256",
html.EscapeString(url))
return 0, "", "", err
}

// The regex ensures that parts[0] can only be "ac/" or "cas/"
// The regex ensures that parts[0] can only be "ac/" or "cas(.v2)?/"
hash = parts[1]
if parts[0] == "cas/" {
if parts[0] == "cas/" || parts[0] == "cas.v2/" {
return cache.CAS, hash, instance, nil
}

Expand Down