From nobody Tue May 03 10:15:40 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4BFFA1AA8892; Tue, 3 May 2022 10:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kswp51fw0z4dNv; Tue, 3 May 2022 10:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651572941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/imgCvBI3eoMp4wRXaqQoDFUGJ0gHNXCJgbsL0k2MJY=; b=YvI4Vq5nlCGLiKlDs04IWD5cY4MQi+N+U+s16cHpdQUVGx8b3D9bxvTQjghtkeBiB1xWk5 x75vY5gDsAZtmwQXhHMS+1knjxl03RFDErXNOMhFgDhtlUTLbMlMbxzT2SDjmwm6piXVtc yEXNtEzxuDFFDuqxAYj2R3BCYN0Bl4p4U3wi3cROa9IVcVmNtreJx3cqdyJKhJPrdI5dVw szMHh/Hg4wQsaZngr9Jv271V1bbo7B16glwzEk3GJcei5VwwR/yqs+4Iqi07qF/HWxgjwg Q4jt/LBT9M6mAU0/Kg376ZSp79g3WkOx+4i0oE1A11bVcVcJDU6W2TCnV3VaCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18EDB1C762; Tue, 3 May 2022 10:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 243AFfeo067013; Tue, 3 May 2022 10:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243AFeOa067012; Tue, 3 May 2022 10:15:40 GMT (envelope-from git) Date: Tue, 3 May 2022 10:15:40 GMT Message-Id: <202205031015.243AFeOa067012@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 365d267c54be - 2022Q2 - mail/rainloop: Add patch to fix cross-site-scripting (XSS) vulnerability List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 365d267c54be8e7a985ed58360621924325187dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651572941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/imgCvBI3eoMp4wRXaqQoDFUGJ0gHNXCJgbsL0k2MJY=; b=jhMidczklRsCOpoi8pwLH0YjE/lwB7/g7CRezi6JDy/hmCgpkVqLYNi8lsnlOJPcW1l80l UQ5xjKBbQuoVLhJ1YF5QdKRVOT6HhlUq3F6GU3BbmLC0BJUpCL/vebPLlncVElrvey782K aPLDeP8JwXkQC6B4mPRuCMeskqL8HJ2GDQ5cKlhhaTIweUGU4H82rzMmn0LjjoibWczXR7 GeT1fNp+oaJ5MsEFdefTWMSuX9uNHzcwQeyHYUvpO/uu2M42ZGWwePuByqtZobsTP4jVXF GUcJonrZ92won/3i4/KuVOM9Ik028Bl0g10rtSGocZXua3e03pfUd6sfHo2wQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651572941; a=rsa-sha256; cv=none; b=fMPm/Z5T1b1NYZeGmBG9hWu+yA/ZOqN1UyrdAUYDSm/1PU15zQeGrWy++soBGMg1S0lzvo o43qMDgFZjGEqCKfKEHHiBxRe95MaA5/JebXT/LihN3HeOC/mZ3AvitbbATvkQWG4zlXPl jENngvUGO9eHfBKy48L8ZTiQf7LXSGwBSys6K3MHK/g8SCRD3ETvJYpflEqgQP2nWGh+50 vMmi1qk87fhh7o6P4tBqWF7V7pzOmTX1YSg4KcLlTrUlVz5WXv0Z+wUpGN3Lw/xveLG8Ti EQfCow4rzxG11+UhPwiojiST7RIakRURRxJzbR5m167D1/awPyieaWYbSwrBww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=365d267c54be8e7a985ed58360621924325187dc commit 365d267c54be8e7a985ed58360621924325187dc Author: Yasuhiro Kimura AuthorDate: 2022-05-03 10:06:33 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-05-03 10:15:08 +0000 mail/rainloop: Add patch to fix cross-site-scripting (XSS) vulnerability PR: 263749 Reported by: Lapo Luchini Obtained from: https://blog.sonarsource.com/rainloop-emails-at-risk-due-to-code-flaw MFH: 2022Q2 Security: a8118db0-cac2-11ec-9288-0800270512f4 (cherry picked from commit f9f524f160cb67555ffab240926b693d090ebd20) --- mail/rainloop/Makefile | 2 +- ...v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile index 37b9010a9499..1f2dfc496013 100644 --- a/mail/rainloop/Makefile +++ b/mail/rainloop/Makefile @@ -1,6 +1,6 @@ PORTNAME= rainloop DISTVERSION= 1.16.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www MASTER_SITES= https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX?= ${PHP_PKGNAMESUFFIX} diff --git a/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php b/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php new file mode 100644 index 000000000000..210cee2adc56 --- /dev/null +++ b/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php @@ -0,0 +1,21 @@ +--- rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php.orig 2021-05-06 11:04:36 UTC ++++ rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php +@@ -239,7 +239,8 @@ class HtmlUtils + $oWrapHtml->setAttribute($sKey, $sValue); + } + +- $oWrapDom = $oDom->createElement('div', '___xxx___'); ++ $rand_str = base64_encode(random_bytes(32)); ++ $oWrapDom = $oDom->createElement('div', $rand_str); + $oWrapDom->setAttribute('data-x-div-type', 'body'); + foreach ($aBodylAttrs as $sKey => $sValue) + { +@@ -250,7 +251,7 @@ class HtmlUtils + + $sWrp = $oDom->saveHTML($oWrapHtml); + +- $sResult = \str_replace('___xxx___', $sResult, $sWrp); ++ $sResult = \str_replace($rand_str, $sResult, $sWrp); + } + + $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);