extract user name; update docs

Author: auhlig

doc/cadf.md

@@ -22,6 +22,9 @@ For example: `WATCHER.ACTION`, `WATCHER.INITIATOR_PROJECT_ID`, `WATCHER.TARGET_P
 - `domain_id`:              the initiators domain uid. `None` if project scoped, `Unknown` if not authenticated.
 - `domain_name`:            the initiators domain uid. `None` if project scoped, `Unknown` if not authenticated.
 - `user_id`:                the initiators user id. `Unknown` if not authenticated.
+- `user_name`:              the initiators user name. `Unknown` if not authenticated.
+- `user_domain_id`:         the initiators user domain id. `Unknown` if not authenticated.
+- `user_domain_name`:       the initiators user domain name. `Unknown` if not authenticated.
 - `host_address`:           the initiators host address.
 
 

watcher/watcher.py

@@ -139,10 +139,11 @@ def __call__(self, environ, start_response):
         initiator_project_id = self.get_safe_from_environ(environ, 'HTTP_X_PROJECT_ID')
         initiator_project_name = self.get_safe_from_environ(environ, 'HTTP_X_PROJECT_NAME')
         initiator_project_domain_id = self.get_safe_from_environ(environ, 'HTTP_X_PROJECT_DOMAIN_ID')
-        initiator_project_domain_name = self.get_safe_from_environ(environ, 'HTTP_X_DOMAIN_NAME')
+        initiator_project_domain_name = self.get_safe_from_environ(environ, 'HTTP_X_PROJECT_DOMAIN_NAME')
         initiator_domain_id = self.get_safe_from_environ(environ, 'HTTP_X_DOMAIN_ID')
         initiator_domain_name = self.get_safe_from_environ(environ, 'HTTP_X_DOMAIN_NAME')
         initiator_user_id = self.get_safe_from_environ(environ, 'HTTP_X_USER_ID')
+        initiator_user_name = self.get_safe_from_environ(environ, 'HTTP_X_USER_NAME')
         initiator_user_domain_id = self.get_safe_from_environ(environ, 'HTTP_X_USER_DOMAIN_ID')
         initiator_user_domain_name = self.get_safe_from_environ(environ, 'HTTP_X_USER_DOMAIN_NAME')
         initiator_host_address = req.client_addr or taxonomy.UNKNOWN
@@ -177,6 +178,7 @@ def __call__(self, environ, start_response):
         environ['WATCHER.INITIATOR_DOMAIN_ID'] = initiator_domain_id
         environ['WATCHER.INITIATOR_DOMAIN_NAME'] = initiator_domain_name
         environ['WATCHER.INITIATOR_USER_ID'] = initiator_user_id
+        environ['WATCHER.INITIATOR_USER_NAME'] = initiator_user_name
         environ['WATCHER.INITIATOR_USER_DOMAIN_ID'] = initiator_user_domain_id
         environ['WATCHER.INITIATOR_USER_DOMAIN_NAME'] = initiator_user_domain_name
         environ['WATCHER.INITIATOR_HOST_ADDRESS'] = initiator_host_address