diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2016-01-20 18:35:15 +1100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-01-21 14:09:44 +0100 |
| commit | fd7ea2c9395651d5bce41cc603557fea107f65a7 (patch) | |
| tree | 1cd88074387ced02b1700ce0f48a7dc98ad82d4f /ipaplatform | |
| parent | c152e1007515f208b0c3b84c1ff13a9fe9b45fdf (diff) | |
| download | freeipa-fd7ea2c9395651d5bce41cc603557fea107f65a7.tar.gz freeipa-fd7ea2c9395651d5bce41cc603557fea107f65a7.tar.xz freeipa-fd7ea2c9395651d5bce41cc603557fea107f65a7.zip | |
Remove workaround for CA running check
A workaround was introduced for ticket #4676 that used wget to
perform an (unauthenticated) https request to check the CA status.
Later, wget was changed to curl (the request remained
unauthenticated).
Remove the workaround and use an http request (no TLS) to check the
CA status. Also remove the now-unused unauthenticated_http_request
method, and update specfile to remove ipalib dependency on curl.
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/redhat/services.py | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/ipaplatform/redhat/services.py b/ipaplatform/redhat/services.py index 11292fa49..3c18dbc3c 100644 --- a/ipaplatform/redhat/services.py +++ b/ipaplatform/redhat/services.py @@ -199,30 +199,7 @@ class RedHatCAService(RedHatService): op_timeout = time.time() + timeout while time.time() < op_timeout: try: - # FIXME https://fedorahosted.org/freeipa/ticket/4716 - # workaround - # - # status = dogtag.ca_status(use_proxy=use_proxy) - # - port = 8443 - - url = "https://%(host_port)s%(path)s" % { - "host_port": ipautil.format_netloc(api.env.ca_host, port), - "path": "/ca/admin/ca/getStatus" - } - - args = [ - paths.BIN_CURL, - '-o', '-', - '--connect-timeout', '30', - '-k', - url - ] - - result = ipautil.run(args, capture_output=True) - - status = dogtag._parse_ca_status(result.output) - # end of workaround + status = dogtag.ca_status() except Exception as e: status = 'check interrupted due to error: %s' % e root_logger.debug('The CA status is: %s' % status) |