← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-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 Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/auth.py
22
22
 
23
23
from nova.api.openstack import wsgi
24
24
from nova import context
25
 
from nova import flags
 
25
from nova.openstack.common import cfg
26
26
from nova.openstack.common import log as logging
27
27
from nova import wsgi as base_wsgi
28
28
 
29
29
LOG = logging.getLogger(__name__)
30
 
FLAGS = flags.FLAGS
31
 
flags.DECLARE('use_forwarded_for', 'nova.api.auth')
 
30
CONF = cfg.CONF
 
31
CONF.import_opt('use_forwarded_for', 'nova.api.auth')
32
32
 
33
33
 
34
34
class NoAuthMiddleware(base_wsgi.Middleware):
54
54
        user_id, _sep, project_id = token.partition(':')
55
55
        project_id = project_id or user_id
56
56
        remote_address = getattr(req, 'remote_address', '127.0.0.1')
57
 
        if FLAGS.use_forwarded_for:
 
57
        if CONF.use_forwarded_for:
58
58
            remote_address = req.headers.get('X-Forwarded-For', remote_address)
59
59
        ctx = context.RequestContext(user_id,
60
60
                                     project_id,