# -*- coding: utf-8 -*-
#
# Author: François Rossigneux <francois.rossigneux@inria.fr>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

"""Computes the signature of a metering message."""

import hashlib
import hmac


def recursive_keypairs(d):
    """Generator that produces sequence of keypairs for nested dictionaries."""
    for name, value in sorted(d.iteritems()):
        if isinstance(value, dict):
            for subname, subvalue in recursive_keypairs(value):
                yield ('%s:%s' % (name, subname), subvalue)
        else:
            yield name, value


def compute_signature(message, secret):
    """Returns the signature for a message dictionary."""
    digest_maker = hmac.new(secret, '', hashlib.sha256)
    for name, value in recursive_keypairs(message):
        if name == 'message_signature':
            continue
        digest_maker.update(name)
        digest_maker.update(unicode(value).encode('utf-8'))
    return digest_maker.hexdigest()


def append_signature(message, secret):
    """Sets the message signature key."""
    message['message_signature'] = compute_signature(message, secret)


def verify_signature(message, secret):
    """Checks the signature in the message against the value computed from the
    rest of the contents.

    """
    old_sig = message.get('message_signature')
    new_sig = compute_signature(message, secret)
    return new_sig == old_sig

@@ -707,366 +707,40 @@
 mac%0A
-%0A%0Adef recursive_keypairs(d):%0A    %22%22%22Generator that produces sequence of keypairs for nested dictionaries.%22%22%22%0A    for name, value in sorted(d.iteritems()):%0A        if isinstance(value, dict):%0A            for subname, subvalue in recursive_keypairs(value):%0A                yield ('%25s:%25s' %25 (name, subname), subvalue)%0A        else:%0A            yield name, value
+from oslo.utils import dictutils
 %0A%0A%0Ad
@@ -919,17 +919,33 @@
  in 
-recursive
+dictutils.flatten_dict_to
 _key
@@ -957,16 +957,21 @@
 (message
+, ':'
 ):%0A     

Use flatten_dict_to_keypairs instead of recursive_keypairs