Merge pull request #181 from Syslifters/sysreptor-303-redirect-issues

Raise error if server redirects

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.22
+* Update reptor for updated SysReptor field definition
+* Raise error if wrong server URL was specified
+
 # 0.21
 * Create findings from finding templates
 * Fix errors in exportfindings plugin

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "reptor"
-version = "0.21"
+version = "0.22"
 authors = [
   { name="Richard Schwabe" },
   { name="Aron Molnar", email="[email protected]" }

reptor/api/APIClient.py

@@ -59,7 +59,8 @@ def _get_headers(self, json_content=True) -> typing.Dict:
     def _prepare_kwargs(self, kwargs, json_content=True):
         return kwargs | {
             'headers': kwargs.get('headers', {}) | self._get_headers(json_content=json_content),
-            'verify': kwargs.get('verify', self.verify)
+            'verify': kwargs.get('verify', self.verify),
+            'allow_redirects': False,
         }
 
     @property
@@ -164,6 +165,10 @@ def _do_request(
         self.debug(f"{method} URL: {url}")
         kwargs = self._prepare_kwargs(kwargs, json_content=json_content)
         response = methods[method](url, **kwargs)
+        if response.headers.get('location'):
+            raise requests.exceptions.HTTPError(
+                f"Received redirect to {response.headers.get('location')}. Maybe run \"reptor conf\" to update your server URL?"
+            )
         self.debug(f"Received response: {response.content[:1000]}")
         response.raise_for_status()
         return response