Skip to content

Commit

Permalink
youcat 0.5.4: improve availability checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@pdowler
pdowler committed Jan 4, 2024
1 parent 40d9c7f commit 2db38cb
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 32 deletions.
2 changes: 1 addition & 1 deletion youcat/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ See <a href="https://github.com/opencadc/reg/tree/master/cadc-registry">cadc-reg

This service uses the `cadc-tap-tmp` library for temporary storage needed by core TAP features
(async results, tap_upload tables). It is currently hard-coded (PluginFactory.properties) to
use the HttpStorageManager and persist to an external URL (HTTP PUT).
use the DelegatingStorageManager.

This storage _is not_ used for content upload of user-created tables: that content is streamed
directly into the database server.
Expand Down
2 changes: 1 addition & 1 deletion youcat/VERSION
View file
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.5.3
VER=0.5.4
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
unset VER
2 changes: 1 addition & 1 deletion youcat/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ dependencies {
compile 'org.opencadc:cadc-vosi:[1.4.3,2.0)'
compile 'org.opencadc:cadc-registry:[1.7.2,)'
compile 'org.opencadc:cadc-gms:[1.0.4,2.0)'
compile 'org.opencadc:cadc-tap-tmp:[1.1.5,)'

runtime 'org.opencadc:cadc-tap-tmp:[1.1,)'
runtime 'org.opencadc:cadc-vos:[1.1,2.0)'
runtime 'org.opencadc:cadc-access-control-identity:[1.1.0,)'

Expand Down
97 changes: 69 additions & 28 deletions youcat/src/main/java/org/opencadc/youcat/CatalogTapService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2019. (c) 2019.
* (c) 2023. (c) 2023.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -74,18 +74,27 @@
import ca.nrc.cadc.reg.client.RegistryClient;
import ca.nrc.cadc.rest.RestAction;
import ca.nrc.cadc.tap.schema.InitDatabaseTS;
import ca.nrc.cadc.util.InvalidConfigException;
import ca.nrc.cadc.uws.server.impl.InitDatabaseUWS;
import ca.nrc.cadc.vosi.Availability;
import ca.nrc.cadc.vosi.AvailabilityPlugin;
import ca.nrc.cadc.vosi.avail.CheckCertificate;
import ca.nrc.cadc.vosi.avail.CheckDataSource;
import ca.nrc.cadc.vosi.avail.CheckException;
import ca.nrc.cadc.vosi.avail.CheckResource;
import ca.nrc.cadc.vosi.avail.CheckWebService;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.spec.InvalidKeySpecException;
import java.util.NoSuchElementException;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.opencadc.tap.tmp.DelegatingStorageManager;
import org.opencadc.tap.tmp.StorageManager;

/**
*
Expand All @@ -98,7 +107,7 @@ public class CatalogTapService implements AvailabilityPlugin {
private static final String TAPUSER_TEST = "select schema_name from tap_schema.schemas11 where schema_name='tap_schema'";
private static final String UWS_TEST = "select jobID from uws.Job limit 1";

private static File SERVOPS_CERT = new File(System.getProperty("user.home") + "/.ssl/cadcproxy.pem");
private static final File AAI_PEM_FILE = new File(System.getProperty("user.home") + "/.ssl/cadcproxy.pem");
private static File TMPOPS_CERT = new File(System.getProperty("user.home") + "/.ssl/tmpops.pem");

private static final URI TMP_STORAGE_WS = URI.create("ivo://cadc.nrc.ca/cadc/minoc");
Expand Down Expand Up @@ -147,38 +156,70 @@ public Availability getStatus() {
cr.check();
// TODO: check that DS_TAPUSER can create/drop TAP_UPLOAD tables

// create/drop in all user schemas
//File cert = TODO;
//CheckCertificate checkCert = new CheckCertificate(cert);
//checkCert.check();

// check other services we depend on
RegistryClient reg = new RegistryClient();
URL url;
CheckResource checkResource;

LocalAuthority localAuthority = new LocalAuthority();

URI credURI = localAuthority.getServiceURI(Standards.CRED_PROXY_10.toString());
url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
checkResource = new CheckWebService(url);
checkResource.check();

URI usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
url = reg.getServiceURL(usersURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
checkResource = new CheckWebService(url);
checkResource.check();

URI groupsURI = localAuthority.getServiceURI(Standards.GMS_SEARCH_10.toString());
if (!groupsURI.equals(usersURI)) {
url = reg.getServiceURL(groupsURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
checkResource = new CheckWebService(url);
checkResource.check();
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();
} else {
log.debug("check skipped: " + credURI + " does not provide " + Standards.VOSI_AVAILABILITY);
}
} catch (NoSuchElementException ex) {
log.debug("not configured: " + Standards.CRED_PROXY_10);
}

URI usersURI = null;
try {
usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
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);
}

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

if (credURI != null || usersURI != null) {
if (AAI_PEM_FILE.exists() && AAI_PEM_FILE.canRead()) {
// check for a certificate needed to perform network A&A ops
CheckCertificate checkCert = new CheckCertificate(AAI_PEM_FILE);
checkCert.check();
} else {
log.debug("AAI cert not found or unreadable");
}
}

url = reg.getServiceURL(TMP_STORAGE_WS, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
checkResource = new CheckWebService(url);
checkResource.check();
try {
StorageManager store = new DelegatingStorageManager();
store.check();
} catch (Exception ex) {
throw new CheckException("cadc-tap-tmp check: " + ex, ex);
}

} catch (CheckException ce) {
// tests determined that the resource is not working
Expand Down
2 changes: 1 addition & 1 deletion youcat/src/main/resources/PluginFactory.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ca.nrc.cadc.tap.UploadManager = org.opencadc.youcat.tap.UploadManagerImpl

ca.nrc.cadc.tap.writer.format.FormatFactory = org.opencadc.youcat.tap.FormatFactoryImpl

ca.nrc.cadc.tap.ResultStore = org.opencadc.tap.tmp.HttpStorageManager
ca.nrc.cadc.tap.ResultStore = org.opencadc.tap.tmp.DelegatingStorageManager

ca.nrc.cadc.tap.schema.TapSchemaDAO = org.opencadc.youcat.tap.TapSchemaDAOImpl

Expand Down

0 comments on commit 2db38cb

Please sign in to comment.