[core] Fix panic on invalid environment UUID

teo · teo · commit d9cc286cea72 · 2019-05-15T14:28:18.000+02:00
diff --git a/core/environment/manager.go b/core/environment/manager.go
@@ -125,6 +125,9 @@ func (envs *Manager) Environment(environmentId uuid.UUID) (env *Environment, err
 }
 
 func (envs *Manager) environment(environmentId uuid.UUID) (env *Environment, err error) {
+	if len(environmentId.String()) == 0 { // invalid uuid
+		return nil, fmt.Errorf("invalid uuid: %s", environmentId)
+	}
 	env, ok := envs.m[environmentId.Array()]
 	if !ok {
 		err = errors.New(fmt.Sprintf("no environment with id %s", environmentId))

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,9 @@ func (envs Manager) Environment(environmentId uuid.UUID) (env Environment, err`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`func (envs Manager) environment(environmentId uuid.UUID) (env Environment, err error) {`
	`128`	`+ if len(environmentId.String()) == 0 { // invalid uuid`
	`129`	`+ return nil, fmt.Errorf("invalid uuid: %s", environmentId)`
	`130`	`+ }`
`128`	`131`	`env, ok := envs.m[environmentId.Array()]`
`129`	`132`	`if !ok {`
`130`	`133`	`err = errors.New(fmt.Sprintf("no environment with id %s", environmentId))`