validte API req

x-pack/plugins/uptime/common/translations.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const VALUE_MUST_BE_GREATER_THEN_ZEO = i18n.translate(
+  'xpack.uptime.settings.invalid.error',
+  {
+    defaultMessage: 'Value must be greater than 0.',
+  }
+);

x-pack/plugins/uptime/public/pages/settings.tsx

@@ -32,6 +32,7 @@ import {
   OnFieldChangeType,
 } from '../components/settings/certificate_form';
 import * as Translations from './translations';
+import { VALUE_MUST_BE_GREATER_THEN_ZEO } from '../../common/translations';
 
 interface SettingsPageFieldErrors {
   heartbeatIndices: string | '';
@@ -52,7 +53,7 @@ const isValidCertVal = (val: string | number) => {
     return Translations.BLANK_STR;
   }
   if (val === 0) {
-    return Translations.VALID_STR;
+    return VALUE_MUST_BE_GREATER_THEN_ZEO;
   }
 };
 

x-pack/plugins/uptime/public/pages/translations.ts

@@ -40,7 +40,3 @@ export const settings = {
 export const BLANK_STR = i18n.translate('xpack.uptime.settings.blank.error', {
   defaultMessage: 'May not be blank.',
 });
-
-export const VALID_STR = i18n.translate('xpack.uptime.settings.invalid.error', {
-  defaultMessage: 'Not a valid value.',
-});

x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts

@@ -11,6 +11,7 @@ import { UMServerLibs } from '../lib/lib';
 import { DynamicSettings, DynamicSettingsType } from '../../common/runtime_types';
 import { UMRestApiRouteFactory } from '.';
 import { savedObjectsAdapter } from '../lib/saved_objects';
+import { VALUE_MUST_BE_GREATER_THEN_ZEO } from '../../common/translations';
 
 export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
@@ -23,19 +24,35 @@ export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSer
   },
 });
 
+const validateCertsValues = (settings: DynamicSettings) => {
+  const errors: any = {};
+  if (settings.certAgeThreshold <= 0) {
+    errors.certAgeThreshold = VALUE_MUST_BE_GREATER_THEN_ZEO;
+  }
+  if (settings.certExpirationThreshold <= 0) {
+    errors.certExpirationThreshold = VALUE_MUST_BE_GREATER_THEN_ZEO;
+  }
+  if (errors.certAgeThreshold || errors.certExpirationThreshold) {
+    return errors;
+  }
+};
+
 export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'POST',
   path: '/api/uptime/dynamic_settings',
   validate: {
-    body: schema.object({}, { unknowns: 'allow' }),
+    body: schema.object({
+      heartbeatIndices: schema.string(),
+      certAgeThreshold: schema.number(),
+      certExpirationThreshold: schema.number(),
+    }),
   },
   writeAccess: true,
-  options: {
-    tags: ['access:uptime-write'],
-  },
   handler: async ({ savedObjectsClient }, _context, request, response): Promise<any> => {
     const decoded = DynamicSettingsType.decode(request.body);
-    if (isRight(decoded)) {
+    const certThresholdErrors = validateCertsValues(request.body as DynamicSettings);
+
+    if (isRight(decoded) && !certThresholdErrors) {
       const newSettings: DynamicSettings = decoded.right;
       await savedObjectsAdapter.setUptimeDynamicSettings(savedObjectsClient, newSettings);
 
@@ -47,7 +64,7 @@ export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSe
     } else {
       const error = PathReporter.report(decoded).join(', ');
       return response.badRequest({
-        body: error,
+        body: JSON.stringify(certThresholdErrors) || error,
       });
     }
   },