From 2a380b7d67ac58006da22465103c2dcb0ec565c9 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 27 Nov 2023 12:28:23 -0500 Subject: [PATCH 1/4] Bump version from 1.5.3 to 1.5.4 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b4c19ff..f489fb4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ expects the secrets in a different location. To run the `cisagov/trustymail_reporter` image via Docker: ```console -docker run cisagov/trustymail_reporter:1.5.3 +docker run cisagov/trustymail_reporter:1.5.4 ``` ### Running with Docker Compose ### @@ -43,7 +43,7 @@ docker run cisagov/trustymail_reporter:1.5.3 services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.3 + image: cisagov/trustymail_reporter:1.5.4 volumes: - type: bind source: @@ -102,7 +102,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.3 + image: cisagov/trustymail_reporter:1.5.4 volumes: - type: bind source: @@ -141,7 +141,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/trustymail_reporter:1.5.3 + docker pull cisagov/trustymail_reporter:1.5.4 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -151,11 +151,11 @@ environment variables. See the The images of this container are tagged with [semantic versions](https://semver.org) of the underlying example project that they containerize. It is recommended that most users use a version tag (e.g. -`:1.5.3`). +`:1.5.4`). | Image:tag | Description | |-----------|-------------| -|`cisagov/trustymail_reporter:1.5.3`| An exact release version. | +|`cisagov/trustymail_reporter:1.5.4`| An exact release version. | |`cisagov/trustymail_reporter:1.5`| The most recent release matching the major and minor version numbers. | |`cisagov/trustymail_reporter:1`| The most recent release matching the major version number. | |`cisagov/trustymail_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -220,7 +220,7 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --tag cisagov/trustymail_reporter:1.5.3 \ + --tag cisagov/trustymail_reporter:1.5.4 \ https://github.com/cisagov/trustymail_reporter.git#develop ``` @@ -251,7 +251,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/trustymail_reporter:1.5.3 . + --tag cisagov/trustymail_reporter:1.5.4 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index a06ff4e..3a384fb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.3" +__version__ = "1.5.4" From 494db2a035cc11abc610f629fefc8bb5f29ae1e6 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 27 Nov 2023 12:28:36 -0500 Subject: [PATCH 2/4] Bump version from 1.5.4 to 1.5.4-rc.1 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f489fb4..cf65126 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ expects the secrets in a different location. To run the `cisagov/trustymail_reporter` image via Docker: ```console -docker run cisagov/trustymail_reporter:1.5.4 +docker run cisagov/trustymail_reporter:1.5.4-rc.1 ``` ### Running with Docker Compose ### @@ -43,7 +43,7 @@ docker run cisagov/trustymail_reporter:1.5.4 services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.4 + image: cisagov/trustymail_reporter:1.5.4-rc.1 volumes: - type: bind source: @@ -102,7 +102,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.4 + image: cisagov/trustymail_reporter:1.5.4-rc.1 volumes: - type: bind source: @@ -141,7 +141,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/trustymail_reporter:1.5.4 + docker pull cisagov/trustymail_reporter:1.5.4-rc.1 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -151,11 +151,11 @@ environment variables. See the The images of this container are tagged with [semantic versions](https://semver.org) of the underlying example project that they containerize. It is recommended that most users use a version tag (e.g. -`:1.5.4`). +`:1.5.4-rc.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/trustymail_reporter:1.5.4`| An exact release version. | +|`cisagov/trustymail_reporter:1.5.4-rc.1`| An exact release version. | |`cisagov/trustymail_reporter:1.5`| The most recent release matching the major and minor version numbers. | |`cisagov/trustymail_reporter:1`| The most recent release matching the major version number. | |`cisagov/trustymail_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -220,7 +220,7 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --tag cisagov/trustymail_reporter:1.5.4 \ + --tag cisagov/trustymail_reporter:1.5.4-rc.1 \ https://github.com/cisagov/trustymail_reporter.git#develop ``` @@ -251,7 +251,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/trustymail_reporter:1.5.4 . + --tag cisagov/trustymail_reporter:1.5.4-rc.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 3a384fb..6700484 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.4" +__version__ = "1.5.4-rc.1" From 74d29ba02823aedb04609525b764dc50eb308d82 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 27 Nov 2023 12:29:06 -0500 Subject: [PATCH 3/4] Call \phantomsection and create a hypertarget for a \subsection* Resolves #114. This change makes this \subsection* identical to others in this same document. --- src/report/trustymail_report.mustache | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/report/trustymail_report.mustache b/src/report/trustymail_report.mustache index f116a28..d56d438 100644 --- a/src/report/trustymail_report.mustache +++ b/src/report/trustymail_report.mustache @@ -367,14 +367,15 @@ \newpage \renewcommand{\footrulewidth}{0.4pt} \section{Executive Summary} -\label{sec:executive summary} +\label{sec:executive_summary} Email underpins interactions between government agencies and enables direct correspondence with US citizens, immigrants, and international users. However, email was not built with security in mind, and without supplementary configuration or architecture it lacks important properties of trusted communication. Several email authentication technologies work in harmony to enable a recipient to detect and mitigate fraudulent email, particularly SPF and DMARC. This weekly report, created by the \href{https://www.cisa.gov/}{Cybersecurity and Infrastructure Security Agency (CISA)}, is intended to assist your agency to comply with the email security aspects of \href{https://cyber.dhs.gov}{Binding Operational Directive (BOD) 18-01}. Implementation guidance can be found at \href{https://cyber.dhs.gov/bod/18-01}{https://cyber.dhs.gov/bod/18-01/\#compliance-guide}. \vspace*{-3mm} +\phantomsection \addcontentsline{toc}{subsection}{Overview} % Adds a subsection to toc -\subsection*{Overview} +\hypertarget{Overview}{\subsection*{Overview}} \vspace*{-3mm} \raggedright We measure the presence of SPF and DMARC records in the DNS for your agency's publicly accessible .gov hostnames, as well as support for STARTTLS by your agency's SMTP servers. This report includes all agency-registered \href{https://github.com/cisagov/dotgov-data/blob/main/current-federal.csv}{second-level .gov domains} and known subdomains, collectively referred to as ``hostnames" in this document. Any hostnames that respond with NXDOMAIN (``nonexistent") in the public DNS are removed from the compliance figures below.\\~\\ From 065e5796e88d725d17eac5f5cfaa0eacf8cad913 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 28 Nov 2023 13:36:58 -0500 Subject: [PATCH 4/4] Finalize version from 1.5.4-rc.1 to 1.5.4 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index cf65126..f489fb4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ expects the secrets in a different location. To run the `cisagov/trustymail_reporter` image via Docker: ```console -docker run cisagov/trustymail_reporter:1.5.4-rc.1 +docker run cisagov/trustymail_reporter:1.5.4 ``` ### Running with Docker Compose ### @@ -43,7 +43,7 @@ docker run cisagov/trustymail_reporter:1.5.4-rc.1 services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.4-rc.1 + image: cisagov/trustymail_reporter:1.5.4 volumes: - type: bind source: @@ -102,7 +102,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.4-rc.1 + image: cisagov/trustymail_reporter:1.5.4 volumes: - type: bind source: @@ -141,7 +141,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/trustymail_reporter:1.5.4-rc.1 + docker pull cisagov/trustymail_reporter:1.5.4 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -151,11 +151,11 @@ environment variables. See the The images of this container are tagged with [semantic versions](https://semver.org) of the underlying example project that they containerize. It is recommended that most users use a version tag (e.g. -`:1.5.4-rc.1`). +`:1.5.4`). | Image:tag | Description | |-----------|-------------| -|`cisagov/trustymail_reporter:1.5.4-rc.1`| An exact release version. | +|`cisagov/trustymail_reporter:1.5.4`| An exact release version. | |`cisagov/trustymail_reporter:1.5`| The most recent release matching the major and minor version numbers. | |`cisagov/trustymail_reporter:1`| The most recent release matching the major version number. | |`cisagov/trustymail_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -220,7 +220,7 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --tag cisagov/trustymail_reporter:1.5.4-rc.1 \ + --tag cisagov/trustymail_reporter:1.5.4 \ https://github.com/cisagov/trustymail_reporter.git#develop ``` @@ -251,7 +251,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/trustymail_reporter:1.5.4-rc.1 . + --tag cisagov/trustymail_reporter:1.5.4 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 6700484..3a384fb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.4-rc.1" +__version__ = "1.5.4"