26 q1

edoc/admin/admin.xqm

@@ -4,7 +4,6 @@ module namespace wdbAdmin = "https://github.com/dariok/wdbplus/Admin";
 
 import module namespace config   = "https://github.com/dariok/wdbplus/config" at "../modules/wdb-config.xqm";
 import module namespace wdbErr   = "https://github.com/dariok/wdbplus/errors" at "../modules/error.xqm";
-import module namespace wdbFiles = "https://github.com/dariok/wdbplus/files"  at "../modules/wdb-files.xqm";
 import module namespace wdbm     = "https://github.com/dariok/wdbplus/model"  at "../modules/model.xqm";
 
 declare namespace meta      = "https://github.com/dariok/wdbplus/wdbmeta";
@@ -24,31 +23,40 @@ function wdbAdmin:start ( $node as node(), $model as map(*), $ed as xs:string )
   wdbm:populateModel((), $ed, "", "", "")
 };
 
-declare function wdbAdmin:getEd ( $node as node(), $model as map(*) ) as element(meta) {
-  <meta name="ed" content="{ $model?ed }" />
-};
+declare function wdbAdmin:getEd ( $node as node(), $model as map(*) ) as item()+ {(
+  comment { "Created in admin.xqm for "|| $node/@data-template },
+  <meta name="ed" content="{ $model?ed }" />,
+  <meta name="path" content="{ $model?pathToEd }" />
+)};
 
