Commit 2a4f5575 authored by Alexander Pace's avatar Alexander Pace

gracedb-client 2.7.5

parent 75ad109a
Pipeline #187429 passed with stages
in 18 minutes and 22 seconds
ligo-gracedb (2.7.5-1) unstable; urgency=low
* changed search order for x509 credentials
-- Alexander E. Pace <alexander.pace@ligo.org> Fri, 08 Jan 2021 19:31:35 +0000
ligo-gracedb (2.7.4-1) unstable; urgency=low
* fix for requests/urllib3 bug
* fix for json response for update event CLI command
......
%define name ligo-gracedb
%define version 2.7.4
%define unmangled_version 2.7.4
%define version 2.7.5
%define unmangled_version 2.7.5
%define release 1
Summary: Gravity Wave Candidate Event Database
......@@ -12,7 +12,7 @@ License: GPLv3+
Group: Development/Libraries
Prefix: %{_prefix}
Vendor: Tanner Prestegard <tanner.prestegard@ligo.org>, Alexander Pace <alexander.pace@ligo.org>
Url: http://www.lsc-group.phys.uwm.edu/daswg/gracedb.html
Url: https://ligo-gracedb.readthedocs.io/en/latest/
BuildArch: noarch
......
......@@ -156,7 +156,7 @@ class GraceDBClient(Session):
def _get_x509_credentials(self, cred):
""" Get a user's x509 credentials. Look in the following locations.
1) 'cred' input variable, either cert/key pair or combined file
2) $X509_USER_PROXY/CERT/KEY environment variables.
2) $X509_USER_CERT/KEY/PROXY environment variables.
- X509_USER_PROXY: combined cert/cert pair
- X509_USER_CERT: x509 certificate file.
- X509_USER_KEY: corresponding x509 private key.
......@@ -185,12 +185,14 @@ class GraceDBClient(Session):
grid_key_file = os.environ.get('X509_USER_KEY')
# Set logic for returning credentials:
# If the user supplies a proxy file, then return it:
if grid_proxy_file:
return grid_proxy_file
# If the user supplies both a cert and key, return those:
elif grid_cert_file and grid_key_file:
if grid_cert_file and grid_key_file:
return grid_cert_file, grid_key_file
# If the user supplies a proxy file, then return it:
elif grid_proxy_file:
return grid_proxy_file
# If the user supplies one or the other, then return a warning
elif grid_cert_file or grid_key_file:
warn("Warning: must supply a $X509_USER_PROXY or a "
......
__version__ = '2.7.4'
__version__ = '2.7.5'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment