[SIEM] [Detections] Import rules (#56389) (#56562)

* refactor import rules to do it by batch * fix error msg on api to match with json contract * review I * fix export
elastic · Jan 31, 2020 · 7a1eec9 · 7a1eec9
1 parent 927fc42
commit 7a1eec9
Show file tree

Hide file tree

Showing 7 changed files with 288 additions and 184 deletions.
diff --git a/...ges/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap b/...ges/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
diff --git a/...y/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx b/...y/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
@@ -90,6 +90,11 @@ export const ImportRuleModalComponent = ({
     }
   }, [selectedFiles, overwrite]);
 
+  const handleCloseModal = useCallback(() => {
+    setSelectedFiles(null);
+    closeModal();
+  }, [closeModal]);
+
   return (
     <>
       {showModal && (
@@ -125,7 +130,7 @@ export const ImportRuleModalComponent = ({
             </EuiModalBody>
 
             <EuiModalFooter>
-              <EuiButtonEmpty onClick={closeModal}>{i18n.CANCEL_BUTTON}</EuiButtonEmpty>
+              <EuiButtonEmpty onClick={handleCloseModal}>{i18n.CANCEL_BUTTON}</EuiButtonEmpty>
               <EuiButton
                 onClick={importRulesCallback}
                 disabled={selectedFiles == null || isImporting}

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
@@ -39,28 +39,32 @@ export const createExportRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         return headers.response().code(404);
       }
 
-      const exportSizeLimit = server.config().get<number>('savedObjects.maxImportExportSize');
-      if (request.payload?.objects != null && request.payload.objects.length > exportSizeLimit) {
-        return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
-      } else {
-        const nonPackagedRulesCount = await getNonPackagedRulesCount({ alertsClient });
-        if (nonPackagedRulesCount > exportSizeLimit) {
+      try {
+        const exportSizeLimit = server.config().get<number>('savedObjects.maxImportExportSize');
+        if (request.payload?.objects != null && request.payload.objects.length > exportSizeLimit) {
           return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
+        } else {
+          const nonPackagedRulesCount = await getNonPackagedRulesCount({ alertsClient });
+          if (nonPackagedRulesCount > exportSizeLimit) {
+            return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
+          }
         }
-      }
 
-      const exported =
-        request.payload?.objects != null
-          ? await getExportByObjectIds(alertsClient, request.payload.objects)
-          : await getExportAll(alertsClient);
+        const exported =
+          request.payload?.objects != null
+            ? await getExportByObjectIds(alertsClient, request.payload.objects)
+            : await getExportAll(alertsClient);
 
-      const response = request.query.exclude_export_details
-        ? headers.response(exported.rulesNdjson)
-        : headers.response(`${exported.rulesNdjson}${exported.exportDetails}`);
+        const response = request.query.exclude_export_details
+          ? headers.response(exported.rulesNdjson)
+          : headers.response(`${exported.rulesNdjson}${exported.exportDetails}`);
 
-      return response
-        .header('Content-Disposition', `attachment; filename="${request.query.file_name}"`)
-        .header('Content-Type', 'application/ndjson');
+        return response
+          .header('Content-Disposition', `attachment; filename="${request.query.file_name}"`)
+          .header('Content-Type', 'application/ndjson');
+      } catch {
+        return Boom.badRequest(`Sorry, something went wrong to export rules`);
+      }
     },
   };
 };