for 3.9.2

README.md

@@ -12,7 +12,7 @@ run with `docker-compose -f caMicroscope.yml up`
 this will build all services and run in the foreground.
 Use `docker-compose -f caMicroscope.yml build` to rebuild the services.
 
-Once everything is up, go to <the host this is running on>:4010/ to see the landing page.
+Once everything is up, go to http://localhost:4010/ to see the landing page.
 
 ## SSL
 To enable ssl, mount the private key and certificate files to the ca-back service in /root/src/ssl/privatekey.pem and /root/src/ssl/certificate.pem respectively. HTTPS mode will only be enabled if both of these files are present.
@@ -31,9 +31,9 @@ back - security, data, and routing (see https://github.com/camicroscope/caracal)
 back/viewer - within back, viewer files ( see https://github.com/camicroscope/caMicroscope)
 
 ## Configuration
-Logging - Container Logging is, for HIPAA reasons, disabled. Feel free to use a different logging engine if desired, especially for development.
+Logging - Logging is enabled by default with a set configurable maximum size. If you need to disable logs, for example due to HIPAA requirements, set the logging driver to none.
 
-See backend and security config notes (here)[https://github.com/camicroscope/caracal]
+See backend and security config notes [here](https://github.com/camicroscope/caracal).
 
 Image Volume - This is, by default, the images directory in this directory. If this is changed, please make the same change across all impacted services.
 

caMicroscope.yml

@@ -27,9 +27,9 @@ services:
       - mongo
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.9.1"
+      context: "https://github.com/camicroscope/caracal.git#v3.9.2"
       args:
-        viewer: "v3.9.1"
+        viewer: "v3.9.2"
     depends_on:
       - "mongo"
     ports:
@@ -44,6 +44,8 @@ services:
       - ./config/#.html:/src/static/#.html
       - ./jwt_keys/:/src/keys/
       - ./config/routes.json:/src/routes.json
+      - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json
+      - ./config/additional_links.json:/src/static/additional_links.json
     environment:
       JWK_URL: "https://www.googleapis.com/oauth2/v3/certs"
       IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi"
@@ -59,7 +61,7 @@ services:
     volumes:
       - ./images/:/images/
   loader:
-    build: "https://github.com/camicroscope/SlideLoader.git#v3.9.0"
+    build: "https://github.com/camicroscope/SlideLoader.git#v3.9.2"
     container_name: ca-load
     restart: always
     logging:

config/additional_links.json

@@ -0,0 +1,8 @@
+[
+    {
+        "displayName":"Bug Report",
+        "url":"https://goo.gl/forms/mgyhx4ADH0UuEQJ53",
+        "icon": "bug_report",
+        "openInNewTab": true
+    }
+]

config/contentSecurityPolicy.json

@@ -0,0 +1,39 @@
+{
+  "defaultSrc": [
+  "'self'"
+],
+"scriptSrc": [
+  "'self'",
+  "'unsafe-inline'",
+  "'unsafe-eval'",
+  "code.jquery.com",
+  "stackpath.bootstrapcdn.com",
+  "apis.google.com",
+  "ajax.googleapis.com",
+  "cdn.jsdelivr.net",
+  "unpkg.com",
+  "http://openseadragon.github.io"
+],
+"styleSrc": [
+  "'self'",
+  "'unsafe-inline'",
+  "fonts.googleapis.com",
+  "use.fontawesome.com",
+  "stackpath.bootstrapcdn.com",
+  "cdnjs.cloudflare.com"
+],
+"fontSrc": [
+  "'self'",
+  "use.fontawesome.com",
+  "fonts.gstatic.com",
+  "cdnjs.cloudflare.com"
+],
+"imgSrc": [
+  "'self'"
+],
+"frameSrc": [
+ "'self'",
+ "accounts.google.com"
+]
+}
+

config/#.html

@@ -34,7 +34,7 @@ <h2 style="margin:0;">caMicroscope</h2>
       <div class="posts" style="justify-content: center;">
         <!-- Organizer -->
         <section class="post">
-            <a href="../table.html" class="image"><img src="./apps/landing/camic.jpg" alt=""/></a>
+          <a href="#" class="image"><img src="./apps/landing/camic.jpg" alt=""/></a>
             <div class="content">
                 <h3>Please # With Your Google Account</h3>
                 <div id="google-signin2"></div>

develop.yml

@@ -31,6 +31,8 @@ services:
       - ./config/#.html:/src/static/#.html
       - ./jwt_keys/:/src/keys/
       - ./config/routes.json:/src/routes.json
+      - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json
+      - ./config/additional_links.json:/src/static/additional_links.json
     environment:
       JWK_URL: "https://www.googleapis.com/oauth2/v3/certs"
       IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi"

dh_caMicroscope.yml

@@ -33,6 +33,7 @@ services:
       - ./config/#.html:/src/static/#.html
       - ./jwt_keys/:/src/keys/
       - ./config/routes.json:/src/routes.json
+      - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json
   iip:
     image: camicroscope/iipimage:latest
     container_name: ca-iip

quip-pathdb.yml

@@ -26,9 +26,9 @@ services:
       - ./images/:/data/images/
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.9.1"
+      context: "https://github.com/camicroscope/caracal.git#v3.9.2"
       args:
-        viewer: "v3.9.1"
+        viewer: "v3.9.2"
     depends_on:
       - "mongo"
     ports:
@@ -43,11 +43,12 @@ services:
       MONGO_URI: "mongodb://ca-mongo"
       DEFAULT_USER_TYPE: "Editor"
       DISABLE_SEC: "true"
+      DISABLE_CSP: "true"
   pathdb:
     build:
-      context: "https://github.com/SBU-BMI/PathDB.git#1.4.1"
+      context: "https://github.com/SBU-BMI/PathDB.git#1.6.1"
       args:
-        viewer: "v3.9.1"
+        viewer: "v3.9.2"
     container_name: quip-pathdb
     restart: unless-stopped
     ports: ["443:443","80:80"]