release: 3.5.1

eb8cbef0 · threedytech · 2161f818 · eb8cbef0 · eb8cbef0 · eb8cbef0
Commit eb8cbef0 authored Aug 18, 2022 by threedytech
--- a/INSTALL_SINGLE_NODE.rst
+++ b/INSTALL_SINGLE_NODE.rst
@@ -29,7 +29,7 @@ System
 * Snapd is installed and running
 * SELinux is disabled
 * The system has the correct Linux kernel sources from the CentOS repositories
-* If you want to use GPU support, then make sure that the nouveau driver is disabled
+* If you want to use GPU support, then make sure that the nouveau driver is disabled and that there is no other driver installed on the host system running microk8s. 
 * If your system uses firewalld then make sure that masquerade is enabled on the host.
 * You have a running instant3Dhub License Server which can be accessed from the host. For installing instant3Dhub License Server please check the documenation `here <LICENSE_SERVER.rst>`_. 

@@ -72,4 +72,4 @@ Now you can install instant3Dhub
 .. toctree::
   :hidden:

-   INSTALL_WINDOWS
\ No newline at end of file
+   INSTALL_WINDOWS
--- a/helm/templates/services/APIGateway.yml
+++ b/helm/templates/services/APIGateway.yml
@@ -101,6 +101,7 @@ http {
    location / {
      root /data;
      index index.html;
+      expires -1;
    }
 {{ if .Values.adminEntrypoint }}
  }

--- a/helm/templates/services/SharedSessionService.yml
+++ b/helm/templates/services/SharedSessionService.yml
@@ -97,7 +97,30 @@ service:
        base-path: /log
        protocol: ws

-{{- $logParams := dict "panic" "FATAL"  "fatal" "FATAL"  "error" "ERROR"  "warning" "WARNING"  "info" "INFORMATION"  "debug"  "DEBUG"  "trace" "TRACE" }}
+{{- $logLevelOrder := list "fatal" "error" "warning" "info" "debug" "trace" }}
+{{- $logParams := dict "fatal" "FATAL"  "error" "ERROR"  "warning" "WARNING"  "info" "INFORMATION"  "debug"  "DEBUG"  "trace" "TRACE" }}
+{{- $logLevelFound := false }}
+
+{{- $headers := dict }}
+{{- $cookies := dict }}
+{{- range $rule := .Values.auth.forwardHeaders }}
+  {{- range $header := $rule.headers }}
+    {{- $_ := set $headers $header true }}
+  {{- end }}
+  {{- range $cookie := $rule.cookies }}
+    {{- $_ := set $cookies $cookie true }}
+  {{- end }}
+{{- end }}
+{{- range $gateway, $rules := .Values.dataGateways }}
+  {{- range $rule := $rules }}
+    {{- range $header := $rule.forwardHeaders }}
+      {{- $_ := set $headers $header true }}
+    {{- end }}
+    {{- range $cookie := $rule.forwardCookies }}
+      {{- $_ := set $cookies $cookie true }}
+    {{- end }}
+  {{- end }}
+{{- end }}

  patterns:
    - name: Session
@@ -116,8 +139,28 @@ service:
          --hubUrl http://i3dhub-entrygw:8080
          --spaceId [[ .Params.sessionId | shell_escape ]]
          --relativeHostedUris
-          --webVisLogLevel "{{ get $logParams .Values.logLevel }}"
+          --webVisLogLevel {{ if eq .Values.logLevel "panic" -}}
+            "FATAL","ERROR"
+          {{- else }}
+            {{- range $level := $logLevelOrder }}
+              {{- if not $logLevelFound -}}
+              "{{ get $logParams $level }}"
+              {{- end -}}
+              {{- if eq $.Values.logLevel $level -}}
+                {{- $logLevelFound = true -}}
+              {{- end -}}
+              {{- if not $logLevelFound -}}
+              ,
+              {{- end -}}
+            {{- end }}
+          {{- end }}
          --logLevel {{ .Values.logLevel }}
          --pingInterval {{ mul $pingInterval 1000 }}
          --random-path [[ .RESOURCE_ID ]]
+          {{- if gt (len $headers) 0 }}
+          --requiredAuthzHeaders {{ join "," (keys $headers) }},
+          {{- end }}
+          {{- if gt (len $cookies) 0 }}
+          --requiredAuthzCookies {{ join "," (keys $cookies) }},
+          {{- end }}
 {{- end }}
--- a/helm/templates/services/TranscoderService.yml
+++ b/helm/templates/services/TranscoderService.yml
@@ -94,26 +94,24 @@ service:
      optional: true
      default: any
      value: >
