More Hacking Violation Fixes

These are more fixes to bring the code in compliance with hacking violations.

Change-Id: I92ebacb6250cdaadb792dbfd81b9fee35358def9

barbican/api/controllers/containers.py

@@ -13,9 +13,7 @@
 import pecan
 
 from barbican import api
-from barbican.api.controllers import handle_exceptions
-from barbican.api.controllers import handle_rbac
-from barbican.api.controllers import hrefs
+from barbican.api import controllers
 from barbican.common import exception
 from barbican.common import resources as res
 from barbican.common import utils
@@ -43,8 +41,8 @@ class ContainerController(object):
         self.validator = validators.ContainerValidator()
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Container retrieval'))
-    @handle_rbac('container:get')
+    @controllers.handle_exceptions(u._('Container retrieval'))
+    @controllers.handle_rbac('container:get')
     def index(self, keystone_id):
         container = self.container_repo.get(entity_id=self.container_id,
                                             keystone_id=keystone_id,
@@ -55,16 +53,16 @@ class ContainerController(object):
         dict_fields = container.to_dict_fields()
 
         for secret_ref in dict_fields['secret_refs']:
-            hrefs.convert_to_hrefs(keystone_id, secret_ref)
+            controllers.hrefs.convert_to_hrefs(keystone_id, secret_ref)
 
-        return hrefs.convert_to_hrefs(
+        return controllers.hrefs.convert_to_hrefs(
             keystone_id,
-            hrefs.convert_to_hrefs(keystone_id, dict_fields)
+            controllers.hrefs.convert_to_hrefs(keystone_id, dict_fields)
         )
 
     @index.when(method='DELETE', template='')
-    @handle_exceptions(u._('Container deletion'))
-    @handle_rbac('container:delete')
+    @controllers.handle_exceptions(u._('Container deletion'))
+    @controllers.handle_rbac('container:delete')
     def on_delete(self, keystone_id):
 
         try:
@@ -94,8 +92,8 @@ class ContainersController(object):
                                    self.container_repo), remainder
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Containers(s) retrieval'))
-    @handle_rbac('containers:get')
+    @controllers.handle_exceptions(u._('Containers(s) retrieval'))
+    @controllers.handle_rbac('containers:get')
     def index(self, keystone_id, **kw):
         LOG.debug('Start containers on_get '
                   'for tenant-ID {0}:'.format(keystone_id))
@@ -113,20 +111,25 @@ class ContainersController(object):
             resp_ctrs_overall = {'containers': [], 'total': total}
         else:
             resp_ctrs = [
-                hrefs.convert_to_hrefs(keystone_id, c.to_dict_fields())
+                controllers.hrefs.convert_to_hrefs(keystone_id,
+                                                   c.to_dict_fields())
                 for c in containers
             ]
-            resp_ctrs_overall = hrefs.add_nav_hrefs('containers',
-                                                    keystone_id, offset,
-                                                    limit, total,
-                                                    {'containers': resp_ctrs})
+            resp_ctrs_overall = controllers.hrefs.add_nav_hrefs(
+                'containers',
+                keystone_id,
+                offset,
+                limit,
+                total,
+                {'containers': resp_ctrs}
+            )
             resp_ctrs_overall.update({'total': total})
 
         return resp_ctrs_overall
 
     @index.when(method='POST', template='json')
-    @handle_exceptions(u._('Container creation'))
-    @handle_rbac('containers:post')
+    @controllers.handle_exceptions(u._('Container creation'))
+    @controllers.handle_rbac('containers:post')
     def on_post(self, keystone_id):
 
         tenant = res.get_or_create_tenant(keystone_id, self.tenant_repo)
@@ -143,8 +146,10 @@ class ContainersController(object):
                                           keystone_id=keystone_id,
                                           suppress_exception=True)
             if not secret:
-                pecan.abort(404, u._("Secret provided for '%s'"
-                                     " doesn't exist." % secret_ref.name))
+                # This only partially localizes the error message and
+                # doesn't localize secret_ref.name.
+                pecan.abort(404, u._("Secret provided for '{0}' doesn't"
+                                     " exist.").format(secret_ref.name))
 
         self.container_repo.create_from(new_container)
 
@@ -152,5 +157,6 @@ class ContainersController(object):
         pecan.response.headers['Location'] = '/{0}/containers/{1}'.format(
             keystone_id, new_container.id
         )
-        url = hrefs.convert_container_to_href(keystone_id, new_container.id)
+        url = controllers.hrefs.convert_container_to_href(keystone_id,
+                                                          new_container.id)
         return {'container_ref': url}

barbican/api/controllers/orders.py

