Merge pull request #55 from cisagov/goose-1.2.5

goose v1.2.5
cisagov · Aug 4, 2023 · 6febba8 · 6febba8
2 parents 8c90678 + 3a4c2c0
commit 6febba8
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.5] - The goose is loose - 2023-08-04
+### Added
+
+### Changed
+- Updated `cryptography` to 41.0.3 based on dependabot.
+
+### Fixed
+- Incorporated fix for function `helper_multiple_object` when parent object contains a `/`
+- Updated authentication fix for graze.py and messagetrace.py
+
 ## [1.2.4] - The goose is loose - 2023-07-27
 ### Added
 

diff --git a/cyclonedx_output.json b/cyclonedx_output.json
@@ -2,15 +2,15 @@
  "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
  "bomFormat": "CycloneDX",
  "specVersion": "1.4",
- "serialNumber": "urn:uuid:1fd2d207-8341-4360-90f2-9ccbc917bb3c",
+ "serialNumber": "urn:uuid:2bd6900f-7e05-477c-bb2b-4b665f6394f4",
  "version": 1,
  "metadata": {
- "timestamp": "2023-07-27T18:14:16-04:00",
+ "timestamp": "2023-08-03T19:48:21-04:00",
  "tools": [
  {
  "vendor": "anchore",
  "name": "syft",
- "version": "0.85.0"
+ "version": "0.86.1"
  }
  ],
  "component": {
@@ -231,12 +231,12 @@
  ]
  },
  {
- "bom-ref": "pkg:pypi/[email protected].2?package-id=ec857cc0e0d2bac4",
+ "bom-ref": "pkg:pypi/[email protected].3?package-id=30c4dfdade0e13a8",
  "type": "library",
  "name": "cryptography",
- "version": "41.0.2",
- "cpe": "cpe:2.3:a:python-cryptography_project:python-cryptography:41.0.2:*:*:*:*:*:*:*",
- "purl": "pkg:pypi/[email protected].2",
+ "version": "41.0.3",
+ "cpe": "cpe:2.3:a:python-cryptography_project:python-cryptography:41.0.3:*:*:*:*:*:*:*",
+ "purl": "pkg:pypi/[email protected].3",
  "properties": [
  {
  "name": "syft:package:foundBy",
@@ -250,62 +250,6 @@
  "name": "syft:package:type",
  "value": "python"
  },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python-cryptography_project:python_cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python-cryptography_project:cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python-cryptography:python-cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python-cryptography:python_cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python_cryptography:python-cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python_cryptography:python_cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:cryptography:python-cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:cryptography:python_cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python-cryptography:cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python_cryptography:cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python:python-cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python:python_cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:cryptography:cryptography:41.0.2:*:*:*:*:*:*:*"
- },
- {
- "name": "syft:cpe23",
- "value": "cpe:2.3:a:python:cryptography:41.0.2:*:*:*:*:*:*:*"
- },
  {
  "name": "syft:location:0:path",
  "value": "/setup.py"

diff --git a/goosey/auth.py b/goosey/auth.py
@@ -27,7 +27,7 @@
 from seleniumwire import webdriver
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 green = "\x1b[1;32m"
 

diff --git a/goosey/azure_ad_datadumper.py b/goosey/azure_ad_datadumper.py
@@ -15,7 +15,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 class AzureAdDataDumper(DataDumper):
 
@@ -449,6 +449,9 @@ async def helper_multiple_object(self, parent, child,identifier='id'):
  temp = child.split('/')
  child = temp[-1]
 
+ if '/' in parent:
+ parent = parent.replace("/", "")
+
  outfile = os.path.join(self.output_dir, parent + "_" + child + '.json')
  if child_list:
  with open(outfile, 'w', encoding='utf-8') as f:

diff --git a/goosey/azure_dumper.py b/goosey/azure_dumper.py
@@ -29,7 +29,7 @@
 from typing import NewType, Optional
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 utc = pytz.UTC
 

diff --git a/goosey/csv.py b/goosey/csv.py
@@ -14,7 +14,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 if sys.platform == 'win32':
  asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())

diff --git a/goosey/d4iot.py b/goosey/d4iot.py
@@ -22,7 +22,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 if sys.platform == 'win32':
  asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())

