Find tokens by regex

peterkowalski · peterkowalski · commit 113240196a98 · 2021-09-06T10:56:04.000+02:00
diff --git a/aws_role.go b/aws_role.go
@@ -2,6 +2,7 @@ package saml2aws
 
 import (
 	"fmt"
+	"regexp"
 	"strings"
 )
 
@@ -29,7 +30,8 @@ func ParseAWSRoles(roles []string) ([]*AWSRole, error) {
 }
 
 func parseRole(role string) (*AWSRole, error) {
-	tokens := strings.Split(role, ",")
+	r, _ := regexp.Compile("arn:([^:\n]*):([^:\n]*):([^:\n]*):([^:\n]*):(([^:/\n]*)[:/])?([^:,\n]*)")
+	tokens := r.FindAllString(role, -1)
 
 	if len(tokens) != 2 {
 		return nil, fmt.Errorf("Invalid role string only %d tokens", len(tokens))

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package saml2aws`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "regexp"`
`5`	`6`	`"strings"`
`6`	`7`	`)`
`7`	`8`
`@@ -29,7 +30,8 @@ func ParseAWSRoles(roles []string) ([]*AWSRole, error) {`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`func parseRole(role string) (*AWSRole, error) {`
`32`		`- tokens := strings.Split(role, ",")`
	`33`	`+ r, _ := regexp.Compile("arn:([^:\n]):([^:\n]):([^:\n]):([^:\n]):(([^:/\n])[:/])?([^:,\n])")`
	`34`	`+ tokens := r.FindAllString(role, -1)`
`33`	`35`
`34`	`36`	`if len(tokens) != 2 {`
`35`	`37`	`return nil, fmt.Errorf("Invalid role string only %d tokens", len(tokens))`