kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

fail fast when network filter invalid

Browse source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-12-29 16:10:40 +08:00
parent a2b12b5e82
commit ee2925e2f9
2 changed files with 15 additions and 15 deletions
api/server/router/network
filter.gonetwork_routes.go

15
api/server/router/network/filter.go
View file

@ -8,17 +8,6 @@ import (
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
) )
var (
// acceptedNetworkFilters is a list of acceptable filters
acceptedNetworkFilters = map[string]bool{
"driver": true,
"type": true,
"name": true,
"id": true,
"label": true,
}
)
func filterNetworkByType(nws []types.NetworkResource, netType string) (retNws []types.NetworkResource, err error) { func filterNetworkByType(nws []types.NetworkResource, netType string) (retNws []types.NetworkResource, err error) {
switch netType { switch netType {
case "builtin": case "builtin":
@ -47,10 +36,6 @@ func filterNetworks(nws []types.NetworkResource, filter filters.Args) ([]types.N
return nws, nil return nws, nil
} }
if err := filter.Validate(acceptedNetworkFilters); err != nil {
return nil, err
}
displayNet := []types.NetworkResource{} displayNet := []types.NetworkResource{}
for _, nw := range nws { for _, nw := range nws {
if filter.Include("driver") { if filter.Include("driver") {

15
api/server/router/network/network_routes.go
View file

@ -14,6 +14,17 @@ import (
"github.com/docker/libnetwork/networkdb" "github.com/docker/libnetwork/networkdb"
) )
var (
// acceptedNetworkFilters is a list of acceptable filters
acceptedNetworkFilters = map[string]bool{
"driver": true,
"type": true,
"name": true,
"id": true,
"label": true,
}
)
func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := httputils.ParseForm(r); err != nil { if err := httputils.ParseForm(r); err != nil {
return err return err
@ -25,6 +36,10 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit
return err return err
} }
if err := netFilters.Validate(acceptedNetworkFilters); err != nil {
return err
}
list := []types.NetworkResource{} list := []types.NetworkResource{}
if nr, err := n.cluster.GetNetworks(); err == nil { if nr, err := n.cluster.GetNetworks(); err == nil {