fixes csirtgadgets#88 (csirtgadgets#89)

Author: wesyoung

csirtg_indicator/indicator.py

@@ -43,7 +43,6 @@ def __init__(self, indicator=None, version=PROTOCOL_VERSION, **kwargs):
                 continue
 
             if k in FIELDS_TIME:
-                kwargs[k] = parse_timestamp(kwargs[k]).datetime
                 setattr(self, k, kwargs[k])
                 continue
 
@@ -96,6 +95,48 @@ def indicator(self):
     def confidence(self):
         return self._confidence
 
+    def _time_setter(self, v):
+        if isinstance(v, datetime):
+            return v
+        else:
+            return parse_timestamp(v).to('utc').datetime
+
+    @property
+    def reporttime(self):
+        return self._reporttime
+
+    @reporttime.getter
+    def reporttime(self):
+        return self._reporttime
+
+    @reporttime.setter
+    def reporttime(self, v):
+        self._reporttime = self._time_setter(v)
+
+    @property
+    def lasttime(self):
+        return self._lasttime
+
+    @lasttime.getter
+    def lasttime(self):
+        return self._lasttime
+
+    @lasttime.setter
+    def lasttime(self, v):
+        self._lasttime = self._time_setter(v)
+
+    @property
+    def firsttime(self):
+        return self._firsttime
+
+    @firsttime.getter
+    def firsttime(self):
+        return self._firsttime
+
+    @firsttime.setter
+    def firsttime(self, v):
+        self._firsttime = self._time_setter(v)
+
     @confidence.setter
     def confidence(self, v):
         self._confidence = float(v)

test/test_timestamps.py

@@ -20,3 +20,14 @@ def test_indicator_timestamps():
     assert i['firsttime'] == f
     assert i['lasttime'] == l
     assert i['reporttime'] == r
+
+
+def test_indicator_timezones():
+    t = '2017-03-06T11:41:48-06:00'
+    a = arrow.get('2017-03-06T17:41:48Z').datetime
+
+    i = Indicator('example.com', firsttime=t, lasttime=t, reporttime=t)
+
+    assert i.firsttime == a
+    assert i.lasttime == a
+    assert i.reporttime == a