Patched portrait vulnerability CVE-2006-1711 #129705

(Portage version: 2.1_pre7-r5)

5 files changed, 190 insertions, 12 deletions

diff --git a/net-zope/plone/ChangeLog b/net-zope/plone/ChangeLog
index 9489d8772c68..46ca4134aa9d 100644
--- a/net-zope/plone/ChangeLog
+++ b/net-zope/plone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/plone
-# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.27 2005/11/14 13:38:11 seemant Exp $
+# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.28 2006/04/16 11:31:08 radek Exp $
+
+*plone-2.0.5-r2 (16 Apr 2006)
+
+  16 Apr 2006; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/plone-2.0.5-portrait_security.patch, +plone-2.0.5-r2.ebuild:
+  Patched portrait vulnerability CVE-2006-1711 #129705
 
   14 Nov 2005; Seemant Kulleen <seemant@gentoo.org> plone-2.0.4.ebuild:
   keywording for amd64 testing
diff --git a/net-zope/plone/Manifest b/net-zope/plone/Manifest
index 6bc118e9e6b5..58a81d229cb9 100644
--- a/net-zope/plone/Manifest
+++ b/net-zope/plone/Manifest
@@ -1,24 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 28d9222ebc354090445fbe3d7a2d7487 ChangeLog 4383
+RMD160 772755a8f7ceba3613c0721db3caf41a414d93a9 ChangeLog 4383
+SHA256 602f5aebcb4782878eaa53e7fd5d4b4b07fc68fb3488da86226c0d1bad2c4414 ChangeLog 4383
 MD5 9e35feee29aeb8a7ecb18106d3378df0 files/digest-plone-1.0.5 66
+RMD160 54a7107a285fc9874ea5fda8d554b950cd1fcc79 files/digest-plone-1.0.5 66
+SHA256 844b89eeea0b4ab6237b4eb63d46bb4089027e61a80379161c62c6552901f0da files/digest-plone-1.0.5 66
 MD5 16d7a68ca1aee9115817c3a98c410fd0 files/digest-plone-1.0.6 63
+RMD160 3723ca91cd50f712b37ca96aed01ecd864087e4d files/digest-plone-1.0.6 63
+SHA256 46ee5624cca074d938167f1be55cc0c77cb74d8cff0cad91fd79b04977fa557c files/digest-plone-1.0.6 63
 MD5 069f9e1bb877e5e659d3f3c8b37bce38 files/digest-plone-2.0 71
+RMD160 4ea9df369c324ba4ac38d33cc26b3484d879dac2 files/digest-plone-2.0 71
+SHA256 a58fe2a988acb88ffb4ad6a392f0427b698a29a5fb61e4387eb6b4e24c7dc0b6 files/digest-plone-2.0 71
 MD5 4a7478c84170f5e7bcf8a00a6f13576f files/digest-plone-2.0.4 67
+RMD160 0896d13c7586e2c03f2366e233995de2c67e576e files/digest-plone-2.0.4 67
+SHA256 127598f053abe98546bf3179e20ea5503bb5572482efcf17d0dca5cda1693f56 files/digest-plone-2.0.4 67
 MD5 a7677837a9758dbd21316659b0f03dc5 files/digest-plone-2.0.5 67
+RMD160 23fe6b0749dfc09d83f5389adce8ab2a87018d49 files/digest-plone-2.0.5 67
+SHA256 763fbf741f0f75f24665e85b8aaae6854a56f01481fa55ee82b17f38c08de188 files/digest-plone-2.0.5 67
 MD5 a7677837a9758dbd21316659b0f03dc5 files/digest-plone-2.0.5-r1 67
+RMD160 23fe6b0749dfc09d83f5389adce8ab2a87018d49 files/digest-plone-2.0.5-r1 67
+SHA256 763fbf741f0f75f24665e85b8aaae6854a56f01481fa55ee82b17f38c08de188 files/digest-plone-2.0.5-r1 67
+MD5 e770cd92cfa7bee094443e872e5bc122 files/digest-plone-2.0.5-r2 247
+RMD160 c886666d980890b47ab22430c208b3a3a3753108 files/digest-plone-2.0.5-r2 247
+SHA256 ef74e3604c33228f2e14f6fb2dd1ec63b3bbb5897084c1c1fbd6170eeec19f8f files/digest-plone-2.0.5-r2 247
+MD5 49c12978ecb07eb8a9c1241249bf90c6 files/plone-2.0.5-portrait_security.patch 4081
+RMD160 b5275fc71cbe60ab7ea4aefac099a43e2f55c0c3 files/plone-2.0.5-portrait_security.patch 4081
+SHA256 28b558d460d4565ee1585770fc787fcc14d47605bff8d09b34daa958dd1f5cf0 files/plone-2.0.5-portrait_security.patch 4081
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
+SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5 metadata.xml 161
 MD5 09ce2150f95427912b9a722018b271b3 plone-1.0.5.ebuild 835
