From e3c0ff68131e5f0413d210865a603f4005b4a5bc Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 24 Nov 2020 22:05:36 -0500 Subject: [PATCH] 6.12.0 --- _modules/index.html | 4 ++-- _modules/parsedmarc.html | 6 +++--- _modules/parsedmarc/elastic.html | 11 ++++++++--- _modules/parsedmarc/splunk.html | 4 ++-- _modules/parsedmarc/utils.html | 10 ++++++---- _sources/index.rst.txt | 2 ++ _static/basic.css | 1 + _static/doctools.js | 5 +++-- _static/documentation_options.js | 2 +- _static/pygments.css | 7 ++++++- _static/searchtools.js | 8 ++++---- genindex.html | 4 ++-- index.html | 10 +++++++--- objects.inv | Bin 781 -> 781 bytes py-modindex.html | 4 ++-- search.html | 4 ++-- 16 files changed, 51 insertions(+), 31 deletions(-) diff --git a/_modules/index.html b/_modules/index.html index 4b6b83b..f255ed4 100644 --- a/_modules/index.html +++ b/_modules/index.html @@ -7,7 +7,7 @@ - Overview: module code — parsedmarc 6.11.0 documentation + Overview: module code — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
diff --git a/_modules/parsedmarc.html b/_modules/parsedmarc.html index 11bacf1..801728c 100644 --- a/_modules/parsedmarc.html +++ b/_modules/parsedmarc.html @@ -7,7 +7,7 @@ - parsedmarc — parsedmarc 6.11.0 documentation + parsedmarc — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
@@ -185,7 +185,7 @@ 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/_modules/parsedmarc/elastic.html b/_modules/parsedmarc/elastic.html index a322843..11fe127 100644 --- a/_modules/parsedmarc/elastic.html +++ b/_modules/parsedmarc/elastic.html @@ -7,7 +7,7 @@ - parsedmarc.elastic — parsedmarc 6.11.0 documentation + parsedmarc.elastic — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
@@ -323,7 +323,8 @@ """Raised when a report to be saved matches an existing report""" -
[docs]def set_hosts(hosts, use_ssl=False, ssl_cert_path=None, timeout=60.0): +
[docs]def set_hosts(hosts, use_ssl=False, ssl_cert_path=None, + username=None, password=None, timeout=60.0): """ Sets the Elasticsearch hosts to use @@ -331,6 +332,8 @@ hosts (str): A single hostname or URL, or list of hostnames or URLs use_ssl (bool): Use a HTTPS connection to the server ssl_cert_path (str): Path to the certificate chain + username (str): The username to use for authentication + password (str): The password to use for authentication timeout (float): Timeout in seconds """ if type(hosts) != list: @@ -346,6 +349,8 @@ conn_params['ca_certs'] = ssl_cert_path else: conn_params['verify_certs'] = False + if username: + conn_params['http_auth'] = (username+":"+password) connections.create_connection(**conn_params)
diff --git a/_modules/parsedmarc/splunk.html b/_modules/parsedmarc/splunk.html index 46d262b..22c93d2 100644 --- a/_modules/parsedmarc/splunk.html +++ b/_modules/parsedmarc/splunk.html @@ -7,7 +7,7 @@ - parsedmarc.splunk — parsedmarc 6.11.0 documentation + parsedmarc.splunk — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
diff --git a/_modules/parsedmarc/utils.html b/_modules/parsedmarc/utils.html index 105641b..263980f 100644 --- a/_modules/parsedmarc/utils.html +++ b/_modules/parsedmarc/utils.html @@ -7,7 +7,7 @@ - parsedmarc.utils — parsedmarc 6.11.0 documentation + parsedmarc.utils — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
@@ -430,8 +430,8 @@ "/usr/share/GeoIP/GeoLite2-Country.mmdb", "/var/lib/GeoIP/GeoLite2-Country.mmdb", "/var/local/lib/GeoIP/GeoLite2-Country.mmdb", - "%SystemDrive%\\ProgramData\\" - "MaxMind\\GeoIPUpdate\\GeoIP\\GeoLite2-Country.mmdb" + "%SystemDrive%\\ProgramData\\MaxMind\\GeoIPUpdate\\GeoIP\\" + "GeoLite2-Country.mmdb", "C:\\GeoIP\\GeoLite2-Country.mmdb" ] @@ -547,6 +547,8 @@ string = string.replace(char, "") string = string.rstrip(".") + string = (string[:100]) if len(string) > 100 else string + return string
diff --git a/_sources/index.rst.txt b/_sources/index.rst.txt index 769e44a..5bc6ae0 100644 --- a/_sources/index.rst.txt +++ b/_sources/index.rst.txt @@ -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/_static/basic.css b/_static/basic.css index 24bc73e..24a49f0 100644 --- a/_static/basic.css +++ b/_static/basic.css @@ -764,6 +764,7 @@ div.code-block-caption code { } table.highlighttable td.linenos, +span.linenos, div.doctest > div.highlight span.gp { /* gp: Generic.Prompt */ user-select: none; } diff --git a/_static/doctools.js b/_static/doctools.js index daccd20..7d88f80 100644 --- a/_static/doctools.js +++ b/_static/doctools.js @@ -285,9 +285,10 @@ var Documentation = { initOnKeyListeners: function() { $(document).keydown(function(event) { var activeElementType = document.activeElement.tagName; - // don't navigate when in search box or textarea + // don't navigate when in search box, textarea, dropdown or button if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT' - && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) { + && activeElementType !== 'BUTTON' && !event.altKey && !event.ctrlKey && !event.metaKey + && !event.shiftKey) { switch (event.keyCode) { case 37: // left var prevHref = $('link[rel="prev"]').prop('href'); diff --git a/_static/documentation_options.js b/_static/documentation_options.js index 53ebf4e..8015677 100644 --- a/_static/documentation_options.js +++ b/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '6.11.0', + VERSION: '6.12.0', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/_static/pygments.css b/_static/pygments.css index 20c4814..f346859 100644 --- a/_static/pygments.css +++ b/_static/pygments.css @@ -1,5 +1,10 @@ +pre { line-height: 125%; margin: 0; } +td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; } +span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; } +td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } -.highlight { background: #eeffcc; } +.highlight { background: #eeffcc; } .highlight .c { color: #408090; font-style: italic } /* Comment */ .highlight .err { border: 1px solid #FF0000 } /* Error */ .highlight .k { color: #007020; font-weight: bold } /* Keyword */ diff --git a/_static/searchtools.js b/_static/searchtools.js index 970d0d9..261ecaa 100644 --- a/_static/searchtools.js +++ b/_static/searchtools.js @@ -59,10 +59,10 @@ var Search = { _pulse_status : -1, htmlToText : function(htmlString) { - var htmlElement = document.createElement('span'); - htmlElement.innerHTML = htmlString; - $(htmlElement).find('.headerlink').remove(); - docContent = $(htmlElement).find('[role=main]')[0]; + var virtualDocument = document.implementation.createHTMLDocument('virtual'); + var htmlElement = $(htmlString, virtualDocument); + htmlElement.find('.headerlink').remove(); + docContent = htmlElement.find('[role=main]')[0]; if(docContent === undefined) { console.warn("Content block not found. Sphinx search tries to obtain it " + "via '[role=main]'. Could you check your theme or template."); diff --git a/genindex.html b/genindex.html index 8b7b6ea..5e410e9 100644 --- a/genindex.html +++ b/genindex.html @@ -7,7 +7,7 @@ - Index — parsedmarc 6.11.0 documentation + Index — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
diff --git a/index.html b/index.html index f62ac1b..4e5990a 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 6.11.0 documentation + parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 6.12.0 documentation @@ -59,7 +59,7 @@
- 6.11.0 + 6.12.0
@@ -382,6 +382,8 @@ lookalike domain monitoring, check out 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

    • @@ -2160,7 +2162,7 @@ index

    -parsedmarc.elastic.set_hosts(hosts, use_ssl=False, ssl_cert_path=None, timeout=60.0)[source]
    +parsedmarc.elastic.set_hosts(hosts, use_ssl=False, ssl_cert_path=None, username=None, password=None, timeout=60.0)[source]

    Sets the Elasticsearch hosts to use

    Parameters
    @@ -2168,6 +2170,8 @@ index

  • hosts (str) – A single hostname or URL, or list of hostnames or URLs

  • use_ssl (bool) – Use a HTTPS connection to the server

  • ssl_cert_path (str) – Path to the certificate chain

    • +

  • username (str) – The username to use for authentication

    • +

  • password (str) – The password to use for authentication

  • timeout (float) – Timeout in seconds

    • diff --git a/objects.inv b/objects.inv index 858d865c82829b2da218e080e182c5b1078adc9e..81063f7e1cd82e4aad0bbbc8da4dd15c7adab339 100644 GIT binary patch delta 12 TcmeBW>t&nZ$Y`|D=`<4n84CmJ delta 12 TcmeBW>t&nZ$Y{9H=`<4n83qID diff --git a/py-modindex.html b/py-modindex.html index 769db38..8085100 100644 --- a/py-modindex.html +++ b/py-modindex.html @@ -7,7 +7,7 @@ - Python Module Index — parsedmarc 6.11.0 documentation + Python Module Index — parsedmarc 6.12.0 documentation @@ -62,7 +62,7 @@
    - 6.11.0 + 6.12.0
    diff --git a/search.html b/search.html index 4fe280d..c6e82fa 100644 --- a/search.html +++ b/search.html @@ -7,7 +7,7 @@ - Search — parsedmarc 6.11.0 documentation + Search — parsedmarc 6.12.0 documentation @@ -61,7 +61,7 @@
    - 6.11.0 + 6.12.0