-declare function wdbAdmin:heading ($node as node(), $model as map(*)) {
+declare function wdbAdmin:heading ( $node as node(), $model as map(*) ) as element()+ {
   let $opts := if (request:get-parameter('job', '') != '')
     then <span class="dispOpts"><a href="global.html">globale Optionen</a></span>
     else ()
 
   return (
+
     <h1>{
-      if ($model?page = 'admin.html')
-      then "Admin-Seite"
-      else if ($model?page = 'global.html')
-      then "Globale Einstellungen"
-      else if ($model?ed = '')
-      then "Projekte"
-      else ("Projekt ", <i>{$model?title}</i>, " (" || $model?ed || ")")
+      comment { "Created in admin.xqm for "|| $node/@data-template },
+      if ($model?page = 'admin.html') then
+        "Admin-Seite"
+      else if ($model?page = 'global.html') then
+        "Globale Einstellungen"
+      else if ($model?ed = '') then
+        "Projekte"
+      else (
+        "Projekt ",
+        <i>{$model?title}</i>,
+        " (" || $model?ed || ")"
+      )
     }</h1>,
     $opts
   )
 };
 
-declare function wdbAdmin:getAside ($node as node(), $model as map(*)) as element() {
+declare function wdbAdmin:getAside ( $node as node(), $model as map(*) ) as element() {
   <aside>
+    comment { "Created in admin.xqm for "|| $node/@data-template }
     <h3>Funktionen</h3>
     {
       switch ($model?page)
@@ -68,11 +76,12 @@ declare function wdbAdmin:getAside ($node as node(), $model as map(*)) as elemen
   </aside>
 };
 
-declare function wdbAdmin:css ( $node as node(), $model as map(*) ) as element()* {
+declare function wdbAdmin:css ( $node as node(), $model as map(*) ) as item()* {
+  comment { "Created in admin.xqm for "|| $node/@data-template },
   if ( unparsed-text-available($config:data || "/resources/css/wdb.css") )
-    then <link rel="stylesheet" type="text/css" href="../data/resources/css/wdb.css" />
+    then <link rel="stylesheet" type="text/css" href="$global/css/wdb.css" />
     else (),
   if ( unparsed-text-available($config:data || "/resources/css/admin.css") )
-    then <link rel="stylesheet" type="text/css" href="../data/resources/css/admin.css" />
+    then <link rel="stylesheet" type="text/css" href="$global/css/admin.css" />
     else ()
 };

edoc/admin/directoryForm.html

@@ -1,29 +1,27 @@
 <div data-template="templates:surround" data-template-with="templates/admin.html" data-template-at="container">
-  <h1>Funktion</h1>
-  <form action="#" method="post">
-    <fieldset id="selectTask">
-      <input type="radio" name="task" id="do">Verzeichnis ohne Eintragen in wdbmeta</input><br/>
-      <input type="radio" name="task" id="dm">Verzeichnis mit Eintragen in wdbmeta</input><br/>
-      <input type="radio" name="task" id="fo">Datei(en) ohne Eintragen in wdbmeta</input><br/>
-      <input type="radio" name="task" id="fi" checked="checked">Datei(en) mit Eintragen in wdbmeta</input><br/>
+   <h1>Funktion</h1>
+   <form action="#" method="post">
+      <fieldset id="selectTask">
+         <input type="radio" name="task" id="dm">Verzeichnis(se) (relative Pfade)</input><br/>
+         <input type="radio" name="task" id="fi" checked="checked">Datei(en)</input>
     </fieldset>
-    <fieldset id="selectTarget">
-      <label>Collection: </label>
-      <pre/>
-      <br/>
-      <label>Zielcollection auswählen: </label>
-      <select name="target">
-        <option/>
-      </select>
-    </fieldset>
-    <fieldset id="selectInputDir">
-      <label>Datei auswählen: </label>
-      <input type="file" id="picker" name="fileList" multiple="multiple" />
-    </fieldset>
-    <input type="submit" disabled="disabled"/>
-  </form>
-  <p>
-    <img src="../resources/FhHRx.gif" style="display: none;" alt="loading"/>
-  </p>
-  <table id="results"/>
+      <fieldset id="selectTarget">
+         <label>Collection: </label>
+         <pre/>
+         <br/>
+         <label>Zielcollection auswählen: </label>
+         <select name="target">
+            <option/>
+         </select>
+      </fieldset>
+      <fieldset id="selectInputDir">
+         <label>Datei auswählen: </label>
+         <input type="file" id="picker" name="fileList" multiple="multiple" />
+      </fieldset>
+      <input type="submit" disabled="disabled"/>
+   </form>
+   <p>
+      <img src="$shared/images/FhHRx.gif" style="display: none;" alt="loading"/>
+   </p>
+   <table id="results"/>
 </div>

edoc/config.xml

@@ -28,19 +28,33 @@
    <server>http://localhost:8080/exist/apps/edoc</server>
 
    <!-- Full path for the instance’s REST base URL -->
-   <rest>http://localhost:8080/exist/restxq/edoc/</rest>
+   <rest version="1">http://localhost:8080/exist/restxq/edoc/</rest>
+   <rest version="2">https://localhost/exist/apps/edoc/api/v2/</rest>
 
    <!-- the collection that will hold all the projects. Adjust if you decide to put your projects elsewhere
      default: /db/apps/edoc/data -->
    <data>/db/apps/edoc/data</data>
 
    <!-- standard HTTP reponse headers for HTML files -->
    <headers>
+      <header name="Content-Security-Policy" value="
+         base-uri 'self';
+         connect-src 'self' https://example.org;
+         default-src 'self';
+         form-action 'self';
+         frame-ancestors 'none';
+         frame-src 'self';
+         img-src 'self' data: https://example.org;
+         object-src 'none';
+         script-src 'self' https://example.org 'sha256-i5FN1OSK7gDNa3opBmzMU9YJGHPyoa6XHjjunO2922g=';
+         style-src 'self' 'unsafe-inline' https://example.org;
+         upgrade-insecure-requests;" />
       <header name="Permissions-Policy" value="geolocation=(self), fullscreen=(self)"/>
-      <header name="Referrer-Policy" value="no-referrer-when-downgrade"/>
+      <header name="Referrer-Policy" value="strict-origin-when-cross-origin"/>
       <header name="X-Content-Type-Options" value="nosniff"/>
       <header name="X-Frame-Options" value="DENY"/>
       <header name="X-XSS-Protection" value="1; mode=block"/>
+      <header name="Strict-Transport-Security" value="max-age=31536000" />
    </headers>
 
    <!-- Allowed origins for CORS requests – these may be necessary when wdb+ is behind a rewriting proxy
@@ -51,6 +65,8 @@
 
    <!-- Sources for some Blobs -->
    <externalSources>
-      <source name="jquery" path="$shared/jquery-3.6.3.min.js" />
+      <source name="jquery" path="$shared/js/jquery-4.0.0.min.js" />
+      <source name="jquery-ui-js" path="$shared/js/jquery-ui.min.js" />
+      <source name="jquery-ui-css" path="$shared/css/jquery-ui.min.css" />
    </externalSources>
 </config>

edoc/controller.xql

@@ -5,12 +5,11 @@
  :)
 xquery version "3.1";
 
-import module namespace login   = "http://exist-db.org/xquery/login"           at "resource:org/exist/xquery/modules/persistentlogin/login.xql";
-import module namespace request = "http://exist-db.org/xquery/request"         at "java:org.exist.xquery.functions.request.RequestModule";
-(: import module namespace sm      = "http://exist-db.org/xquery/securitymanager" at "java:org.exist.xquery.functions.securitymanager.SecurityManagerModule";:)
-import module namespace wdba    = "https://github.com/dariok/wdbplus/auth"     at "modules/auth.xqm";
+import module namespace login      = "http://exist-db.org/xquery/login"          at "resource:org/exist/xquery/modules/persistentlogin/login.xql";
+import module namespace request    = "http://exist-db.org/xquery/request"        at "java:org.exist.xquery.functions.request.RequestModule";
 
-declare namespace exist = "http://exist.sourceforge.net/NS/exist";
+declare namespace config = "https://github.com/dariok/wdbplus/config";
+declare namespace exist  = "http://exist.sourceforge.net/NS/exist";
 
 declare variable $exist:path external;
 declare variable $exist:resource external;
@@ -19,16 +18,17 @@ declare variable $exist:prefix external;
 (: declare variable $exist:root external; :)
 
 declare variable $local:isget := request:get-method() = ("GET","get");
+declare variable $local:config := doc("/db/apps/edoc/config.xml")/config:config;
 
-util:log("info", "request:get-method(): " || request:get-method()),
-util:log("info", "exist:path: " || $exist:path),
+util:log("info", request:get-method() || " " || request:get-url() || ' ? ' || request:get-query-string() || " -> resource: " || $exist:resource),
 
 (: static HTML page for API documentation should be served directly to make sure it is always accessible :)
 if (
-    ( $local:isget and $exist:path eq "/apiv2.html" ) or 
-    ( $local:isget and matches($exist:path, "^/[^/]+\.json$", "s") )
+    ( $local:isget and $exist:resource = ('v2.json', 'apiv2.html') )
 ) then
-  <dispatch xmlns="http://exist.sourceforge.net/NS/exist" />
+  <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+    <forward url="{$exist:controller}/rest2/{$exist:resource}"/>
+  </dispatch>
 (: login :)
 else if ( $exist:resource = 'login' ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
@@ -69,15 +69,33 @@ else if ( ends-with($exist:resource, ".html") ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <view>
       <forward url="{$exist:controller}/modules/view.xql">
-			</forward>
+        {
+          for $header in $local:config//config:header
+            return <set-header>{ $header/@* }</set-header>
+        }
+      </forward>
     </view>
   </dispatch>
-else if ( contains($exist:path, "/$shared/") ) then
-  <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-    <forward url="{$exist:controller}/resources/{substring-after($exist:path, '/$shared/')}">
-      <set-header name="Cache-Control" value="max-age=604800, must-revalidate"/>
-    </forward>
-  </dispatch>
+  (: generic resources :)
+  else if ( contains($exist:path, "/$shared/") ) then
+    <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+      <forward url="{$exist:controller}/resources/{substring-after($exist:path, '/$shared/')}">
+        {
+          for $header in $local:config//config:header
+            return <set-header>{ $header/@* }</set-header>
+        }
+      </forward>
+    </dispatch>
+  (: instance specific resources :)
+  else if ( contains($exist:path, "/$global/") ) then
+    <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+      <forward url="{$exist:controller}/data/resources/{substring-after($exist:path, '/$global/')}">
+        {
+          for $header in $local:config//config:header
+            return <set-header>{ $header/@* }</set-header>
+        }
+      </forward>
+    </dispatch>
 else if ( ends-with($exist:path, ".xql") ) then
   <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
     <set-header name="Cache-Control" value="no-cache"/>

edoc/index/index-projects.xq

@@ -3,20 +3,22 @@ xquery version "3.1";
 declare namespace index = "https://github.com/dariok/wdbplus/index";
 declare namespace meta  = "https://github.com/dariok/wdbplus/wdbmeta";
 
-update replace doc("/db/apps/edoc/index/project-index.xml")/index:index with <index xmlns="https://github.com/dariok/wdbplus/index"/>,
-update replace doc("/db/apps/edoc/index/file-index.xml")/index:index with <index xmlns="https://github.com/dariok/wdbplus/index"/>,
-for $project in //meta:projectMD
+update delete doc("/db/apps/edoc/index/project-index.xml")/index:index/*,
+update delete doc("/db/apps/edoc/index/file-index.xml")/index:index/*,
+for $project in collection('/db/apps/edoc/data')//meta:projectMD
   let $path := util:collection-name($project)
-  where contains($path, '/data/')
-
   let $files := $project//meta:file
   let $file-entries := for $file in $files
-    return <file xmlns="https://github.com/dariok/wdbplus/index" xml:id="{ $file/@xml:id }" project="{ base-uri($file) }" />
+    return <file xmlns="https://github.com/dariok/wdbplus/index"
+        xml:id="{ $file/@xml:id }"
+        project="{ base-uri($file) }"
+    />
 
   return (
     update insert <project xmlns="https://github.com/dariok/wdbplus/index"
         xml:id="{ $project/@xml:id }"
         path="{ $path }"
+        title="{ $project//meta:title[@type='main'] }"
        /> into doc("/db/apps/edoc/index/project-index.xml")/index:index,
     if ( not(empty($file-entries)) )
       then update insert $file-entries into doc("/db/apps/edoc/index/file-index.xml")/index:index

edoc/modules/addin.xqm

@@ -13,7 +13,7 @@ declare namespace wdbadd = "https://github.com/dariok/wdbplus/addins";
 (: load the main XQuery module for the requested addin. It is mandatory these implement wdbadd:main($map as map(*)) :)
 declare function wdbAddinMain:body ( $node as node(), $model as map(*) ) as element()+ {
   let $addinName := substring-before(substring-after(request:get-uri(), 'addins/'), '/')
-    , $path := substring-before(base-uri(), '/addin.xqm') || "/addins/" || $addinName || "/addin.xqm"
+    , $path := "/db/apps/edoc/addins/" || $addinName || "/addin.xqm"
     , $map := map { "location-hints": $path }
 
   let $module := try {

edoc/modules/app.xqm

@@ -291,41 +291,52 @@ declare function wdb:getXslFromWdbMeta ( $infoFileLoc as xs:string, $id as xs:st
         "no process found for target '" || $target || "' and view '" || $view || "' in " || $infoFileLoc
       )
 };
-(: END LOCAL HELPER FUNCTIONS :)
 
-(: HELPERS FOR REST AND HTTP REQUESTS :)
-declare function wdb:parseMultipart ( $data, $header ) {
-  let $boundary := $header => substring-after('boundary=') => translate('"', '')
-  return map:merge(
-    for $m in tokenize($data, "--" || $boundary) return
-      if (string-length($m) lt 6)
-      then ()
+(:~
+ : Apply a project specific XSLT to some XML
+ :
+ : @param $xml The XML to be transformed
+ : @param $edPath The path to the project
+ : @param $name The name of the XSLT file to be applied
+ :
+ : @returns The transformed XML
+ :
+ : The lookup order is:
+ : 1) project resources
+ : 2) instance resources
+ : 3) global resources
+ :)
+declare function wdb:applySpecificXsl ( $xml as node(), $edPath as xs:string, $name as xs:string ) as node() {
+  wdb:applySpecificXsl($xml, $edPath, $name, ())
+};
+(:~
+ : Apply a project specific XSLT to some XML
+ :
+ : @param $xml The XML to be transformed
+ : @param $edPath The path to the project
+ : @param $name The name of the XSLT file to be applied
+ : @param $parameters (optional) parameters to be passed to the XSLT
+ :
+ : @returns The transformed XML
+ :
+ : The lookup order is:
+ : 1) project resources
+ : 2) instance resources
+ : 3) global resources
+ :)
+declare function wdb:applySpecificXsl ( $xml as node(), $edPath as xs:string, $name as xs:string, $parameters as element(parameters)? ) as node() {
+  let $xsl := if ( doc-available($edPath || "/resources/xsl/" || $name) ) then
+        doc($edPath || "/resources/xsl/" || $name)
+      else if ( doc-available("/db/apps/edoc/data/resources/xsl/" || $name) ) then
+        doc("/db/apps/edoc/data/resources/xsl/" || $name)
       else
-        let $parts := (tokenize($m, "(^\s*$){2}", "m"))[normalize-space() != ""]
-        let $header := map:merge( 
-          for $line in tokenize($parts[1], "\n") return
-            if (normalize-space($line) eq "")
-            then ()
-            else
-              let $val := $line => substring-after(': ') => normalize-space()
-              let $value := if (contains($val, '; '))
-                then map:merge( 
-                  for $entry in tokenize($val, '; ') return
-                    if (contains($entry, '='))
-                    then map:entry ( substring-before($entry, '='), translate(substring-after($entry, '='), '"', '') )
-                    else map:entry ( "text", $entry )
-                )
-                else $val
-              return map:entry(substring-before($line, ': '), $value)
-        )
-
-        (: empty lines in the body will also cause splitting; hence, recombine everything except the header :)
-        return map:entry(($header?Content-Disposition?name, 'name')[1],
-            map { "header" : $header, "body" : string-join($parts[position() > 1], '\n') }
-        )
-  )
+        doc("/db/apps/edoc/resources/xsl/" || $name)
+
+   return transform:transform($xml, $xsl, $parameters)
 };
+(: END LOCAL HELPER FUNCTIONS :)
 
+(: HELPERS FOR REST AND HTTP REQUESTS :)
 (:~
  : Get a MIME type from an extension and an optional XML namespace
  :