Merge pull request #31 from instana/validate-type-pre-json

Fix: Protect against byte based json

Author: pglombardo

.travis.yml

@@ -1,6 +1,9 @@
 language: python
 python:
   - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
   - "3.6"
 install: "pip install -r requirements.txt"
 script: nosetests -v

instana/__init__.py

@@ -6,11 +6,11 @@
 """
 
 __author__ = 'Instana Inc.'
-__copyright__ = 'Copyright 2016 Instana Inc.'
-__credits__ = ['Pavlo Baron']
+__copyright__ = 'Copyright 2017 Instana Inc.'
+__credits__ = ['Pavlo Baron', 'Peter Giacomo Lombardo']
 __license__ = 'MIT'
-__version__ = '0.0.1'
-__maintainer__ = 'Pavlo Baron'
-__email__ = 'pavlo.baron@instana.com'
+__version__ = '0.6.6'
+__maintainer__ = 'Peter Giacomo Lombardo'
+__email__ = 'peter.lombardo@instana.com'
 
 __all__ = ['sensor', 'tracer']

instana/agent.py

@@ -135,5 +135,10 @@ def set_host(self, host):
     def set_port(self, port):
         self.port = port
 
-    def set_from(self, from_):
-        self.from_ = From(**json.loads(from_))
+    def set_from(self, json_string):
+        if type(json_string) is bytes:
+            raw_json = json_string.decode("UTF-8")
+        else:
+            raw_json = json_string
+
+        self.from_ = From(**json.loads(raw_json))