+RMD160 b10a675205f7a779d3b9846f272a2d069352486a plone-1.0.5.ebuild 835
+SHA256 8fc53417926fc75940b5503b00e0df052bd44c06c8283f3dc8955f8be22ef178 plone-1.0.5.ebuild 835
 MD5 af792bad58f734cab9812c788eca8066 plone-1.0.6.ebuild 834
+RMD160 017b7542729c254864e081012153ffa5263979e5 plone-1.0.6.ebuild 834
+SHA256 7b2111a6daf463ce24b3671cb9b2895b6b39fe6d8c4255b14606dadd1df1bf23 plone-1.0.6.ebuild 834
 MD5 f271ac1d80cc079f23e571839c4c9e41 plone-2.0.4.ebuild 994
+RMD160 68235d3c91f89a794df73e3351f11887cd3f483b plone-2.0.4.ebuild 994
+SHA256 9619d2267f5df10d246612ba940fdc331ef24fe8d9845d9dc1982564279035b0 plone-2.0.4.ebuild 994
 MD5 312f8aec105f47b7c20969f05f1f2ae4 plone-2.0.5-r1.ebuild 1027
+RMD160 1a75c02c0a5db7980769802e5f87b0215b05828e plone-2.0.5-r1.ebuild 1027
+SHA256 33c1fcf90c048d5233cfea46e792bbbc00ba403f3026232e5b1cd3e505d4394a plone-2.0.5-r1.ebuild 1027
+MD5 444e499bfb03368e319ed82c697a389a plone-2.0.5-r2.ebuild 1117
+RMD160 e3fed544c5909cbe5d76b0d1a957cf65d59f60ae plone-2.0.5-r2.ebuild 1117
+SHA256 dac3d73abe76b951d8526724bd53c1b1d75c5a7c79e71cb73a8e15432934fb60 plone-2.0.5-r2.ebuild 1117
 MD5 f0a36e4e9c9d6aecf8110f73a17e5f17 plone-2.0.5.ebuild 1026
+RMD160 9d4fe4228bbb80e2652a90d22eeca96ea4a6fca3 plone-2.0.5.ebuild 1026
+SHA256 a30b5be666eb661ccf156e5d66b32a31d1ba02a777b74f245f1ec2c0195f17cf plone-2.0.5.ebuild 1026
 MD5 80e268c70b24efaf5dd967f10ba5a7e0 plone-2.0.ebuild 929
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2Yhu2+ySkm8kpY0RAhn6AJ9P5hyYcL8wSwXLJqCU1xq84hLedwCdF9Iz
-AzfwZLrfag9dq+4vD0UQrHU=
-=WzNH
------END PGP SIGNATURE-----
+RMD160 855c5ce34051294e5763d9d4bb3e37d26222618d plone-2.0.ebuild 929
+SHA256 13773cf829fc2c6bdbcbb24cf5ace80f78e22da5e7abbd085484d33659d27eea plone-2.0.ebuild 929
diff --git a/net-zope/plone/files/digest-plone-2.0.5-r2 b/net-zope/plone/files/digest-plone-2.0.5-r2
new file mode 100644
index 000000000000..0602559bc075
--- /dev/null
+++ b/net-zope/plone/files/digest-plone-2.0.5-r2
@@ -0,0 +1,3 @@
+MD5 ffb80a0e3cc77f1d2484f845319a69df PloneBase-2.0.5.tar.gz 709483
+RMD160 a243d5798765d1e69abcd161860ea1679b445a14 PloneBase-2.0.5.tar.gz 709483
+SHA256 2d80d42fa804f5e8ecf03f35e41659ea6a3a703639dd854af112b1b2efc2639b PloneBase-2.0.5.tar.gz 709483
diff --git a/net-zope/plone/files/plone-2.0.5-portrait_security.patch b/net-zope/plone/files/plone-2.0.5-portrait_security.patch
new file mode 100644
index 000000000000..e3e0d62614b5
--- /dev/null
+++ b/net-zope/plone/files/plone-2.0.5-portrait_security.patch
@@ -0,0 +1,103 @@
+--- CMFPlone/MembershipTool.py (revision 5844)

++++ CMFPlone/MembershipTool.py (revision 9512)

+@@ -1,4 +1,4 @@

+-from Products.CMFCore.CMFCorePermissions import SetOwnPassword

+ from Products.CMFCore.utils import getToolByName

++from Products.CMFCore.utils import _checkPermission

+ from Products.CMFDefault.MembershipTool import MembershipTool as BaseTool

+ from Products.CMFPlone import ToolNames

+@@ -9,4 +9,7 @@

+ from Globals import InitializeClass

+ from Acquisition import aq_base, aq_parent, aq_inner

++from Products.CMFCore.CMFCorePermissions import ManagePortal

++from Products.CMFCore.CMFCorePermissions import SetOwnProperties

++from Products.CMFCore.CMFCorePermissions import SetOwnPassword

+ from Products.CMFCore.CMFCorePermissions import View

