Merge lp:~henninge/launchpad/bug-507498-oops-subset into lp:launchpad

[Henning Eggers]

[Henning Eggers (henninge)]

This is a simple fix for bug 507498 to stop the OOPS from happening. It fixes the persmission checker that tried to check the owner of a POTemplateSubset which it does not have. A somewhat articficial test was added to reproduce the error.

[Guilherme Salgado (salgado)]

Hi Henning,

Since your new test is a test for a corner case, I'd rather see it as a unit test (e.g. in lp/translations/tests/test_potemplate.py) than in a doctest.

review: Approve (code)

[Adi Roiban (adiroiban)]

Just a small comment:

Since AdminPOTemplateSubset(self.obj).checkAuthenticated(user) is checking for user.is_admin, it can be left out and have only:

return AdminPOTemplateSubset(self.obj).checkAuthenticated(user)

[Henning Eggers (henninge)]

This will not be merged as Adi is working on a branch that fixes this bug, too.

Unmerged revisions

10180. By Henning Eggers on 2010-01-15

Fixed the bug by not checking for owner.

10179. By Henning Eggers on 2010-01-15

Added test for Edit permission on POTemplateSubset.

10178. By Henning Eggers on 2010-01-15

Merged devel.

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-01-14 11:36:51 +0000
+++ lib/canonical/launchpad/security.py	2010-01-15 14:04:15 +0000
@@ -1668,7 +1668,7 @@
 
         return (
             AdminPOTemplateSubset(self.obj).checkAuthenticated(user) or
-            EditByOwnersOrAdmins(self.obj).checkAuthenticated(user))
+            user.in_admin)
 
 
 class AdminDistroSeriesTranslations(AuthorizationBase):

=== modified file 'lib/lp/translations/doc/potemplate.txt'
--- lib/lp/translations/doc/potemplate.txt	2009-11-01 22:50:17 +0000
+++ lib/lp/translations/doc/potemplate.txt	2010-01-15 14:04:15 +0000
@@ -210,6 +210,23 @@
     True
 
 
+== launchpd.Edit permissions on a POTemplateSubset ==
+
+A normal unprivileged user does not have edit rights for a subset. If this
+test seems artificial, note that it is to verify the fix for bug 507498.
+
+    >>> unprivperson = factory.makePerson()
+    >>> distroseries = factory.makeDistroSeries()
+    >>> sourcepackage = factory.makeSourcePackage(distroseries=distroseries)
+    >>> subset = potemplate_set.getSubset(
+    ...     distroseries=distroseries,
+    ...     sourcepackagename=sourcepackage.sourcepackagename)
+    >>> from canonical.launchpad.webapp.authorization import check_permission
+    >>> login_person(unprivperson)
+    >>> print check_permission('launchpad.Edit', subset)
+    False
+
+
 = POTemplate =
 
 POTemplate is an object with all strings that must be translated for a