oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00
Code Wiki Activity

review: fix various issues brought up by Gusted

Browse source
This commit is contained in:
Kwonunn 2025-01-26 11:50:03 +01:00 • committed by Kwonunn
parent 7a21d64333
commit ef43d7c615
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
act/artifactcache/mac.go
View file

@ -25,7 +25,7 @@ func (h *Handler) validateMac(rundata cacheproxy.RunData) (string, error) {
} }
expectedMAC := computeMac(h.secret, rundata.RepositoryFullName, rundata.RunNumber, rundata.Timestamp) expectedMAC := computeMac(h.secret, rundata.RepositoryFullName, rundata.RunNumber, rundata.Timestamp)
if expectedMAC == rundata.RepositoryMAC { if hmac.Equal([]byte(expectedMAC), []byte(rundata.RepositoryMAC)) {
return rundata.RepositoryFullName, nil return rundata.RepositoryFullName, nil
} }
return rundata.RepositoryFullName, ErrValidation return rundata.RepositoryFullName, ErrValidation

31
act/cacheproxy/handler.go
View file

@ -16,6 +16,7 @@ import (
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"regexp" "regexp"
"strconv"
"sync" "sync"
"time" "time"
@ -29,6 +30,10 @@ const (
urlBase = "/_apis/artifactcache" urlBase = "/_apis/artifactcache"
) )
var (
urlRegex = regexp.MustCompile(`/(\w+)(/_apis/artifactcache/.+)`)
)
type Handler struct { type Handler struct {
router *httprouter.Router router *httprouter.Router
listener net.Listener listener net.Listener
@ -133,8 +138,7 @@ func (h *Handler) newReverseProxy(targetHost string) (*httputil.ReverseProxy, er
proxy := &httputil.ReverseProxy{ proxy := &httputil.ReverseProxy{
Rewrite: func(r *httputil.ProxyRequest) { Rewrite: func(r *httputil.ProxyRequest) {
re := regexp.MustCompile(`/(\w+)(/_apis/artifactcache/.+)`) matches := urlRegex.FindStringSubmatch(r.In.URL.Path)
matches := re.FindStringSubmatch(r.In.URL.Path)
id := matches[1] id := matches[1]
data, ok := h.runs.Load(id) data, ok := h.runs.Load(id)
var runData = data.(RunData) var runData = data.(RunData)
@ -149,12 +153,12 @@ func (h *Handler) newReverseProxy(targetHost string) (*httputil.ReverseProxy, er
r.SetURL(targetURL) r.SetURL(targetURL)
r.Out.URL.Path = uri r.Out.URL.Path = uri
r.Out.Header.Add("Forgejo-Cache-Repo", runData.RepositoryFullName) r.Out.Header.Set("Forgejo-Cache-Repo", runData.RepositoryFullName)
r.Out.Header.Add("Forgejo-Cache-RunNumber", runData.RunNumber) r.Out.Header.Set("Forgejo-Cache-RunNumber", runData.RunNumber)
r.Out.Header.Add("Forgejo-Cache-RunId", id) r.Out.Header.Set("Forgejo-Cache-RunId", id)
r.Out.Header.Add("Forgejo-Cache-Timestamp", runData.Timestamp) r.Out.Header.Set("Forgejo-Cache-Timestamp", runData.Timestamp)
r.Out.Header.Add("Forgejo-Cache-MAC", runData.RepositoryMAC) r.Out.Header.Set("Forgejo-Cache-MAC", runData.RepositoryMAC)
r.Out.Header.Add("Forgejo-Cache-Host", h.ExternalURL()) r.Out.Header.Set("Forgejo-Cache-Host", h.ExternalURL())
}, },
} }
return proxy, nil return proxy, nil
@ -162,9 +166,7 @@ func (h *Handler) newReverseProxy(targetHost string) (*httputil.ReverseProxy, er
func (h *Handler) ExternalURL() string { func (h *Handler) ExternalURL() string {
// TODO: make the external url configurable if necessary // TODO: make the external url configurable if necessary
return fmt.Sprintf("http://%s:%d", return net.JoinHostPort(h.outboundIP, strconv.Itoa(h.listener.Addr().(*net.TCPAddr).Port))
h.outboundIP,
h.listener.Addr().(*net.TCPAddr).Port)
} }
// Informs the proxy of a workflow run that can make cache requests. // Informs the proxy of a workflow run that can make cache requests.
@ -178,7 +180,10 @@ func (h *Handler) AddRun(data RunData) (string, error) {
} }
key := hex.EncodeToString(keyBytes) key := hex.EncodeToString(keyBytes)
h.runs.Store(key, data) _, loaded := h.runs.LoadOrStore(key, data)
if loaded {
return "", errors.New("Run id already exists")
}
return key, nil return key, nil
} }
@ -219,7 +224,9 @@ func (h *Handler) Close() error {
func computeMac(secret, repo, run, ts string) string { func computeMac(secret, repo, run, ts string) string {
mac := hmac.New(sha256.New, []byte(secret)) mac := hmac.New(sha256.New, []byte(secret))
mac.Write([]byte(repo)) mac.Write([]byte(repo))
mac.Write([]byte(">"))
mac.Write([]byte(run)) mac.Write([]byte(run))
mac.Write([]byte(">"))
mac.Write([]byte(ts)) mac.Write([]byte(ts))
return hex.EncodeToString(mac.Sum(nil)) return hex.EncodeToString(mac.Sum(nil))
} }