Fixed datetime formatting, corrected api endpoints, and fixed kwargs not getting set in client.

jordan-wright · jordan-wright · commit 81fd4be0a1d5 · 2017-01-22T21:47:54.000-06:00
diff --git a/gophish/api/api.py b/gophish/api/api.py
@@ -57,7 +57,7 @@ def post(self, resource):
             resource - gophish.models.Model - The resource instance
 
         """
-        response = self.api.execute("POST", self.endpoint, json=json.dumps(resource))
+        response = self.api.execute("POST", self.endpoint, json=(resource.as_dict()))
         
         if not response.ok:
             return Error.parse(response.json())
diff --git a/gophish/api/campaigns.py b/gophish/api/campaigns.py
@@ -5,7 +5,7 @@
 
 
 class API(APIEndpoint):
-    def __init__(self, api, endpoint='/api/campaigns'):
+    def __init__(self, api, endpoint='/api/campaigns/'):
         """ Creates a new instance of the campaigns API """
 
         super(API, self).__init__(api, endpoint=endpoint, cls=Campaign)
diff --git a/gophish/api/groups.py b/gophish/api/groups.py
@@ -2,7 +2,7 @@
 from gophish.api import APIEndpoint
 
 class API(APIEndpoint):
-    def __init__(self, api, endpoint='/api/groups'):
+    def __init__(self, api, endpoint='/api/groups/'):
         super(API, self).__init__(api, endpoint=endpoint, cls=Group)
 
     def get(self, group_id=None):
diff --git a/gophish/api/pages.py b/gophish/api/pages.py
@@ -2,7 +2,7 @@
 from gophish.api import APIEndpoint
 
 class API(APIEndpoint):
-    def __init__(self, api, endpoint='/api/pages'):
+    def __init__(self, api, endpoint='/api/pages/'):
         super(API, self).__init__(api, endpoint=endpoint, cls=Page)
 
     def get(self, page_id=None):
diff --git a/gophish/api/smtp.py b/gophish/api/smtp.py
@@ -2,7 +2,7 @@
 from gophish.api import APIEndpoint
 
 class API(APIEndpoint):
-    def __init__(self, api, endpoint='/api/smtp'):
+    def __init__(self, api, endpoint='/api/smtp/'):
         super(API, self).__init__(api, endpoint=endpoint, cls=SMTP)
 
     def get(self, smtp_id=None):
diff --git a/gophish/api/templates.py b/gophish/api/templates.py
@@ -2,13 +2,13 @@
 from gophish.api import APIEndpoint
 
 class API(APIEndpoint):
-    def __init__(self, api, endpoint='/api/templates'):
+    def __init__(self, api, endpoint='/api/templates/'):
         super(API, self).__init__(api, endpoint=endpoint, cls=Template)
 
     def get(self, template_id=None):
         """ Gets one or more templates """
         
-        return super(API, self).get(resource_id=campaign_id)
+        return super(API, self).get(resource_id=template_id)
 
     def post(self, template):
         """ Creates a new template """
diff --git a/gophish/client.py b/gophish/client.py
@@ -14,13 +14,14 @@ class GophishClient(object):
     def __init__(self, api_key, host=DEFAULT_URL, **kwargs):
         self.api_key = api_key
         self.host = host
-        self._kwargs = kwargs
+        self._client_kwargs = kwargs
     
-    def execute(self, method, path, data=None):
+    def execute(self, method, path, **kwargs):
         """ Executes a request to a given endpoint, returning the result """
 
         url = "{}{}".format(self.host, path)
-        response = requests.request(method, url, params={"api_key": self.api_key}, json=data, **self._kwargs)
+        kwargs.update(self._client_kwargs)
+        response = requests.request(method, url, params={"api_key": self.api_key}, **kwargs)
         return response
 
 class Gophish(object):
diff --git a/gophish/models.py b/gophish/models.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from dateutil.tz import tzlocal
 
 import json as _json
 import dateutil.parser
@@ -11,6 +12,25 @@ class Model(object):
     def __init__(self):
         self._valid_properties = {}
 
+    def as_dict(self):
+        """ Returns a dict representation of the resource """
+        result = {}
+        for key in self._valid_properties:
+            val = getattr(self, key)
+            if isinstance(val, datetime):
+                val = val.isoformat()
+            # Parse custom classes
+            elif val and not isinstance(val, (str, list, dict)):
+                val = val.as_dict()
+            # Parse lists of objects
+            elif isinstance(val, list):
+                val = [e.as_dict() for e in val]
+
+            # Add it if it's not None
+            if val:
+                result[key] = val 
+        return result
+
     @classmethod
     def parse(cls, json):
         """Parse a JSON object into a model instance."""
@@ -19,8 +39,8 @@ def parse(cls, json):
 
 class Campaign(Model):
     _valid_properties = {
-        'id': None, 'name': None, 'created_date': datetime.now(),
-        'launch_date': datetime.now(), 'completed_date': None, 'template': None,
+        'id': None, 'name': None, 'created_date': datetime.now(tzlocal()),
+        'launch_date': datetime.now(tzlocal()), 'completed_date': None, 'template': None,
         'page': None, 'results': [], 'status': None, 'timeline': [],
         'smtp': None, 'url': None}
 
@@ -106,7 +126,7 @@ def parse(cls, json):
 class Group(Model):
     """ Groups contain one or more users """
     _valid_properties = {
-            'id': None, 'name': None, 'modified_date': datetime.now(),
+            'id': None, 'name': None, 'modified_date': datetime.now(tzlocal()),
             'targets': []}
 
     def __init__(self, **kwargs):
@@ -131,7 +151,7 @@ class SMTP(Model):
     _valid_properties = {
         'id': None, 'interface_type': 'SMTP', 'name': None, 'host': None,
         'from_address': None, 'ignore_cert_errors' : False,
-        'modified_date': datetime.now()}
+        'modified_date': datetime.now(tzlocal())}
 
     def __init__(self, **kwargs):
         for key, default in SMTP._valid_properties.items():
@@ -151,7 +171,7 @@ def parse(cls, json):
 class Template(Model):
     _valid_properties = {
         'id': None, 'name': None, 'text': None, 'html': None,
-        'modified_date': datetime.now(), 'subject': None, 'attachments': []}
+        'modified_date': datetime.now(tzlocal()), 'subject': None, 'attachments': []}
 
     def __init__(self, **kwargs):
         for key, default in Template._valid_properties.items():
@@ -173,7 +193,7 @@ def parse(cls, json):
 
 class Page(Model):
     _valid_properties = {
-        'id': None, 'name': None, 'html': None, 'modified_date': datetime.now(),
+        'id': None, 'name': None, 'html': None, 'modified_date': datetime.now(tzlocal()),
         'capture_credentials': False, 'capture_passwords': False,
         'redirect_url': None}
 
