Develop (#226)

* Removed `linkeddatahub-` prefix from version in CI workflow

* Moved `MAX_CONTENT_LENGTH` to .env

* Default config with `varnish-frontend`

Fixed proxied return URL in `post.sh`

* If using proxy, CLI scripts rewrite the effective URL back to original hostname

* Fixed object blocks for non-RDF resources (e.g. images)

`rdf:value` cardinality constraint

* Tunnel the `$proxy` param in CLI scripts

* Show chart form actions only when the agent has write access

* Web-Client bump

* Changelog update

Author: namedgraph

.env_sample

@@ -15,4 +15,6 @@ OWNER_ORG_UNIT=My unit
 OWNER_ORGANIZATION=My org
 OWNER_LOCALITY=Copenhagen
 OWNER_STATE_OR_PROVINCE=Denmark
-OWNER_COUNTRY_NAME=DK
+OWNER_COUNTRY_NAME=DK
+
+MAX_CONTENT_LENGTH=2097152

CHANGELOG.md

@@ -1,4 +1,20 @@
-[5.0.17] - 2025-06-23
+## [5.0.18] - 2025-06-30
+### Added
+- Proxy parameter tunneling in CLI scripts (`add-object-block.sh`, `add-xhtml-block.sh`)
+
+### Changed
+- Web-Client dependency version bump
+- Chart form actions now only display when agent has write access
+- CLI scripts now rewrite effective URLs back to original hostname when using proxy
+- Default configuration now uses `varnish-frontend`
+- `MAX_CONTENT_LENGTH` environment variable moved to `.env` file
+
+### Fixed
+- Fixed object blocks rendering for non-RDF resources (e.g. images)
+- Fixed `rdf:value` cardinality constraint
+- Fixed proxied return URL in `post.sh`
+
+## [5.0.17] - 2025-06-23
 ### Changed
   - Replaced `xsl:value-of` usage in XSLT stylesheets
   - Removed debug output for cleaner production logs

Dockerfile

@@ -101,7 +101,7 @@ ENV UPLOAD_CONTAINER_PATH=$UPLOAD_CONTAINER_PATH
 
 ENV OIDC_REFRESH_TOKENS=/var/linkeddatahub/oidc/refresh_tokens.properties
 
-ENV MAX_CONTENT_LENGTH=
+ENV MAX_CONTENT_LENGTH=2097152
 
 ENV MAX_CONN_PER_ROUTE=20
 

bin/add-object-block.sh

@@ -116,6 +116,8 @@ args+=("-p")
 args+=("$cert_password")
 args+=("-t")
 args+=("text/turtle") # content type
+args+=("--proxy")
+args+=("$proxy") # tunnel the proxy param
 
 if [ -n "$fragment" ] ; then
     # relative URI that will be resolved against the request URI

bin/add-xhtml-block.sh

@@ -110,6 +110,8 @@ args+=("-p")
 args+=("$cert_password")
 args+=("-t")
 args+=("text/turtle") # content type
+args+=("--proxy")
+args+=("$proxy") # tunnel the proxy param
 
 if [ -n "$fragment" ] ; then
     # relative URI that will be resolved against the request URI

bin/imports/create-file.sh

@@ -175,5 +175,14 @@ if [ -n "$proxy" ]; then
     target="${target/$target_host/$proxy_host}"
 fi
 
-# POST RDF/POST multipart form from stdin to the server
-echo -e "$rdf_post" | curl -w '%{url_effective}\n' -v -s -k -X PUT -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" -o /dev/null --config - "$target"
+# POST RDF/POST multipart form and capture the effective URL
+effective_url=$(echo -e "$rdf_post" | curl -w '%{url_effective}' -v -s -k -X PUT -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" -o /dev/null --config - "$target")
+
+# If using proxy, rewrite the effective URL back to original hostname
+if [ -n "$proxy" ]; then
+    # Replace proxy host with original host in the effective URL
+    rewritten_url="${effective_url/$proxy_host/$target_host}"
+    echo "$rewritten_url"
+else
+    echo "$effective_url"
+fi

bin/post.sh

@@ -80,4 +80,13 @@ else
 fi
 
 # resolve RDF document from stdin against base URL and POST to the server and print request URL
-cat - | turtle --base="$url" | curl -w '%{url_effective}\n' -v -k -E "$cert_pem_file":"$cert_password" -d @- -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$final_url"
+effective_url=$(cat - | turtle --base="$url" | curl -w '%{url_effective}' -v -k -E "$cert_pem_file":"$cert_password" -d @- -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$final_url")
+
+# If using proxy, rewrite the effective URL back to original hostname
+if [ -n "$proxy" ]; then
+    # Replace proxy host with original host in the effective URL
+    rewritten_url="${effective_url/$proxy_host/$url_host}"
+    echo "$rewritten_url"
+else
+    echo "$effective_url"
+fi

bin/put.sh

@@ -80,4 +80,13 @@ else
 fi
 
 # resolve RDF document from stdin against base URL and PUT to the server and print request URL
-cat - | turtle --base="$url" | curl -w '%{url_effective}\n' -v -k -E "$cert_pem_file":"$cert_password" -d @- -X PUT -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$final_url"
+effective_url=$(cat - | turtle --base="$url" | curl -w '%{url_effective}' -v -k -E "$cert_pem_file":"$cert_password" -d @- -X PUT -H "Content-Type: ${content_type}" -H "Accept: text/turtle" -o /dev/null "$final_url")
+
+# If using proxy, rewrite the effective URL back to original hostname
+if [ -n "$proxy" ]; then
+    # Replace proxy host with original host in the effective URL
+    rewritten_url="${effective_url/$proxy_host/$url_host}"
+    echo "$rewritten_url"
+else
+    echo "$effective_url"
+fi

config/system-varnish.trig

@@ -20,15 +20,17 @@
     ldt:ontology <https://w3id.org/atomgraph/linkeddatahub/admin#> ;
     ldt:service <urn:linkeddatahub:services/admin> ;
     ac:stylesheet <static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl> ;
-    lapp:endUserApplication <urn:linkeddatahub:apps/end-user> .
+    lapp:endUserApplication <urn:linkeddatahub:apps/end-user> ;
+    lapp:frontendProxy <http://varnish-frontend:6060/> .
 
 <urn:linkeddatahub:services/admin> a sd:Service ;
     dct:title "LinkedDataHub admin service" ;
     sd:supportedLanguage sd:SPARQL11Query, sd:SPARQL11Update ;
     sd:endpoint <http://fuseki-admin:3030/ds/> ;
     a:graphStore <http://fuseki-admin:3030/ds/> ;
-    a:quadStore <http://fuseki-admin:3030/ds/> .
- 
+    a:quadStore <http://fuseki-admin:3030/ds/> ;
+    lapp:backendProxy <http://varnish-admin/> .
+
 # root end-user
 
 <urn:linkeddatahub:apps/end-user> a lapp:Application, lapp:EndUserApplication ;
@@ -37,11 +39,13 @@
     ldt:ontology <ns#> ;
     ldt:service <urn:linkeddatahub:services/end-user> ;
     lapp:adminApplication <urn:linkeddatahub:apps/admin> ;
+    lapp:frontendProxy <http://varnish-frontend:6060/> ;
     lapp:public true .
 
 <urn:linkeddatahub:services/end-user> a sd:Service ;
     dct:title "LinkedDataHub service" ;
     sd:supportedLanguage sd:SPARQL11Query, sd:SPARQL11Update ;
     sd:endpoint <http://fuseki-end-user:3030/ds/> ;
     a:graphStore <http://fuseki-end-user:3030/ds/> ;
-    a:quadStore <http://fuseki-end-user:3030/ds/> .
+    a:quadStore <http://fuseki-end-user:3030/ds/> ;
+    lapp:backendProxy <http://varnish-end-user/> .