github/hubproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复镜像信息缓存污染问题

Browse Source
This commit is contained in:
user123456
2025-06-13 11:02:48 +08:00
parent 232260c1bf
commit 018a8235e2
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/imagetar.go
View File

@@ -78,7 +78,7 @@ func (is *ImageStreamer) StreamImageToWriter(ctx context.Context, imageRef strin
contextOptions := append(is.remoteOptions, remote.WithContext(ctx)) contextOptions := append(is.remoteOptions, remote.WithContext(ctx))
desc, err := is.getImageDescriptor(ref, contextOptions) desc, err := is.getImageDescriptorWithPlatform(ref, contextOptions, options.Platform)
if err != nil { if err != nil {
return fmt.Errorf("获取镜像描述失败: %w", err) return fmt.Errorf("获取镜像描述失败: %w", err)
} }
@@ -94,6 +94,11 @@ func (is *ImageStreamer) StreamImageToWriter(ctx context.Context, imageRef strin
// getImageDescriptor 获取镜像描述符 // getImageDescriptor 获取镜像描述符
func (is *ImageStreamer) getImageDescriptor(ref name.Reference, options []remote.Option) (*remote.Descriptor, error) { func (is *ImageStreamer) getImageDescriptor(ref name.Reference, options []remote.Option) (*remote.Descriptor, error) {
return is.getImageDescriptorWithPlatform(ref, options, "")
}
// getImageDescriptorWithPlatform 获取指定平台的镜像描述符
func (is *ImageStreamer) getImageDescriptorWithPlatform(ref name.Reference, options []remote.Option, platform string) (*remote.Descriptor, error) {
if isCacheEnabled() { if isCacheEnabled() {
var reference string var reference string
if tagged, ok := ref.(name.Tag); ok { if tagged, ok := ref.(name.Tag); ok {
@@ -103,14 +108,14 @@ func (is *ImageStreamer) getImageDescriptor(ref name.Reference, options []remote
} }
if reference != "" { if reference != "" {
cacheKey := buildManifestCacheKey(ref.Context().String(), reference) cacheKey := buildManifestCacheKeyWithPlatform(ref.Context().String(), reference, platform)
if cachedItem := globalCache.Get(cacheKey); cachedItem != nil { if cachedItem := globalCache.Get(cacheKey); cachedItem != nil {
desc := &remote.Descriptor{ desc := &remote.Descriptor{
Manifest: cachedItem.Data, Manifest: cachedItem.Data,
}
log.Printf("使用缓存的manifest: %s (平台: %s)", ref.String(), platform)
return desc, nil
} }
log.Printf("使用缓存的manifest: %s", ref.String())
return desc, nil
}
} }
} }
@@ -128,13 +133,13 @@ func (is *ImageStreamer) getImageDescriptor(ref name.Reference, options []remote
} }
if reference != "" { if reference != "" {
cacheKey := buildManifestCacheKey(ref.Context().String(), reference) cacheKey := buildManifestCacheKeyWithPlatform(ref.Context().String(), reference, platform)
ttl := getManifestTTL(reference) ttl := getManifestTTL(reference)
headers := map[string]string{ headers := map[string]string{
"Docker-Content-Digest": desc.Digest.String(), "Docker-Content-Digest": desc.Digest.String(),
} }
globalCache.Set(cacheKey, desc.Manifest, string(desc.MediaType), headers, ttl) globalCache.Set(cacheKey, desc.Manifest, string(desc.MediaType), headers, ttl)
log.Printf("缓存manifest: %s (TTL: %v)", ref.String(), ttl) log.Printf("缓存manifest: %s (平台: %s, TTL: %v)", ref.String(), platform, ttl)
} }
} }
@@ -376,7 +381,7 @@ func (is *ImageStreamer) streamSingleImageForBatch(ctx context.Context, tarWrite
contextOptions := append(is.remoteOptions, remote.WithContext(ctx)) contextOptions := append(is.remoteOptions, remote.WithContext(ctx))
desc, err := is.getImageDescriptor(ref, contextOptions) desc, err := is.getImageDescriptorWithPlatform(ref, contextOptions, options.Platform)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("获取镜像描述失败: %w", err) return nil, nil, fmt.Errorf("获取镜像描述失败: %w", err)
} }

9
src/token_cache.go
View File

@@ -78,6 +78,15 @@ func buildManifestCacheKey(imageRef, reference string) string {
return buildCacheKey("manifest", key) return buildCacheKey("manifest", key)
} }
// buildManifestCacheKeyWithPlatform 构建包含平台信息的manifest缓存key
func buildManifestCacheKeyWithPlatform(imageRef, reference, platform string) string {
if platform == "" {
platform = "default"
}
key := fmt.Sprintf("%s:%s@%s", imageRef, reference, platform)
return buildCacheKey("manifest", key)
}
// getManifestTTL 根据引用类型智能确定TTL // getManifestTTL 根据引用类型智能确定TTL
func getManifestTTL(reference string) time.Duration { func getManifestTTL(reference string) time.Duration {
cfg := GetConfig() cfg := GetConfig()