From 293d3ecf747d5e21d7ff211e519a3537ca206eb5 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Fri, 5 Oct 2018 16:16:24 -0400 Subject: [PATCH] Update documentation --- README.rst | 147 +++++++++++++++++++++++++------------------------ docs/index.rst | 6 +- 2 files changed, 80 insertions(+), 73 deletions(-) diff --git a/README.rst b/README.rst index bcba89d..d74f820 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,8 @@ CLI help usage: parsedmarc [-h] [-o OUTPUT] [-n NAMESERVERS [NAMESERVERS ...]] [-t TIMEOUT] [-H HOST] [-u USER] [-p PASSWORD] - [-r REPORTS_FOLDER] [-a ARCHIVE_FOLDER] [-d] + [--imap-port IMAP_PORT] [--imap-no-ssl] [-r REPORTS_FOLDER] + [-a ARCHIVE_FOLDER] [-d] [-E [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]]] [--elasticsearch-index-prefix ELASTICSEARCH_INDEX_PREFIX] [--elasticsearch-index-suffix ELASTICSEARCH_INDEX_SUFFIX] @@ -54,79 +55,81 @@ CLI help [-s] [--debug] [-v] [file_path [file_path ...]] - Parses DMARC reports + Parses DMARC reports - positional arguments: - file_path one or more paths to aggregate or forensic report - files or emails - - optional arguments: - -h, --help show this help message and exit - -o OUTPUT, --output OUTPUT - Write output files to the given directory - -n NAMESERVERS [NAMESERVERS ...], --nameservers NAMESERVERS [NAMESERVERS ...] - nameservers to query (Default is Cloudflare's) - -t TIMEOUT, --timeout TIMEOUT - number of seconds to wait for an answer from DNS - (default 2.0) - -H HOST, --host HOST IMAP hostname or IP address - -u USER, --user USER IMAP user - -p PASSWORD, --password PASSWORD - IMAP password - -r REPORTS_FOLDER, --reports-folder REPORTS_FOLDER - The IMAP folder containing the reports Default: INBOX - -a ARCHIVE_FOLDER, --archive-folder ARCHIVE_FOLDER - Specifies the IMAP folder to move messages to after - processing them Default: Archive - -d, --delete Delete the reports after processing them - -E [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]], --elasticsearch-host [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]] - A list of one or more Elasticsearch hostnames or URLs - to use (e.g. localhost:9200) - --elasticsearch-index-prefix ELASTICSEARCH_INDEX_PREFIX - Prefix to add in front of the dmarc_aggregate and - dmarc_forensic Elasticsearch index names, joined by _ - --elasticsearch-index-suffix ELASTICSEARCH_INDEX_SUFFIX - Append this suffix to the dmarc_aggregate and - dmarc_forensic Elasticsearch index names, joined by _ - --hec HEC URL to a Splunk HTTP Event Collector (HEC) - --hec-token HEC_TOKEN - The authorization token for a Splunk HTTP Event - Collector (HEC) - --hec-index HEC_INDEX - The index to use when sending events to the Splunk - HTTP Event Collector (HEC) - --hec-skip-certificate-verification - Skip certificate verification for Splunk HEC - --save-aggregate Save aggregate reports to search indexes - --save-forensic Save forensic reports to search indexes - -O OUTGOING_HOST, --outgoing-host OUTGOING_HOST - Email the results using this host - -U OUTGOING_USER, --outgoing-user OUTGOING_USER - Email the results using this user - -P OUTGOING_PASSWORD, --outgoing-password OUTGOING_PASSWORD - Email the results using this password - --outgoing-port OUTGOING_PORT - Email the results using this port - --outgoing-ssl OUTGOING_SSL - Use SSL/TLS instead of STARTTLS (more secure, and - required by some providers, like Gmail) - -F OUTGOING_FROM, --outgoing-from OUTGOING_FROM - Email the results using this from address - -T OUTGOING_TO [OUTGOING_TO ...], --outgoing-to OUTGOING_TO [OUTGOING_TO ...] - Email the results to these addresses - -S OUTGOING_SUBJECT, --outgoing-subject OUTGOING_SUBJECT - Email the results using this subject - -A OUTGOING_ATTACHMENT, --outgoing-attachment OUTGOING_ATTACHMENT - Email the results using this filename - -M OUTGOING_MESSAGE, --outgoing-message OUTGOING_MESSAGE - Email the results using this message - -w, --watch Use an IMAP IDLE connection to process reports as they - arrive in the inbox - --test Do not move or delete IMAP messages - -s, --silent Only print errors - --debug Print debugging information - -v, --version show program's version number and exit + positional arguments: + file_path one or more paths to aggregate or forensic report + files or emails + optional arguments: + -h, --help show this help message and exit + -o OUTPUT, --output OUTPUT + Write output files to the given directory + -n NAMESERVERS [NAMESERVERS ...], --nameservers NAMESERVERS [NAMESERVERS ...] + nameservers to query (Default is Cloudflare's) + -t TIMEOUT, --timeout TIMEOUT + number of seconds to wait for an answer from DNS + (default 2.0) + -H HOST, --host HOST IMAP hostname or IP address + -u USER, --user USER IMAP user + -p PASSWORD, --password PASSWORD + IMAP password + --imap-port IMAP_PORT + IMAP port + --imap-no-ssl Do not use SSL when connecting to IMAP + -r REPORTS_FOLDER, --reports-folder REPORTS_FOLDER + The IMAP folder containing the reports Default: INBOX + -a ARCHIVE_FOLDER, --archive-folder ARCHIVE_FOLDER + Specifies the IMAP folder to move messages to after + processing them Default: Archive + -d, --delete Delete the reports after processing them + -E [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]], --elasticsearch-host [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]] + A list of one or more Elasticsearch hostnames or URLs + to use (e.g. localhost:9200) + --elasticsearch-index-prefix ELASTICSEARCH_INDEX_PREFIX + Prefix to add in front of the dmarc_aggregate and + dmarc_forensic Elasticsearch index names, joined by _ + --elasticsearch-index-suffix ELASTICSEARCH_INDEX_SUFFIX + Append this suffix to the dmarc_aggregate and + dmarc_forensic Elasticsearch index names, joined by _ + --hec HEC URL to a Splunk HTTP Event Collector (HEC) + --hec-token HEC_TOKEN + The authorization token for a Splunk HTTP Event + Collector (HEC) + --hec-index HEC_INDEX + The index to use when sending events to the Splunk + HTTP Event Collector (HEC) + --hec-skip-certificate-verification + Skip certificate verification for Splunk HEC + --save-aggregate Save aggregate reports to search indexes + --save-forensic Save forensic reports to search indexes + -O OUTGOING_HOST, --outgoing-host OUTGOING_HOST + Email the results using this host + -U OUTGOING_USER, --outgoing-user OUTGOING_USER + Email the results using this user + -P OUTGOING_PASSWORD, --outgoing-password OUTGOING_PASSWORD + Email the results using this password + --outgoing-port OUTGOING_PORT + Email the results using this port + --outgoing-ssl OUTGOING_SSL + Use SSL/TLS instead of STARTTLS (more secure, and + required by some providers, like Gmail) + -F OUTGOING_FROM, --outgoing-from OUTGOING_FROM + Email the results using this from address + -T OUTGOING_TO [OUTGOING_TO ...], --outgoing-to OUTGOING_TO [OUTGOING_TO ...] + Email the results to these addresses + -S OUTGOING_SUBJECT, --outgoing-subject OUTGOING_SUBJECT + Email the results using this subject + -A OUTGOING_ATTACHMENT, --outgoing-attachment OUTGOING_ATTACHMENT + Email the results using this filename + -M OUTGOING_MESSAGE, --outgoing-message OUTGOING_MESSAGE + Email the results using this message + -w, --watch Use an IMAP IDLE connection to process reports as they + arrive in the inbox + --test Do not move or delete IMAP messages + -s, --silent Only print errors + --debug Print debugging information + -v, --version show program's version number and exit SPF and DMARC record validation =============================== diff --git a/docs/index.rst b/docs/index.rst index dd13ae7..22b8fee 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -47,7 +47,8 @@ CLI help usage: parsedmarc [-h] [-o OUTPUT] [-n NAMESERVERS [NAMESERVERS ...]] [-t TIMEOUT] [-H HOST] [-u USER] [-p PASSWORD] - [-r REPORTS_FOLDER] [-a ARCHIVE_FOLDER] [-d] + [--imap-port IMAP_PORT] [--imap-no-ssl] [-r REPORTS_FOLDER] + [-a ARCHIVE_FOLDER] [-d] [-E [ELASTICSEARCH_HOST [ELASTICSEARCH_HOST ...]]] [--elasticsearch-index-prefix ELASTICSEARCH_INDEX_PREFIX] [--elasticsearch-index-suffix ELASTICSEARCH_INDEX_SUFFIX] @@ -80,6 +81,9 @@ CLI help -u USER, --user USER IMAP user -p PASSWORD, --password PASSWORD IMAP password + --imap-port IMAP_PORT + IMAP port + --imap-no-ssl Do not use SSL when connecting to IMAP -r REPORTS_FOLDER, --reports-folder REPORTS_FOLDER The IMAP folder containing the reports Default: INBOX -a ARCHIVE_FOLDER, --archive-folder ARCHIVE_FOLDER