External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-15 18:20:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-1201 Fix UnicodeEncodeError when validating hostname:port containing unicode.

Browse Source
This commit is contained in:
Chris Church
2014-04-16 23:05:57 -04:00
parent 284c947347
commit ac2cd63ab5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -771,7 +771,7 @@ class HostSerializer(BaseSerializerWithVariables):
if port < 1 or port > 65535: if port < 1 or port > 65535:
raise ValueError raise ValueError
except ValueError: except ValueError:
raise serializers.ValidationError('Invalid port specification: %s' % str(port)) raise serializers.ValidationError(u'Invalid port specification: %s' % unicode(port))
return name, port return name, port
def validate_name(self, attrs, source): def validate_name(self, attrs, source):

10
awx/main/tests/inventory.py
View File

@@ -281,21 +281,23 @@ class InventoryTest(BaseTest):
organization = self.organizations[0] organization = self.organizations[0]
) )
invalid = dict(name='asdf0.example.com') invalid = dict(name='asdf0.example.com')
new_host_a = dict(name='asdf0.example.com:1022', inventory=inv.pk) new_host_a = dict(name=u'asdf\u0162.example.com:1022', inventory=inv.pk)
new_host_b = dict(name='asdf1.example.com', inventory=inv.pk) new_host_b = dict(name='asdf1.example.com', inventory=inv.pk)
new_host_c = dict(name='127.1.2.3:2022', inventory=inv.pk, new_host_c = dict(name='127.1.2.3:2022', inventory=inv.pk,
variables=json.dumps({'who': 'what?'})) variables=json.dumps({'who': 'what?'}))
new_host_d = dict(name='asdf3.example.com', inventory=inv.pk) new_host_d = dict(name='asdf3.example.com', inventory=inv.pk)
new_host_e = dict(name='asdf4.example.com', inventory=inv.pk) new_host_e = dict(name=u'asdf4.example.com:\u0162', inventory=inv.pk)
host_data0 = self.post(hosts, data=invalid, expect=400, auth=self.get_super_credentials()) host_data0 = self.post(hosts, data=invalid, expect=400, auth=self.get_super_credentials())
host_data0 = self.post(hosts, data=new_host_a, expect=201, auth=self.get_super_credentials()) host_data0 = self.post(hosts, data=new_host_a, expect=201, auth=self.get_super_credentials())
# Port should be split out into host variables. # Port should be split out into host variables.
host_a = Host.objects.get(pk=host_data0['id']) host_a = Host.objects.get(pk=host_data0['id'])
self.assertEqual(host_a.name, 'asdf0.example.com') self.assertEqual(host_a.name, u'asdf\u0162.example.com')
self.assertEqual(host_a.variables_dict, {'ansible_ssh_port': 1022}) self.assertEqual(host_a.variables_dict, {'ansible_ssh_port': 1022})
# an org admin can add hosts # an org admin can add hosts (try first with invalid port #).
host_data1 = self.post(hosts, data=new_host_e, expect=400, auth=self.get_normal_credentials())
new_host_e['name'] = u'asdf4.example.com'
host_data1 = self.post(hosts, data=new_host_e, expect=201, auth=self.get_normal_credentials()) host_data1 = self.post(hosts, data=new_host_e, expect=201, auth=self.get_normal_credentials())
# a normal user cannot add hosts # a normal user cannot add hosts