Merge lp:~lifeless/launchpad/librarian-filealiases into lp:launchpad

[Robert Collins]

Revert the hack for apport from the restricted library file code.

Revert the workaround commit we had to let apport work; also includes a docstring fix.

[Robert Collins (lifeless)]

This is just a revert, no brainer.

review: Approve

=== modified file 'lib/canonical/launchpad/browser/librarian.py'
--- lib/canonical/launchpad/browser/librarian.py	2010-11-08 12:52:43 +0000
+++ lib/canonical/launchpad/browser/librarian.py	2010-11-18 21:04:17 +0000
@@ -259,16 +259,15 @@
 
     The URL's output by this decorator will always point at the webapp. This is
     useful when:
-     - we are proxying files via the webapp (as we do at the moment)
-     - when the webapp has to be contacted to get access to a file (the case
-       for restricted files in the future)
+     - the webapp has to be contacted to get access to a file (required for
+       restricted files).
      - files might change from public to private and thus not work even if the
        user has access to the once its private, unless they go via the webapp.
 
     This should be used anywhere we are outputting URL's to LibraryFileAliases
     other than directly in rendered pages. For rendered pages, using a
     LibraryFileAlias directly is OK as at that point the status of the file
-    is know.
+    is known.
 
     Overrides `ILibraryFileAlias.http_url` to always point to the webapp URL,
     even when called from the webservice domain.

=== modified file 'lib/canonical/launchpad/rest/bytestorage.py'
--- lib/canonical/launchpad/rest/bytestorage.py	2010-09-03 20:28:36 +0000
+++ lib/canonical/launchpad/rest/bytestorage.py	2010-11-18 21:04:17 +0000
@@ -6,7 +6,6 @@
 __metaclass__ = type
 __all__ = [
     'LibraryBackedByteStorage',
-    'RestrictedLibraryBackedByteStorage',
 ]
 
 
@@ -16,7 +15,6 @@
 from zope.component import getUtility
 from zope.interface import implements
 
-from canonical.launchpad.browser.librarian import ProxiedLibraryFileAlias
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 
@@ -75,29 +73,3 @@
     def deleteStored(self):
         """See `IByteStorage`."""
         setattr(self.entry, self.field.__name__, None)
-
-
-class RestrictedLibraryBackedByteStorage(LibraryBackedByteStorage):
-    """See `IByteStorage`.
-
-    This variant of LibraryBackedByteStorage provides an alias_url
-    which points to a StreamOrRedirectLibraryFileAliasView for
-    restricted Librarian files.
-    """
-
-    @property
-    def alias_url(self):
-        """See `IByteStorage`."""
-        if self.file_alias.restricted:
-            # XXX Abel Deuring 2010-09-03, bug=629804
-            # This is a bad hack: We can't give ordinary users API access to
-            # restricted files at present. But we can allow access to
-            # some machines in the data center (and should do that).
-            # We need here an HTTP URL, not an HTTPS URL, so we don't
-            # use getUrl(). Since http_url uses not an official domain
-            # name, all we do is expose an unaccessible HTTP URL also
-            # users outside of the data center, instead of the HTTPS URL
-            # returned by getURL().
-            return self.file_alias.http_url
-        else:
-            return self.file_alias.getURL()

=== modified file 'lib/canonical/launchpad/webapp/servers.py'
--- lib/canonical/launchpad/webapp/servers.py	2010-11-03 13:44:35 +0000
+++ lib/canonical/launchpad/webapp/servers.py	2010-11-18 21:04:17 +0000
@@ -1293,19 +1293,10 @@
         return principal
 
 
