From 9d7208b2d658055f888531d97090568036e19cc3 Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 19 Apr 2023 10:01:25 -0500 Subject: [PATCH 1/9] rc-1 initialize --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .github/ISSUE_TEMPLATE/critical_report.md | 4 ++-- README.md | 13 ++++++------- docs/CHANGELOG.md | 3 +++ docs/SECURITY.md | 15 ++++++++------- docs/SUPPORT.md | 14 +++++++++++--- includes/template.php | 2 +- 7 files changed, 33 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0991102..2816729 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[ ] Version 1 Beta 2 -[ ] Version 1 Beta 1 +[ ] Version 1 Release Candidate 1 +[ ] Version 1 Beta 3 [ ] Other **Desktop (please complete the following information):** diff --git a/.github/ISSUE_TEMPLATE/critical_report.md b/.github/ISSUE_TEMPLATE/critical_report.md index a767846..29ba4dd 100644 --- a/.github/ISSUE_TEMPLATE/critical_report.md +++ b/.github/ISSUE_TEMPLATE/critical_report.md @@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[ ] Version 1 Beta 2 -[ ] Version 1 Beta 1 +[ ] Version 1 Release Candidate 1 +[ ] Version 1 Beta 3 [ ] Other **Desktop (please complete the following information):** diff --git a/README.md b/README.md index e7cf546..b768e2e 100644 --- a/README.md +++ b/README.md @@ -97,9 +97,8 @@ Valid date signifiers are `m`, `w`, and `d` for "month", "week", and "day". # Latest Changes -## 1-β3 -- Tweaks to the `openda` and `openda_light` themes, including table widths and data coloring. -- Issue template fix per issue #78. +## 1-rc1 +- Documentation updates. See `CHANGELOG` under `docs` for full details of all changes. @@ -107,7 +106,7 @@ See `CHANGELOG` under `docs` for full details of all changes. | OS | HTTP | PHP | SQL | | --------------- | ------------- | ------ | --------------- | -| Debian 11.6 | Apache 2.4.52 | 8.2.3 | MariaDB 10.5.18 | +| Debian 11.6 | Apache 2.4.56 | 8.2.3 | MariaDB 10.5.18 | | CentOS 7.6.1810 | Apache 2.4.6 | 5.4.16 | MariaDB 5.5.65 | If you have a system configuration not listed, and would like to contribue this data, please [provide feedback](https://github.com/userjack6880/Open-Dmarc-Analyzer/issues). @@ -122,9 +121,9 @@ Support will be provided as outlined in the following schedule. For more details | Version | Support Level | Released | End of Support | End of Life | | ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- | -| Version 1 Beta 3 | Full Support | 19 April 2023 | 1-rc1 Release | TBD | -| Version 1 Beta 2 | Critical Support | 29 November 2022 | 19 April 2023 | 1-rc1 Release | -| Version 1 Beta 1 | End of Life | 4 November 2022 | 29 November 2022 | 19 April 2023 | +| Version 1 Release Candidate 1 | Full Support | 15 May 2023 | ~15 June 2023 | 31 December 2023 | +| Version 1 Beta 3 | Critical Support | 19 April 2023 | 15 May 2023 | ~15 June 2023 | +| Version 1 Beta 2 | End of Life | 29 November 2022 | 19 April 2023 | 15 May 2023 | # Contributing diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1d12b1f..e0228d8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1-rc1 +- Documentation updates. + ## 1-β3 - Tweaks to the `openda` and `openda_light` themes, including table widths and data coloring. - Issue template fix per issue #78. diff --git a/docs/SECURITY.md b/docs/SECURITY.md index d50ac2d..730f337 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -18,10 +18,11 @@ A response should be recieved within 72 hours. If no response is given, please f Open DMARC Analyzer Version Security Support -| Version | Supported | End of Life | -| -------------------------- | --------- | ---------------- | -| Version 1 Beta 3 | YES | TBD | -| Version 1 Beta 2 | YES | 1-rc1 Release | -| Version 1 Beta 1 | NO | 19 April 2023 | -| Version 1 Feature Complete | NO | 29 November 2022 | -| Version 0 Alpha 9 | NO | 4 November 2022 | +| Version | Supported | End of Life | +| ----------------------------- | --------- | ---------------- | +| Version 1 Release Candidate 1 | YES | 31 December 2023 | +| Version 1 Beta 3 | YES | ~15 June 2023 | +| Version 1 Beta 2 | NO | 15 May 2023 | +| Version 1 Beta 1 | NO | 19 April 2023 | +| Version 1 Feature Complete | NO | 29 November 2022 | +| Version 0 Alpha 9 | NO | 4 November 2022 | diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index 3a072da..0da39b7 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -1,11 +1,12 @@ -# Software Support +# Software Support Chart Due to the limited time available to developrs to maintain support, dates must be set where support must end. The following is a chart outlining the support shedule for Open DMARC Analyzer. | Version | Support Level | Released | End of Support | End of Life | | ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- | -| Version 1 Beta 3 | Full Support | 19 April 2023 | 1-rc1 Release | TBD | -| Version 1 Beta 2 | Critical Support | 29 November 2022 | 19 April 2023 | 1-rc1 Release | +| Version 1 Release Candidate 1 | Full Support | 15 May 2023 | ~15 June 2023 | 31 December 2023 | +| Version 1 Beta 3 | Critical Support | 19 April 2023 | 15 May 2023 | ~15 June 2023 | +| Version 1 Beta 2 | End of Life | 29 November 2022 | 19 April 2023 | 15 May 2023 | | Version 1 Beta 1 | End of Life | 4 November 2022 | 29 November 2022 | 19 April 2023 | | Version 1 Feature Complete | End of Life | 27 July 2022 | 4 November 2022 | 29 November 2022 | | Version 0 Alpha 9 | End of Life | 2 May 2022 | 27 July 2022 | 4 November 2022 | @@ -13,6 +14,13 @@ Due to the limited time available to developrs to maintain support, dates must b | Version 0 Alpha 8.1 | End of Life | 30 March 2022 | 31 March 2022 | 2 May 2022 | | Version 0 Alpha 8 or Older | End of Life | 29 March 2022 | 30 March 2022 | 30 March 2022 | +# Support Cycle + +- Pre-stable versions recieve one version cycle of full spport and one cycle of critical support before being considered end of life. Due to the lack of release cycle for these versions, support time can wildly vary. +- The final release candidate will have critical support until the end of a year that the stable version is released. +- All versions of a stable version are considered supported, though it is encouraged to keep updated to the latest stable release. +- Stable versions reach end of life at the end of a year that a new stable version is released. The exception is LTS versions - those will recieve 3 years of support. + # Support Levels - **Full Support** means that software will recieve regular bug fixes, feature updates (if applicable), and security fixes. All current versions do not have an expected End of Support or End of Life date, as new version releases are not always predictable. diff --git a/includes/template.php b/includes/template.php index 91deeb9..ba3b920 100644 --- a/includes/template.php +++ b/includes/template.php @@ -31,7 +31,7 @@ // Versioning ----------------------------------------------------------------- function oda_version() { - echo "1-β3"; + echo "1-rc1"; } From e5e12155be94617c2dea19ce58fa5fd315ba0571 Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 19 Apr 2023 13:48:04 -0500 Subject: [PATCH 2/9] changed references to rrdmarc and dmarcts-report-parser to open-report-parser --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b768e2e..628a18d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Open DMARC Analyzer ![Open DMARC Analyzer Screenshot](docs/images/oda-screenshot.jpg?raw=true) -Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMARC reports that have been parsed by [John Levine's rrdmarc script](http://www.taugh.com/rddmarc/) or [techsneeze's dmarcts-report-parser](https://github.com/techsneeze/dmarcts-report-parser). +Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMARC reports that have been parsed by [Open Report Parser](https://github.com/userjack6880/Open-Report-Parser). Open DMARC Analyzer was written because there didn't seem to be a full-featured self-hosted report analyzer that provided enough details to make heads or tails of a large volume of DMARC reports that come into medium to large-sized organizations. While other solutions required paid subscriptions or have part of it hosted on AWS, Open DMARC Analyzer will run on any webserver that supports PHP 7.4+ and MySQL 15.1+. @@ -12,7 +12,7 @@ Open DMARC Analyzer Version 1 Beta 3 (1-β3) is an [Anomaly \](https: - PHP 5 (PHP 7 required for phpWhois) - PHP PDO - MySQL 15.1 or equivalent -- **A database that is pre-populated with data from [rrdmarc](http://www.taugh.com/rddmarc/) or [dmarcts-report-parser](https://github.com/techsneeze/dmarcts-report-parser)** +- **A database that is pre-populated with data from [Open Report Parser](https://github.com/userjack6880/Open-Report-Parser)** # Dependencies From 0fbfecfb1a7b7b301c70cfee5155824a50657f0f Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 08:45:05 -0500 Subject: [PATCH 3/9] readme version line update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 628a18d..af09b17 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMAR Open DMARC Analyzer was written because there didn't seem to be a full-featured self-hosted report analyzer that provided enough details to make heads or tails of a large volume of DMARC reports that come into medium to large-sized organizations. While other solutions required paid subscriptions or have part of it hosted on AWS, Open DMARC Analyzer will run on any webserver that supports PHP 7.4+ and MySQL 15.1+. -Open DMARC Analyzer Version 1 Beta 3 (1-β3) is an [Anomaly \](https://systemanomaly.com/codebase) project by John Bradley (john@systemanomaly.com) +Open DMARC Analyzer Version 1 Release Candidate 1 (1-rc1) is an [Anomaly \](https://systemanomaly.com/codebase) project by John Bradley (john@systemanomaly.com) # Minimum Requirements - Apache 2 or equivalent From 3f920c5e7daae56b13024a9adfb50c524a15b4b6 Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 08:53:17 -0500 Subject: [PATCH 4/9] documentation updates --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/critical_report.md | 6 +++--- docs/SUPPORT.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2816729..9f8b882 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[ ] Version 1 Release Candidate 1 -[ ] Version 1 Beta 3 -[ ] Other +[] Version 1 Release Candidate 1 +[] Version 1 Beta 3 +[] Other **Desktop (please complete the following information):** - OS [e.g. macOS] diff --git a/.github/ISSUE_TEMPLATE/critical_report.md b/.github/ISSUE_TEMPLATE/critical_report.md index 29ba4dd..06a7551 100644 --- a/.github/ISSUE_TEMPLATE/critical_report.md +++ b/.github/ISSUE_TEMPLATE/critical_report.md @@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[ ] Version 1 Release Candidate 1 -[ ] Version 1 Beta 3 -[ ] Other +[] Version 1 Release Candidate 1 +[] Version 1 Beta 3 +[] Other **Desktop (please complete the following information):** - OS [e.g. macOS] diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index 0da39b7..dedc37a 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -19,7 +19,7 @@ Due to the limited time available to developrs to maintain support, dates must b - Pre-stable versions recieve one version cycle of full spport and one cycle of critical support before being considered end of life. Due to the lack of release cycle for these versions, support time can wildly vary. - The final release candidate will have critical support until the end of a year that the stable version is released. - All versions of a stable version are considered supported, though it is encouraged to keep updated to the latest stable release. -- Stable versions reach end of life at the end of a year that a new stable version is released. The exception is LTS versions - those will recieve 3 years of support. +- Stable versions reach end of life at the end of a year that a new stable version is released. The exception is LTS versions - those will recieve 3 years of support after a new stable version is released. # Support Levels From a8129c8d2f70592f575bde6a5f6e02e6e6479625 Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 10:44:08 -0500 Subject: [PATCH 5/9] version 2 backports --- README.md | 17 +++++++++++------ config.php.pub | 3 ++- docs/CHANGELOG.md | 4 ++++ docs/SECURITY.md | 5 +++-- docs/SUPPORT.md | 5 +++-- includes/db.php | 10 +++++++++- includes/functions.php | 2 +- install.php | 9 ++++++++- pgsql.sql | 8 ++++++++ 9 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 pgsql.sql diff --git a/README.md b/README.md index af09b17..8ffcdf6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Open DMARC Analyzer Version 1 Release Candidate 1 (1-rc1) is an [Anomaly \"; foreach ($lines as $line) @@ -89,6 +89,13 @@ echo "FAILED → mysql.sql
"; } +if (unlink('pgsql.sql') == true) { + echo "DELETED → pgsql.sql
"; +} +else { + echo "FAILED → pgsql.sql
"; +} + if (unlink(__FILE__) == true) { echo "DELETED → install.php
"; } diff --git a/pgsql.sql b/pgsql.sql new file mode 100644 index 0000000..17875d3 --- /dev/null +++ b/pgsql.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE VIEW report_stats AS ( + SELECT + report.serial, domain, rcount, disposition, reason, + policy_p, policy_pct, dkimdomain, dkimresult, dkim_align, + spfdomain, spfresult, spf_align, mindate, maxdate + FROM report RIGHT JOIN rptrecord + ON report.serial=rptrecord.serial +); From f73342d6db79722f0722625100c0850cc60e7fa5 Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 10:44:19 -0500 Subject: [PATCH 6/9] version 2 backports --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/critical_report.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9f8b882..551e05d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ If applicable, add screenshots to help explain your problem. **Software Version** [] Version 1 Release Candidate 1 -[] Version 1 Beta 3 +[] Version 1 Beta 4 [] Other **Desktop (please complete the following information):** diff --git a/.github/ISSUE_TEMPLATE/critical_report.md b/.github/ISSUE_TEMPLATE/critical_report.md index 06a7551..26b2153 100644 --- a/.github/ISSUE_TEMPLATE/critical_report.md +++ b/.github/ISSUE_TEMPLATE/critical_report.md @@ -25,7 +25,7 @@ If applicable, add screenshots to help explain your problem. **Software Version** [] Version 1 Release Candidate 1 -[] Version 1 Beta 3 +[] Version 1 Beta 4 [] Other **Desktop (please complete the following information):** From 3a0c4c4721fe877cc233ecfca89ab5aafbe627af Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 10:47:21 -0500 Subject: [PATCH 7/9] version 2 backports --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/critical_report.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 551e05d..032278e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[] Version 1 Release Candidate 1 -[] Version 1 Beta 4 -[] Other +[ ] Version 1 Release Candidate 1 +[ ] Version 1 Beta 4 +[ ] Other **Desktop (please complete the following information):** - OS [e.g. macOS] diff --git a/.github/ISSUE_TEMPLATE/critical_report.md b/.github/ISSUE_TEMPLATE/critical_report.md index 26b2153..bb85b45 100644 --- a/.github/ISSUE_TEMPLATE/critical_report.md +++ b/.github/ISSUE_TEMPLATE/critical_report.md @@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Software Version** -[] Version 1 Release Candidate 1 -[] Version 1 Beta 4 -[] Other +[ ] Version 1 Release Candidate 1 +[ ] Version 1 Beta 4 +[ ] Other **Desktop (please complete the following information):** - OS [e.g. macOS] From 2d5904831660bdb84ae9e306dfd8ace0fbf2efcf Mon Sep 17 00:00:00 2001 From: userjack6880 Date: Wed, 26 Apr 2023 10:50:46 -0500 Subject: [PATCH 8/9] documentation update referring to postgres requirement --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ffcdf6..8126cf0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Open DMARC Analyzer Version 1 Release Candidate 1 (1-rc1) is an [Anomaly \ Date: Fri, 28 Apr 2023 15:24:59 -0500 Subject: [PATCH 9/9] early release --- README.md | 6 +++--- docs/SECURITY.md | 2 +- docs/SUPPORT.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8126cf0..ea97c77 100644 --- a/README.md +++ b/README.md @@ -126,9 +126,9 @@ Support will be provided as outlined in the following schedule. For more details | Version | Support Level | Released | End of Support | End of Life | | ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- | -| Version 1 Release Candidate 1 | Full Support | 15 May 2023 | ~15 June 2023 | 31 December 2023 | -| Version 1 Beta 4 | Critical Support | 26 April 2023 | 15 May 2023 | ~15 June 2023 | -| Version 1 Beta 3 | End of Life | 19 April 2023 | 26 April 2023 | 15 May 2023 | +| Version 1 Release Candidate 1 | Full Support | 28 April 2023 | 15 May 2023 | 31 December 2023 | +| Version 1 Beta 4 | Critical Support | 26 April 2023 | 28 April 2023 | 15 May 2023 | +| Version 1 Beta 3 | End of Life | 19 April 2023 | 26 April 2023 | 28 April 2023 | # Contributing diff --git a/docs/SECURITY.md b/docs/SECURITY.md index 7c54101..6c9dc1b 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -21,7 +21,7 @@ Open DMARC Analyzer Version Security Support | Version | Supported | End of Life | | ----------------------------- | --------- | ---------------- | | Version 1 Release Candidate 1 | YES | 31 December 2023 | -| Version 1 Beta 4 | YES | ~15 June 2023 | +| Version 1 Beta 4 | YES | 28 April 2023 | | Version 1 Beta 3 | NO | 15 May 2023 | | Version 1 Beta 2 | NO | 26 April 2023 | | Version 1 Beta 1 | NO | 19 April 2023 | diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index dd58b64..3361065 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -4,9 +4,9 @@ Due to the limited time available to developrs to maintain support, dates must b | Version | Support Level | Released | End of Support | End of Life | | ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- | -| Version 1 Release Candidate 1 | Full Support | 15 May 2023 | ~15 June 2023 | 31 December 2023 | -| Version 1 Beta 4 | Critical Support | 26 April 2023 | 15 May 2023 | ~15 June 2023 | -| Version 1 Beta 3 | End of Life | 19 April 2023 | 26 April 2023 | 15 May 2023 | +| Version 1 Release Candidate 1 | Full Support | 28 April 2023 | 15 May 2023 | 31 December 2023 | +| Version 1 Beta 4 | Critical Support | 26 April 2023 | 28 April 2023 | 15 May 2023 | +| Version 1 Beta 3 | End of Life | 19 April 2023 | 26 April 2023 | 28 April 2023 | | Version 1 Beta 2 | End of Life | 29 November 2022 | 19 April 2023 | 26 April 2023 | | Version 1 Beta 1 | End of Life | 4 November 2022 | 29 November 2022 | 19 April 2023 | | Version 1 Feature Complete | End of Life | 27 July 2022 | 4 November 2022 | 29 November 2022 |