55cb4f4473
Currently glanceclient doesn't support non-ASCII characters for images
names and properties (names and values as well). This patch introduces 2
functions (utils.py) that will help encoding and decoding strings in a
more "secure" way.
About the ensure_(str|unicode) functions:
They both try to use first the encoding used in stdin (or python's
default encoding if that's None) and fallback to utf-8 if those
encodings fail to decode a given text.
About the changes in glanceclient:
The major change is that all inputs will be decoded and will kept as
such inside the client's functions and will then be encoded before
being printed / sent out the client.
There are other small changes, all related to encoding to str,
around in order to avoid fails during some conversions. i.e: quoting
url encoded parameters.
Fixes bug: 1061150
Change-Id: I5c3ea93a716edfe284d19f6291d4e36028f91eb2
86 lines
3.7 KiB
Python
86 lines
3.7 KiB
Python
# Copyright 2012 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
import errno
|
|
import testtools
|
|
|
|
from glanceclient.common import utils
|
|
|
|
|
|
class TestUtils(testtools.TestCase):
|
|
|
|
def test_integrity_iter_without_checksum(self):
|
|
try:
|
|
data = ''.join([f for f in utils.integrity_iter('A', None)])
|
|
self.fail('integrity checked passed without checksum.')
|
|
except IOError, e:
|
|
self.assertEqual(errno.EPIPE, e.errno)
|
|
msg = 'was 7fc56270e7a70fa81a5935b72eacbe29 expected None'
|
|
self.assertTrue(msg in str(e))
|
|
|
|
def test_integrity_iter_with_wrong_checksum(self):
|
|
try:
|
|
data = ''.join([f for f in utils.integrity_iter('BB', 'wrong')])
|
|
self.fail('integrity checked passed with wrong checksum')
|
|
except IOError, e:
|
|
self.assertEqual(errno.EPIPE, e.errno)
|
|
msg = 'was 9d3d9048db16a7eee539e93e3618cbe7 expected wrong'
|
|
self.assertTrue('expected wrong' in str(e))
|
|
|
|
def test_integrity_iter_with_checksum(self):
|
|
fixture = 'CCC'
|
|
checksum = 'defb99e69a9f1f6e06f15006b1f166ae'
|
|
data = ''.join([f for f in utils.integrity_iter(fixture, checksum)])
|
|
|
|
def test_make_size_human_readable(self):
|
|
self.assertEqual("106B", utils.make_size_human_readable(106))
|
|
self.assertEqual("1000kB", utils.make_size_human_readable(1024000))
|
|
self.assertEqual("1MB", utils.make_size_human_readable(1048576))
|
|
self.assertEqual("1.4GB", utils.make_size_human_readable(1476395008))
|
|
self.assertEqual("9.3MB", utils.make_size_human_readable(9761280))
|
|
|
|
def test_ensure_unicode(self):
|
|
ensure_unicode = utils.ensure_unicode
|
|
self.assertEqual(u'True', ensure_unicode(True))
|
|
self.assertEqual(u'ni\xf1o', ensure_unicode("ni\xc3\xb1o",
|
|
incoming="utf-8"))
|
|
self.assertEqual(u"test", ensure_unicode("dGVzdA==",
|
|
incoming='base64'))
|
|
|
|
self.assertEqual(u"strange", ensure_unicode('\x80strange',
|
|
errors='ignore'))
|
|
|
|
self.assertEqual(u'\xc0', ensure_unicode('\xc0',
|
|
incoming='iso-8859-1'))
|
|
|
|
# Forcing incoming to ascii so it falls back to utf-8
|
|
self.assertEqual(u'ni\xf1o', ensure_unicode('ni\xc3\xb1o',
|
|
incoming='ascii'))
|
|
|
|
def test_ensure_str(self):
|
|
ensure_str = utils.ensure_str
|
|
self.assertEqual("True", ensure_str(True))
|
|
self.assertEqual("ni\xc3\xb1o", ensure_str(u'ni\xf1o',
|
|
encoding="utf-8"))
|
|
self.assertEqual("dGVzdA==\n", ensure_str("test",
|
|
encoding='base64'))
|
|
self.assertEqual('ni\xf1o', ensure_str("ni\xc3\xb1o",
|
|
encoding="iso-8859-1",
|
|
incoming="utf-8"))
|
|
|
|
# Forcing incoming to ascii so it falls back to utf-8
|
|
self.assertEqual('ni\xc3\xb1o', ensure_str('ni\xc3\xb1o',
|
|
incoming='ascii'))
|