Skip to content

fix: fix for availability service #268

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

Merged
pdowler merged 2 commits into from
Mar 5, 2026
Merged

fix: fix for availability service #268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78867d0
fix: fix for availability service
at88mph Dec 10, 2025
3146336
fix: fix for lookup in usersuri
at88mph Dec 10, 2025
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 cavern/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
# build version tag: timestamp
VER=0.9.2
VER=0.9.3
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
45 changes: 25 additions & 20 deletions cavern/src/main/java/org/opencadc/cavern/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,35 +150,40 @@ public Availability getStatus() {

URI credURI = null;
try {
credURI = localAuthority.getServiceURI(Standards.CRED_PROXY_10.toString());
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
credURI = localAuthority.getResourceID(Standards.CRED_PROXY_10);

// The CDP is not applicable to all deployments, so don't throw an exception
if (credURI != null) {
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
} else {
log.debug("check skipped: " + credURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
} else {
log.debug("check skipped: " + credURI + " does not provide " + Standards.VOSI_AVAILABILITY);
log.debug("check skipped: " + Standards.CRED_PROXY_10 + " not applicable");
}
} catch (NoSuchElementException ex) {
} catch (NoSuchElementException | IllegalArgumentException ex) {
log.debug("not configured: " + Standards.CRED_PROXY_10);
}

URI usersURI = null;
try {
usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
usersURI = localAuthority.getResourceID(Standards.UMS_USERS_10);
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
} else {
log.debug("check skipped: " + usersURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
} catch (NoSuchElementException ex) {
log.debug("not configured: " + Standards.UMS_USERS_01);
} catch (NoSuchElementException | IllegalArgumentException ex) {
log.debug("not configured: " + Standards.UMS_USERS_10);
}

URI groupsURI = null;
try {
groupsURI = localAuthority.getServiceURI(Standards.GMS_SEARCH_10.toString());
URI groupsURI = localAuthority.getResourceID(Standards.GMS_SEARCH_10);
if (!groupsURI.equals(usersURI)) {
URL url = reg.getServiceURL(groupsURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
Expand All @@ -188,36 +193,36 @@ public Availability getStatus() {
log.debug("check skipped: " + groupsURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
}
} catch (NoSuchElementException ex) {
} catch (NoSuchElementException | IllegalArgumentException ex) {
log.debug("not configured: " + Standards.GMS_SEARCH_10);
}

URI posixUserMapURI = null;
try {
posixUserMapURI = localAuthority.getServiceURI(Standards.POSIX_USERMAP.toASCIIString());
URL url = reg.getServiceURL(groupsURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
posixUserMapURI = localAuthority.getResourceID(Standards.POSIX_USERMAP);
URL url = reg.getServiceURL(posixUserMapURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
} else {
log.debug("check skipped: " + posixUserMapURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
} catch (NoSuchElementException ex) {
} catch (NoSuchElementException | IllegalArgumentException ex) {
log.debug("not configured: " + Standards.POSIX_USERMAP);
}
URI posixGroupMapURI = null;

try {
posixGroupMapURI = localAuthority.getServiceURI(Standards.POSIX_GROUPMAP.toASCIIString());
URI posixGroupMapURI = localAuthority.getResourceID(Standards.POSIX_GROUPMAP);
if (!posixGroupMapURI.equals(posixUserMapURI)) {
URL url = reg.getServiceURL(groupsURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
URL url = reg.getServiceURL(posixGroupMapURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
} else {
log.debug("check skipped: " + posixGroupMapURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
}
} catch (NoSuchElementException ex) {
} catch (NoSuchElementException | IllegalArgumentException ex) {
log.debug("not configured: " + Standards.POSIX_GROUPMAP);
}

Expand Down