Merge branch 'master' of github.com:oasis-open/cti-python-stix2

stix2/datastore/__init__.py

@@ -420,7 +420,7 @@ class CompositeDataSource(DataSource):
     """Controller for all the attached DataSources.
 
     A user can have a single CompositeDataSource as an interface
-    the a set of DataSources. When an API call is made to the
+    to a set of DataSources. When an API call is made to the
     CompositeDataSource, it is delegated to each of the (real)
     DataSources that are attached to it.
 

stix2/test/v20/constants.py

@@ -50,7 +50,7 @@
 CAMPAIGN_MORE_KWARGS = dict(
     type='campaign',
     id=CAMPAIGN_ID,
-    created_by_ref="identity--f431f809-377b-45e0-aa1c-6a4751cae5ff",
+    created_by_ref=IDENTITY_ID,
     created="2016-04-06T20:03:00.000Z",
     modified="2016-04-06T20:03:00.000Z",
     name="Green Group Attacks Against Finance",

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--0a3ead4e-6d47-4ccb-854c-a6a4f9d96b22/20170531213019735010.json

@@ -2,7 +2,7 @@
     "id": "bundle--f68640b4-0cdc-42ae-b176-def1754a1ea0",
     "objects": [
         {
-            "created": "2017-05-31T21:30:19.73501Z",
+            "created": "2017-05-31T21:30:19.735Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Credential dumping is the process of obtaining account login and password information from the operating system and software. Credentials can be used to perform Windows Credential Editor, Mimikatz, and gsecdump. These tools are in use by both professional security testers and adversaries.\n\nPlaintext passwords can be obtained using tools such as Mimikatz to extract passwords stored by the Local Security Authority (LSA). If smart cards are used to authenticate to a domain using a personal identification number (PIN), then that PIN is also cached as a result and may be dumped.Mimikatz access the LSA Subsystem Service (LSASS) process by opening the process, locating the LSA secrets key, and decrypting the sections in memory where credential details are stored. Credential dumpers may also use methods for reflective DLL Injection to reduce potential indicators of malicious activity.\n\nNTLM hash dumpers open the Security Accounts Manager (SAM) on the local file system (%SystemRoot%/system32/config/SAM) or create a dump of the Registry SAM key to access stored account password hashes. Some hash dumpers will open the local file system as a device and parse to the SAM table to avoid file access defenses. Others will make an in-memory copy of the SAM table before reading hashes. Detection of compromised Legitimate Credentials in-use by adversaries may help as well. \n\nOn Windows 8.1 and Windows Server 2012 R2, monitor Windows Logs for LSASS.exe creation to verify that LSASS started as a protected process.\n\nMonitor processes and command-line arguments for program execution that may be indicative of credential dumping. Remote access tools may contain built-in features or incorporate existing tools like Mimikatz. PowerShell scripts also exist that contain credential dumping functionality, such as PowerSploit's Invoke-Mimikatz module,[[Citation: Powersploit]] which may require additional logging features to be configured in the operating system to collect necessary information for analysis.\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: API monitoring, Process command-line parameters, Process monitoring, PowerShell logs",
             "external_references": [
@@ -29,7 +29,7 @@
                     "phase_name": "credential-access"
                 }
             ],
-            "modified": "2017-05-31T21:30:19.73501Z",
+            "modified": "2017-05-31T21:30:19.735Z",
             "name": "Credential Dumping",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--0f20e3cb-245b-4a61-8a91-2d93f7cb0e9b/20170531213026496201.json

@@ -2,7 +2,7 @@
     "id": "bundle--b07d6fd6-7cc5-492d-a1eb-9ba956b329d5",
     "objects": [
         {
-            "created": "2017-05-31T21:30:26.496201Z",
+            "created": "2017-05-31T21:30:26.496Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Rootkits are programs that hide the existence of malware by intercepting and modifying operating system API calls that supply system information. Rootkits or rootkit enabling functionality may reside at the user or kernel level in the operating system or lower, to include a Hypervisor, Master Boot Record, or the Basic Input/Output System.[[Citation: Wikipedia Rootkit]]\n\nAdversaries may use rootkits to hide the presence of programs, files, network connections, services, drivers, and other system components.\n\nDetection: Some rootkit protections may be built into anti-virus or operating system software. There are dedicated rootkit detection tools that look for specific types of rootkit behavior. Monitor for the existence of unrecognized DLLs, devices, services, and changes to the MBR.[[Citation: Wikipedia Rootkit]]\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: BIOS, MBR, System calls",
             "external_references": [
@@ -24,7 +24,7 @@
                     "phase_name": "defense-evasion"
                 }
             ],
-            "modified": "2017-05-31T21:30:26.496201Z",
+            "modified": "2017-05-31T21:30:26.496Z",
             "name": "Rootkit",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--774a3188-6ba9-4dc4-879d-d54ee48a5ce9/20170531213029458940.json

@@ -2,7 +2,7 @@
     "id": "bundle--1a854c96-639e-4771-befb-e7b960a65974",
     "objects": [
         {
-            "created": "2017-05-31T21:30:29.45894Z",
+            "created": "2017-05-31T21:30:29.458Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Data, such as sensitive documents, may be exfiltrated through the use of automated processing or Scripting after being gathered during Exfiltration Over Command and Control Channel and Exfiltration Over Alternative Protocol.\n\nDetection: Monitor process file access patterns and network behavior. Unrecognized processes or scripts that appear to be traversing file systems and sending network traffic may be suspicious.\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: File monitoring, Process monitoring, Process use of network",
             "external_references": [
@@ -19,7 +19,7 @@
                     "phase_name": "exfiltration"
                 }
             ],
-            "modified": "2017-05-31T21:30:29.45894Z",
+            "modified": "2017-05-31T21:30:29.458Z",
             "name": "Automated Exfiltration",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--7e150503-88e7-4861-866b-ff1ac82c4475/20170531213045139269.json

@@ -2,7 +2,7 @@
     "id": "bundle--33e3e33a-38b8-4a37-9455-5b8c82d3b10a",
     "objects": [
         {
-            "created": "2017-05-31T21:30:45.139269Z",
+            "created": "2017-05-31T21:30:45.139Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Adversaries may attempt to get a listing of network connections to or from the compromised system.\nUtilities and commands that acquire this information include netstat, \"net use,\" and \"net session\" with Net.\n\nDetection: System and network discovery techniques normally occur throughout an operation as an adversary learns the environment. Data and events should not be viewed in isolation, but as part of a chain of behavior that could lead to other activities, such as Windows Management Instrumentation and PowerShell.\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: Process command-line parameters, Process monitoring",
             "external_references": [
@@ -19,7 +19,7 @@
                     "phase_name": "discovery"
                 }
             ],
-            "modified": "2017-05-31T21:30:45.139269Z",
+            "modified": "2017-05-31T21:30:45.139Z",
             "name": "Local Network Connections Discovery",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--ae676644-d2d2-41b7-af7e-9bed1b55898c/20170531213041022897.json

@@ -2,7 +2,7 @@
     "id": "bundle--a87938c5-cc1e-4e06-a8a3-b10243ae397d",
     "objects": [
         {
-            "created": "2017-05-31T21:30:41.022897Z",
+            "created": "2017-05-31T21:30:41.022Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Sensitive data can be collected from remote systems via shared network drives (host shared directory, network file server, etc.) that are accessible from the current system prior to cmd may be used to gather information.\n\nDetection: Monitor processes and command-line arguments for actions that could be taken to collect files from a network share. Remote access tools with built-in features may interact directly with the Windows API to gather data. Data may also be acquired through Windows system management tools such as Windows Management Instrumentation and PowerShell.\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: File monitoring, Process monitoring, Process command-line parameters",
             "external_references": [
@@ -19,7 +19,7 @@
                     "phase_name": "collection"
                 }
             ],
-            "modified": "2017-05-31T21:30:41.022897Z",
+            "modified": "2017-05-31T21:30:41.022Z",
             "name": "Data from Network Shared Drive",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/attack-pattern/attack-pattern--b3d682b6-98f2-4fb0-aa3b-b4df007ca70a/20170531213032662702.json

@@ -2,7 +2,7 @@
     "id": "bundle--5ddaeff9-eca7-4094-9e65-4f53da21a444",
     "objects": [
         {
-            "created": "2017-05-31T21:30:32.662702Z",
+            "created": "2017-05-31T21:30:32.662Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Adversaries may attempt to make an executable or file difficult to discover or analyze by encrypting, encoding, or otherwise obfuscating its contents on the system.\n\nDetection: Detection of file obfuscation is difficult unless artifacts are left behind by the obfuscation process that are uniquely detectable with a signature. If detection of the obfuscation itself is not possible, it may be possible to detect the malicious activity that caused the obfuscated file (for example, the method that was used to write, read, or modify the file on the file system).\n\nPlatforms: Windows Server 2003, Windows Server 2008, Windows Server 2012, Windows XP, Windows 7, Windows 8, Windows Server 2003 R2, Windows Server 2008 R2, Windows Server 2012 R2, Windows Vista, Windows 8.1\n\nData Sources: Network protocol analysis, Process use of network, Binary file metadata, File monitoring, Malware reverse engineering",
             "external_references": [
@@ -19,7 +19,7 @@
                     "phase_name": "defense-evasion"
                 }
             ],
-            "modified": "2017-05-31T21:30:32.662702Z",
+            "modified": "2017-05-31T21:30:32.662Z",
             "name": "Obfuscated Files or Information",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/course-of-action/course-of-action--95ddb356-7ba0-4bd9-a889-247262b8946f/20170531213026495974.json

@@ -2,11 +2,11 @@
     "id": "bundle--a42d26fe-c938-4074-a1b3-50d852e6f0bd",
     "objects": [
         {
-            "created": "2017-05-31T21:30:26.495974Z",
+            "created": "2017-05-31T21:30:26.495Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Identify potentially malicious software that may contain rootkit functionality, and audit and/or block it by using whitelisting[[CiteRef::Beechey 2010]] tools, like AppLocker,[[CiteRef::Windows Commands JPCERT]][[CiteRef::NSA MS AppLocker]] or Software Restriction Policies[[CiteRef::Corio 2008]] where appropriate.[[CiteRef::TechNet Applocker vs SRP]]",
             "id": "course-of-action--95ddb356-7ba0-4bd9-a889-247262b8946f",
-            "modified": "2017-05-31T21:30:26.495974Z",
+            "modified": "2017-05-31T21:30:26.495Z",
             "name": "Rootkit Mitigation",
             "type": "course-of-action"
         }

stix2/test/v20/stix2_data/course-of-action/course-of-action--d9727aee-48b8-4fdb-89e2-4c49746ba4dd/20170531213041022744.json

@@ -1,9 +1,9 @@
 {
-    "created": "2017-05-31T21:30:41.022744Z",
+    "created": "2017-05-31T21:30:41.022Z",
     "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
     "description": "Identify unnecessary system utilities or potentially malicious software that may be used to collect data from a network share, and audit and/or block them by using whitelisting[[CiteRef::Beechey 2010]] tools, like AppLocker,[[CiteRef::Windows Commands JPCERT]][[CiteRef::NSA MS AppLocker]] or Software Restriction Policies[[CiteRef::Corio 2008]] where appropriate.[[CiteRef::TechNet Applocker vs SRP]]",
     "id": "course-of-action--d9727aee-48b8-4fdb-89e2-4c49746ba4dd",
-    "modified": "2017-05-31T21:30:41.022744Z",
+    "modified": "2017-05-31T21:30:41.022Z",
     "name": "Data from Network Shared Drive Mitigation",
     "type": "course-of-action"
 }

stix2/test/v20/stix2_data/identity/identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5/20170601000000000000.json

@@ -2,10 +2,10 @@
     "id": "bundle--81884287-2548-47fc-a997-39489ddd5462",
     "objects": [
         {
-            "created": "2017-06-01T00:00:00Z",
+            "created": "2017-06-01T00:00:00.000Z",
             "id": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "identity_class": "organization",
-            "modified": "2017-06-01T00:00:00Z",
+            "modified": "2017-06-01T00:00:00.000Z",
             "name": "The MITRE Corporation",
             "type": "identity"
         }

stix2/test/v20/stix2_data/intrusion-set/intrusion-set--a653431d-6a5e-4600-8ad3-609b5af57064/20170531213149412497.json

@@ -10,7 +10,7 @@
                 "PinkPanther",
                 "Black Vine"
             ],
-            "created": "2017-05-31T21:31:49.412497Z",
+            "created": "2017-05-31T21:31:49.412Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Deep Panda is a suspected Chinese threat group known to target many industries, including government, defense, financial, and telecommunications.Deep Panda.Deep Panda also appears to be known as Black Vine based on the attribution of both group names to the Anthem intrusion.[[Citation: Symantec Black Vine]]",
             "external_references": [
@@ -41,7 +41,7 @@
                 }
             ],
             "id": "intrusion-set--a653431d-6a5e-4600-8ad3-609b5af57064",
-            "modified": "2017-05-31T21:31:49.412497Z",
+            "modified": "2017-05-31T21:31:49.412Z",
             "name": "Deep Panda",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/intrusion-set/intrusion-set--f3bdec95-3d62-42d9-a840-29630f6cdc1a/20170531213153197755.json

@@ -5,7 +5,7 @@
             "aliases": [
                 "DragonOK"
             ],
-            "created": "2017-05-31T21:31:53.197755Z",
+            "created": "2017-05-31T21:31:53.197Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "DragonOK is a threat group that has targeted Japanese organizations with phishing emails. Due to overlapping TTPs, including similar custom tools, DragonOK is thought to have a direct or indirect relationship with the threat group Moafee. [[Citation: Operation Quantum Entanglement]][[Citation: Symbiotic APT Groups]] It is known to use a variety of malware, including Sysget/HelloBridge, PlugX, PoisonIvy, FormerFirstRat, NFlog, and NewCT. [[Citation: New DragonOK]]",
             "external_references": [
@@ -31,7 +31,7 @@
                 }
             ],
             "id": "intrusion-set--f3bdec95-3d62-42d9-a840-29630f6cdc1a",
-            "modified": "2017-05-31T21:31:53.197755Z",
+            "modified": "2017-05-31T21:31:53.197Z",
             "name": "DragonOK",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/malware/malware--6b616fc1-1505-48e3-8b2c-0d19337bff38/20170531213258226477.json

@@ -2,7 +2,7 @@
     "id": "bundle--f64de948-7067-4534-8018-85f03d470625",
     "objects": [
         {
-            "created": "2017-05-31T21:32:58.226477Z",
+            "created": "2017-05-31T21:32:58.226Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Rover is malware suspected of being used for espionage purposes. It was used in 2015 in a targeted email sent to an Indian Ambassador to Afghanistan.[[Citation: Palo Alto Rover]]",
             "external_references": [
@@ -21,7 +21,7 @@
             "labels": [
                 "malware"
             ],
-            "modified": "2017-05-31T21:32:58.226477Z",
+            "modified": "2017-05-31T21:32:58.226Z",
             "name": "Rover",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/malware/malware--92ec0cbd-2c30-44a2-b270-73f4ec949841/20170531213326565056.json

@@ -2,7 +2,7 @@
     "id": "bundle--c633942b-545c-4c87-91b7-9fe5740365e0",
     "objects": [
         {
-            "created": "2017-05-31T21:33:26.565056Z",
+            "created": "2017-05-31T21:33:26.565Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "RTM is custom malware written in Delphi. It is used by the group of the same name (RTM).[[Citation: ESET RTM Feb 2017]]",
             "external_references": [
@@ -21,7 +21,7 @@
             "labels": [
                 "malware"
             ],
-            "modified": "2017-05-31T21:33:26.565056Z",
+            "modified": "2017-05-31T21:33:26.565Z",
             "name": "RTM",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/malware/malware--96b08451-b27a-4ff6-893f-790e26393a8e/20170531213248482655.json

@@ -2,7 +2,7 @@
     "id": "bundle--09ce4338-8741-4fcf-9738-d216c8e40974",
     "objects": [
         {
-            "created": "2017-05-31T21:32:48.482655Z",
+            "created": "2017-05-31T21:32:48.482Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "Sakula is a remote access tool (RAT) that first surfaced in 2012 and was used in intrusions throughout 2015.[[Citation: Dell Sakula]]\n\nAliases: Sakula, Sakurel, VIPER",
             "external_references": [
@@ -21,7 +21,7 @@
             "labels": [
                 "malware"
             ],
-            "modified": "2017-05-31T21:32:48.482655Z",
+            "modified": "2017-05-31T21:32:48.482Z",
             "name": "Sakula",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/malware/malware--b42378e0-f147-496f-992a-26a49705395b/20170531213215263882.json

@@ -2,7 +2,7 @@
     "id": "bundle--611947ce-ae3b-4fdb-b297-aed8eab22e4f",
     "objects": [
         {
-            "created": "2017-05-31T21:32:15.263882Z",
+            "created": "2017-05-31T21:32:15.263Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "description": "PoisonIvy is a popular remote access tool (RAT) that has been used by many groups.[[Citation: FireEye Poison Ivy]]\n\nAliases: PoisonIvy, Poison Ivy",
             "external_references": [
@@ -21,7 +21,7 @@
             "labels": [
                 "malware"
             ],
-            "modified": "2017-05-31T21:32:15.263882Z",
+            "modified": "2017-05-31T21:32:15.263Z",
             "name": "PoisonIvy",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"

stix2/test/v20/stix2_data/relationship/relationship--0d4a7788-7f3b-4df8-a498-31a38003c883/20170531213327182784.json

@@ -2,10 +2,10 @@
     "id": "bundle--7e715462-dd9d-40b9-968a-10ef0ecf126d",
     "objects": [
         {
-            "created": "2017-05-31T21:33:27.182784Z",
+            "created": "2017-05-31T21:33:27.182Z",
             "created_by_ref": "identity--c78cb6e5-0c4b-4611-8297-d1b8b55e40b5",
             "id": "relationship--0d4a7788-7f3b-4df8-a498-31a38003c883",
-            "modified": "2017-05-31T21:33:27.182784Z",
+            "modified": "2017-05-31T21:33:27.182Z",
             "object_marking_refs": [
                 "marking-definition--fa42a846-8d90-4e51-bc29-71d5b4802168"
             ],