+             [[- $inputUri := .Params.inputUri -]]
+             [[- if .Params.inputURI -]]
+              [[- $inputUri = index .Params.inputURI 0 -]]
+             [[- end -]]
             [[- if .Params.inputContentType -]]
               [[- .Params.inputContentType -]]
             [[- else if .Params.acceptedContentTypes -]]
               [[- if gt (.Params.acceptedContentTypes | len) 0 -]]
                 [[- index .Params.acceptedContentTypes 0 -]]
               [[- end -]]
-             [[- else if .Params.inputURI -]]
-               [[- $resolved := index .Params.inputURI 0 | resolve -]]
-               [[- $numTypes := $resolved.Types | len ]]
-               [[- if eq $numTypes 1 -]]
-                 [[- index $resolved.Types 0 -]]
-               [[- end -]]
-             [[- else if .Params.inputUri | lower | hasPrefix "urn" -]]
-               [[- $resolved := resolve .Params.inputUri -]]
+             [[- else if $inputUri | lower | hasPrefix "urn" -]]
+               [[- $resolved := resolve $inputUri -]]
               [[- $numTypes := $resolved.Types | len ]]
               [[- if eq $numTypes 1 -]]
                 [[- index $resolved.Types 0 -]]
               [[- end -]]
             [[- else -]]
-               [[- .Params.inputUri | content_type_from_ext -]]
+               [[- $inputUri | content_type_from_ext -]]
             [[- end -]]

      # rewrite to another field so we only have to do this once and not everywhere it is used
@@ -123,24 +121,23 @@ service:
      optional: true
      default: '[]' # no types
      value: >
+             [[- $inputUri := .Params.inputUri -]]
+             [[- if .Params.inputURI -]]
+              [[- $inputUri = index .Params.inputURI 0 -]]
+             [[- end -]]
             [[- if .Params.inputContentType -]]
               [ "[[- .Params.inputContentType -]]" ]
             [[- else if .Params.acceptedContentTypes -]]
               [[- .Params.acceptedContentTypes | toJson -]]
-             [[- else if .Params.inputURI -]]
-               [[- $resolved := index .Params.inputURI 0 | resolve -]]
-               [[- if gt ($resolved.Types | len) 0 -]]
-                 [[- $resolved.Types | toJson -]]
-               [[- end -]]
-             [[- else if .Params.inputUri | lower | hasPrefix "urn" -]]
-               [[- $resolved := resolve .Params.inputUri -]]
+             [[- else if $inputUri | lower | hasPrefix "urn" -]]
+               [[- $resolved := resolve $inputUri -]]
               [[- if gt ($resolved.Types | len) 0 -]]
                 [[- $resolved.Types | toJson -]]
               [[- else -]]
                 [ "[[- $resolved.URI | content_type_from_ext -]]" ]
               [[- end -]]
             [[- else -]]
-               [ "[[- .Params.inputUri | content_type_from_ext -]]" ]
+               [ "[[- $inputUri | content_type_from_ext -]]" ]
             [[- end -]]

      # extract ignore cached result from hints

--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -399,7 +399,7 @@ numSpaceServicePods: 1
 numUploadServicePods: 1

 # This is the version name and the tag for the instant3Dhub images
-imageTag: 847b4f716b1e750d3b3cf88ea03dc6b8 
+imageTag: 1670dd2208a1613b791e7a6d237c2db3 

 # Override ping interval in seconds on websocket connections.
 # Setting it to 0 will disable sending pings.

--- a/init/postgres/instant3Dhub-ansibledb-noarch-3.0.0.10387.tgz
+++ b/init/postgres/instant3Dhub-ansibledb-noarch-3.0.0.10387.tgz
--- a/init/postgres/instant3Dhub-ansibledb-noarch-3.0.0.10396.tgz
+++ b/init/postgres/instant3Dhub-ansibledb-noarch-3.0.0.10396.tgz
--- a/instant3Dhub_changelog.html
+++ b/instant3Dhub_changelog.html
@@ -77,7 +77,18 @@ font-weight: 400;
 <header>
 <h1 class="title">instant3Dhub changelog</h1>
 </header>
-<h1 id="section">3.5</h1>
+<h1 id="section">3.5.1</h1>
+<ul>
+<li>Important Fixes
+<ul>
+<li>Fixed an XSS vulnerability with property synchronization</li>
+<li>Fixed incorrect rendering of HTML annotations</li>
+<li>Fixed distribution of header/cookie forwarding settings to all services</li>
+<li>Fixed an issue with the update of sharedsession service logs in the admin UI</li>
+<li>Fixed incorrect caching of the splash page</li>
+</ul></li>
+</ul>
+<h1 id="section-1">3.5</h1>
 <ul>
 <li>Updates
 <ul>
