Merge pull request #15 from minvws/bug/minor-fixes

Allow to override version_url and validate if env is allowed

Author: gerbrand-bosch

public/check_status.php

@@ -24,6 +24,8 @@
     'ca' => $_ENV['MTLS_CA'] ?: null
 ];
 
+$env = $_ENV['SERVICES_ENVIRONMENT']  ?: null;
+
 // Get requested Service
 if (!isset($_GET['service'])) {
     http_response_code(400);
@@ -38,6 +40,12 @@
     exit;
 }
 
+if (isset($env) && $env !== $_GET['env']) {
+    http_response_code(400);
+    echo json_encode(['error' => 'Environment not allowed']);
+    exit;
+}
+
 $service = get_service(__DIR__ . '/../services.json', $_GET['service'], $_GET['env']);
 if (!$service) {
     http_response_code(400);

public/check_version.php

@@ -22,6 +22,7 @@
     'key' => $_ENV['MTLS_KEY'] ?: null,
     'ca' => $_ENV['MTLS_CA'] ?: null
 ];
+$env = $_ENV['SERVICES_ENVIRONMENT']  ?: null;
 
 // Get requested Service
 if (!isset($_GET['service'])) {
@@ -37,6 +38,12 @@
     exit;
 }
 
+if (isset($env) && $env !== $_GET['env']) {
+    http_response_code(400);
+    echo json_encode(['error' => 'Environment not allowed']);
+    exit;
+}
+
 $service = get_service(__DIR__ . '/../services.json', $_GET['service'], $_GET['env']);
 if (!$service) {
     http_response_code(400);
@@ -45,7 +52,8 @@
 }
 
 // Check cache
-$cacheKey = sha1($service['url']);
+$versionUrl = $service['version_url'] ?? $service['url'];
+$cacheKey = sha1($versionUrl);
 $cachedItem = $cache->getItem($cacheKey);
 
 if ($cachedItem->isHit()) {
@@ -105,11 +113,11 @@ function fetch_version_info(array $service, array $mtls) {
     ]);
     try {
         if(strcmp($service['type'], "HAPI") == 0){
-            $response = $client->get($service['url'] . '/fhir/metadata');
+            $response = $client->get($service['version_url'] ?? $service['url'] . '/fhir/metadata');
             $json = $response->getBody()->getContents();
             return json_decode($json, true)['software'];
         } else {
-            $response = $client->get($service['url'] . '/version.json');
+            $response = $client->get($service['version_url'] ?? $service['url'] . '/version.json');
             $json = $response->getBody()->getContents();
             return json_decode($json, true);
         }

services.json

@@ -22,23 +22,24 @@
       "name": "Adresseringsdienst",
       "url": "https://adressering.test.gf.irealisatie.nl",
       "type": "HAPI",
-      "has_version": false,
+      "has_version": true,
       "description": "The Addressing Service manages the translation between healthcare providers and the endpoints where the metadata can be retrieved."
     },
     {
       "name": "Max (inge6)",
       "url": "https://emax.test.gf.irealisatie.nl",
+      "version_url": "https://emax.test.gf.irealisatie.nl/static/version.json",
       "type": "Python",
       "github": "minvws/nl-rdo-max-private",
-      "has_version": false,
+      "has_version": true,
       "description": "This is the login service, this will provide eHerkenning SAML to OIDC bridge."
     },
     {
       "name": "Documentation",
       "url": "https://fdocs.test.gf.irealisatie.nl",
       "github": "minvws/gfmodules-functional-documentation",
       "type": "Sphinx",
-      "has_version": false,
+      "has_version": true,
       "description": "This is the documentation for the functional aspects of the system."
     },
     {
@@ -52,21 +53,21 @@
       "name": "LMR Noord",
       "url": "https://lmr-noord.test.gf.irealisatie.nl",
       "type": "HAPI",
-      "has_version": false,
+      "has_version": true,
       "description": "HAPI Storage system for LMR Noord."
     },
     {
       "name": "LMR Oost",
       "url": "https://lmr-oost.test.gf.irealisatie.nl",
       "type": "HAPI",
-      "has_version": false,
+      "has_version": true,
       "description": "HAPI Storage system for LMR Oost."
     },
     {
       "name": "LMR Zuid",
       "url": "https://lmr-zuid.test.gf.irealisatie.nl",
       "type": "HAPI",
-      "has_version": false,
+      "has_version": true,
       "description": "HAPI Storage system for LMR Zuid."
     },
     {
@@ -95,7 +96,7 @@
       "name": "MCSD Registratie Portaal",
       "url": "https://mcsd-registratie-portaal.test.gf.irealisatie.nl",
       "github": "",
-      "type": "Python",
+      "type": "PHP",
       "has_version": true
     },
     {
@@ -109,7 +110,7 @@
       "name": "National Referral Index",
       "url": "https://nvi.test.gf.irealisatie.nl",
       "github": "minvws/gfmodules-national-referral-index",
-      "type": "PHP",
+      "type": "Python",
       "has_version": true
     },
     {

templates/index.twig

@@ -136,7 +136,7 @@
                 <tr>
                     <td>{{ service.name }}<br><small>{{ service.description }}</small></td>
                     <td>{{ service.type|default('—') }}</td>
-                    <td><a href="{{ service.external_url }}" target="_blank">{{ service.external_url ?? service.url }}</a></td>
+                    <td><a href="{{ service.external_url ?? service.url }}" target="_blank">{{ service.external_url ?? service.url }}</a></td>
                     <td class="status" data-status-service="{{ service.name }}" data-status-env="{{ env }}">Loading…</td>
                     <td class="version">
                         {% if service.has_version %}