Fix ARN parsing to not break on aws-us-gov resources (#55)

jtblin · Mar 8, 2017 · 98da578 · 98da578
1 parent a1f7cd7
commit 98da578
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/iam.go b/cmd/iam.go
@@ -17,7 +17,7 @@ var cache = ccache.New(ccache.Configure())
 const (
 	ttl               = time.Minute * 15
 	maxSessNameLength = 64
-	fullArnPrefix     = "arn:aws:"
+	fullArnPrefix     = "arn:"
 )
 
 type iam struct {

diff --git a/cmd/server.go b/cmd/server.go
@@ -89,7 +89,7 @@ func (s *Server) securityCredentialsHandler(w http.ResponseWriter, r *http.Reque
 	roleARN := s.iam.roleARN(role)
 	// If a base ARN has been supplied and this is not cross-account then
 	// return a simple role-name, otherwise return the full ARN
-	if s.iam.baseARN == "" && strings.HasPrefix(roleARN, s.iam.baseARN) {
+	if s.iam.baseARN != "" && strings.HasPrefix(roleARN, s.iam.baseARN) {
 		idx := strings.LastIndex(roleARN, "/")
 		write(w, roleARN[idx+1:])
 		return