From d6dd8651414503b228ee341451ec7045d577f7d3 Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Fri, 16 Aug 2024 12:22:16 +0530 Subject: [PATCH 1/3] fix matrix build --- .github/workflows/build.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69967b3df..df11eb559 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,11 @@ jobs: build-and-push: name: 🐳 Build and Push Docker image runs-on: ubuntu-latest + strategy: + matrix: + platform: + - linux/amd64 + - linux/arm64 steps: - name: 📥 Checkout the git repo uses: actions/checkout@v4 @@ -34,19 +39,18 @@ jobs: with: images: yogeshojha/rengine tags: | - type=raw,value=latest,enable={{is_default_branch}} - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - type=sha,prefix=sha- - type=schedule,pattern={{date 'YYYYMMDD'}} + type=raw,value=${{ matrix.platform }}-latest,enable={{is_default_branch}} + type=semver,pattern=${{ matrix.platform }}-{{version}} + type=semver,pattern=${{ matrix.platform }}-{{major}}.{{minor}} + type=semver,pattern=${{ matrix.platform }}-{{major}} + type=sha,prefix=${{ matrix.platform }}-sha- + type=schedule,pattern=${{ matrix.platform }}-{{date 'YYYYMMDD'}} - name: 🏗️ Build and push Docker image uses: docker/build-push-action@v5 with: context: web/ - # platforms: linux/amd64,linux/arm64,linux/arm/v7 - platforms: linux/amd64,linux/arm64 + platforms: ${{ matrix.platform }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 2eda767b50e1f47090ad13af441b9375d13c9f4c Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Fri, 16 Aug 2024 12:30:45 +0530 Subject: [PATCH 2/3] update auto comment --- .github/workflows/auto-comment.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml index 4dde25868..7230c4dbb 100644 --- a/.github/workflows/auto-comment.yml +++ b/.github/workflows/auto-comment.yml @@ -23,38 +23,34 @@ jobs: issue_number: context.issue.number, owner, repo, - body: `👋 Hi @${author}, + body: `Hey @${author}! 👋 Thanks for flagging this! 🐛🐞 - Issues are only for reporting bugs or feature requests. Please read the documentation before raising an issue: https://rengine.wiki + Before we dig in, Let's make sure you have - Please include all the requested and relevant information when opening a bug report. Improper reports will be closed without any response.` + 🔍 Gone through the documentation: https://rengine.wiki + 🕵️ Make sure it's not a known issue + 📝 Provided us all the details related to this bug` }); } else if (context.eventName === 'pull_request' && context.payload.action === 'opened') { github.rest.issues.createComment({ issue_number: context.issue.number, owner, repo, - body: `👋 Hi @${author}, + body: `Woohoo @${author}! 🎉 You've just dropped some hot new code! 🔥 - Thank you for sending this pull request. - - Please make sure you have followed our [contribution guidelines](https://github.com/yogeshojha/rengine/blob/master/.github/CONTRIBUTING.md). - - We will review this PR as soon as possible. Thank you for your patience.` + Hang tight while we review this! You rock! 🤘` }); } else if (context.eventName === 'pull_request' && context.payload.action === 'closed') { github.rest.issues.createComment({ issue_number: context.issue.number, owner, repo, - body: `🚀 Hi @${author}, + body: `Holy smokes, @${author}! 🤯 You've just made reNgine even more awesome! - You are amazing! Thank you for your contributions. Your contributions are what makes reNgine awesome! + Your code is now part of the reNgine hall of fame. 🏆 + + Keep the cool ideas coming - maybe next time you'll break the internet! 💻💥 - This pull request has now been closed. - - We look forward to your future contributions and support. - - Thanks` + Virtual high fives all around! 🙌` }); } \ No newline at end of file From 84d37c7d67cb8e3dc04a4ecc0f08e7075f558bec Mon Sep 17 00:00:00 2001 From: Yogesh Ojha Date: Sun, 18 Aug 2024 07:18:48 +0530 Subject: [PATCH 3/3] Update changelog, bump version --- CHANGELOG.md | 36 ++++++++++++++++---- README.md | 2 +- docker-compose.dev.yml | 2 +- docker-compose.yml | 2 +- web/dashboard/templates/dashboard/index.html | 2 +- web/templates/base/_items/top_bar.html | 8 ++--- web/templates/base/login.html | 2 +- 7 files changed, 39 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c3b3262d..b24f1555d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## 2.1.3 + +**Release Date: Aug 18, 2024** + +## What's Changed + +### Security Update + +* (Security) CVE-2024-41661 Stored Cross-Site Scripting (XSS) via DNS Record Poisoning reported by @touhidshaikh Advisory https://github.com/yogeshojha/rengine/security/advisories/GHSA-96q4-fj2m-jqf7 + +### Bug Fixes + +* remove redundant docker environment variables by @jxdv in https://github.com/yogeshojha/rengine/pull/1353 +* fix: reNgine installation issue due to orjson and langchain #1362 by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1363 +* #1364 FIx whois lookup and improve performance by executing various modules of whois lookup to run concurrently by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1368 +* chores: Add error handling for the curl command by @gitworkflows in https://github.com/yogeshojha/rengine/pull/1367 +* Update Github Actions Workflows by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1369 +* chores: Fix docker build on master by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1373 + +#### New Contributors +* @gitworkflows made their first contribution in https://github.com/yogeshojha/rengine/pull/1367 + +**Full Changelog**: https://github.com/yogeshojha/rengine/compare/v2.1.2...v2.1.3 + ## 2.1.2 **Release Date: July 30, 2024** @@ -44,7 +68,7 @@ * Fix #1315 Fix for todo URLs not compatible with slugs by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1316 * Fixes #1122 But in port service lookup that caused multiple entries of Port with same port number but different service name/description by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1317 -## New Contributors +#### New Contributors * @emmanuel-ferdman made their first contribution in https://github.com/yogeshojha/rengine/pull/1286 **Full Changelog**: https://github.com/yogeshojha/rengine/compare/v2.1.0...v2.1.1 @@ -66,7 +90,7 @@ * Release/2.1.0 by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1147 * Dockerfile Build Multiple Platforms by @vncloudsco in https://github.com/yogeshojha/rengine/pull/1210 -## New Contributors +#### New Contributors * @fopina made their first contribution in https://github.com/yogeshojha/rengine/pull/1230 * @iuime made their first contribution in https://github.com/yogeshojha/rengine/pull/1137 * @null-ref-0000 made their first contribution in https://github.com/yogeshojha/rengine/pull/1275 @@ -91,7 +115,7 @@ * Fix/infoga removal by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1249 * Fix #1241 by @yogeshojha in https://github.com/yogeshojha/rengine/pull/1251 -## New Contributors +#### New Contributors * @Talanor made their first contribution in https://github.com/yogeshojha/rengine/pull/1245 * @specters312 made their first contribution in https://github.com/yogeshojha/rengine/pull/1239 * @TH3xACE made their first contribution in https://github.com/yogeshojha/rengine/pull/1224 @@ -121,7 +145,7 @@ * Fix uninitialised variable cmd in custom_subdomain_tools by @cpandya2909 in https://github.com/yogeshojha/rengine/pull/1207 * [FIX] security: OS Command Injection vulnerability (x2) #1219 by @0xtejas in https://github.com/yogeshojha/rengine/pull/1227 -## New Contributors :rocket: +### New Contributors :rocket: * @yarysp made their first contribution in https://github.com/yogeshojha/rengine/pull/1199 * @jostasik made their first contribution in https://github.com/yogeshojha/rengine/pull/1226 * @cpandya2909 made their first contribution in https://github.com/yogeshojha/rengine/pull/1207 @@ -144,7 +168,7 @@ * Change Redirect URL after login to prevent 500 error by @psyray in https://github.com/yogeshojha/rengine/pull/1124 * fix-1030: Add missing slug on target summary link by @psyray in https://github.com/yogeshojha/rengine/pull/1123 -## New Contributors +### New Contributors * @Deathpoolxrs made their first contribution in https://github.com/yogeshojha/rengine/pull/1149 * @ErdemOzgen made their first contribution in https://github.com/yogeshojha/rengine/pull/1126 @@ -196,7 +220,7 @@ * Fix report generation when `Ignore Informational Vulnerabilities` checked by @psyray in https://github.com/yogeshojha/rengine/pull/1100 * fix(tool_arsenal): incorrect regex version numbers by @AnonymousWP in https://github.com/yogeshojha/rengine/pull/1086 -## New Contributors +### New Contributors * @luizmlo made their first contribution in https://github.com/yogeshojha/rengine/pull/1029 :partying_face: * @aqhmal made their first contribution in https://github.com/yogeshojha/rengine/pull/1021 :partying_face: * @C0wnuts made their first contribution in https://github.com/yogeshojha/rengine/pull/973 :partying_face: diff --git a/README.md b/README.md index 4a7b45d2e..e09810b25 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

