scrubber creates queued files containing unencrypted uris

[John Lenihan]

The scrubber can sometimes create queue files under certain conditions. in _delete(), if there is a store.UnsupportedBackend or exception.NotFound exception the uri is stored in the queue file in unencryped form.

From glance/store/scrubber.py:

    def _delete(self, id, uri, now):
        file_path = os.path.join(self.datadir, str(id))
        if CONF.metadata_encryption_key is not None:
            uri = crypt.urlsafe_decrypt(CONF.metadata_encryption_key, uri)
        try:
            LOG.debug(_("Deleting %(uri)s") % {'uri': uri})
            # Here we create a request context with credentials to support
            # delayed delete when using multi-tenant backend storage
            ctx = context.RequestContext(auth_tok=self.registry.auth_tok,
                                         user=self.admin_user,
                                         tenant=self.admin_tenant)
            store.delete_from_backend(ctx, uri)
        except store.UnsupportedBackend:
            msg = _("Failed to delete image from store (%(id)s).")
            LOG.error(msg % {'id': id})
            if CONF.metadata_encryption_key is not None:
                uri = crypt.urlsafe_encrypt(CONF.metadata_encryption_key, uri, 64)
            write_queue_file(file_path, uri, now)
        except exception.NotFound:
            msg = _("Image not found in store (%(id)s).")
            LOG.error(msg % {'id': id})
            if CONF.metadata_encryption_key is not None:
                uri = crypt.urlsafe_encrypt(CONF.metadata_encryption_key, uri, 64)
            write_queue_file(file_path, uri, now)

        self.registry.update_image(id, {'status': 'deleted'})
        utils.safe_remove(file_path)

Fix to follow shortly.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/29405

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/29405
Committed: http://github.com/openstack/glance/commit/7d3cdc51acaf093b0ce393ffd522e238c4eeb0e5
Submitter: Jenkins
Branch: master

commit 7d3cdc51acaf093b0ce393ffd522e238c4eeb0e5
Author: John Lenihan <email address hidden>
Date: Wed Jun 19 09:25:09 2013 +0000

    Fix for unencrypted uris in scrubber queue files

    The scrubber can write unencrypted uris in queue files in
    certain conditions. This fixes the problem by removing the
    lines which write the queue files when exceptions occur.

    Test included.

    Fixes bug 1180884

    Change-Id: If742a84cea1bd1f5abf99fb0e3cbd1e0c1623171