fixes timestamp issue (csirtgadgets#90)

Author: wesyoung

csirtg_indicator/indicator.py

@@ -42,8 +42,8 @@ def __init__(self, indicator=None, version=PROTOCOL_VERSION, **kwargs):
                 setattr(self, k, v)
                 continue
 
+            # set this at the end
             if k in FIELDS_TIME:
-                setattr(self, k, kwargs[k])
                 continue
 
             if isinstance(kwargs[k], basestring):
@@ -63,6 +63,9 @@ def __init__(self, indicator=None, version=PROTOCOL_VERSION, **kwargs):
         self._count = None
         self.count = kwargs.get('count', 1)
 
+        for k in FIELDS_TIME:
+            setattr(self, k, kwargs.get(k, None))
+
     @property
     def indicator(self):
         return self.__indicator
@@ -96,6 +99,9 @@ def confidence(self):
         return self._confidence
 
     def _time_setter(self, v):
+        if not v:
+            return
+
         if isinstance(v, datetime):
             return v
         else:
@@ -194,7 +200,7 @@ def format_keys(self):
 
             try:
                 d[k] = d[k].format(**d)
-            except (KeyError, ValueError):
+            except (KeyError, ValueError, IndexError):
                 pass
 
         yield Indicator(**d)

test/test_timestamps.py

@@ -31,3 +31,29 @@ def test_indicator_timezones():
     assert i.firsttime == a
     assert i.lasttime == a
     assert i.reporttime == a
+
+
+def test_lasttime_only():
+    l = arrow.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+
+    i = Indicator('192.168.1.1', lasttime=l)
+
+    assert i.lasttime == arrow.get(l).datetime
+
+    s = str(i)
+    i = json.loads(s)
+
+    assert i.get('firsttime') is None
+
+
+def test_firsttime_only():
+    l = arrow.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+
+    i = Indicator('192.168.1.1', firsttime=l)
+
+    assert i.firsttime == arrow.get(l).datetime
+
+    s = str(i)
+    i = json.loads(s)
+
+    assert i.get('lasttime') is None