reNgine: The Ultimate Web Reconnaissance & Vulnerability Scanner 🚀

-

reNgine Latest Version License 

+

reNgine Latest Version License 

  diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f80e3d91b..9481d7f46 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -96,7 +96,7 @@ services: - POSTGRES_HOST=${POSTGRES_HOST} # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/ - - RENGINE_CURRENT_VERSION='2.1.2' + - RENGINE_CURRENT_VERSION='2.1.3' volumes: - ./web:/usr/src/app - github_repos:/usr/src/github diff --git a/docker-compose.yml b/docker-compose.yml index e46db5430..2daccd382 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: - DJANGO_SUPERUSER_PASSWORD=${DJANGO_SUPERUSER_PASSWORD} # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/ - - RENGINE_CURRENT_VERSION='2.1.2' + - RENGINE_CURRENT_VERSION='2.1.3' volumes: - ./web:/usr/src/app - github_repos:/usr/src/github diff --git a/web/dashboard/templates/dashboard/index.html b/web/dashboard/templates/dashboard/index.html index 99276d2d2..cbdeeeb8d 100644 --- a/web/dashboard/templates/dashboard/index.html +++ b/web/dashboard/templates/dashboard/index.html @@ -17,7 +17,7 @@ Dashboard {% endblock custom_js_css_link %} {% block breadcrumb_title %} -reNgine 2.1.2 +reNgine 2.1.3 {% endblock breadcrumb_title %} {% block main_content %} diff --git a/web/templates/base/_items/top_bar.html b/web/templates/base/_items/top_bar.html index 9819958ae..eafcf41c9 100644 --- a/web/templates/base/_items/top_bar.html +++ b/web/templates/base/_items/top_bar.html @@ -170,18 +170,18 @@

diff --git a/web/templates/base/login.html b/web/templates/base/login.html index 1ce18a7ba..cff84aa4f 100644 --- a/web/templates/base/login.html +++ b/web/templates/base/login.html @@ -58,7 +58,7 @@

Login to reNgine

-

Current release: v2.1.2

+

Current release: v2.1.3