Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

icewind: fallback to anon if service does not support cert auth #291

Merged
merged 2 commits into from
Sep 5, 2023
Merged

icewind: fallback to anon if service does not support cert auth #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
742e425
icewind-0.9.7: fall back to anon endpoint if cert configured but remo…
pdowler Sep 5, 2023
3069846
Merge branch 'master' of https://github.com/opencadc/caom2db
pdowler Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion caom2-repo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.4.6'
version = '1.4.7'

description = 'OpenCADC CAOM repository client library'
def git_url = 'https://github.com/opencadc/caom2db'
Expand Down
8 changes: 7 additions & 1 deletion caom2-repo/src/main/java/ca/nrc/cadc/caom2/repo/client/RepoClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,13 @@ private void init() {
}
Interface iface = obs.findInterface(meth);
if (iface == null) {
throw new RuntimeException("observation list capability does not suppoort auth: " + meth.getValue());
iface = obs.findInterface(AuthMethod.ANON);
if (iface == null) {
throw new RuntimeException("observation list capability does not support auth: " + meth.getValue()
+ " or anon");
}
log.debug("observation list capability does not support auth: " + meth.getValue() + ": using anon");
meth = AuthMethod.ANON; // use same for deletion endpoint below
}
this.baseServiceURL = iface.getAccessURL().getURL();
log.debug("observation list URL: " + baseServiceURL.toString());
Expand Down
2 changes: 1 addition & 1 deletion icewind/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## deployable containers have a semantic and build tag
# semantic version tag: major.minor[.patch]
# build version tag: timestamp
VER=0.9.6
VER=0.9.7
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
unset VER
Loading