Merge ~lgp171188/launchpad:allow-launchpad-team-to-view-mirror-prober-logs into launchpad:master

[Guruprasad]

Allow Launchpad team members to view mirror prober logs

Show the side menu with a link to the prober logs for users
with the 'launchpad.Moderate' permission on a distribution mirror.

[Ioana Lasc (ilasc)]

Looks good!

review: Approve

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml
index 80a57d0..22096c8 100644
--- a/lib/lp/registry/browser/configure.zcml
+++ b/lib/lp/registry/browser/configure.zcml
@@ -2598,7 +2598,7 @@
         name="+prober-logs"
         for="lp.registry.interfaces.distributionmirror.IDistributionMirror"
         class="lp.registry.browser.distributionmirror.DistributionMirrorProberLogView"
-        permission="launchpad.Edit"
+        permission="launchpad.Moderate"
         template="../templates/distributionmirror-prober-logs.pt">
     </browser:page>
     <browser:menus
diff --git a/lib/lp/registry/browser/distributionmirror.py b/lib/lp/registry/browser/distributionmirror.py
index 75aa827..262784e 100644
--- a/lib/lp/registry/browser/distributionmirror.py
+++ b/lib/lp/registry/browser/distributionmirror.py
@@ -61,7 +61,7 @@ class DistributionMirrorOverviewMenu(NavigationMenu):
         text = "Change details"
         return Link("+edit", text, icon="edit")
 
-    @enabled_with_permission("launchpad.Edit")
+    @enabled_with_permission("launchpad.Moderate")
     def proberlogs(self):
         text = "Prober logs"
         enabled = self.context.last_probe_record is not None
diff --git a/lib/lp/registry/security.py b/lib/lp/registry/security.py
index 0487001..97e7643 100644
--- a/lib/lp/registry/security.py
+++ b/lib/lp/registry/security.py
@@ -385,6 +385,17 @@ class EditDistributionMirrorByOwnerOrDistroOwnerOrMirrorAdminsOrAdmins(
         )
 
 
+class ModerateDistributionMirror(AuthorizationBase):
+    permission = "launchpad.Moderate"
+    usedfor = IDistributionMirror
+
+    def checkAuthenticated(self, user):
+        return (
+            self.forwardCheckAuthenticated(user, self.obj, "launchpad.Edit")
+            or user.in_launchpad_developers
+        )
+
+
 class ViewDistributionMirror(AnonymousAuthorization):
     """Anyone can view an IDistributionMirror."""
 
diff --git a/lib/lp/registry/stories/distributionmirror/xx-distributionmirror-prober-logs.rst b/lib/lp/registry/stories/distributionmirror/xx-distributionmirror-prober-logs.rst
index 8b9ae98..581bb7f 100644
--- a/lib/lp/registry/stories/distributionmirror/xx-distributionmirror-prober-logs.rst
+++ b/lib/lp/registry/stories/distributionmirror/xx-distributionmirror-prober-logs.rst
@@ -3,7 +3,7 @@ Distribution mirror prober logs
 
 Every time we probe a mirror for its contents we keep a log of the probe.
 All these logs can be seen by the mirror owner or the mirror admin of
-that mirror's distribution.
+that mirror's distribution or Launchpad team members.
 
     >>> browser.addHeader("Authorization", "Basic [e-mail]:test")
     >>> browser.open("http://launchpad.test/ubuntu/+mirror/archive-mirror2/")
@@ -18,6 +18,31 @@ that mirror's distribution.
     >>> print(extract_text(navigation.decode_contents()))
     1...→...1...of...1...result
 
+    >>> login("[e-mail]")
+    >>> from zope.component import getUtility
+    >>> from lp.app.interfaces.launchpad import ILaunchpadCelebrities
+    >>> launchpad_developer = factory.makePerson(
+    ...     member_of=[getUtility(ILaunchpadCelebrities).launchpad_developers]
+    ... )
+    >>> from lp.testing import logout
+    >>> logout()
+
+    >>> from lp.testing.pages import setupBrowserForUser
+    >>> lp_dev_browser = setupBrowserForUser(launchpad_developer)
+    >>> lp_dev_browser.open(
+    ...     "http://launchpad.test/ubuntu/+mirror/archive-mirror2/"
+    ... )
+    >>> lp_dev_browser.getLink("Prober logs").click()
+    >>> lp_dev_browser.url
+    'http://launchpad.test/ubuntu/+mirror/archive-mirror2/+prober-logs'
+
+    >>> navigation = find_tags_by_class(
+    ...     lp_dev_browser.contents, "batch-navigation-index"
+    ... )[0]
+    >>> print(extract_text(navigation.decode_contents()))
+    1...→...1...of...1...result
+
+
 A random logged in user won't have the rights to see that page.
 
     >>> user_browser.open(
diff --git a/lib/lp/registry/templates/distributionmirror-index.pt b/lib/lp/registry/templates/distributionmirror-index.pt
index 3d840d0..2e7cbec 100644
--- a/lib/lp/registry/templates/distributionmirror-index.pt
+++ b/lib/lp/registry/templates/distributionmirror-index.pt
@@ -157,7 +157,7 @@
     </div>
   </tal:main>
 
-  <tal:side metal:fill-slot="side" condition="context/required:launchpad.Edit">
+  <tal:side metal:fill-slot="side" condition="context/required:launchpad.Moderate">
     <tal:menu replace="structure context/@@+global-actions" />
   </tal:side>
 </body>
diff --git a/lib/lp/registry/tests/test_distributionmirror.py b/lib/lp/registry/tests/test_distributionmirror.py
index 4e301c5..7d6a2ee 100644
--- a/lib/lp/registry/tests/test_distributionmirror.py
+++ b/lib/lp/registry/tests/test_distributionmirror.py
@@ -18,11 +18,14 @@ from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.database.sqlbase import flush_database_updates
 from lp.services.mail import stub
+from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.interfaces import OAuthPermission
 from lp.services.worlddata.interfaces.country import ICountrySet
 from lp.testing import (
     TestCaseWithFactory,
+    admin_logged_in,
     api_url,
+    celebrity_logged_in,
     login,
     login_as,
     person_logged_in,
@@ -57,6 +60,22 @@ class TestDistributionMirror(TestCaseWithFactory):
         )
         removeSecurityProxy(bin_mirror).freshness = freshness
 
+    def test_distributionmirror_moderate_permission(self):
+        with admin_logged_in():
+            self.assertTrue(
+                check_permission("launchpad.Moderate", self.archive_mirror)
+            )
+
+        with person_logged_in(self.archive_mirror.distribution.owner):
+            self.assertTrue(
+                check_permission("launchpad.Moderate", self.archive_mirror)
+            )
+
+        with celebrity_logged_in("launchpad_developers"):
+            self.assertTrue(
+                check_permission("launchpad.Moderate", self.archive_mirror)
+            )
+
     def test_archive_mirror_without_content_should_be_disabled(self):
         self.assertTrue(self.archive_mirror.shouldDisable())