@@ -13,8 +13,7 @@
 import pecan
 
 from barbican import api
-from barbican.api.controllers import handle_exceptions
-from barbican.api.controllers import handle_rbac
+from barbican.api import controllers
 from barbican.api.controllers import hrefs
 from barbican.common import exception
 from barbican.common import resources as res
@@ -53,8 +52,8 @@ class OrderController(object):
         self.repo = order_repo or repo.OrderRepo()
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Order retrieval'))
-    @handle_rbac('order:get')
+    @controllers.handle_exceptions(u._('Order retrieval'))
+    @controllers.handle_rbac('order:get')
     def index(self, keystone_id):
         order = self.repo.get(entity_id=self.order_id, keystone_id=keystone_id,
                               suppress_exception=True)
@@ -64,13 +63,13 @@ class OrderController(object):
         return hrefs.convert_to_hrefs(keystone_id, order.to_dict_fields())
 
     @index.when(method='PUT')
-    @handle_exceptions(u._('Order update'))
+    @controllers.handle_exceptions(u._('Order update'))
     def on_put(self, keystone_id):
         _order_update_not_supported()
 
     @index.when(method='DELETE')
-    @handle_exceptions(u._('Order deletion'))
-    @handle_rbac('order:delete')
+    @controllers.handle_exceptions(u._('Order deletion'))
+    @controllers.handle_rbac('order:delete')
     def on_delete(self, keystone_id):
 
         try:
@@ -98,8 +97,8 @@ class OrdersController(object):
         return OrderController(order_id, self.order_repo), remainder
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Order(s) retrieval'))
-    @handle_rbac('orders:get')
+    @controllers.handle_exceptions(u._('Order(s) retrieval'))
+    @controllers.handle_rbac('orders:get')
     def index(self, keystone_id, **kw):
         LOG.debug('Start orders on_get '
                   'for tenant-ID {0}:'.format(keystone_id))
@@ -127,14 +126,14 @@ class OrdersController(object):
         return orders_resp_overall
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Order update'))
-    @handle_rbac('orders:put')
+    @controllers.handle_exceptions(u._('Order update'))
+    @controllers.handle_rbac('orders:put')
     def on_put(self, keystone_id):
         _order_update_not_supported()
 
     @index.when(method='POST', template='json')
-    @handle_exceptions(u._('Order creation'))
-    @handle_rbac('orders:post')
+    @controllers.handle_exceptions(u._('Order creation'))
+    @controllers.handle_rbac('orders:post')
     def on_post(self, keystone_id):
 
         tenant = res.get_or_create_tenant(keystone_id, self.tenant_repo)

barbican/api/controllers/secrets.py

@@ -16,10 +16,8 @@ import urllib
 import pecan
 
 from barbican import api
-from barbican.api.controllers import handle_exceptions
-from barbican.api.controllers import handle_rbac
+from barbican.api import controllers
 from barbican.api.controllers import hrefs
-from barbican.api.controllers import is_json_request_accept
 from barbican.common import exception
 from barbican.common import resources as res
 from barbican.common import utils
@@ -65,8 +63,8 @@ class SecretController(object):
 
     @pecan.expose(generic=True)
     @allow_all_content_types
-    @handle_exceptions(u._('Secret retrieval'))
-    @handle_rbac('secret:get')
+    @controllers.handle_exceptions(u._('Secret retrieval'))
+    @controllers.handle_rbac('secret:get')
     def index(self, keystone_id):
 
         secret = self.repo.get(entity_id=self.secret_id,
@@ -75,7 +73,7 @@ class SecretController(object):
         if not secret:
             _secret_not_found()
 
-        if is_json_request_accept(pecan.request):
+        if controllers.is_json_request_accept(pecan.request):
             # Metadata-only response, no decryption necessary.
             pecan.override_template('json', 'application/json')
             secret_fields = mime_types.augment_fields_with_content_types(
@@ -92,8 +90,8 @@ class SecretController(object):
 
     @index.when(method='PUT')
     @allow_all_content_types
-    @handle_exceptions(u._('Secret update'))
-    @handle_rbac('secret:put')
+    @controllers.handle_exceptions(u._('Secret update'))
+    @controllers.handle_rbac('secret:put')
     def on_put(self, keystone_id):
 
         if not pecan.request.content_type or \
@@ -128,8 +126,8 @@ class SecretController(object):
                                    self.kek_repo)
 
     @index.when(method='DELETE')
-    @handle_exceptions(u._('Secret deletion'))
-    @handle_rbac('secret:delete')
+    @controllers.handle_exceptions(u._('Secret deletion'))
+    @controllers.handle_rbac('secret:delete')
     def on_delete(self, keystone_id):
 
         try:
@@ -162,8 +160,8 @@ class SecretsController(object):
                                 self.datum_repo, self.kek_repo), remainder
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Secret(s) retrieval'))
-    @handle_rbac('secrets:get')
+    @controllers.handle_exceptions(u._('Secret(s) retrieval'))
+    @controllers.handle_rbac('secrets:get')
     def index(self, keystone_id, **kw):
         LOG.debug('Start secrets on_get '
                   'for tenant-ID {0}:'.format(keystone_id))