diff --git a/goosey/d4iot_dumper.py b/goosey/d4iot_dumper.py
@@ -12,7 +12,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 class DefenderIoTDumper(DataDumper):
  def __init__(self, output_dir, reports_dir, session, csrftoken, sessionid, config, auth_un_pw, debug):

diff --git a/goosey/datadumper.py b/goosey/datadumper.py
@@ -4,7 +4,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 class DataDumper(object):
  def __init__(self, output_dir: str, reports_dir: str, auth: dict, app_auth: dict, session, debug):

diff --git a/goosey/graze.py b/goosey/graze.py
@@ -24,7 +24,7 @@
 from urllib.parse import unquote
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 warnings.simplefilter('ignore')
 
@@ -272,9 +272,9 @@ def main(args=None) -> None:
  logger.info("Reading in authfile: {}".format(args.authfile))
  with open(args.authfile, 'r') as infile:
  if exo_us_government == 'false':
- auth = json.loads(infile.read())['mfa']['https://graph.microsoft.com/.default']
+ auth = json.loads(infile.read())['mfa']["['https://graph.microsoft.com/.default']"]
  elif exo_us_government == 'true':
- auth = json.loads(infile.read())['mfa']['https://graph.microsoft.us/.default']
+ auth = json.loads(infile.read())['mfa']["['https://graph.microsoft.us/.default']"]
  except Exception as e:
  logger.error("{}".format(str(e)))
  raise e

diff --git a/goosey/guimain.py b/goosey/guimain.py
@@ -18,7 +18,7 @@
 from goosey.main import main as gooseymain
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 try:
  from gooey import Gooey, GooeyParser

diff --git a/goosey/honk.py b/goosey/honk.py
@@ -26,7 +26,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 if sys.platform == 'win32':
  asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())

diff --git a/goosey/m365_datadumper.py b/goosey/m365_datadumper.py
@@ -23,7 +23,7 @@
 from io import StringIO
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 class M365DataDumper(DataDumper):
 

diff --git a/goosey/main.py b/goosey/main.py
@@ -35,7 +35,7 @@
 '''
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 def main():
  # Primary argument parser

diff --git a/goosey/mde_datadumper.py b/goosey/mde_datadumper.py
@@ -11,7 +11,7 @@
 from goosey.utils import *
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 end_29_days_ago = datetime.today().replace(hour=0, minute=0, second=0, microsecond=0) - timedelta(days=29)
 today_date = datetime.today().replace(hour=0, minute=0, second=0, microsecond=0)

diff --git a/goosey/messagetrace.py b/goosey/messagetrace.py
@@ -40,7 +40,7 @@
 '''
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 logger = None
 encryption_pw = None
@@ -523,9 +523,9 @@ def main(args=None) -> None:
  logger.info("Reading in authfile: {}".format(args.authfile))
  with open(args.authfile, 'r') as infile:
  if exo_us_government == 'true':
- auth = json.loads(infile.read())['mfa']['https://graph.microsoft.us/.default']
+ auth = json.loads(infile.read())['mfa']["['https://graph.microsoft.us/.default']"]
  else:
- auth = json.loads(infile.read())['mfa']['https://graph.microsoft.com/.default']
+ auth = json.loads(infile.read())['mfa']["['https://graph.microsoft.com/.default']"]
  except Exception as e:
  logger.error("{}".format(str(e)))
  raise e 

diff --git a/goosey/utils.py b/goosey/utils.py
@@ -18,7 +18,7 @@
 from logging import handlers
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 if sys.platform == 'win32':
  import msvcrt

diff --git a/scripts/generate_conf.py b/scripts/generate_conf.py
@@ -12,7 +12,7 @@
 from goosey.mde_datadumper import MDEDataDumper
 
 __author__ = "Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace"
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 def main():
  auth_s = '[auth]\nusername=\npassword=\nappid=\nclientsecret=\n\n'

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 from setuptools import setup
 setup(name='goosey',
- version='1.2.4',
+ version='1.2.5',
  description='AzureAD, Azure and M365 Data Collector',
  author='Claire Casalnova, Jordan Eberst, Wellington Lee, Victoria Wallace',
  classifiers=[
@@ -19,7 +19,7 @@
  packages=['goosey'],
  python_requires='>=3.7,<=3.10.11',
  install_requires=[
- 'cryptography==41.0.2',
+ 'cryptography==41.0.3',
  'requests',
  'webdrivermanager',
  'aiohttp==3.8.5',