@@ -109,7 +120,7 @@ font-weight: 400;
 <li>Required: Upgrade LicenseServer to 22.2</li>
 </ul></li>
 </ul>
-<h1 id="section-1">3.4.3</h1>
+<h1 id="section-2">3.4.3</h1>
 <ul>
 <li>Important Fixes
 <ul>
@@ -122,7 +133,7 @@ font-weight: 400;
 <li>Removed broken and deprecated batchedQueryEnabled setting</li>
 </ul></li>
 </ul>
-<h1 id="section-2">3.4.2</h1>
+<h1 id="section-3">3.4.2</h1>
 <ul>
 <li>Important Fixes
 <ul>
@@ -142,7 +153,7 @@ font-weight: 400;
 <li>Added configuration options for additional Websocket Query Parameters</li>
 </ul></li>
 </ul>
-<h1 id="section-3">3.4.1</h1>
+<h1 id="section-4">3.4.1</h1>
 <ul>
 <li>Important Fixes
 <ul>
@@ -153,7 +164,7 @@ font-weight: 400;
 <li>Fixed the error display for unauthorized resources when using custom headers</li>
 </ul></li>
 </ul>
-<h1 id="section-4">3.4</h1>
+<h1 id="section-5">3.4</h1>
 <ul>
 <li>Highlights
 <ul>
@@ -189,14 +200,14 @@ font-weight: 400;
 <li>Recommended: Upgrade LicenseServer to 22.1</li>
 </ul></li>
 </ul>
-<h1 id="section-5">3.3.4</h1>
+<h1 id="section-6">3.3.4</h1>
 <ul>
 <li>Important Fixes
 <ul>
 <li>Fixed an issue with the storage of 3DSpaces after the restart of specific containers</li>
 </ul></li>
 </ul>
-<h1 id="section-6">3.3.3</h1>
+<h1 id="section-7">3.3.3</h1>
 <ul>
 <li>Important Fixes
 <ul>
@@ -208,7 +219,7 @@ font-weight: 400;
 <li>Fixed issue where webvis config smallfeatureculling settings are not propagated correctly</li>
 </ul></li>
 </ul>
-<h1 id="section-7">3.3.2</h1>
+<h1 id="section-8">3.3.2</h1>
 <ul>
 <li>Updates
 <ul>
@@ -224,7 +235,7 @@ font-weight: 400;
 <li>Update LicenseServer</li>
 </ul></li>
 </ul>
-<h1 id="section-8">3.3.1</h1>
+<h1 id="section-9">3.3.1</h1>
 <ul>
 <li>Important Fixes
 <ul>
@@ -238,7 +249,7 @@ font-weight: 400;
 <li>Update LicenseServer</li>
 </ul></li>
 </ul>
-<h1 id="section-9">3.3</h1>
+<h1 id="section-10">3.3</h1>
 <ul>
 <li>Highlights
 <ul>
@@ -278,7 +289,7 @@ font-weight: 400;
 <li>Clear Cache</li>
 </ul></li>
 </ul>
-<h1 id="section-10">3.2.1</h1>
+<h1 id="section-11">3.2.1</h1>
 <ul>
 <li>Important Changes
 <ul>
@@ -293,7 +304,7 @@ font-weight: 400;
 <li>Fixed an issue with parsing Content-Disposition with encoding flags</li>
 </ul></li>
 </ul>
-<h1 id="section-11">3.2</h1>
+<h1 id="section-12">3.2</h1>
 <ul>
 <li>Focus Topic
 <ul>
@@ -328,7 +339,7 @@ font-weight: 400;
 <li>Clear Cache</li>
 </ul></li>
 </ul>
-<h1 id="section-12">3.1</h1>
+<h1 id="section-13">3.1</h1>
 <ul>
 <li>Focus Topic
 <ul>
@@ -369,7 +380,7 @@ font-weight: 400;
 <li>Data Gateway &amp; Authorization configuration syntax</li>
 </ul></li>
 </ul>
-<h1 id="section-13">3.0</h1>
+<h1 id="section-14">3.0</h1>
 <p>Welcome to instant3Dhub Version 3! This version is a major overhaul of the core system for cloud-native, containerized environments. We are also switching to a new release model. For more information visit the<a href="https://www.threedy.io/blog/instant3dhub-release-3-0">public announcement</a>.</p>
 </body>
 </html>