@@ -212,8 +210,8 @@ class SecretsController(object):
         return secrets_resp_overall
 
     @index.when(method='POST', template='json')
-    @handle_exceptions(u._('Secret creation'))
-    @handle_rbac('secrets:post')
+    @controllers.handle_exceptions(u._('Secret creation'))
+    @controllers.handle_rbac('secrets:post')
     def on_post(self, keystone_id):
         LOG.debug('Start on_post for tenant-ID {0}:...'.format(keystone_id))
 

barbican/api/controllers/transportkeys.py

@@ -17,8 +17,7 @@ import urllib
 import pecan
 
 from barbican import api
-from barbican.api.controllers import handle_exceptions
-from barbican.api.controllers import handle_rbac
+from barbican.api import controllers as con
 from barbican.api.controllers import hrefs
 from barbican.common import exception
 from barbican.common import utils
@@ -44,8 +43,8 @@ class TransportKeyController(object):
         self.repo = transport_key_repo or repo.TransportKeyRepo()
 
     @pecan.expose(generic=True)
-    @handle_exceptions(u._('Transport Key retrieval'))
-    @handle_rbac('transport_key:get')
+    @con.handle_exceptions(u._('Transport Key retrieval'))
+    @con.handle_rbac('transport_key:get')
     def index(self, keystone_id):
         LOG.debug("== Getting transport key for %s" % keystone_id)
         transport_key = self.repo.get(entity_id=self.transport_key_id)
@@ -56,8 +55,8 @@ class TransportKeyController(object):
         return transport_key
 
     @index.when(method='DELETE')
-    @handle_exceptions(u._('Transport Key deletion'))
-    @handle_rbac('transport_key:delete')
+    @con.handle_exceptions(u._('Transport Key deletion'))
+    @con.handle_rbac('transport_key:delete')
     def on_delete(self, keystone_id):
         LOG.debug("== Deleting transport key ===")
         try:
@@ -83,8 +82,8 @@ class TransportKeysController(object):
         return TransportKeyController(transport_key_id, self.repo), remainder
 
     @pecan.expose(generic=True, template='json')
-    @handle_exceptions(u._('Transport Key(s) retrieval'))
-    @handle_rbac('transport_keys:get')
+    @con.handle_exceptions(u._('Transport Key(s) retrieval'))
+    @con.handle_rbac('transport_keys:get')
     def index(self, keystone_id, **kw):
         LOG.debug('Start transport_keys on_get')
 
@@ -118,8 +117,8 @@ class TransportKeysController(object):
         return transport_keys_resp_overall
 
     @index.when(method='POST', template='json')
-    @handle_exceptions(u._('Transport Key Creation'))
-    @handle_rbac('transport_keys:post')
+    @con.handle_exceptions(u._('Transport Key Creation'))
+    @con.handle_rbac('transport_keys:post')
     def on_post(self, keystone_id):
         LOG.debug('Start transport_keys on_post')
 

barbican/api/controllers/versions.py

@@ -12,8 +12,7 @@
 
 import pecan
 
-from barbican.api.controllers import handle_exceptions
-from barbican.api.controllers import handle_rbac
+from barbican.api import controllers as con
 from barbican.common import utils
 from barbican.openstack.common import gettextutils as u
 from barbican import version
@@ -27,8 +26,8 @@ class VersionController(object):
         LOG.debug('=== Creating VersionController ===')
 
     @pecan.expose('json')
-    @handle_exceptions(u._('Version retrieval'))
-    @handle_rbac('version:get')
+    @con.handle_exceptions(u._('Version retrieval'))
+    @con.handle_rbac('version:get')
     def index(self):
         return {
             'v1': 'current',

barbican/api/middleware/simple.py

@@ -22,14 +22,14 @@ purposes only.
 
 from oslo.config import cfg
 
-from barbican.api.middleware import Middleware
+from barbican.api import middleware
 from barbican.common import utils
 
 LOG = utils.getLogger(__name__)
 CONF = cfg.CONF
 
 
-class SimpleFilter(Middleware):
+class SimpleFilter(middleware.Middleware):
 
     def __init__(self, app):
         super(SimpleFilter, self).__init__(app)