Minor cleanup and formatting.

center-for-threat-informed-defense · Jan 24, 2024 · d721767 · d721767
1 parent 225273b
commit d721767
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 77 deletions.
diff --git a/app/controllers/software-controller.js b/app/controllers/software-controller.js
@@ -2,7 +2,7 @@
 
 const softwareService = require('../services/software-service');
 const logger = require('../lib/logger');
-const { DuplicateIdError, BadlyFormattedParameterError, InvalidQueryStringParameterError, MissingPropertyError, PropertyNotAllowedError } = require('../exceptions');
+const { DuplicateIdError, BadlyFormattedParameterError, InvalidQueryStringParameterError, PropertyNotAllowedError } = require('../exceptions');
 
 exports.retrieveAll = async function(req, res) {
     const options = {
@@ -113,10 +113,6 @@ exports.create = async function(req, res) {
             logger.warn("Duplicate stix.id and stix.modified");
             return res.status(409).send('Unable to create software. Duplicate stix.id and stix.modified properties.');
         }
-        else if (err instanceof MissingPropertyError) {
-            logger.warn(`Unable to create software, missing property ${ err.propertyName }`);
-            return res.status(400).send(`Unable to create software, missing property ${ err.propertyName }`);
-        }
         else if (err instanceof PropertyNotAllowedError) {
             logger.warn(`Unable to create software, property ${ err.propertyName } is not allowed`);
             return res.status(400).send(`Unable to create software, property ${ err.propertyName } is not allowed`);

diff --git a/app/exceptions/index.js b/app/exceptions/index.js
@@ -87,12 +87,6 @@ class NotImplementedError extends CustomError {
     }
 }
 
-class MissingPropertyError extends CustomError {
-    constructor(propertyName, options) {
-        super(`Unable to create software, missing property ${propertyName}`, options);
-    }
-}
-
 class PropertyNotAllowedError extends CustomError {
     constructor(propertyName, options) {
         super(`Unable to create software, property ${propertyName} is not allowed`, options);
@@ -126,8 +120,6 @@ module.exports = {
     IdentityServiceError,
     TechniquesServiceError,
     TacticsServiceError,
-
-    MissingPropertyError,
     PropertyNotAllowedError,
 
     InvalidTypeError,

diff --git a/app/repository/software-repository.js b/app/repository/software-repository.js
@@ -3,8 +3,6 @@
 const BaseRepository = require('./_base.repository');
 const Software = require('../models/software-model');
 
-class SoftwareRepository extends BaseRepository {
-
-}
+class SoftwareRepository extends BaseRepository { }
 
 module.exports = new SoftwareRepository(Software);
diff --git a/app/services/_base.service.js b/app/services/_base.service.js
@@ -238,11 +238,9 @@ class BaseService extends AbstractService {
             callback = arguments[arguments.length - 1];
         }
 
-
         if (data?.stix?.type !== this.type) {
             throw new InvalidTypeError();
         }
-
 
         // eslint-disable-next-line no-useless-catch
         try {

diff --git a/app/services/software-service.js b/app/services/software-service.js
@@ -5,81 +5,84 @@ const systemConfigurationService = require('./system-configuration-service');
 const attackObjectsService = require('./attack-objects-service');
 const config = require('../config/config');
 
-const { PropertyNotAllowedError} = require('../exceptions');
+const { PropertyNotAllowedError, InvalidTypeError } = require('../exceptions');
 
 const BaseService = require('./_base.service');
-const SoftwareRepository = require('../repository/software-repository');
+const softwareRepository = require('../repository/software-repository');
 
 class SoftwareService extends BaseService {
-
     async create(data, options, callback) {
         // This function handles two use cases:
         //   1. This is a completely new object. Create a new object and generate the stix.id if not already
         //      provided. Set both stix.created_by_ref and stix.x_mitre_modified_by_ref to the organization identity.
         //   2. This is a new version of an existing object. Create a new object with the specified id.
         //      Set stix.x_mitre_modified_by_ref to the organization identity.
-    
+
         // is_family defaults to true for malware, not allowed for tools
-    try {
-        if (data.stix && data.stix.type === 'malware' && typeof data.stix.is_family !== 'boolean') {
-            data.stix.is_family = true;
-        }
-        else if (data.stix && data.stix.type === 'tool' && data.stix.is_family !== undefined) {
-            throw new PropertyNotAllowedError;
-        }
+        try {
+            if (data?.stix?.type !== 'malware' && data?.stix?.type !== 'tool') {
+                throw new InvalidTypeError();
+            }
 
-        options = options || {};
-        if (!options.import) {
-            // Set the ATT&CK Spec Version
-            data.stix.x_mitre_attack_spec_version = data.stix.x_mitre_attack_spec_version ?? config.app.attackSpecVersion;
-
-            // Record the user account that created the object
-            if (options.userAccountId) {
-                data.workspace.workflow.created_by_user_account = options.userAccountId;
+            if (data.stix && data.stix.type === 'malware' && typeof data.stix.is_family !== 'boolean') {
+                data.stix.is_family = true;
+            }
+            else if (data.stix && data.stix.type === 'tool' && data.stix.is_family !== undefined) {
+                throw new PropertyNotAllowedError();
             }
 
-            // Set the default marking definitions
-            await attackObjectsService.setDefaultMarkingDefinitions(data);
+            options = options || {};
+            if (!options.import) {
+                // Set the ATT&CK Spec Version
+                data.stix.x_mitre_attack_spec_version = data.stix.x_mitre_attack_spec_version ?? config.app.attackSpecVersion;
 
-            // Get the organization identity
-            const organizationIdentityRef = await systemConfigurationService.retrieveOrganizationIdentityRef();
-
-          // Check for an existing object
-          let existingObject;
-          if (data.stix.id) {
-              existingObject = await this.repository.retrieveOneById(data.stix.id);
-          }
+                // Record the user account that created the object
+                if (options.userAccountId) {
+                    data.workspace.workflow.created_by_user_account = options.userAccountId;
+                }
 
-          if (existingObject) {
-              // New version of an existing object
-              // Only set the x_mitre_modified_by_ref property
-              data.stix.x_mitre_modified_by_ref = organizationIdentityRef;
-          }
-          else {
-              // New object
-              // Assign a new STIX id if not already provided
-              if (!data.stix.id) {
-                  // const stixIdPrefix = getStixIdPrefixFromModel(this.model.modelName, data.stix.type);
-                  data.stix.id = `${data.stix.type}--${uuid.v4()}`;
-              }
+                // Set the default marking definitions
+                await attackObjectsService.setDefaultMarkingDefinitions(data);
 
-              // Set the created_by_ref and x_mitre_modified_by_ref properties
-              data.stix.created_by_ref = organizationIdentityRef;
-              data.stix.x_mitre_modified_by_ref = organizationIdentityRef;
-          }
-      }
-      const res = await this.repository.save(data);
-      if (callback) {
-          return callback(null, res);
-      }
-      return res;
-  } catch (err) {
-      if (callback) {
-          return callback(err);
-      }
-      throw err;
-  }
-}
+                // Get the organization identity
+                const organizationIdentityRef = await systemConfigurationService.retrieveOrganizationIdentityRef();
+
+                // Check for an existing object
+                let existingObject;
+                if (data.stix.id) {
+                    existingObject = await this.repository.retrieveOneById(data.stix.id);
+                }
+
+                if (existingObject) {
+                    // New version of an existing object
+                    // Only set the x_mitre_modified_by_ref property
+                    data.stix.x_mitre_modified_by_ref = organizationIdentityRef;
+                }
+                else {
+                    // New object
+                    // Assign a new STIX id if not already provided
+                    if (!data.stix.id) {
+                        // const stixIdPrefix = getStixIdPrefixFromModel(this.model.modelName, data.stix.type);
+                        data.stix.id = `${data.stix.type}--${uuid.v4()}`;
+                    }
+
+                    // Set the created_by_ref and x_mitre_modified_by_ref properties
+                    data.stix.created_by_ref = organizationIdentityRef;
+                    data.stix.x_mitre_modified_by_ref = organizationIdentityRef;
+                }
+            }
+            const res = await this.repository.save(data);
+            if (callback) {
+                return callback(null, res);
+            }
+            return res;
+        } catch (err) {
+            if (callback) {
+                return callback(err);
+            }
+            throw err;
+        }
+    }
 }
 
-module.exports = new SoftwareService(null, SoftwareRepository);
+module.exports = new SoftwareService(null, softwareRepository);