Merge pull request #1 from rapid7/carbon_black_protection

CB Protection: 2.1.1: Fix issue where the Resolve Approval Request ac…
rapid7 · Jun 5, 2019 · 197e004 · 197e004
2 parents dddf667 + a969962
commit 197e004
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/carbon_black_protection/Makefile b/carbon_black_protection/Makefile
@@ -50,4 +50,4 @@ export: image
 
 # Make will not run a target if a file of the same name exists unless setting phony targets
 # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
-.PHONY: default tarball image regenerate
+.PHONY: default tarball image regenerate
diff --git a/carbon_black_protection/bin/komand_carbon_black_protection b/carbon_black_protection/bin/komand_carbon_black_protection
@@ -6,7 +6,7 @@ from komand_carbon_black_protection import connection, actions, triggers
 
 Name = 'Carbon Black Protection'
 Vendor = 'rapid7'
-Version = '2.1.0'
+Version = '2.1.1'
 Description = 'Cb Protection allows users to lock down and harden systems to prevent malware, ransomware, and more'
 
 

diff --git a/carbon_black_protection/help.md b/carbon_black_protection/help.md
@@ -508,6 +508,7 @@ Examples:
 * 1.1.0 - New action Retrieve File Instance
 * 2.0.0 - Fix for Approve File Locally action | Fix for Unapprove File Locally action | Update to rename Unapprove Local Approval action to Unapprove File Locally
 * 2.1.0 - Add Action: Create File Rule | Add Action: Get File Rule
+* 2.1.1 - Fix issue where the Resolve Approval Request action used the wrong endpoint
 
 ## References
 
@@ -1062,4 +1063,4 @@ Examples:
 |modifiedBy|string|False|None|
 |name|string|False|None|
 |platformFlags|integer|False|1=windows,2=mac,4=linux|
-|version|string|False|None|
+|version|string|False|None|
diff --git a/...lack_protection/komand_carbon_black_protection/actions/resolve_approval_request/action.py b/...lack_protection/komand_carbon_black_protection/actions/resolve_approval_request/action.py
@@ -41,12 +41,13 @@ def run(self, params={}):
             }
         }
 
-        url = self.connection.host + '/api/bit9platform/v1/fileInstance/%s' % approval_request_id
+        url = self.connection.host + '/api/bit9platform/v1/approvalRequest/%s' % approval_request_id
         r = self.connection.session.put(url, json.dumps(data), verify=self.connection.verify)
 
         try:
             r.raise_for_status()
-        except:
+        except Exception as e:
+            self.logger.error(e)
             raise Exception('Run: HTTPError: %s' % r.text)
 
         result = komand.helper.clean(r.json())
@@ -60,7 +61,8 @@ def test(self):
 
         try:
             request.raise_for_status()
-        except:
+        except Exception as e:
+            self.logger.error(e)
             raise Exception('Run: HTTPError: %s' % request.text)
 
         return {}
diff --git a/carbon_black_protection/plugin.spec.yaml b/carbon_black_protection/plugin.spec.yaml
@@ -3,7 +3,7 @@ name: carbon_black_protection
 title: Carbon Black Protection
 description: Cb Protection allows users to lock down and harden systems to prevent
   malware, ransomware, and more
-version: 2.1.0
+version: 2.1.1
 vendor: rapid7
 status: ["supported"]
 tags:

diff --git a/carbon_black_protection/setup.py b/carbon_black_protection/setup.py
@@ -3,7 +3,7 @@
 
 
 setup(name='carbon_black_protection-rapid7-plugin',
-      version='2.1.0',
+      version='2.1.1',
       description='Cb Protection allows users to lock down and harden systems to prevent malware, ransomware, and more',
       author='rapid7',
       author_email='',