Browse code

Validate filter values before calling registry.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Vincent Demeester authored on 2016/05/27 18:13:12
Showing 1 changed files
... ...
@@ -32,11 +32,6 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
32 32
 		return nil, err
33 33
 	}
34 34
 
35
-	unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers)
36
-	if err != nil {
37
-		return nil, err
38
-	}
39
-
40 35
 	var isAutomated, isOfficial bool
41 36
 	var hasStarFilter = 0
42 37
 	if searchFilters.Include("is-automated") {
... ...
@@ -66,6 +61,11 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
66 66
 		}
67 67
 	}
68 68
 
69
+	unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers)
70
+	if err != nil {
71
+		return nil, err
72
+	}
73
+
69 74
 	filteredResults := []registrytypes.SearchResult{}
70 75
 	for _, result := range unfilteredResult.Results {
71 76
 		if searchFilters.Include("is-automated") {