← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/api/openstack/auth.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandleman, Chuck Short
  • Date: 2012-03-02 11:04:04 UTC
  • mfrom: (1.1.47)
  • Revision ID: package-import@ubuntu.com-20120302110404-fr230yakr8hov3dj
Tags: 2012.1~e4-0ubuntu1
https://launchpad.net/bugs/940780
[ Adam Gandleman ]
* debian/patches/libvirt-use-console-pipe.patch: Refreshed. 
* debain/nova-volume.upstart.in: Ensure lock directory is created
  (LP: #940780)
* debain/control: Fix nova-compute-$flavor Depends
* debian/control: Add python-iso8601 to python-nova Depends

[ Chuck Short ]
* debian/rules: Fix FTBFS.
* Merge Ubuntu/Debian packaging:
  - Thanks to Julien Danjou, Ghe Rivero, and Thomas Goirand
  - debian/copyright: Update copyright file.
  - debian/nova-api.init, debian/nova-compute.init,
    debian/nova-network.init, debian/nova-objectstore,
    debian/nova-scheduler, debian/nova-volume.init:
    Synchronize init scripts.
  - nova-common.install, debian/rules: Install policy.json
  - debian/rules, debian/nova-xcp-network.install,
    debian/nova-xcp-plugins.install, nova-xcp-plugins.postrm,
    debian/nova-xcp-plugins.doc, debian/nova-xcp-plugins.postinst,
    debian/README.xcp_and_openstack, debian/control,
    debian/ubuntu_xen-openvswitch-nova.rules,
    debian/patches/path-to-the-xenhost.conf-fixup.patch:
    Add Xen XCP support.
  - debian/control,
    debian/nova-compute-{kvm,lxc,qemu,xen,uml}.postinst: Make
    nova-compute a virtual package.
  - Dropped ubuntu_ubuntu_control_vars: We dont use it
* New upstream release.
* Dropped python-babel, it will be handled by langpacks.
* debian/patches/ec2-fixes.patch: Backport turnk fix for ec2
  permissions.
* debian/patches/path-to-the-xenhost.conf-fixup.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/auth.py
24
24
 
25
25
from nova.api.openstack import common
26
26
from nova.api.openstack import wsgi
27
 
from nova import auth
 
27
from nova.auth import manager
28
28
from nova import context
29
29
from nova import exception
30
30
from nova import flags
78
78
        if not db_driver:
79
79
            db_driver = FLAGS.db_driver
80
80
        self.db = utils.import_object(db_driver)
81
 
        self.auth = auth.manager.AuthManager()
 
81
        self.auth = manager.AuthManager()
82
82
        super(AuthMiddleware, self).__init__(application)
83
83
 
84
84
    @webob.dec.wsgify(RequestClass=wsgi.Request)
242
242
            LOG.warn(_("User not found with provided API key."))
243
243
            user = None
244
244
 
245
 
        if user and user.name == username:
 
245
        if user and utils.strcmp_const_time(user.name, username):
246
246
            token_hash = hashlib.sha1('%s%s%f' % (username, key,
247
247
                time.time())).hexdigest()
248
248
            token_dict = {}