jjb/python-jenkins
Code Issues Proposed changes

create_node: avoid double-encoding

Browse Source 
Prior to this change, create_node() would double-encode certain url
params: once when quote()'ing in _get_encoded_params(), and again in
urlencode().

This would cause HTTP 400 errors when creating a node with a name that
contains a url-encodable character, like "my+test+node".

Reviewed-by: Alfredo Deza <adeza@redhat.com>

Change-Id: I237e2988e168af81e623d3f065753f2e9b617696
This commit is contained in:
Ken Dreyer 2017-04-26 19:15:13 -06:00
parent 2b69951603
commit 04c153cc0b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/__init__.py
View File

@ -287,7 +287,7 @@ class Jenkins(object):
if variables: if variables:
if format_spec == CREATE_NODE: if format_spec == CREATE_NODE:
url_path = format_spec % urlencode(self._get_encoded_params(variables)) url_path = format_spec % urlencode(variables)
else: else:
url_path = format_spec % self._get_encoded_params(variables) url_path = format_spec % self._get_encoded_params(variables)
else: else:

8
tests/test_node.py
View File

@ -253,6 +253,14 @@ class JenkinsCreateNodeTest(JenkinsNodesTestBase):
actual) actual)
self._check_requests(jenkins_mock.call_args_list) self._check_requests(jenkins_mock.call_args_list)
def test_build_url(self):
j = jenkins.Jenkins('https://test.noexist/')
# Note the use of a URL-encodable character "+" here.
variables = {'name': '10.0.0.1+test-node'}
result = j._build_url(jenkins.CREATE_NODE, variables=variables)
expected = 'https://test.noexist/computer/doCreateItem?name=10.0.0.1%2Btest-node'
self.assertEqual(result, expected)
@patch.object(jenkins.Jenkins, 'jenkins_open') @patch.object(jenkins.Jenkins, 'jenkins_open')
def test_already_exists(self, jenkins_mock): def test_already_exists(self, jenkins_mock):
jenkins_mock.side_effect = [ jenkins_mock.side_effect = [