Issue #1429 : Removing check for id string length

Harshal Patil · Harshal Patil · commit 700c74cb7e74 · 2017-05-04T09:21:29.000+05:30
Signed-off-by: Harshal Patil &lt;harshal.patil@in.ibm.com&gt;
diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go
@@ -27,10 +27,7 @@ const (
 	execFifoFilename = "exec.fifo"
 )
 
-var (
-	idRegex  = regexp.MustCompile(`^[\w+-\.]+$`)
-	maxIdLen = 1024
-)
+var idRegex = regexp.MustCompile(`^[\w+-\.]+$`)
 
 // InitArgs returns an options func to configure a LinuxFactory with the
 // provided init binary path and arguments.
@@ -330,8 +327,6 @@ func (l *LinuxFactory) validateID(id string) error {
 	if !idRegex.MatchString(id) {
 		return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)
 	}
-	if len(id) > maxIdLen {
-		return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)
-	}
+
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,7 @@ const (`
`27`	`27`	`execFifoFilename = "exec.fifo"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var (`
`31`		- idRegex = regexp.MustCompile(`^[\w+-\.]+$`)
`32`		`- maxIdLen = 1024`
`33`		`-)`
	`30`	+var idRegex = regexp.MustCompile(`^[\w+-\.]+$`)
`34`	`31`
`35`	`32`	`// InitArgs returns an options func to configure a LinuxFactory with the`
`36`	`33`	`// provided init binary path and arguments.`
`@@ -330,8 +327,6 @@ func (l *LinuxFactory) validateID(id string) error {`
`330`	`327`	`if !idRegex.MatchString(id) {`
`331`	`328`	`return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)`
`332`	`329`	`}`
`333`		`- if len(id) > maxIdLen {`
`334`		`- return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)`
`335`		`- }`
	`330`	`+`
`336`	`331`	`return nil`
`337`	`332`	`}`