Add TypedFields to ThreatActor

apsillers · apsillers · commit beee89f8a5d8 · 2015-10-23T14:38:15.000-04:00
diff --git a/stix/common/related.py b/stix/common/related.py
@@ -204,7 +204,7 @@ class RelatedThreatActor(_BaseRelated):
     _namespace = "http://stix.mitre.org/common-1"
     _binding = common_binding
     _binding_class = common_binding.RelatedThreatActorType
-    item = fields.TypedField("ThreatActor", type_="stix.threat_actor.ThreatActor")
+    item = fields.TypedField("Threat_Actor", type_="stix.threat_actor.ThreatActor")
 
 
 class RelatedTTP(_BaseRelated):
diff --git a/stix/common/statement.py b/stix/common/statement.py
@@ -13,7 +13,7 @@
 from .confidence import Confidence
 from .structured_text import StructuredTextList
 from .vocabs import VocabField, HighMediumLow
-
+import mixbox
 
 class Statement(stix.Entity):
     _namespace = 'http://stix.mitre.org/common-1'
@@ -67,3 +67,21 @@ def add_description(self, description):
 
         """
         self.descriptions.add(description)
+
+
+class StatementField(mixbox.fields.TypedField):
+    def __init__(self, *args, **kwargs):
+        self._vocab_type = kwargs.pop("vocab_type")
+        super(StatementField, self).__init__(*args, **kwargs)
+        self.type_ = Statement
+
+    def _clean(self, value):
+        if value is None:
+            return None
+        elif isinstance(value, Statement):
+            return value
+        elif isinstance(value, stix.common.VocabString):
+            return Statement(value)
+        else:
+            vocabklass = self._vocab_type
+            return Statement(vocabklass(value)) 
diff --git a/stix/test/threat_actor_test.py b/stix/test/threat_actor_test.py
@@ -15,9 +15,9 @@
 
 
 class TypesTests(TypedListTestCase, unittest.TestCase):
-    klass = ta._Types
+    klass = ta.ThreatActor
 
-    _full_dict = [
+    _partial_dict = [
         {
             'value': {
                 "value" : "Hacker",
@@ -26,58 +26,74 @@ class TypesTests(TypedListTestCase, unittest.TestCase):
         },
     ]
 
+    _full_dict = {
+          "types": _partial_dict
+    }
 
 class MotivationsTests(TypedListTestCase, unittest.TestCase):
-    klass = ta._Motivations
+    klass = ta.ThreatActor
 
-    _full_dict = [
-         {
+    _partial_dict = [{
              'value': {
                  "value" : "Ego",
                  "xsi:type" : "stixVocabs:MotivationVocab-1.1"
              }
-         },
-    ]
+         }]
+
+    _full_dict = {
+          "motivations": _partial_dict
+    }
 
 
 class SophisticationTests(TypedListTestCase, unittest.TestCase):
-    klass = ta._Sophistications
+    klass = ta.ThreatActor
 
-    _full_dict = [
+    _partial_dict = [
          {
-             'value': {
+          'value': {
                  "value" : "Novice",
                  "xsi:type" : "stixVocabs:ThreatActorSophisticationVocab-1.0"
-             }
-         },
+         }
+         }
     ]
 
-
+    _full_dict = {
+        "sophistications": _partial_dict
+    }
+    
 class IntendedEffectsTests(TypedListTestCase, unittest.TestCase):
-    klass = ta._IntendedEffects
+    klass = ta.ThreatActor
 
-    _full_dict = [
+    _partial_dict = [
         {
-            'value': {
+         'value': {
                 "value" : "Destruction",
                 "xsi:type" : "stixVocabs:IntendedEffectVocab-1.0"
-            }
+         }
         }
     ]
+    
+    _full_dict = {
+        "intended_effects": _partial_dict
+    }
 
 
 class PlanningAndOperationalSupportTests(TypedListTestCase, unittest.TestCase):
-    klass = ta._PlanningAndOperationalSupports
+    klass = ta.ThreatActor
 
-    _full_dict = [
+    _partial_dict = [
         {
-            'value': {
-                "value" : "Data Exploitation",
-                "xsi:type" : 'stixVocabs:PlanningAndOperationalSupportVocab-1.0.1'
-            }
-        },
+         'value': {
+            "value" : "Data Exploitation",
+            "xsi:type" : 'stixVocabs:PlanningAndOperationalSupportVocab-1.0.1'
+         }
+        }
     ]
 
+    _full_dict = {
+        "planning_and_operational_supports": _partial_dict
+    }
+
 
 class ObservedTTPsTests(EntityTestCase, unittest.TestCase):
     klass = ta.ObservedTTPs
@@ -122,11 +138,11 @@ class ThreatActorTests(EntityTestCase, unittest.TestCase):
         'description': "This is a long description about a threat actor.",
         'short_description': "A bad guy",
         'identity': identity_test.IdentityTests._full_dict,
-        'types': TypesTests._full_dict,
-        'motivations': MotivationsTests._full_dict,
-        'sophistications': SophisticationTests._full_dict,
-        'intended_effects': IntendedEffectsTests._full_dict,
-        'planning_and_operational_supports': PlanningAndOperationalSupportTests._full_dict,
+        'types': TypesTests._partial_dict,
+        'motivations': MotivationsTests._partial_dict,
+        'sophistications': SophisticationTests._partial_dict,
+        'intended_effects': IntendedEffectsTests._partial_dict,
+        'planning_and_operational_supports': PlanningAndOperationalSupportTests._partial_dict,
         'observed_ttps': ObservedTTPsTests._full_dict,
         'associated_campaigns': AssocaitedCampaignsTests._full_dict,
         'associated_actors': AssociatedActorsTests._full_dict,
diff --git a/stix/threat_actor/__init__.py b/stix/threat_actor/__init__.py