--- a/instant3Dhub_changelog.md
+++ b/instant3Dhub_changelog.md
+# 3.5.1
+
+- Important Fixes
+    - Fixed an XSS vulnerability with property synchronization
+    - Fixed incorrect rendering of HTML annotations
+    - Fixed distribution of header/cookie forwarding settings to all services
+    - Fixed an issue with the update of sharedsession service logs in the admin UI
+    - Fixed incorrect caching of the splash page
+
+
 # 3.5

 - Updates

--- a/oss-licenses.md
+++ b/oss-licenses.md
 # instant3Dhub Open Source Software (OSS) Licenses
-*Date: 21. July 2022*
+*Date: 17. August 2022*
 ## 1. Open Source Software Licenses
 ### 1.1 Apache License, Version 2.0 [Apache-2.0]
 ### 1.1.1 License Text

--- a/version
+++ b/version
-#Thu Jul 21 07:32:23 UTC 2022
-export VERSION_NAME=3.5.0
-export IMAGE_TAG=847b4f716b1e750d3b3cf88ea03dc6b8
+#Wed Aug 17 09:49:48 UTC 2022
+export VERSION_NAME=3.5.1
+export IMAGE_TAG=1670dd2208a1613b791e7a6d237c2db3
 export CONSUMER_ARVIDAPIXI_HASH=d6e2644beab7212cc302b6a4d4759a523117c582
-export CONSUMER_ARVIDAPIXI_REF=master
-export CONSUMER_ARVIDAPIXI_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_ARVIDAPIXI_REF=3.5.x
+export CONSUMER_ARVIDAPIXI_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_SENLIN_HASH=76554bbc6812b82a9e2e7333562e1ddb8d7a9cb2
-export CONSUMER_SENLIN_REF=master
-export CONSUMER_SENLIN_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_SENLIN_REF=3.5.x
+export CONSUMER_SENLIN_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_SENLINL3D_HASH=806a00e3a2382858be3dfd04aca0c19e50b24e0b
-export CONSUMER_SENLINL3D_REF=master
-export CONSUMER_SENLINL3D_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_SENLINL3D_REF=3.5.x
+export CONSUMER_SENLINL3D_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_CIBUILD_HASH=24971741c78ea73c3bc8157fb1e813c5de6e8ce6
-export CONSUMER_CIBUILD_REF=master
-export CONSUMER_CIBUILD_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_CIBUILD_REF=3.5.x
+export CONSUMER_CIBUILD_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_AR_HASH=de1cd90cc31a7f09bf3ddd49ec793de3aeb2089a
-export CONSUMER_AR_REF=master
-export CONSUMER_AR_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_AR_REF=3.5.x
+export CONSUMER_AR_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_GEOMETRIC_HASH=6fb26b719b075d5b2f95abffdb21f6cefea12978
-export CONSUMER_GEOMETRIC_REF=master
-export CONSUMER_GEOMETRIC_TAG=dc659d714f9a845dcc9a1355b7a12b83
+export CONSUMER_GEOMETRIC_REF=3.5.x
+export CONSUMER_GEOMETRIC_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
 export CONSUMER_FLATBUFFER_HASH=7bdb9d9183ce104c3ae4924aacf2cc879f629b67
-export CONSUMER_FLATBUFFER_REF=master
-export CONSUMER_FLATBUFFER_TAG=dc659d714f9a845dcc9a1355b7a12b83
-export CONSUMER_TAG=068f5b85536bb8b8761fd35c8fa78ac8
-export WEBVIS_HASH=ce806ae49c8e87c807bbbdf77a731ee789497fdc
-export WEBVIS_REF=master
-export WEBVIS_TAG=8070f9e0dcb7d496eb2b7c061144bc16
-export GENERATORS_HASH=37b1a13d38134901be3380f33371ac17c89d6ef3
-export GENERATORS_REF=master
-export GENERATORS_TAG=b7609c5cfde7e7a8faf2f69001664115
-export MICROSERVICES_HASH=2cbd612ad918c8ff7c37d1cca0a89073cd9ad36f
-export MICROSERVICES_REF=master
-export MICROSERVICES_TAG=ebc049a7ead98b0063816e12f749621b
+export CONSUMER_FLATBUFFER_REF=3.5.x
+export CONSUMER_FLATBUFFER_TAG=2b9a3f7c2b9d2c254c89535357ad3ddf
+export CONSUMER_TAG=efc51b7094ccd2de802002e5f2844b41
+export WEBVIS_HASH=cdde1bad0bbdcd314a36d2c9e7a7059360485e2c
+export WEBVIS_REF=3.5.x
+export WEBVIS_TAG=b06b2d3da4b92cad18ad46ac3189e626
+export GENERATORS_HASH=c8566048833768cc2964bf52057013bdbc49d653
+export GENERATORS_REF=3.5.x
+export GENERATORS_TAG=71609e3cbe0a6acc2eb95d6107ba84fa
+export MICROSERVICES_HASH=9e360f4cc271b436285c4d75e845fa22fa249d05
+export MICROSERVICES_REF=3.5.x
+export MICROSERVICES_TAG=20427ec244a7dde4c8c84a348ece70bc
 export EXTERNALLIBRARIES_HASH=40c2ae82ee838931439a08e60d7a6e8bf5240e1e
