From 340ef866d20439cef748dea95fb59b3a7f409418 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:39:26 +0200 Subject: [PATCH 1/4] Update thollander/actions-comment-pull-request action to v2.4.1 (#5377) Signed-off-by: milkmaker Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/check_prs_if_on_staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_prs_if_on_staging.yml b/.github/workflows/check_prs_if_on_staging.yml index bb0d0938..93cd5e32 100644 --- a/.github/workflows/check_prs_if_on_staging.yml +++ b/.github/workflows/check_prs_if_on_staging.yml @@ -10,7 +10,7 @@ jobs: if: github.event.pull_request.base.ref != 'staging' #check if the target branch is not staging steps: - name: Send message - uses: thollander/actions-comment-pull-request@v2.4.0 + uses: thollander/actions-comment-pull-request@v2.4.1 with: GITHUB_TOKEN: ${{ secrets.CHECKIFPRISSTAGING_ACTION_PAT }} message: | From e468c59dfcdba37e57bec54bd5789eb709006da8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 06:46:07 +0200 Subject: [PATCH 2/4] Update thollander/actions-comment-pull-request action to v2.4.2 (#5379) Signed-off-by: milkmaker Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/check_prs_if_on_staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_prs_if_on_staging.yml b/.github/workflows/check_prs_if_on_staging.yml index 93cd5e32..c28454f6 100644 --- a/.github/workflows/check_prs_if_on_staging.yml +++ b/.github/workflows/check_prs_if_on_staging.yml @@ -10,7 +10,7 @@ jobs: if: github.event.pull_request.base.ref != 'staging' #check if the target branch is not staging steps: - name: Send message - uses: thollander/actions-comment-pull-request@v2.4.1 + uses: thollander/actions-comment-pull-request@v2.4.2 with: GITHUB_TOKEN: ${{ secrets.CHECKIFPRISSTAGING_ACTION_PAT }} message: | From 025fd0331038422327a29e699ed9252db2187eb4 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Mon, 7 Aug 2023 14:26:30 +0200 Subject: [PATCH 3/4] [Rspamd] remove X-Moo-Tag header if unnecessary --- data/conf/rspamd/lua/rspamd.local.lua | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua index 5b08dc93..b29a2446 100644 --- a/data/conf/rspamd/lua/rspamd.local.lua +++ b/data/conf/rspamd/lua/rspamd.local.lua @@ -221,6 +221,16 @@ rspamd_config:register_symbol({ local tagged_rcpt = task:get_symbol("TAGGED_RCPT") local mailcow_domain = task:get_symbol("RCPT_MAILCOW_DOMAIN") + local function remove_moo_tag() + local moo_tag_header = task:get_header('X-Moo-Tag', false) + if moo_tag_header then + task:set_milter_reply({ + remove_headers = {['X-Moo-Tag'] = 0}, + }) + end + return true + end + if tagged_rcpt and tagged_rcpt[1].options and mailcow_domain then local tag = tagged_rcpt[1].options[1] rspamd_logger.infox("found tag: %s", tag) @@ -229,6 +239,7 @@ rspamd_config:register_symbol({ if action ~= 'no action' and action ~= 'greylist' then rspamd_logger.infox("skipping tag handler for action: %s", action) + remove_moo_tag() return true end @@ -243,6 +254,7 @@ rspamd_config:register_symbol({ local function tag_callback_subfolder(err, data) if err or type(data) ~= 'string' then rspamd_logger.infox(rspamd_config, "subfolder tag handler for rcpt %s returned invalid or empty data (\"%s\") or error (\"%s\")", body, data, err) + remove_moo_tag() else rspamd_logger.infox("Add X-Moo-Tag header") task:set_milter_reply({ @@ -261,6 +273,7 @@ rspamd_config:register_symbol({ ) if not redis_ret_subfolder then rspamd_logger.infox(rspamd_config, "cannot make request to load tag handler for rcpt") + remove_moo_tag() end else @@ -268,7 +281,10 @@ rspamd_config:register_symbol({ local sbj = task:get_header('Subject') new_sbj = '=?UTF-8?B?' .. tostring(util.encode_base64('[' .. tag .. '] ' .. sbj)) .. '?=' task:set_milter_reply({ - remove_headers = {['Subject'] = 1}, + remove_headers = { + ['Subject'] = 1, + ['X-Moo-Tag'] = 0 + }, add_headers = {['Subject'] = new_sbj} }) end @@ -284,6 +300,7 @@ rspamd_config:register_symbol({ ) if not redis_ret_subject then rspamd_logger.infox(rspamd_config, "cannot make request to load tag handler for rcpt") + remove_moo_tag() end end @@ -295,6 +312,7 @@ rspamd_config:register_symbol({ if #rcpt_split == 2 then if rcpt_split[1] == 'postmaster' then rspamd_logger.infox(rspamd_config, "not expanding postmaster alias") + remove_moo_tag() else rspamd_http.request({ task=task, @@ -307,7 +325,8 @@ rspamd_config:register_symbol({ end end end - + else + remove_moo_tag() end end, priority = 19 From 1db899027197cec65ce98b34b2a31cd1fb5679da Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 10 Aug 2023 13:51:40 +0200 Subject: [PATCH 4/4] Fixed Branch checkout in generate_config.sh --- generate_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_config.sh b/generate_config.sh index d09dae9e..12749605 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -189,7 +189,7 @@ if [[ ${SKIP_BRANCH} != y ]]; then done git fetch --all - git checkout -f $git_branch + git checkout -f $MAILCOW_BRANCH elif [[ ${SKIP_BRANCH} == y ]]; then echo -e "\033[33mEnabled Dev Mode.\033[0m"