Updated Validator to support Websockets.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

compas/docker-compose-basex.yml

@@ -40,6 +40,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-scl-data-service:0.9.4-basex"
+    ports:
+      - "9090:8080"
     environment:
       - BASEX_HOST=basex
       - BASEX_PORT=1984
@@ -68,6 +70,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-cim-mapping:0.8.4"
+    ports:
+      - "9091:8080"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -90,6 +94,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-scl-auto-alignment:0.2.2"
+    ports:
+      - "9092:8080"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -111,7 +117,7 @@ services:
   scl-validator:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-validator:0.1.2"
+    image: "lfenergy/compas-scl-validator:0.1.3"
     ports:
       - "9093:8080"
     environment:
@@ -138,7 +144,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.13.0.0"
+    image: "lfenergy/compas-open-scd:v0.13.0.2"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

compas/docker-compose-postgresql.yml

@@ -47,6 +47,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-scl-data-service:0.9.4-postgresql"
+    ports:
+      - "9090:8080"
     environment:
       - POSTGRESQL_HOST=postgresql
       - POSTGRESQL_DB=compas
@@ -75,6 +77,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-cim-mapping:0.8.4"
+    ports:
+      - "9091:8080"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -97,6 +101,8 @@ services:
     labels:
       compas: true
     image: "lfenergy/compas-scl-auto-alignment:0.2.2"
+    ports:
+      - "9092:8080"
     environment:
       - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
       - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -118,7 +124,7 @@ services:
   scl-validator:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-validator:0.1.2"
+    image: "lfenergy/compas-scl-validator:0.1.3"
     ports:
       - "9093:8080"
     environment:
@@ -145,7 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.13.0.0"
+    image: "lfenergy/compas-open-scd:v0.13.0.2"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

compas/reverse-proxy/nginx.conf

@@ -126,10 +126,33 @@ http {
        proxy_redirect off;
      }
 
-     # Forwarding to the SCL Auto Alignment Service container.
+     # Forwarding to the SCL Validator Service container (websockets).
+     location /compas-scl-validator/validate-ws/ {
+       include /etc/nginx/include/authenticate.include;
+
+       proxy_http_version 1.1;
+       proxy_set_header Upgrade           $http_upgrade;
+       proxy_set_header Connection        "Upgrade";
+       proxy_set_header Host              $host;
+
+       proxy_set_header X-Real-IP         $remote_addr;
+       proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+       proxy_set_header X-Forwarded-Proto $scheme;
+       proxy_set_header X-Forwarded-Port  $server_port;
+       proxy_set_header Authorization     "Bearer ${access_token}";
+
+       # Added Header back to browser to get JWT Content for Debugging, should not do this in production.
+       add_header X-Debug-Bearer "Bearer ${access_token}" always;
+
+       proxy_pass http://scl-validator:8080/compas-scl-validator/validate-ws/;
+     }
+
+     # Forwarding to the SCL Validator Service container (http).
      location /compas-scl-validator/ {
        include /etc/nginx/include/authenticate.include;
 
+       proxy_set_header Host              $http_host;
+
        proxy_set_header X-Real-IP         $remote_addr;
        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
@@ -141,7 +164,6 @@ http {
 
        proxy_pass http://scl-validator:8080/compas-scl-validator/;
 
-       proxy_set_header Host $http_host;
        proxy_cache_bypass $http_upgrade;
        proxy_redirect off;
      }

integration-testing/TestSuite005-validator.robot

@@ -17,7 +17,7 @@ Execute SCL Validator
 
 *** Test Cases ***
 TestCase005-01
-    [Documentation]     Execute the SCL Validator for a Simple Configuration.
+    [Documentation]     Execute the SCL Validator (Websockets) with OCL Validation Errros.
     Set Test Variable   ${sclname}  SingleSubstation
     Set Test Variable   ${scltype}  SCD
 
@@ -32,7 +32,7 @@ TestCase005-01
     Get Element Count   mwc-dialog#diagnostic > filtered-list > abbr                          ==   332
 
 TestCase005-02
-    [Documentation]     Execute the SCL Validator for XSD Errors.
+    [Documentation]     Execute the SCL Validator (Websockets) with XSD Validation Errors.
     Set Test Variable   ${sclname}  XsdValidationErrors
     Set Test Variable   ${scltype}  SCD