Creating package document in admin

Package test updates

Author: namedgraph

CHANGELOG.md

@@ -16,7 +16,7 @@
 ### Added
 - ORCID OpenID Connect login support with JWT token verification
 - `CORSFilter` response filter for cross-origin resource sharing on static assets
-- Cache invalidation (BAN requests) for agent and user account lookup queries
+- Cache invalidation (`BAN` requests) for agent and user account lookup queries
 - New `Application::normalizeOrigin` method for origin normalization
 - `ldh:parent-origin` XPath function for parent origin retrieval
 - HTTP tests for CORS functionality, internal IP blocking, and form proxying

…min/packages/install-package-ontology.sh …min/packages/install-package-document.shhttp-tests/admin/packages/install-package-ontology.sh renamed to http-tests/admin/packages/install-package-document.sh http-tests/admin/packages/install-package-ontology.sh renamed to http-tests/admin/packages/install-package-document.sh

@@ -9,8 +9,6 @@ purge_cache "$FRONTEND_VARNISH_SERVICE"
 
 # test package URI (SKOS package)
 package_uri="https://packages.linkeddatahub.com/skos/#this"
-package_ontology_uri="https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl#"
-namespace_ontology_uri="${END_USER_BASE_URL}ns#"
 
 # install package
 install-package.sh \
@@ -20,15 +18,23 @@ install-package.sh \
   --package "$package_uri" \
 | grep -q "$STATUS_SEE_OTHER"
 
-# verify owl:imports triple was added to namespace graph
-curl -k -s \
-  -H "Accept: application/n-triples" \
-  "${END_USER_BASE_URL}ns" \
-| grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"
-
-# verify package ontology document was created (hash of package ontology URI)
-package_ontology_hash=$(echo -n "$package_ontology_uri" | shasum -a 1 | cut -d' ' -f1)
+# verify package document was created (hash of package URI)
+package_hash=$(echo -n "$package_uri" | shasum -a 1 | cut -d' ' -f1)
 curl -k -w "%{http_code}\n" -o /dev/null -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
-  "${ADMIN_BASE_URL}ontologies/${package_ontology_hash}/" \
+  "${ADMIN_BASE_URL}packages/${package_hash}/" \
 | grep -qE "^($STATUS_OK|$STATUS_NOT_MODIFIED)$"
+
+# uninstall package
+uninstall-package.sh \
+  -b "$END_USER_BASE_URL" \
+  -f "$OWNER_CERT_FILE" \
+  -p "$OWNER_CERT_PWD" \
+  --package "$package_uri" \
+| grep -q "$STATUS_SEE_OTHER"
+
+# verify package document was deleted
+#curl -k -w "%{http_code}\n" -o /dev/null -s \
+#  -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
+#  "${ADMIN_BASE_URL}packages/${package_hash}/" \
+#| grep -q "$STATUS_FORBIDDEN"

http-tests/admin/packages/install-package-stylesheet.sh

@@ -12,6 +12,12 @@ package_uri="https://packages.linkeddatahub.com/skos/#this"
 package_ontology_uri="https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl#"
 namespace_ontology_uri="${END_USER_BASE_URL}ns#"
 
+# verify owl:imports triple does NOT exist before install
+if curl -k -s -H "Accept: application/n-triples" -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" "${ADMIN_BASE_URL}ontologies/namespace/" \
+| grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"; then
+  exit 1
+fi
+
 # install package
 install-package.sh \
   -b "$END_USER_BASE_URL" \
@@ -20,10 +26,11 @@ install-package.sh \
   --package "$package_uri" \
 | grep -q "$STATUS_SEE_OTHER"
 
-# verify owl:imports triple was added
+# verify owl:imports triple was added (check graph store directly, not cached endpoint)
 curl -k -s \
   -H "Accept: application/n-triples" \
-  "${END_USER_BASE_URL}ns" \
+  -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
+  "${ADMIN_BASE_URL}ontologies/namespace/" \
 | grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"
 
 # verify package ontology document exists
