also detect keystone ec2/s3 token authentications

Author: Rudolf Vriend

etc/keystone.yaml

@@ -2,6 +2,7 @@ path_keywords:
   - application_credentials
   - credentials
   - domains
+  - ec2tokens
   - endpoints
   - groups
   - implies
@@ -14,6 +15,7 @@ path_keywords:
   - role_assignments
   - role_inferences
   - roles
+  - s3tokens
   - services
   - tags
   - tokens

watcher/cadf_strategy.py

@@ -186,6 +186,12 @@ def _cadf_action_from_method_and_target_type_uri(self, method, path):
         if method == 'POST' and 'auth/tokens' in path:
             return taxonomy.ACTION_AUTHENTICATE
 
+        if method == 'POST' and 's3tokens' in path:
+            return taxonomy.ACTION_AUTHENTICATE
+
+        if method == 'POST' and 'ec2tokens' in path:
+            return taxonomy.ACTION_AUTHENTICATE
+
         if method == 'GET':
             if path.endswith('/detail'):
                 return taxonomy.ACTION_LIST

watcher/tests/test_keystone.py

@@ -62,6 +62,52 @@ def test_cadf_action(self):
                 ),
                 'expected': 'authenticate'
             },
+            {
+                'request': fake.create_request(
+                    path='/v3/ec2tokens',
+                    method='POST',
+                    body_dict={
+                        "credentials": {
+                            "access": "8cff51dc66594df4a2ae121f796df36c",
+                            "host": "localhost",
+                            "params": {
+                                "Action": "Test",
+                                "SignatureMethod": "HmacSHA256",
+                                "SignatureVersion": "2",
+                                "Timestamp": "2007-01-31T23:59:59Z"
+                            },
+                            "path": "/",
+                            "secret": "df8daeaa981b40cea1217fead123bc64",
+                            "signature": "Fra2UBKKtqy3GQ0mj+JqzR8GTGsbWQW+yN5Nih9ThfI=",
+                            "verb": "GET"
+                        }
+                    }
+                ),
+                'expected': 'authenticate'
+            },
+            {
+                'request': fake.create_request(
+                    path='/v3/s3tokens',
+                    method='POST',
+                    body_dict={
+                        "credentials": {
+                            "access": "8cff51dc66594df4a2ae121f796df36c",
+                            "host": "localhost",
+                            "params": {
+                                "Action": "Test",
+                                "SignatureMethod": "HmacSHA256",
+                                "SignatureVersion": "2",
+                                "Timestamp": "2007-01-31T23:59:59Z"
+                            },
+                            "path": "/",
+                            "secret": "df8daeaa981b40cea1217fead123bc64",
+                            "signature": "Fra2UBKKtqy3GQ0mj+JqzR8GTGsbWQW+yN5Nih9ThfI=",
+                            "verb": "GET"
+                        }
+                    }
+                ),
+                'expected': 'authenticate'
+            },
             {
                 'request': fake.create_request(
                     path='/v3/domains/b206a1900310484f8a9504754c84b067/config/b206a1900310484f8a9504754c84b067/ldap'
@@ -139,6 +185,14 @@ def test_target_type_uri(self):
                 'request': fake.create_request(path='/v3/auth/tokens'),
                 'expected': 'data/security/auth/tokens'
             },
+            {
+                'request': fake.create_request(path='/v3/ec2tokens'),
+                'expected': 'data/security/ec2tokens'
+            },
+            {
+                'request': fake.create_request(path='/v3/s3tokens'),
+                'expected': 'data/security/s3tokens'
+            },
             {
                 'request': fake.create_request(
                     path='/v3/domains/b206a1900310484f8a9504754c84b067/config/b206a1900310484f8a9504754c84b067/ldap'