mission fixes

Author: bamhm182

docs/src/usage/plugins/targets.md

@@ -210,7 +210,7 @@
 >> [{"credentials": [{...},...],...}]
 >> ```
 
-## targets.get_query(status='registered', query_changes={})
+## targets.get(status='registered', query_changes={})
 
 > Pulls back a list of targets matching the specified query
 >
@@ -221,7 +221,7 @@
 >
 >> Examples
 >> ```python3
->> >>> h.targets.get_query(status='unregistered')
+>> >>> h.targets.get(status='unregistered')
 >> [{"codename": "SLEEPYSLUG", ...}, ...]
 >> ```
 

src/synack/plugins/duo.py

@@ -63,7 +63,7 @@ def get_grant_token(self, auth_url):
     def _get_mfa_details(self):
         if self._state.otp_secret:
             self._device = 'null'
-            self._hotp = pyotp.HOTP(s=self._state.otp_secret).generate_otp(self._state.otp_count)
+            self._hotp = pyotp.HOTP(s=self._state.otp_secret).generate_otp(int(self._state.otp_count))
             self._factor = 'Passcode'
             return
 

src/synack/plugins/missions.py

@@ -54,7 +54,7 @@ def build_summary(self, missions):
         for mission in missions:
             codename = mission.get('listingCodename', 'UNKNOWN')
             ret[codename] = ret.get(codename, {'count': 0, 'value': 0, 'time': 0})
-            ret[codename][count] += 1
+            ret[codename]['count'] += 1
             ret[codename]['value'] += mission['payout']['amount']
             ret['total']['count'] += 1
             ret['total']['value'] += mission['payout']['amount']
@@ -83,7 +83,7 @@ def build_summary(self, missions):
 
         return ret
 
-    def get(self, **kwargs):
+    def get(self, status='PUBLISHED', max_pages=1, page=1, per_page=20, listing_uids=None, **kwargs):
         """Get a list of missions given a status
 
         Arguments:
@@ -96,12 +96,6 @@ def get(self, **kwargs):
                     (Bad: per_page=5000, per_page=1&max_pages=10)
         listing_uids -- A specific listing ID to check for missions
         """
-        status = kwargs.get('status', 'PUBLISHED')
-        max_pages = kwargs.get('max_pages', 1)
-        page = kwargs.get('page', 1)
-        per_page = kwargs.get('per_page', 20)
-        listing_uids = kwargs.get('listing_uids', None)
-
         query = {
                 'status': status,
                 'perPage': per_page,

src/synack/plugins/targets.py

@@ -206,7 +206,7 @@ def get_credentials(self, **kwargs):
             if res.status_code == 200:
                 return res.json()
 
-    def get_query(self, status='registered', query_changes={}):
+    def get(self, status='registered', query_changes={}):
         """Get information about targets returned from a query"""
         if not self._db.categories:
             self.get_assessments()
@@ -356,15 +356,15 @@ def get_submissions_summary(self, target=None, hours_ago=None, **kwargs):
 
     def get_unregistered(self):
         """Get slugs of all unregistered targets"""
-        return self.get_query(status='unregistered')
+        return self.get(status='unregistered')
 
     def get_upcoming(self):
         """Get slugs and upcoming start dates of all upcoming targets"""
         query_changes = {
             'sorting[field]': 'upcomingStartDate',
             'sorting[direction]': 'asc'
         }
-        return self.get_query(status='upcoming', query_changes=query_changes)
+        return self.get(status='upcoming', query_changes=query_changes)
 
     def set_connected(self, target=None, **kwargs):
         """Connect to a target"""

test/test_targets.py

@@ -403,7 +403,7 @@ def test_get_credentials(self):
                          self.targets.get_credentials(codename='SLEEPYSLUG'))
         self.targets._api.request.assert_called_with('POST', url)
 
-    def test_get_query(self):
+    def test_get(self):
         """Should get a list of targets"""
         self.targets._db.categories = [
             Category(id=1, passed_practical=True,  passed_written=True),
@@ -429,7 +429,7 @@ def test_get_query(self):
                                                      "targets",
                                                      query=query)
 
-    def test_get_query_assessments_empty(self):
+    def test_get_assessments_empty(self):
         """Should get a list of unregistered targets"""
         self.targets.get_assessments = MagicMock()
         self.targets._db.categories = []
@@ -776,10 +776,10 @@ def test_get_unregistered(self):
         results = [
             {'codename': 'SLEEPYSLUG', 'slug': '1283hi'}
         ]
-        self.targets.get_query = MagicMock()
-        self.targets.get_query.return_value = results
+        self.targets.get = MagicMock()
+        self.targets.get.return_value = results
         self.assertEqual(results, self.targets.get_unregistered())
-        self.targets.get_query.assert_called_with(status='unregistered')
+        self.targets.get.assert_called_with(status='unregistered')
 
     def test_get_upcoming(self):
         """Should query for upcoming targets"""
@@ -790,10 +790,10 @@ def test_get_upcoming(self):
             'sorting[field]': 'upcomingStartDate',
             'sorting[direction]': 'asc'
         }
-        self.targets.get_query = MagicMock()
-        self.targets.get_query.return_value = results
+        self.targets.get = MagicMock()
+        self.targets.get.return_value = results
         self.assertEqual(results, self.targets.get_upcoming())
-        self.targets.get_query.assert_called_with(status='upcoming', query_changes=query_changes)
+        self.targets.get.assert_called_with(status='upcoming', query_changes=query_changes)
 
     def test_set_connected(self):
         """Should connect to a given target provided kwargs"""