-export EXTERNALLIBRARIES_REF=master
+export EXTERNALLIBRARIES_REF=3.5.x
 export EXTERNALLIBRARIES_TAG=fd7adf9b0e08a84817d9bc4940104fe1
 export INTERNALEXTLIBS_HASH=d6991d5eb606239f6bcae7ad38ee2a65d8585188
-export INTERNALEXTLIBS_REF=master
+export INTERNALEXTLIBS_REF=3.5.x
 export INTERNALEXTLIBS_TAG=bf77377733e913872e90dd93b5c5a072
-export DEPLOY_HASH=dd791173b56d15e1e5770bfdf40fa3b26472513d
-export DEPLOY_REF=master
-export DEPLOY_TAG=847b4f716b1e750d3b3cf88ea03dc6b8
+export DEPLOY_HASH=7dabe210ac9677e4435a9d38e0b173192fbe72b9
+export DEPLOY_REF=3.5.x
+export DEPLOY_TAG=1670dd2208a1613b791e7a6d237c2db3
 export CPACK_HASH=b8bcb191df0dc51208b0ae529fa9e0e2ec480b0b
-export CPACK_REF=master
-export CPACK_TAG=041983e1ce0a175fb6acda78b765e4ee
+export CPACK_REF=3.5.x
+export CPACK_TAG=0a800a616e743352219f63655b7d9a07
 export SESSIONHANDLER_HASH=4fe9275495805569a07ba181e51427fdaaf26f04
-export SESSIONHANDLER_REF=master
+export SESSIONHANDLER_REF=3.5.x
 export SESSIONHANDLER_TAG=9ec85bbb23da00ff31010f3a0e5a9304
 export JXVIS_HASH=6e097c26fad839771c3d16d456d6164a8627de8d
-export JXVIS_REF=master
+export JXVIS_REF=3.5.x
 export JXVIS_TAG=5b3f73e9c3c0eda41f0487515e4bfbc7
-export CHANGELOG_HASH=796f9d7f838c3d76c65c9ba746756dcfb90cfdba
-export CHANGELOG_REF=master
-export CHANGELOG_TAG=7f586f370dd24d04bb3123a8d45edf15
-export DOCINTEGRATION_HASH=16af278600e554f79b3261a8127e8b7644b9af62
-export DOCINTEGRATION_REF=master
-export DOCINTEGRATION_TAG=467d20a1f4796ac53de2882c32ac2f0f
+export CHANGELOG_HASH=87ff70cc379598a82f4e6fdb2f68f140d1a6009c
+export CHANGELOG_REF=3.5.x
+export CHANGELOG_TAG=5a8462907ccf9de7953c2fa985ca787b
+export DOCINTEGRATION_HASH=dcc28585d466a41cd68e07f565b5b7b28a1ea647
+export DOCINTEGRATION_REF=3.5.x
+export DOCINTEGRATION_TAG=0aa734a35ee1df1c235efd002038d488
 export DOCPORTAL_HASH=046f14d7f9841b1efb7e02cd29d31a2802d388a1
-export DOCPORTAL_REF=master
+export DOCPORTAL_REF=3.5.x
 export DOCPORTAL_TAG=000d01c22959052651f04df114ae81d5
 export ADMINUI_HASH=bfa57314df73f4ce4e8b9acba45c26b137123b2d
-export ADMINUI_REF=master
+export ADMINUI_REF=3.5.x
 export ADMINUI_TAG=ccd5ea3d28088a59ce3033eb39c4e1bc
 export UPLOADSERVICE_HASH=127e893299bcae557969b9ce79ad230b2718cd63
-export UPLOADSERVICE_REF=master
+export UPLOADSERVICE_REF=3.5.x
 export UPLOADSERVICE_TAG=e4359a2d0a3cf1434198a429f90863a8