浏览代码

Validate filter values before calling registry.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Vincent Demeester 9 年之前
父节点
当前提交
cd012efa2e
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      daemon/search.go

+ 5 - 5
daemon/search.go

@@ -32,11 +32,6 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers)
-	if err != nil {
-		return nil, err
-	}
-
 	var isAutomated, isOfficial bool
 	var isAutomated, isOfficial bool
 	var hasStarFilter = 0
 	var hasStarFilter = 0
 	if searchFilters.Include("is-automated") {
 	if searchFilters.Include("is-automated") {
@@ -66,6 +61,11 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
 		}
 		}
 	}
 	}
 
 
+	unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers)
+	if err != nil {
+		return nil, err
+	}
+
 	filteredResults := []registrytypes.SearchResult{}
 	filteredResults := []registrytypes.SearchResult{}
 	for _, result := range unfilteredResult.Results {
 	for _, result := range unfilteredResult.Results {
 		if searchFilters.Include("is-automated") {
 		if searchFilters.Include("is-automated") {