Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
lscsoft
gracedb-client
Commits
2a4f5575
Commit
2a4f5575
authored
Jan 08, 2021
by
Alexander Pace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gracedb-client 2.7.5
parent
75ad109a
Pipeline
#187429
passed with stages
in 18 minutes and 22 seconds
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
debian/changelog
debian/changelog
+5
-0
ligo-gracedb.spec
ligo-gracedb.spec
+3
-3
ligo/gracedb/client.py
ligo/gracedb/client.py
+7
-5
ligo/gracedb/version.py
ligo/gracedb/version.py
+1
-1
No files found.
debian/changelog
View file @
2a4f5575
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
...
...
ligo-gracedb.spec
View file @
2a4f5575
%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: http
s
://
ligo-gracedb.readthedocs.io/en/latest/
BuildArch: noarch
...
...
ligo/gracedb/client.py
View file @
2a4f5575
...
...
@@ -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 "
...
...
ligo/gracedb/version.py
View file @
2a4f5575
__version__
=
'2.7.
4
'
__version__
=
'2.7.
5
'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment