Merge pull request #1050 from coreos-inc/v2betterlogging

Make our JWT subjects better and log using the info

test/registry_tests.py

@@ -568,6 +568,54 @@ class RegistryTestsMixin(object):
     self.assertEquals('public', logs[0]['performer']['name'])
 
 
+  def test_push_pull_logging_byrobot(self):
+    # Lookup the robot's password.
+    self.conduct_api_login('devtable', 'password')
+    resp = self.conduct('GET', '/api/v1/organization/buynlarge/robots/ownerbot')
+    robot_token = json.loads(resp.text)['token']
+
+    # Push a new repository.
+    self.do_push('buynlarge', 'newrepo', 'buynlarge+ownerbot', robot_token)
+
+    # Retrieve the logs and ensure the push was added.
+    result = self.conduct('GET', '/api/v1/repository/buynlarge/newrepo/logs')
+    logs = result.json()['logs']
+
+    self.assertEquals(1, len(logs))
+    self.assertEquals('push_repo', logs[0]['kind'])
+    self.assertEquals('buynlarge+ownerbot', logs[0]['performer']['name'])
+
+    # Pull the repository.
+    self.do_pull('buynlarge', 'newrepo', 'buynlarge+ownerbot', robot_token)
+
+    # Retrieve the logs and ensure the pull was added.
+    result = self.conduct('GET', '/api/v1/repository/buynlarge/newrepo/logs')
+    logs = result.json()['logs']
+
+    self.assertEquals(2, len(logs))
+    self.assertEquals('pull_repo', logs[0]['kind'])
+    self.assertEquals('buynlarge+ownerbot', logs[0]['performer']['name'])
+
+
+  def test_push_pull_logging_byoauth(self):
+    # Push the repository.
+    self.do_push('devtable', 'newrepo', 'devtable', 'password')
+
+    # Pull the repository.
+    self.do_pull('devtable', 'newrepo', '$oauthtoken', 'test')
+
+    # Retrieve the logs and ensure the pull was added.
+    self.conduct_api_login('devtable', 'password')
+    result = self.conduct('GET', '/api/v1/repository/devtable/newrepo/logs')
+    logs = result.json()['logs']
+
+    self.assertEquals(2, len(logs))
+    self.assertEquals('pull_repo', logs[0]['kind'])
+
+    self.assertEquals('devtable', logs[0]['performer']['name'])
+    self.assertEquals(1, logs[0]['metadata']['oauth_token_id'])
+
+
   def test_pull_publicrepo_anonymous(self):
     # Add a new repository under the public user, so we have a real repository to pull.
     self.do_push('public', 'newrepo', 'public', 'password')