From 4c3fb65af13399ef3c10a0879c84d90989406deb Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 24 Nov 2020 21:42:45 -0500 Subject: [PATCH] 6.12.0 --- CHANGELOG.md | 10 ++++++++++ docs/index.rst | 2 ++ parsedmarc/__init__.py | 2 +- parsedmarc/cli.py | 6 +++--- requirements.txt | 5 ++--- setup.py | 5 ++--- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71166d9..d5759a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ Changelog ========= +6.12.0 +------ + +- Limit output filename length to 100 charcters (PR #199) +- Add basic auth support for Elasticsearch (PR #191) +- Fix Windows paths when searching for the GeoIP database (PR #190) +- Remove `six` requirement +- Require `mailsuite>=1.6.1` +- Require `dnspython>=2.0.0` + 6.11.0 ------ diff --git a/docs/index.rst b/docs/index.rst index 769e44a..9b3aaf2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -167,6 +167,8 @@ The full set of configuration options are: .. note:: Special characters in the username or password must be `URL encoded`_. - ``ssl`` - bool: Use an encrypted SSL/TLS connection (Default: True) + - ``user`` - str: Basic auth username + - ``password` - str: Basic auth password - ``cert_path`` - str: Path to a trusted certificates - ``timeout`` - float: Timeout in seconds (Default: 60) - ``index_suffix`` - str: A suffix to apply to the index names diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index e5a6d62..4924d07 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -35,7 +35,7 @@ from parsedmarc.utils import is_outlook_msg, convert_outlook_msg from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime from parsedmarc.utils import parse_email -__version__ = "6.11.0" +__version__ = "6.12.0" logging.basicConfig( format='%(levelname)8s:%(filename)s:%(lineno)d:' diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py index 64ac175..9dad3fb 100644 --- a/parsedmarc/cli.py +++ b/parsedmarc/cli.py @@ -219,7 +219,7 @@ def _main(): elasticsearch_ssl=True, elasticsearch_ssl_cert_path=None, elasticsearch_monthly_indexes=False, - elasticsearch_username=None, + elasticsearch_username=None, elasticsearch_password=None, kafka_hosts=None, kafka_username=None, @@ -496,8 +496,8 @@ def _main(): elastic.set_hosts(opts.elasticsearch_hosts, opts.elasticsearch_ssl, opts.elasticsearch_ssl_cert_path, - opts.elasticsearch_username, - opts.elasticsearch_password, + opts.elasticsearch_username, + opts.elasticsearch_password, timeout=opts.elasticsearch_timeout) elastic.migrate_indexes(aggregate_indexes=[es_aggregate_index], forensic_indexes=[es_forensic_index]) diff --git a/requirements.txt b/requirements.txt index cbd3d40..4200a90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ tqdm>=4.31.1 rstcheck>=3.3.1 pygments -dnspython>=1.16.0 +dnspython>=2.0.0 expiringdict>=1.1.4 urllib3>=1.25.7 requests>=2.22.0 @@ -12,8 +12,7 @@ imapclient>=2.1.0 dateparser>=0.7.2 elasticsearch-dsl>=7.2.0,<8.0.0 kafka-python>=1.4.4 -six==1.13.0 -mailsuite>=1.5.4 +mailsuite>=1.6.1 nose>=1.3.7 flake8>=3.7.8 doc8>=0.8.0 diff --git a/setup.py b/setup.py index 4311700..1a70332 100644 --- a/setup.py +++ b/setup.py @@ -94,13 +94,12 @@ setup( # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['dnspython>=1.16.0', 'expiringdict>=1.1.4', + install_requires=['dnspython>=2.0.0', 'expiringdict>=1.1.4', 'publicsuffix2>=2.20190812', 'xmltodict>=0.12.0', 'geoip2>=3.0.0', 'urllib3>=1.25.7', 'requests>=2.22.0', 'imapclient>=2.1.0', - 'mail-parser>=3.11.0', 'dateparser>=0.7.2', - 'mailsuite>=1.5.4', + 'mailsuite>=1.6.1', 'elasticsearch-dsl>=7.2.0,<8.0.0', 'kafka-python>=1.4.4', 'tqdm>=4.31.1',