Merge lp:~al-maisan/launchpad/ppa-visibility-514824 into lp:launchpad

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there,

this branch
  - filters archives listed in the
        "Other versions of ... in untrusted archives." portlet
    so that disabled archives are omitted from that list.
    See the bottom of the https://launchpad.net/ubuntu/+source/firefox
    page for an example of what that portlet looks like.
  - revises the security adapter for ISourcePackagePublishingHistory so that
    the checkUnauthenticated() method uses the IArchive's security
    adapter.

Pre-implementation talks with Julian.

Tests to run:

    bin/test -vv -t distribution/xx-distribution-packages -t soyuz/xx-person-packages

[Gavin Panella (allenap)]

The conversation so far:

<allenap> al-maisan: In xx-distribution-packages.txt, the disabled PPA is created, and it's absence from the PPA list is the test. Can you add a comment along the lines of "The disabled PPA is not shown in the page". Or, better, demonstrate that it is shown, disable it, and demonstrate that it is no longer shown.
<al-maisan> allenap: I'll add the comment if you don't mind. Our test suite already takes too much time to run :)
<allenap> al-maisan: Okay :)
<allenap> al-maisan: Also, ViewSourcePackagePublishingHistory could be changed to just inherit from ViewArchive, with a custom __init__() that calls the superclass with obj.archive.
<al-maisan> allenap: good point .. I'll look into that.
<allenap> al-maisan: ViewArchive.checkAuthenticated() already checks for user.is_admin, so both ViewSourcePackagePublishingHistory.checkAuthenticated() and ViewSourcePackagePublishingHistory.checkUnauthenticated() both defer entirely to ViewArchive.
<al-maisan> allenap: right.
<allenap> al-maisan: You don't need to change that though; the composition is quite understandable.

[Gavin Panella (allenap)]

Tip top, thanks for those changes. Looks good.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-02-24 23:02:56 +0000
+++ lib/canonical/launchpad/security.py	2010-03-03 14:28:17 +0000
@@ -2106,19 +2106,13 @@
         return user.in_admin
 
 
-class ViewSourcePackagePublishingHistory(AuthorizationBase):
+class ViewSourcePackagePublishingHistory(ViewArchive):
     """Restrict viewing of source publications."""
     permission = "launchpad.View"
     usedfor = ISourcePackagePublishingHistory
 
-    def checkAuthenticated(self, user):
-        view_archive = ViewArchive(self.obj.archive)
-        if view_archive.checkAuthenticated(user):
-            return True
-        return user.in_admin
-
-    def checkUnauthenticated(self):
-        return not self.obj.archive.private
+    def __init__(self, obj):
+        super(ViewSourcePackagePublishingHistory, self).__init__(obj.archive)
 
 
 class EditPublishing(AuthorizationBase):

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2010-02-17 12:30:41 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2010-03-03 14:28:17 +0000
@@ -263,6 +263,7 @@
         results = store.find(
             Archive,
             Archive.distribution == self.distribution,
+            Archive._enabled == True,
             Archive.private == False,
             SourcePackagePublishingHistory.archive == Archive.id,
             (SourcePackagePublishingHistory.status ==

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2010-02-16 04:52:38 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2010-03-03 14:28:17 +0000
@@ -145,7 +145,18 @@
     >>> ppa_beta = factory.makeArchive(name="beta",
     ...                                distribution=ubuntutest)
 
-    # Then publish netapplet to both PPAs
+The 'ppa_disabled' archive added below will be disabled at the end of this
+set-up block. 
+It will thus not be listed in the "...other untrusted versions of..." portlet.
+
+    >>> ppa_disabled = factory.makeArchive(name="disabled",
+    ...                                    distribution=ubuntutest)
+
+    # Then publish netapplet to all PPAs
+    >>> netapplet_disabled_pub_breezy = publisher.getPubSource(
+    ...     sourcename="netapplet", archive=ppa_disabled,
+    ...     creator=ppa_disabled.owner,
+    ...     status=PackagePublishingStatus.PUBLISHED, version='0.8.1d1')
     >>> netapplet_nightly_pub_breezy = publisher.getPubSource(
     ...     sourcename="netapplet", archive=ppa_nightly,
     ...     creator=ppa_nightly.owner,
@@ -165,6 +176,8 @@
     >>> from lp.registry.model.karma import KarmaTotalCache
     >>> ppa_beta_owner_id = ppa_beta.owner.id
     >>> ppa_nightly_owner_id = ppa_nightly.owner.id
+    >>> ppa_disabled_owner_id = ppa_disabled.owner.id
+    >>> ppa_disabled.disable()
     >>> transaction.commit()
 
     # XXX: Michael Nelson 2009-07-07 bug=396419. Currently there is no
@@ -178,12 +191,13 @@
     ...     person=ppa_beta_owner_id, karma_total=200)
     >>> cache_entry = KarmaTotalCache(
     ...     person=ppa_nightly_owner_id, karma_total=201)
+    >>> cache_entry = KarmaTotalCache(
+    ...     person=ppa_disabled_owner_id, karma_total=202)
     >>> transaction.commit()
     >>> reconnect_stores('launchpad')
 
     >>> logout()
 
-
 A /$DISTRO/+source/$PACKAGE page shows an overview of a source package in
 a distribution.  There are several sections of information.
 

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-02-26 11:21:40 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-03-03 14:28:17 +0000
@@ -398,3 +398,25 @@
     source2 PPA named p3a for No Priv... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
+Please note also that disabled archives are not viewable by anonymous users.
+
+    >>> def print_archive_package_rows(contents):
+    ...     package_table = find_tag_by_id(
+    ...         anon_browser.contents, 'packages_list')
+    ...     for ppa_row in package_table.findChildren('tr'):
+    ...         print extract_text(ppa_row)
+
+    >>> anon_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
+    >>> print_archive_package_rows(anon_browser)
+    Package     Version     Uploaded by
+    ...
+    pmount      0.1-1       no signer (2007-07-09)
+
+    >>> login("[e-mail]")
+    >>> cprov.archive.disable()
+    >>> flush_database_updates()
+    >>> logout()
+    >>> anon_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
+    Traceback (most recent call last):
+    ...
+    Unauthorized: (..., 'browserDefault', 'launchpad.View')