Merge branch 'master' into shamir

README.rst

@@ -950,6 +950,12 @@ Backward compatibility
 improvements brought to the 1.X and 2.X branches (current) will maintain the
 file format introduced in **1.0**.
 
+Security
+--------
+
+Please report security issues to jvehent at mozilla dot com, or by using one
+of the contact method available on keybase: https://keybase.io/jvehent
+
 License
 -------
 Mozilla Public License Version 2.0

cmd/sops/main.go

@@ -315,7 +315,8 @@ func runEditor(path string) error {
 		if err != nil {
 			return fmt.Errorf("Invalid $EDITOR: %s", editor)
 		}
-		cmd = exec.Command(parts[0], parts...)
+		parts = append(parts, path)
+		cmd = exec.Command(parts[0], parts[1:]...)
 	}
 
 	cmd.Stdin = os.Stdin

kms/keysource.go

@@ -140,7 +140,7 @@ func (key MasterKey) createStsSession(config aws.Config, sess *session.Session)
 }
 
 func (key MasterKey) createSession() (*session.Session, error) {
-	re := regexp.MustCompile(`^arn:aws:kms:(.+):([0-9]+):key/(.+)$`)
+	re := regexp.MustCompile(`^arn:aws[\w-]*:kms:(.+):[0-9]+:key/.+$`)
 	matches := re.FindStringSubmatch(key.Arn)
 	if matches == nil {
 		return nil, fmt.Errorf("No valid ARN found in %q", key.Arn)