feat: fix composer
This commit is contained in:
@@ -3,11 +3,15 @@ package composer
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/url"
|
||||
"path"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/any-hub/any-hub/internal/proxy/hooks"
|
||||
)
|
||||
|
||||
var composerDistRegistry sync.Map
|
||||
|
||||
func init() {
|
||||
hooks.MustRegister("composer", hooks.Hooks{
|
||||
NormalizePath: normalizePath,
|
||||
@@ -19,13 +23,23 @@ func init() {
|
||||
}
|
||||
|
||||
func normalizePath(_ *hooks.RequestContext, clean string, rawQuery []byte) (string, []byte) {
|
||||
if trimmed := trimComposerNamespace(clean); trimmed != clean {
|
||||
clean = trimmed
|
||||
}
|
||||
if isComposerDistPath(clean) {
|
||||
return clean, nil
|
||||
}
|
||||
return clean, rawQuery
|
||||
}
|
||||
|
||||
func resolveDistUpstream(_ *hooks.RequestContext, _ string, clean string, rawQuery []byte) string {
|
||||
func resolveDistUpstream(ctx *hooks.RequestContext, _ string, clean string, rawQuery []byte) string {
|
||||
domain := ""
|
||||
if ctx != nil {
|
||||
domain = ctx.Domain
|
||||
}
|
||||
if target := resolveComposerMirrorDist(domain, clean); target != "" {
|
||||
return target
|
||||
}
|
||||
if !isComposerDistPath(clean) {
|
||||
return ""
|
||||
}
|
||||
@@ -43,9 +57,10 @@ func rewriteResponse(
|
||||
body []byte,
|
||||
path string,
|
||||
) (int, map[string]string, []byte, error) {
|
||||
cleanPath := trimComposerNamespace(path)
|
||||
switch {
|
||||
case path == "/packages.json":
|
||||
data, changed, err := rewriteComposerRootBody(body)
|
||||
case cleanPath == "/packages.json":
|
||||
data, changed, err := rewriteComposerRootBody(body, ctx.Domain)
|
||||
if err != nil {
|
||||
return status, headers, body, err
|
||||
}
|
||||
@@ -54,7 +69,7 @@ func rewriteResponse(
|
||||
}
|
||||
outHeaders := ensureJSONHeaders(headers)
|
||||
return status, outHeaders, data, nil
|
||||
case isComposerMetadataPath(path):
|
||||
case isComposerMetadataPath(cleanPath):
|
||||
data, changed, err := rewriteComposerMetadata(body, ctx.Domain)
|
||||
if err != nil {
|
||||
return status, headers, body, err
|
||||
@@ -104,26 +119,21 @@ func contentType(_ *hooks.RequestContext, locatorPath string) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func rewriteComposerRootBody(body []byte) ([]byte, bool, error) {
|
||||
// packages.json from Packagist may contain "packages" as array or object; we only care about URL-like fields.
|
||||
func rewriteComposerRootBody(body []byte, domain string) ([]byte, bool, error) {
|
||||
var root map[string]any
|
||||
if err := json.Unmarshal(body, &root); err != nil {
|
||||
return nil, false, err
|
||||
}
|
||||
|
||||
changed := false
|
||||
for key, val := range root {
|
||||
str, ok := val.(string)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
switch strings.ToLower(key) {
|
||||
// case "metadata-url", "providers-url", "providers-lazy-url", "notify", "notify-batch", "search":
|
||||
case "metadata-url":
|
||||
str = strings.ReplaceAll(str, "https://repo.packagist.org", "")
|
||||
root[key] = str
|
||||
changed = true
|
||||
}
|
||||
if rewriteComposerRootURLField(root, "metadata-url", domain) {
|
||||
changed = true
|
||||
}
|
||||
if rewriteComposerRootURLField(root, "providers-url", domain) {
|
||||
changed = true
|
||||
}
|
||||
if ensureComposerMirrors(root, domain) {
|
||||
changed = true
|
||||
}
|
||||
|
||||
if !changed {
|
||||
@@ -136,6 +146,43 @@ func rewriteComposerRootBody(body []byte) ([]byte, bool, error) {
|
||||
return data, true, nil
|
||||
}
|
||||
|
||||
func rewriteComposerRootURLField(root map[string]any, key string, domain string) bool {
|
||||
value, ok := root[key].(string)
|
||||
if !ok || value == "" {
|
||||
return false
|
||||
}
|
||||
proxied := buildComposerProxyURL(value, domain)
|
||||
if proxied == value {
|
||||
return false
|
||||
}
|
||||
root[key] = proxied
|
||||
return true
|
||||
}
|
||||
|
||||
func ensureComposerMirrors(root map[string]any, domain string) bool {
|
||||
domain = strings.TrimSpace(domain)
|
||||
if domain == "" {
|
||||
return false
|
||||
}
|
||||
target := "https://" + domain + "/dists/%package%/%reference%.%type%"
|
||||
if existing, ok := root["mirrors"].([]any); ok && len(existing) == 1 {
|
||||
if entry, ok := existing[0].(map[string]any); ok {
|
||||
distURL, _ := entry["dist-url"].(string)
|
||||
preferred, _ := entry["preferred"].(bool)
|
||||
if distURL == target && preferred {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
root["mirrors"] = []map[string]any{
|
||||
{
|
||||
"dist-url": target,
|
||||
"preferred": true,
|
||||
},
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func rewriteComposerMetadata(body []byte, domain string) ([]byte, bool, error) {
|
||||
type packagesRoot struct {
|
||||
Packages map[string]json.RawMessage `json:"packages"`
|
||||
@@ -236,7 +283,12 @@ func rewriteComposerVersion(entry map[string]any, domain string, packageName str
|
||||
if !ok || urlValue == "" {
|
||||
return changed
|
||||
}
|
||||
rewritten := rewriteComposerDistURL(urlValue)
|
||||
reference, _ := distVal["reference"].(string)
|
||||
distType, _ := distVal["type"].(string)
|
||||
if packageName != "" && domain != "" && reference != "" && distType != "" {
|
||||
registerComposerDist(domain, packageName, reference, distType, urlValue)
|
||||
}
|
||||
rewritten := rewriteComposerLegacyDistURL(urlValue, domain)
|
||||
if rewritten == urlValue {
|
||||
return changed
|
||||
}
|
||||
@@ -244,38 +296,58 @@ func rewriteComposerVersion(entry map[string]any, domain string, packageName str
|
||||
return true
|
||||
}
|
||||
|
||||
func rewriteComposerDistURL(original string) string {
|
||||
parsed, err := url.Parse(original)
|
||||
if err != nil || parsed.Scheme == "" || parsed.Host == "" {
|
||||
func rewriteComposerLegacyDistURL(original string, domain string) string {
|
||||
trimmed := strings.TrimSpace(original)
|
||||
if trimmed == "" {
|
||||
return original
|
||||
}
|
||||
if isPackagistHost(parsed.Host) {
|
||||
pathVal := parsed.Path
|
||||
if raw := parsed.RawPath; raw != "" {
|
||||
pathVal = raw
|
||||
}
|
||||
if !strings.HasPrefix(pathVal, "/") {
|
||||
pathVal = "/" + pathVal
|
||||
}
|
||||
if parsed.RawQuery != "" {
|
||||
return pathVal + "?" + parsed.RawQuery
|
||||
}
|
||||
return pathVal
|
||||
parsed, err := url.Parse(trimmed)
|
||||
if err != nil {
|
||||
return original
|
||||
}
|
||||
return original
|
||||
if domain != "" && strings.EqualFold(parsed.Host, domain) && strings.HasPrefix(parsed.Path, "/dist/") {
|
||||
// Already rewritten.
|
||||
return original
|
||||
}
|
||||
if parsed.Scheme == "" || parsed.Host == "" {
|
||||
return original
|
||||
}
|
||||
pathVal := parsed.Path
|
||||
if raw := parsed.RawPath; raw != "" {
|
||||
pathVal = raw
|
||||
}
|
||||
if !strings.HasPrefix(pathVal, "/") {
|
||||
pathVal = "/" + pathVal
|
||||
}
|
||||
var builder strings.Builder
|
||||
builder.WriteString("/dist/")
|
||||
builder.WriteString(parsed.Scheme)
|
||||
builder.WriteString("/")
|
||||
builder.WriteString(parsed.Host)
|
||||
builder.WriteString(pathVal)
|
||||
if parsed.RawQuery != "" {
|
||||
builder.WriteString("?")
|
||||
builder.WriteString(parsed.RawQuery)
|
||||
}
|
||||
proxiedPath := builder.String()
|
||||
if domain == "" {
|
||||
return proxiedPath
|
||||
}
|
||||
return buildComposerProxyURL(proxiedPath, domain)
|
||||
}
|
||||
|
||||
func isComposerMetadataPath(path string) bool {
|
||||
clean := trimComposerNamespace(path)
|
||||
switch {
|
||||
case path == "/packages.json":
|
||||
case clean == "/packages.json":
|
||||
return true
|
||||
case strings.HasPrefix(path, "/p2/"):
|
||||
case strings.HasPrefix(clean, "/p2/"):
|
||||
return true
|
||||
case strings.HasPrefix(path, "/p/"):
|
||||
case strings.HasPrefix(clean, "/p/"):
|
||||
return true
|
||||
case strings.HasPrefix(path, "/provider-"):
|
||||
case strings.HasPrefix(clean, "/provider-"):
|
||||
return true
|
||||
case strings.HasPrefix(path, "/providers/"):
|
||||
case strings.HasPrefix(clean, "/providers/"):
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
@@ -283,14 +355,19 @@ func isComposerMetadataPath(path string) bool {
|
||||
}
|
||||
|
||||
func isComposerDistPath(path string) bool {
|
||||
return strings.HasPrefix(path, "/dist/")
|
||||
clean := trimComposerNamespace(path)
|
||||
if strings.HasPrefix(clean, "/dist/") {
|
||||
return true
|
||||
}
|
||||
return strings.HasPrefix(clean, "/dists/")
|
||||
}
|
||||
|
||||
func parseComposerDistURL(path string, rawQuery string) (*url.URL, bool) {
|
||||
if !strings.HasPrefix(path, "/dist/") {
|
||||
clean := trimComposerNamespace(path)
|
||||
if !strings.HasPrefix(clean, "/dist/") {
|
||||
return nil, false
|
||||
}
|
||||
trimmed := strings.TrimPrefix(path, "/dist/")
|
||||
trimmed := strings.TrimPrefix(clean, "/dist/")
|
||||
parts := strings.SplitN(trimmed, "/", 3)
|
||||
if len(parts) < 3 {
|
||||
return nil, false
|
||||
@@ -328,3 +405,132 @@ func stripPackagistHost(raw string) string {
|
||||
func isPackagistHost(host string) bool {
|
||||
return strings.EqualFold(host, "repo.packagist.org")
|
||||
}
|
||||
|
||||
func buildComposerProxyURL(raw string, domain string) string {
|
||||
trimmed := stripPackagistHost(strings.TrimSpace(raw))
|
||||
if trimmed == "" {
|
||||
return trimmed
|
||||
}
|
||||
if parsed, err := url.Parse(trimmed); err == nil && parsed.Host != "" {
|
||||
if domain != "" && strings.EqualFold(parsed.Host, domain) {
|
||||
return trimmed
|
||||
}
|
||||
if !isPackagistHost(parsed.Host) {
|
||||
return trimmed
|
||||
}
|
||||
if path := parsed.EscapedPath(); path != "" {
|
||||
trimmed = path
|
||||
if parsed.RawQuery != "" {
|
||||
trimmed = trimmed + "?" + parsed.RawQuery
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(trimmed, "/") {
|
||||
trimmed = "/" + trimmed
|
||||
}
|
||||
|
||||
if domain == "" {
|
||||
return trimmed
|
||||
}
|
||||
return "https://" + domain + trimmed
|
||||
}
|
||||
|
||||
func resolveComposerMirrorDist(domain string, locator string) string {
|
||||
domain = strings.TrimSpace(domain)
|
||||
if domain == "" {
|
||||
return ""
|
||||
}
|
||||
pkg, reference, distType, ok := parseComposerMirrorDistLocator(locator)
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
target, ok := lookupComposerDist(domain, pkg, reference, distType)
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
return target
|
||||
}
|
||||
|
||||
func parseComposerMirrorDistLocator(locator string) (string, string, string, bool) {
|
||||
clean := trimComposerNamespace(locator)
|
||||
if !strings.HasPrefix(clean, "/dists/") {
|
||||
return "", "", "", false
|
||||
}
|
||||
trimmed := strings.TrimPrefix(clean, "/dists/")
|
||||
lastSlash := strings.LastIndex(trimmed, "/")
|
||||
if lastSlash <= 0 || lastSlash >= len(trimmed)-1 {
|
||||
return "", "", "", false
|
||||
}
|
||||
packagePart := trimmed[:lastSlash]
|
||||
file := trimmed[lastSlash+1:]
|
||||
if packagePart == "" || file == "" {
|
||||
return "", "", "", false
|
||||
}
|
||||
ext := path.Ext(file)
|
||||
if ext == "" {
|
||||
return "", "", "", false
|
||||
}
|
||||
reference := strings.TrimSuffix(file, ext)
|
||||
distType := strings.TrimPrefix(ext, ".")
|
||||
if reference == "" || distType == "" {
|
||||
return "", "", "", false
|
||||
}
|
||||
packageName := strings.ToLower(strings.Trim(packagePart, "/"))
|
||||
if packageName == "" {
|
||||
return "", "", "", false
|
||||
}
|
||||
return packageName, reference, distType, true
|
||||
}
|
||||
|
||||
func registerComposerDist(domain string, packageName string, reference string, distType string, upstream string) {
|
||||
key := composerDistKey(domain, packageName, reference, distType)
|
||||
if key == "" || strings.TrimSpace(upstream) == "" {
|
||||
return
|
||||
}
|
||||
composerDistRegistry.Store(key, upstream)
|
||||
}
|
||||
|
||||
func lookupComposerDist(domain string, packageName string, reference string, distType string) (string, bool) {
|
||||
key := composerDistKey(domain, packageName, reference, distType)
|
||||
if key == "" {
|
||||
return "", false
|
||||
}
|
||||
value, ok := composerDistRegistry.Load(key)
|
||||
if !ok {
|
||||
return "", false
|
||||
}
|
||||
str, _ := value.(string)
|
||||
if strings.TrimSpace(str) == "" {
|
||||
return "", false
|
||||
}
|
||||
return str, true
|
||||
}
|
||||
|
||||
func composerDistKey(domain string, packageName string, reference string, distType string) string {
|
||||
domain = strings.ToLower(strings.TrimSpace(domain))
|
||||
pkg := strings.ToLower(strings.TrimSpace(packageName))
|
||||
ref := strings.TrimSpace(reference)
|
||||
typ := strings.ToLower(strings.TrimSpace(distType))
|
||||
if domain == "" || pkg == "" || ref == "" || typ == "" {
|
||||
return ""
|
||||
}
|
||||
return domain + "|" + pkg + "|" + ref + "|" + typ
|
||||
}
|
||||
|
||||
func trimComposerNamespace(p string) string {
|
||||
if strings.HasPrefix(p, "/composer/") {
|
||||
return strings.TrimPrefix(p, "/composer")
|
||||
}
|
||||
if p == "/composer" {
|
||||
return "/"
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
func resetComposerDistRegistry() {
|
||||
composerDistRegistry.Range(func(key, _ any) bool {
|
||||
composerDistRegistry.Delete(key)
|
||||
return true
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user