Merge branch 'release/7.2.11' into stable/7

openlink · Sep 26, 2023 · d89671f · d89671f
2 parents f3d88f1 + 5b81dd8
commit d89671f
Show file tree

Hide file tree

Showing 64 changed files with 1,994 additions and 301 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,50 @@
 # NEWS
 
+## September 26, 2023, v7.2.11:
+
+  * Virtuoso Engine
+    - Added log info on manual enable/disable scheduler and checkpoint intervals
+    - Added sprintf format %[xx]s for registry settings
+    - Added CPU% and RSS usage to status() output
+    - Added BIF jsonld_ctx_to_dict
+    - Added input state in explain output where missing
+    - Fixed issue with SPARQL UUID() function (fixes #515)
+    - Fixed missing grant from SPARQL_UPDATE role (fixes #1152)
+    - Fixed issue with DROP TABLE/VIEW not checking target
+    - Fixed issue when copying constants in union
+    - Fixed several issues in json parser
+    - Fixed issue with get_keyword with soap options vector
+    - Fixed issue with chash on many threads
+    - Fixed issue with lang matches
+    - Fixed issue loading graphql plugin with musl C library
+    - Fixed do not replace trx log prefix with CHECKPOINT command
+    - Fixed small typos in documentation and error messages
+
+  * SPARQL
+    - Fixed SPARQL property path query returning incorrect results
+    - Fixed issue with conflict on join predicate of pview leading to AREF error
+    - Fixed issue with heterogeneous data column leading to range assert
+    - Fixed issue reusing boxes
+    - Fixed RDF quad sanity check for 'O' column
+    - Fixed entities in /sparql UI for maximum X(HT)ML compatibility
+
+  * Web Server and DAV
+    - Added option http_options_no_exec for http virtual path
+    - Added support for Content-Security-Policy header
+    - Added optional base url to http_xslt function as 3rd parameter
+    - Fixed issues mixing valid and invalid MIME types in Accept header
+    - Fixed issue writing log on delete/put/patch etc
+    - Fixed missing entry for JSON-LD in RDF DET
+    - Fixed issue with missing href in PROPPATCH response
+    - Fixed issue with base64 decode and trailing zeroes
+    - Fixed issue with dead http session
+
+  * Conductor
+    - Added simple webservices UI
+    - Fixed DAV browser to allow editing for json files
+    - Fixed import of all keys in a PEM certificate bundle
+
+
 ## June 7, 2023, v7.2.10:
 
   * Virtuoso Engine

diff --git a/binsrc/conductor/account_create.vspx b/binsrc/conductor/account_create.vspx
@@ -742,7 +742,7 @@
                                   <v:button action="simple" name="imp_key" value="Import Key">
                                     <v:on-post>
                                       <![CDATA[
-                              declare username, key_file_format, key_value any;
+                              declare username, kname, key_file_format, key_value, certs any;
                               declare import_pk_from_pem int;
                                         if (self.vc_is_valid = 0)
                                           return;
@@ -754,23 +754,37 @@
                                           return;
                                         };
                                         username := self.t_login_name.ufl_value;
+                              kname := self.k_name.ufl_value;
                               key_value := get_keyword ('k_value', params);
                               key_file_format := self.k_type.ufl_value;
                               import_pk_from_pem := 0;
+                              certs := null;
                               if (key_file_format = 'PEM' and strstr (key_value, 'PRIVATE KEY') is not null)
                                 import_pk_from_pem := 1;
+                              else if (key_file_format = 'PEM')
+                                certs := pem_certificates_to_array(key_value);
                                         set_user_id (username);
                               set_qualifier ('DB');
 
-                              USER_KEY_LOAD (self.k_name.ufl_value,
+                              if (certs is null or length (certs) = 1) {
+                                USER_KEY_LOAD (kname,
                                     key_value,
                                     'X.509',
                                     key_file_format,
                                     self.k_pwd.ufl_value,
                                     case when import_pk_from_pem then key_value else null end,
                                     1);
-
-                                        EXEC_STMT (make_cert_stmt (self.k_name.ufl_value), 0);
+                                  EXEC_STMT (make_cert_stmt (kname), 0);
+                              } else {
+                                  declare i int;
+                                  declare kn varchar;
+                                  kn := kname;
+                                  for (i := 0; i < length (certs); i := i + 1) {
+                                     key_value := aref (certs, i);
+                                     if (i > 0) kn := concat(kname,'_',cast (i as varchar));
+                                     USER_KEY_LOAD (kn, key_value, 'X.509', 'PEM', null, null, 1);
+                                  }
+                              }
                                         http_request_status ('HTTP/1.1 302 Found');
                                         http_header (sprintf ('Location: account_create.vspx?mode=edit&sid=%s&realm=%s&user_name=%U\r\n',self.sid ,self.realm, username));
                                       ]]>

diff --git a/binsrc/conductor/conductor.list b/binsrc/conductor/conductor.list
@@ -213,6 +213,7 @@ conductor/hosted_modules_show_sql.vsp
 conductor/hosted_modules.vspx
 conductor/hosted_page.vspx
 conductor/http_add_path.vspx
+conductor/http_svc_edit.vspx
 conductor/http_del_path.vspx
 conductor/http_edit_paths.vspx
 conductor/http_host_clone.vspx

diff --git a/binsrc/conductor/dav/dav_browser.xsl b/binsrc/conductor/dav/dav_browser.xsl
@@ -5606,6 +5606,7 @@
                                            or rowset[0] like '%.sql'
                                            or rowset[0] like '%.ini'
                                            or rowset[4] like 'text/%'
+                                           or rowset[4] = 'application/json'
                                            or rowset[4] = 'application/ld+json'
                                            or rowset[4] = 'application/sparql-query'
                                          )