Coalesce nullable string values in usage data to "NULL" strings

elastic · Apr 19, 2021 · a501b8c · a501b8c
1 parent ec84e09
commit a501b8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -191,7 +191,7 @@ describe('CoreUsageDataService', () => {
                   "disableEmbedding": false,
                   "permissionsPolicyConfigured": false,
                   "referrerPolicy": "no-referrer-when-downgrade",
-                  "strictTransportSecurity": null,
+                  "strictTransportSecurity": "NULL",
                   "xContentTypeOptions": "nosniff",
                 },
                 "socketTimeout": 120000,

diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -226,9 +226,10 @@ export class CoreUsageDataService implements CoreService<CoreUsageDataSetup, Cor
             truststoreConfigured: isConfigured.record(http.ssl.truststore),
           },
           securityResponseHeaders: {
-            strictTransportSecurity: http.securityResponseHeaders.strictTransportSecurity,
-            xContentTypeOptions: http.securityResponseHeaders.xContentTypeOptions,
-            referrerPolicy: http.securityResponseHeaders.referrerPolicy,
+            // ES does not index `null` and it cannot be searched, so we coalesce these to string values instead
+            strictTransportSecurity: http.securityResponseHeaders.strictTransportSecurity ?? 'NULL',
+            xContentTypeOptions: http.securityResponseHeaders.xContentTypeOptions ?? 'NULL',
+            referrerPolicy: http.securityResponseHeaders.referrerPolicy ?? 'NULL',
             permissionsPolicyConfigured: isConfigured.string(
               http.securityResponseHeaders.permissionsPolicy ?? undefined
             ),

diff --git a/src/core/server/core_usage_data/types.ts b/src/core/server/core_usage_data/types.ts
@@ -213,9 +213,9 @@ export interface CoreConfigUsageData {
       clientAuthentication: 'none' | 'optional' | 'required';
     };
     securityResponseHeaders: {
-      strictTransportSecurity: string | null;
-      xContentTypeOptions: string | null;
-      referrerPolicy: string | null;
+      strictTransportSecurity: string;
+      xContentTypeOptions: string;
+      referrerPolicy: string;
       permissionsPolicyConfigured: boolean;
       disableEmbedding: boolean;
     };