+ from Products.CMFPlone.PloneBaseTool import PloneBaseTool

+@@ -40,4 +43,5 @@

+     security.declareProtected(View, 'getPortalRoles')

+ 

++    security.declarePublic('getAuthenticatedMember')

+     def getAuthenticatedMember(self):

+         """ """

+@@ -52,4 +56,5 @@

+         return _user

+ 

++    security.declarePublic('getPersonalPortrait')

+     def getPersonalPortrait(self, member_id = None, verifyPermission=0):

+         """

+@@ -58,7 +63,4 @@

+         membertool   = getToolByName(self, 'portal_memberdata')

+ 

+-        # what are we doing with that

+-        #if verifyPermission and not _checkPermission('View', portrait):

+-        #    return None

+         if not member_id:

+             member_id = self.getAuthenticatedMember().getUserName()

+@@ -67,5 +69,8 @@

+         if type(portrait) == type(''):

+             portrait = None

+-        #portrait = None

++        if portrait is not None:

++            if verifyPermission and not _checkPermission(View, portrait):

++                # Don't return the portrait if the user can't get to it

++                portrait = None

+         if portrait is None:

+             portal = getToolByName(self, 'portal_url').getPortalObject()

+@@ -74,4 +79,5 @@

+         return portrait

+ 

++    security.declareProtected(SetOwnProperties, 'deletePersonalPortrait')

+     def deletePersonalPortrait(self, member_id = None):

+         """

+@@ -85,4 +91,5 @@

+         membertool._deletePortrait(member_id)

+ 

++    security.declarePublic('getPersonalFolder')

+     def getPersonalFolder(self, member_id=None):

+         """

+@@ -98,4 +105,5 @@

+         return personal

+ 

++    security.declareProtected(SetOwnProperties, 'changeMemberPortrait')

+     def changeMemberPortrait(self, portrait, member_id=None):

+         """

+@@ -112,4 +120,5 @@

+             membertool._setPortrait(portrait, member_id)

+ 

++    security.declarePublic('createMemberarea')

+     def createMemberarea(self, member_id=None, minimal=0):

+         """

+@@ -242,4 +251,5 @@

+     createMemberArea = createMemberarea

+ 

++    security.declareProtected(ManagePortal, 'listMembers')

+     def listMembers(self):

+         '''Gets the list of all members.

+@@ -251,4 +261,5 @@

+             return BaseTool.listMembers(self)

+ 

++    security.declareProtected(ManagePortal, 'listMemberIds')

+     def listMemberIds(self):

+         '''Lists the ids of all members.  This may eventually be

+@@ -263,5 +274,5 @@

+ 

+     # this should probably be in MemberDataTool.py

+-    #security.declarePublic( 'searchForMembers' )

++    security.declarePublic('searchForMembers')

+     def searchForMembers( self, REQUEST=None, **kw ):

+         """ """

+@@ -319,10 +330,10 @@

+         return res

+ 

+-    def testCurrentPassword(self, password, username=None):

++    security.declareProtected(SetOwnPassword, 'testCurrentPassword')

++    def testCurrentPassword(self, password):

+         """ test to see if password is current """

+         portal=getToolByName(self, 'portal_url').getPortalObject()

+         REQUEST=getattr(self, 'REQUEST', {})

+-        if username is None:

+-            username=self.getAuthenticatedMember().getUserName()

++        username=self.getAuthenticatedMember().getUserName()

+         acl_users = self._findUsersAclHome(username)

+         if not acl_users:

diff --git a/net-zope/plone/plone-2.0.5-r2.ebuild b/net-zope/plone/plone-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..b81ceee1f3d3
--- /dev/null
+++ b/net-zope/plone/plone-2.0.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5-r2.ebuild,v 1.1 2006/04/16 11:31:08 radek Exp $
+
+inherit zproduct eutils
+
+DESCRIPTION="A Zope Content Management System, based on Zope CMF"
+HOMEPAGE="http://plone.org"
+SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="=net-zope/cmf-1.4*
+	=net-zope/zope-2.7*
+	>=net-zope/btreefolder2-1.0.1
+	>=net-zope/cmfactionicons-0.9
+	>=net-zope/cmfformcontroller-1.0.2
+	>=net-zope/cmfquickinstallertool-1.5.0
+	>=net-zope/formulator-1.6.2
+	>=net-zope/groupuserfolder-2.0.1
+	>=net-zope/placelesstranslationservice-fork-1.0_rc7
+	>=net-zope/ploneerrorreporting-0.11
+	>=net-zope/plonetranslations-0.5
+	>=net-zope/archetypes-1.2.5_rc5
+	>=net-zope/portaltransforms-1.0.4
+	>=net-zope/externaleditor-0.8
+	>=net-zope/epoz-0.8.2
+	>=app-admin/zope-config-0.5
+	>=dev-lang/python-2.3"
+
+ZPROD_LIST="CMFPlone"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-portrait_security.patch
+}
+