Merge lp:~julian-edwards/launchpad/team-uploader-copy-packages-bug-445828 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Allow third-party PPA uploaders copy access to a PPA when they have indirect
permissions via a team.

== Proposed fix ==
See bug https://bugs.edge.launchpad.net/soyuz/+bug/445828

When copying packages from a PPA, the drop-down list didn't include PPAs that
it should do if you were an indirect uploader by virtue of third-party
permissions on a team you're in.

== Pre-implementation notes ==
This is a trivial fix to join via TeamParticipation when needed.

== Implementation details ==
Because the archive.txt doctest was being particularly dense in relying on a
bunch of person names that were auto-generated by makePerson in the test
factory, I also had to make some other unrelated test fixes.

== Tests ==
bin/test -cvvt tests.*/doc/archive.txt

== Demo and Q/A ==
Dogfood FTW.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/doc/archive.txt
  lib/lp/soyuz/model/archive.py

== Pylint notices ==

lib/lp/soyuz/model/archive.py
    14: [F0401] Unable to import 'lazr.lifecycle.event' (No module named
lifecycle)

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2009-10-13 11:17:10 +0000
+++ lib/lp/soyuz/doc/archive.txt	2009-10-13 17:15:20 +0000
@@ -1619,6 +1619,26 @@
     PPA for Celso Providelo
     PPA for No Privileges Person
 
+This also works via indirect team memberships.  Let's make a dummy team
+and user and give the team access to cprov's PPA:
+
+    >>> uploader_team = factory.makeTeam(owner=cprov, name='uploader-team')
+    >>> indirect_uploader = factory.makePerson(name='indirect-uploader')
+    >>> cprov_archive.newComponentUploader(uploader_team, "main")
+    <ArchivePermission ...>
+
+'indirect_uploader' currently can't upload to cprov's PPA:
+
+    >>> for ppa in archive_set.getPPAsForUser(indirect_uploader):
+    ...     print ppa.displayname
+
+But if we make him part of the uploader_team he'll gain access:
+
+    >>> uploader_team.addMember(indirect_uploader, indirect_uploader)
+    >>> for ppa in archive_set.getPPAsForUser(indirect_uploader):
+    ...     print ppa.displayname
+    PPA for Celso Providelo
+
 When there is no active PPA for the team a user participates the
 method returns an empty SelectResults.
 
@@ -1896,10 +1916,12 @@
 
 First we create three copy archives for ubuntu:
 
-    >>> copy = factory.makeCopyArchiveLocation(distribution=ubuntu,
-    ...                                        name="ultimate-copy")
-    >>> copy = factory.makeCopyArchiveLocation(distribution=ubuntu,
-    ...                                        name="fine-copy")
+    >>> copy_owner1 = factory.makePerson(name="copy-owner1")
+    >>> copy_owner2 = factory.makePerson(name="copy-owner2")
+    >>> copy = factory.makeCopyArchiveLocation(
+    ...     distribution=ubuntu, name="ultimate-copy", owner=copy_owner1)
+    >>> copy = factory.makeCopyArchiveLocation(
+    ...     distribution=ubuntu, name="fine-copy", owner=copy_owner2)
 
 One of the new copy archives will be owned by a team:
 
@@ -1917,10 +1939,10 @@
     ...     ubuntu, purposes=[ArchivePurpose.COPY])
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
+    fine-copy        copy-owner2   False    True
     my-copy-archive  person-name6  False    True
     team-archive     t1            False    True
-    ultimate-copy    person-name9  False    True
+    ultimate-copy    copy-owner1   False    True
 
 The `getArchivesForDistribution` method can also be used to get an
 archive using an archive name:
@@ -1947,8 +1969,8 @@
     ...     ubuntu, purposes=[ArchivePurpose.COPY])
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
-    ultimate-copy    person-name9  False    True
+    fine-copy        copy-owner2   False    True
+    ultimate-copy    copy-owner1   False    True
 
 Similarly, a user who has no privs for the private archive will not see
 the private archives:
@@ -1957,8 +1979,8 @@
     ...     ubuntu, purposes=[ArchivePurpose.COPY], user=cprov)
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
-    ultimate-copy    person-name9  False    True
+    fine-copy        copy-owner2   False    True
+    ultimate-copy    copy-owner1   False    True
 
 The owner of the archive will also see their private archive in the results:
 
@@ -1967,9 +1989,9 @@
     ...     user=my_copy_archive.owner)
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
+    fine-copy        copy-owner2   False    True
     my-copy-archive  person-name6  True     True
-    ultimate-copy    person-name9  False    True
+    ultimate-copy    copy-owner1   False    True
 
 An admin will see all the private and disabled archives in the results:
 
@@ -1978,11 +2000,11 @@
     ...     ubuntu, purposes=[ArchivePurpose.COPY], user=foobar)
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
+    fine-copy        copy-owner2   False    True
     my-copy-archive  person-name6  True     True
     team-archive     t1            True     True
     there-we-go      juergen       False    False
-    ultimate-copy    person-name9  False    True
+    ultimate-copy    copy-owner1   False    True
 
 And if the archive is owned by a team, then anyone in the team will also
 be able to view the private team archive:
@@ -1992,9 +2014,9 @@
     ...     ubuntu, purposes=[ArchivePurpose.COPY], user=cprov)
     >>> print_archive_names(ubuntu_copy_archives)
     Name             Owner         Private  Enabled
-    fine-copy        person-name12 False    True
+    fine-copy        copy-owner2   False    True
     team-archive     t1            True     True
-    ultimate-copy    person-name9  False    True
+    ultimate-copy    copy-owner1   False    True
 
 
 == Getting publishing records across a set of Archives ==

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2009-10-13 11:17:10 +0000
+++ lib/lp/soyuz/model/archive.py	2009-10-13 17:15:20 +0000
@@ -1424,14 +1424,15 @@
             TeamParticipation.team == Archive.ownerID,
             TeamParticipation.person == user,
             )
-        third_part_upload_acl = store.find(
+        third_party_upload_acl = store.find(
             Archive,
             Archive.purpose == ArchivePurpose.PPA,
             ArchivePermission.archiveID == Archive.id,
-            ArchivePermission.person == user,
+            TeamParticipation.person == user,
+            TeamParticipation.team == ArchivePermission.personID,
             )
 
-        result = direct_membership.union(third_part_upload_acl)
+        result = direct_membership.union(third_party_upload_acl)
         result.order_by(Archive.displayname)
 
         return result