PR#2450: serverca property from KojiHubCA web config - koji

koji

#2450 serverca property from KojiHubCA web config

Closed 4 years ago by tkopecek. Opened 4 years ago by lrossett.

lrossett/koji kojiweb-ca-fix into master

flake8 fixes

lrossett • 4 years ago

79bb5dd

requests exception

lrossett • 4 years ago

d02290c

set serverca opts

lrossett • 4 years ago

0a5d1bb

koji/__init__.py

file modified

+11

		`@@ -58,6 +58,7 @@`
		`import six.moves.urllib`
		`from requests.adapters import HTTPAdapter`
		`from requests.packages.urllib3.util.retry import Retry`
		`+ from requests.exceptions import RequestException`
		`from six.moves import range, zip`

		`from koji.xmlrpcplus import Fault, dumps, getparser, loads, xmlrpc_client`
		`@@ -2771,6 +2772,16 @@`
		`# (depending on the python version, these may or may not be subclasses of`
		`# Exception)`
		`raise`
		`+ except RequestException as e:`
		`+ _err_res = e.response`
		`+ _err_req = e.request`
		`+ if _err_res:`
		`+ _values = (_err_res.status_code, _err_res.text, str(_err_res))`
		`+ self.logger.error('Response error: %s::%s::%s' % _values)`
		`+ else:`
		`+ _values = (_err_req.method, _err_req.url, str(_err_req))`
		`+ self.logger.error('Request error: %s::%s::%s' % _values)`
		`+ raise`
		`except Exception as e:`
		`tb_str = ''.join(traceback.format_exception(*sys.exc_info()))`
		`self.new_session()`

vm/kojikamid.py

file modified

-1

		`@@ -40,7 +40,6 @@`
		`import traceback`
		`import zipfile`
		`from optparse import OptionParser`
		`-`
		`import xmlrpc.client`
		`# urllib is required by the SCM class which is substituted into this file`
		`# do not remove the import below`

www/kojiweb/index.py

file modified

+6 -2

		`@@ -172,8 +172,12 @@`


		`def _getServer(environ):`
		`- opts = environ['koji.options']`
		`- session = koji.ClientSession(opts['KojiHubURL'])`
		`+ koji_opts = environ['koji.options']`
		`+ opts = {`
		`+ 'serverca': koji_opts.get('KojiHubCA', '')`
		`+ }`
		`+`
		`+ session = koji.ClientSession(koji_opts['KojiHubURL'], opts=opts)`

		`environ['koji.currentLogin'] = _getUserCookie(environ)`
		`if environ['koji.currentLogin']:`

lrossett commented 4 years ago

fixes #2448

Changes

sets serverca for session if KojiHubCA is available in environ using an empty string as default value
package dependencies update in setup.py

ktdreyer commented 4 years ago

Is this related to https://pagure.io/koji/issue/2448 ?

lrossett commented 4 years ago

oh it is, I can improve the error message as well if you want to.

pretty please pagure-ci rebuild

4 years ago

2 new commits added

requests exception
set serverca opts

4 years ago

rebased onto 3fc39e76dd33babe6fc614463bc0814bb241ad3a

4 years ago

pretty please pagure-ci rebuild

4 years ago

rebased onto 657f9d9bdc1aac68f6ceb8478dd632286fc80f69

4 years ago

pretty please pagure-ci rebuild

4 years ago

pretty please pagure-ci rebuild

4 years ago

lrossett commented 4 years ago

lol why did the test pass now :-)

it looked like some weird dependency error for librepo just for El7 and F29

OK I see the job changed.. could I get a review again for this PR?

Edited 4 years ago by lrossett

tkopecek commented 4 years ago

librepo is not installed on all workers in jenkins :-(

lrossett commented 4 years ago

I think each job runs in a VM.. so the image being used may need an update.

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

4 years ago

Metadata Update from @mfilip:
- Pull-request tagged with: testing-done

4 years ago

rebased onto 0a5d1bb

4 years ago

ktdreyer commented 4 years ago

LGTM (untested)

ngompa commented 4 years ago

:thumbsup:

tkopecek commented 4 years ago

merged (script failed to do proper merge request, but commits are in master)

https://pagure.io/koji/c/1c787a323ff1644fdd88bd298532437e4f505e98?branch=master
https://pagure.io/koji/c/ff8c13969e64691b213c0cd2a263c18b607f6e54?branch=master
https://pagure.io/koji/c/74061d5d710155c0888c155df0ac3c0c40a96d41?branch=master

Pull-Request has been closed by tkopecek

4 years ago

mikem commented 4 years ago

This PR includes changes unrelated to the description.

The whitespace change in kojikamid is probably ok, though I prefer to keep pull requests on topic.

However, the change to ClientSession looks like some debug code that accidentally slipped in. This change defeats Koji's retry mechanism in some situations and we'll need to revert that.

Edited 4 years ago by mikem

mikem commented 4 years ago

Filed #2786