-class LaunchpadWebServiceRequestTraversal(WebServiceRequestTraversal):
-    implements(canonical.launchpad.layers.WebServiceLayer)
-
-    def getRootURL(self, rootsite):
-        """See IBasicLaunchpadRequest."""
-        # When browsing the web service, we want URLs to point back at the web
-        # service, so we basically ignore rootsite.
-        return self.getApplicationURL() + '/'
-
-
-class WebServiceClientRequest(LaunchpadWebServiceRequestTraversal,
+class WebServiceClientRequest(WebServiceRequestTraversal,
                               LaunchpadBrowserRequest):
     """Request type for a resource published through the web service."""
+    implements(canonical.launchpad.layers.WebServiceLayer)
 
     def __init__(self, body_instream, environ, response=None):
         super(WebServiceClientRequest, self).__init__(
@@ -1331,14 +1322,20 @@
         # than ETag, we may have to revisit this.
         self.response.setHeader('Vary', 'Accept')
 
-
-class WebServiceTestRequest(LaunchpadWebServiceRequestTraversal,
-                            LaunchpadTestRequest):
+    def getRootURL(self, rootsite):
+        """See IBasicLaunchpadRequest."""
+        # When browsing the web service, we want URLs to point back at the web
+        # service, so we basically ignore rootsite.
+        return self.getApplicationURL() + '/'
+
+
+class WebServiceTestRequest(WebServiceRequestTraversal, LaunchpadTestRequest):
     """Test request for the webservice.
 
     It provides the WebServiceLayer and supports the getResource()
     web publication hook.
     """
+    implements(canonical.launchpad.layers.WebServiceLayer)
 
     def __init__(self, body_instream=None, environ=None, version=None, **kw):
         test_environ = {

=== modified file 'lib/canonical/launchpad/zcml/webservice.zcml'
--- lib/canonical/launchpad/zcml/webservice.zcml	2010-11-09 14:35:44 +0000
+++ lib/canonical/launchpad/zcml/webservice.zcml	2010-11-18 21:04:17 +0000
@@ -43,19 +43,6 @@
         <allow interface='lazr.restful.interfaces.IByteStorage' />
     </class>
 
-    <!-- Registration for the class that manages an entry's RestrictedBytes
-         fields. -->
-    <adapter
-        for="lazr.restful.interfaces.IEntry
-             lp.services.fields.IRestrictedBytes"
-        provides="lazr.restful.interfaces.IByteStorage"
-        factory="canonical.launchpad.rest.bytestorage.RestrictedLibraryBackedByteStorage"
-        />
-
-    <class class="canonical.launchpad.rest.bytestorage.RestrictedLibraryBackedByteStorage">
-        <allow interface='lazr.restful.interfaces.IByteStorage' />
-    </class>
-
     <!-- WebService uses the default LaunchpadRootNavigation -->
     <view
         for="canonical.launchpad.interfaces.launchpad.IWebServiceApplication"

=== modified file 'lib/lp/bugs/interfaces/bugattachment.py'
--- lib/lp/bugs/interfaces/bugattachment.py	2010-11-02 19:54:59 +0000
+++ lib/lp/bugs/interfaces/bugattachment.py	2010-11-18 21:04:17 +0000
@@ -39,7 +39,7 @@
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.launchpad import IHasBug
 from canonical.launchpad.interfaces.message import IMessage
-from lp.services.fields import RestrictedBytes, Title
+from lp.services.fields import Title
 
 
 class BugAttachmentType(DBEnumeratedType):
@@ -115,7 +115,7 @@
     libraryfile = Bytes(title=_("The attachment content."),
               required=True)
     data = exported(
-        RestrictedBytes(title=_("The attachment content."),
+        Bytes(title=_("The attachment content."),
               required=True,
               readonly=True))
     message = exported(

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-10-22 13:58:41 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-11-18 21:04:17 +0000
@@ -1360,46 +1360,6 @@
   ---
 
 
-Attachments of private bugs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Attachments of private bugs are served by the app server itself.
-
-  >>> print webservice.patch(
-  ...     bug_one['self_link'], 'application/json', dumps(dict(private=True)))
-  HTTP/1.1 209 Content Returned...
-
-  >>> response = webservice.named_post(
-  ...     bug_one['self_link'], 'addAttachment',
-  ...     data="67890", filename="more-numbers.txt", content_type='foo/bar',
-  ...     comment="The numbers you asked for.")
-  >>> attachments = webservice.get(
-  ...     bug_one['attachments_collection_link']).jsonBody()
-  >>> attachment = attachments['entries'][0]
-  >>> pprint_entry(attachment)
-  bug_link:...
-  data_link: u'http://api.launchpad.dev/beta/bugs/1/+attachment/.../data'
-  ...
-
-XXX Abel Deuring 2010-09-03, bug=629804: Please note that the http URLs in this
-example are part of a temporary hack.  Please see the comment in
-canonical.launchpad.rest.bytestorage.RestrictedLibraryBackedByteStorage.
-alias_url for details.
-
-  >>> response = webservice.get(attachment['data_link'])
-  >>> print response
-  HTTP/1.1 303 See Other
-  Status: 303 See Other
-  ...
-  Location: http://localhost:58005/94/more-numbers.txt
-  ...
-
-  >>> # Let's make the bug public again for later tests.
-  >>> print webservice.patch(
-  ...     bug_one['self_link'], 'application/json', dumps(dict(private=False)))
-  HTTP/1.1 209 Content Returned...
-
-
 Searching for bugs
 ------------------
 

=== modified file 'lib/lp/services/fields/__init__.py'
--- lib/lp/services/fields/__init__.py	2010-10-23 16:45:43 +0000
+++ lib/lp/services/fields/__init__.py	2010-11-18 21:04:17 +0000
@@ -22,7 +22,6 @@
     'ILocationField',
     'INoneableTextLine',
     'IPasswordField',
-    'IRestrictedBytes',
     'IStrippedTextLine',
     'ISummary',
     'ITag',
@@ -46,7 +45,6 @@
     'ProductBugTracker',
     'ProductNameField',
     'PublicPersonChoice',
-    'RestrictedBytes',
     'SearchTag',
     'StrippedTextLine',
     'Summary',
@@ -113,7 +111,6 @@
 
 
 # Field Interfaces
-
 class IStrippedTextLine(ITextLine):
     """A field with leading and trailing whitespaces stripped."""
 
@@ -229,10 +226,6 @@
         """
 
 
-class IRestrictedBytes(IBytes):
-    """A marker interface used for restricted LibraryFileAlias fields."""
-
-
 class StrippedTextLine(TextLine):
     implements(IStrippedTextLine)
 
@@ -248,7 +241,6 @@
 
 # Title
 # A field to capture a launchpad object title
-
 class Title(StrippedTextLine):
     implements(ITitle)
 
@@ -269,14 +261,12 @@
 
 # Summary
 # A field capture a Launchpad object summary
-
 class Summary(StrippableText):
     implements(ISummary)
 
 
 # Description
 # A field capture a Launchpad object description
-
 class Description(StrippableText):
     implements(IDescription)
 
@@ -287,7 +277,6 @@
 
 # Whiteboard
 # A field capture a Launchpad object whiteboard
-
 class Whiteboard(StrippableText):
     implements(IWhiteboard)
 
@@ -321,7 +310,6 @@
 # TimeInterval
 # A field to capture an interval in time, such as X days, Y hours, Z
 # minutes.
-
 class TimeInterval(TextLine):
     implements(ITimeInterval)
 
@@ -842,8 +830,3 @@
         else:
             # The vocabulary prevents the revealing of private team names.
             raise PrivateTeamNotAllowed(value)
-
-
-class RestrictedBytes(Bytes):
-    """A field for restricted LibraryFileAlias records."""
-    implements(IRestrictedBytes)