@@ -41,8 +48,8 @@ uninstall-package.sh \
   --package "$package_uri" \
 | grep -q "$STATUS_SEE_OTHER"
 
-# verify owl:imports triple was removed
-ns_after=$(curl -k -s -H "Accept: application/n-triples" "${END_USER_BASE_URL}ns")
+# verify owl:imports triple was removed (check graph store directly, not cached endpoint)
+ns_after=$(curl -k -s -H "Accept: application/n-triples" -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" "${ADMIN_BASE_URL}ontologies/namespace/")
 if echo "$ns_after" | grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"; then
   exit 1
 fi

http-tests/admin/packages/install-uninstall-package-ontology.sh

@@ -7,37 +7,57 @@ purge_cache "$END_USER_VARNISH_SERVICE"
 purge_cache "$ADMIN_VARNISH_SERVICE"
 purge_cache "$FRONTEND_VARNISH_SERVICE"
 
+# Clean up any leftover package stylesheet files from previous test runs
+docker compose exec -T linkeddatahub rm -rf /usr/local/tomcat/webapps/ROOT/static/com/linkeddatahub/packages/skos 2>/dev/null || true
+docker compose exec -T linkeddatahub sed -i '/linkeddatahub\/packages\/skos\/layout.xsl/d' /usr/local/tomcat/webapps/ROOT/static/xsl/layout.xsl 2>/dev/null || true
+
+# Tomcat caches static files with default cacheTtl=5000ms (5 seconds)
+# See: https://tomcat.apache.org/tomcat-10.1-doc/config/resources.html#Attributes
+default_ttl=5
+
 # test package URI (SKOS package)
 package_uri="https://packages.linkeddatahub.com/skos/#this"
 
+# verify package stylesheet does NOT exist initially (should return 404)
+curl -k -w "%{http_code}\n" -o /dev/null -s \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl" \
+| grep -q "$STATUS_NOT_FOUND"
+
+# verify master stylesheet does NOT include package initially
+if curl -k -s "${END_USER_BASE_URL}static/xsl/layout.xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
+  exit 1
+fi
+
 # install package
 install-package.sh \
   -b "$END_USER_BASE_URL" \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
-  --package "$package_uri" \
-| grep -q "$STATUS_SEE_OTHER"
+  --package "$package_uri"
+
+# Wait for Tomcat's static resource cache to expire
+sleep $default_ttl
 
 # verify package stylesheet was installed (should return 200)
-curl -k -f -s -o /dev/null \
-  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl"
+install_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
+if [ "$install_status" != "200" ]; then
+  exit 1
+fi
 
 # verify master stylesheet includes package
-curl -k -s "${END_USER_BASE_URL}static/xsl/layout.xsl" \
-  | grep -q "com/linkeddatahub/packages/skos/layout.xsl"
+if ! curl -k -s "${END_USER_BASE_URL}static/xsl/layout.xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
+  exit 1
+fi
 
 # uninstall package
 uninstall-package.sh \
   -b "$END_USER_BASE_URL" \
   -f "$OWNER_CERT_FILE" \
   -p "$OWNER_CERT_PWD" \
-  --package "$package_uri" \
-| grep -q "$STATUS_SEE_OTHER"
+  --package "$package_uri"
 
 # Wait for Tomcat's static resource cache to expire
-# Tomcat caches static files with default cacheTtl=5000ms (5 seconds)
-# See: https://tomcat.apache.org/tomcat-10.1-doc/config/resources.html#Attributes
-default_ttl=5
 sleep $default_ttl
 
 # verify package stylesheet was deleted (should return 404)
@@ -46,7 +66,6 @@ curl -k -w "%{http_code}\n" -o /dev/null -s \
 | grep -q "$STATUS_NOT_FOUND"
 
 # verify master stylesheet no longer includes package
-master_xsl=$(curl -k -s "${END_USER_BASE_URL}static/xsl/layout.xsl")
-if echo "$master_xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
+if curl -k -s "${END_USER_BASE_URL}static/xsl/layout.xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
   exit 1
 fi