Merge lp:~jml/launchpad/upload-permission-joy into lp:launchpad

[Jonathan Lange]

Extract a function that gives a clear answer to whether you can upload to a package. Use it for branch edit checks.

[Jonathan Lange (jml)]

This branch extracts out a function that says whether you can upload a package or not, and makes sure that this function gets used to get branch edit permissions and also for uploads, thus reducing duplication.

[Abel Deuring (adeuring)]

returning the review to the team -- got interrupted by an, let's say, serious OOPS...

[Tim Penhey (thumper)]

As discussed on IRC, some small changes, but otherwise good.

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-11-17 09:51:40 +0000
+++ lib/canonical/launchpad/security.py	2009-11-19 15:18:17 +0000
@@ -10,8 +10,8 @@
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces.account import IAccount
+from lp.archiveuploader.permission import can_upload_to_archive
 from canonical.launchpad.interfaces.emailaddress import IEmailAddress
-from lp.archiveuploader.permission import verify_upload
 from lp.registry.interfaces.announcement import IAnnouncement
 from lp.soyuz.interfaces.archive import IArchive
 from lp.soyuz.interfaces.archivepermission import (
@@ -1578,17 +1578,6 @@
 
 def can_upload_linked_package(person, branch):
     """True if person may upload the package linked to `branch`."""
-
-    def get_current_release(ssp):
-        """Get current release for the source package linked to branch.
-
-        This function uses the `ISuiteSourcePackage` instance supplied.
-        """
-        package = ssp.sourcepackage
-        releases = ssp.distroseries.getCurrentSourceReleases(
-            [package.sourcepackagename])
-        return releases.get(package, None)
-
     # No associated `ISuiteSourcePackage` data -> not an official branch.
     # Abort.
     ssp_list = branch.associatedSuiteSourcePackages()
@@ -1601,31 +1590,10 @@
     # around this by assuming that things are fine as long as we find at least
     # one combination that allows us to upload the corresponding source
     # package.
-
-    # Go through the associated `ISuiteSourcePackage` instances and see
-    # whether we can upload to any of the distro series/pocket combinations.
-    ssp = None
     for ssp in ssp_list:
-        # Can we upload to the respective pocket?
-        if ssp.distroseries.canUploadToPocket(ssp.pocket):
-            break
-    else:
-        # Loop terminated normally i.e. we could not upload to any of the
-        # (distroseries, pocket) combinations found.
-        return False
-
-    archive = ssp.distroseries.distribution.main_archive
-    # Find the component the linked source package was published in.
-    current_release = get_current_release(ssp)
-    component = getattr(current_release, 'component', None)
-
-    # Is person authorised to upload the source package this branch
-    # is targeting?
-    result = verify_upload(
-        person, ssp.sourcepackagename, archive, component, ssp.distroseries)
-    # verify_upload() indicates that person *is* allowed to upload by
-    # returning None.
-    return result is None
+        if can_upload_to_archive(person, ssp):
+            return True
+    return False
 
 
 class AdminBranch(AuthorizationBase):

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2009-11-09 17:54:02 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2009-11-19 15:18:17 +0000
@@ -28,7 +28,7 @@
 from lp.archiveuploader.nascentuploadfile import (
     UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
     BaseBinaryUploadFile)
-from lp.archiveuploader.permission import verify_upload
+from lp.archiveuploader.permission import check_upload_to_archive
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose, MAIN_ARCHIVE_PURPOSES
 from canonical.launchpad.interfaces import (
@@ -504,9 +504,10 @@
         source_name = getUtility(
             ISourcePackageNameSet).queryByName(self.changes.dsc.package)
 
-        rejection_reason = verify_upload(
-            signer, source_name, archive, self.changes.dsc.component,
-            self.policy.distroseries, not self.is_new)
+        rejection_reason = check_upload_to_archive(
+            signer, self.policy.distroseries, source_name, archive,
+            self.changes.dsc.component, self.policy.pocket, not self.is_new)
+
         if rejection_reason is not None:
             self.reject(str(rejection_reason))
 
@@ -1012,6 +1013,11 @@
             if self.is_ppa:
                 return
 
+            # XXX: JonathanLange 2009-09-16: It would be nice to use
+            # ISourcePackage.get_default_archive here, since it has the same
+            # logic. However, I'm not sure whether we can get a SourcePackage
+            # object.
+
             # See if there is an archive to override with.
             distribution = self.policy.distroseries.distribution
             archive = distribution.getArchiveByComponent(
@@ -1027,4 +1033,3 @@
             else:
                 # Reset the archive in the policy to the partner archive.
                 self.policy.archive = archive
-

=== modified file 'lib/lp/archiveuploader/permission.py'
--- lib/lp/archiveuploader/permission.py	2009-11-09 17:50:23 +0000
+++ lib/lp/archiveuploader/permission.py	2009-11-19 15:18:17 +0000
@@ -7,14 +7,17 @@
 __all__ = [
     'CannotUploadToArchive',
     'CannotUploadToPPA',
+    'can_upload_to_archive',
+    'check_upload_to_archive',
     'components_valid_for',
     'verify_upload',
     ]
 
 from zope.component import getUtility
 
-from lp.registry.interfaces.distribution import IDistributionSet
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
+from lp.soyuz.interfaces.archive import ArchivePurpose
 
 
 class CannotUploadToArchive:
@@ -30,6 +33,15 @@
         return self._message
 
 
+class CannotUploadToPocket:
+    """Returned when a pocket is closed for uploads."""
+
+    def __init__(self, distroseries, pocket):
+        super(CannotUploadToPocket, self).__init__(
+            "Not permitted to upload to the %s pocket in a series in the "
+            "'%s' state." % (pocket.name, distroseries.status.name))
+
+
 class CannotUploadToPPA(CannotUploadToArchive):
     """Raised when a person cannot upload to a PPA."""
 
@@ -63,6 +75,18 @@
         super(NoRightsForComponent, self).__init__(component=component.name)
 
 
+class InvalidPocketForPPA(CannotUploadToArchive):
+    """PPAs only support some pockets."""
+
+    _fmt = "PPA uploads must be for the RELEASE pocket."
+
+
+class InvalidPocketForPartnerArchive(CannotUploadToArchive):
+    """Partner archives only support some pockets."""
+
+    _fmt = "Partner uploads must be for the RELEASE or PROPOSED pocket."
+
+
 def components_valid_for(archive, person):
     """Return the components that 'person' can upload to 'archive'.
 
@@ -75,6 +99,67 @@
     return set(permission.component for permission in permissions)
 
 
+def can_upload_to_archive(person, suitesourcepackage, archive=None):
+    """Check if 'person' upload 'suitesourcepackage' to 'archive'.
+
+    :param person: An `IPerson` who might be uploading.
+    :param suitesourcepackage: An `ISuiteSourcePackage` to be uploaded.
+    :param archive: The `IArchive` to upload to. If not provided, defaults
+        to the default archive for the source package. (See
+        `ISourcePackage.get_default_archive`).
+    :return: True if they can, False if they cannot.
+    """
+    sourcepackage = suitesourcepackage.sourcepackage
+    if archive is None:
+        archive = sourcepackage.get_default_archive()
+    pocket = suitesourcepackage.pocket
+    distroseries = sourcepackage.distroseries
+    sourcepackagename = sourcepackage.sourcepackagename
+    component = sourcepackage.latest_published_component
+    # strict_component is True because the source package already exists
+    # (otherwise we couldn't have a suitesourcepackage object) and
+    # nascentupload passes True as a matter of policy when the package exists.
+    reason = check_upload_to_archive(
+        person, distroseries, sourcepackagename, archive, component, pocket,
+        strict_component=True)
+    return reason is None
+
+
+def check_upload_to_archive(person, distroseries, sourcepackagename, archive,
+                            component, pocket, strict_component=True):
+    """Check if 'person' upload 'suitesourcepackage' to 'archive'.
+
+    :param person: An `IPerson` who might be uploading.
+    :param distroseries: The `IDistroSeries` being uploaded to.
+    :param sourcepackagename: The `ISourcePackageName` being uploaded.
+    :param archive: The `IArchive` to upload to. If not provided, defaults
+        to the default archive for the source package. (See
+        `ISourcePackage.get_default_archive`).
+    :param component: The `Component` being uploaded to.
+    :param pocket: The `PackagePublishingPocket` of 'distroseries' being
+        uploaded to.
+    :return: The reason for not being able to upload, None otherwise.
+    """
+    if archive.purpose == ArchivePurpose.PARTNER:
+        if pocket not in (
+            PackagePublishingPocket.RELEASE,
+            PackagePublishingPocket.PROPOSED):
+            return InvalidPocketForPartnerArchive()
+    else:
+        # Uploads to the partner archive are allowed in any distroseries
+        # state.
+        # XXX julian 2005-05-29 bug=117557:
+        # This is a greasy hack until bug #117557 is fixed.
+        if not distroseries.canUploadToPocket(pocket):
+            return CannotUploadToPocket(distroseries, pocket)
+
+    if archive.is_ppa and pocket != PackagePublishingPocket.RELEASE:
+        return InvalidPocketForPPA()
+    return verify_upload(
+        person, sourcepackagename, archive, component, distroseries,
+        strict_component)
+
+
 def packagesets_valid_for(archive, person):
     """Return the package sets that 'person' can upload to 'archive'.
 

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2009-08-28 06:39:38 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2009-11-19 15:18:17 +0000
@@ -130,29 +130,6 @@
                 # Buildd binary uploads (resulting from successful builds)
                 # to copy archives may go into *any* pocket.
                 return
-        if upload.is_ppa:
-            if self.pocket != PackagePublishingPocket.RELEASE:
-                upload.reject(
-                    "PPA uploads must be for the RELEASE pocket.")
-        elif (self.archive.purpose == ArchivePurpose.PARTNER and
-              self.pocket != PackagePublishingPocket.RELEASE and
-              self.pocket != PackagePublishingPocket.PROPOSED):
-            # Partner uploads can only go to the release or proposed
-            # pockets.
-            upload.reject(
-                "Partner uploads must be for the RELEASE or PROPOSED pocket.")
-        else:
-            # Uploads to the partner archive are allowed in any distroseries
-            # state.
-            # XXX julian 2005-05-29 bug=117557:
-            # This is a greasy hack until bug #117557 is fixed.
-            if (self.distroseries and
-                self.archive.purpose != ArchivePurpose.PARTNER and
-                not self.distroseries.canUploadToPocket(self.pocket)):
-                upload.reject(
-                    "Not permitted to upload to the %s pocket in a "
-                    "series in the '%s' state." % (
-                    self.pocket.name, self.distroseries.status.name))
 
         # reject PPA uploads by default
         self.rejectPPAUploads(upload)

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2009-11-13 16:24:01 +0000
+++ lib/lp/registry/interfaces/distribution.py	2009-11-19 15:18:17 +0000
@@ -16,6 +16,7 @@
     'IDistributionMirrorMenuMarker',
     'IDistributionPublic',
     'IDistributionSet',
+    'NoPartnerArchive',
     'NoSuchDistribution',
     ]
 
@@ -580,5 +581,14 @@
     _message_prefix = "No such distribution"
 
 
+class NoPartnerArchive(Exception):
+    """Raised when a partner archive is needed, but none exists."""
+
+    def __init__(self, distribution):
+        Exception.__init__(
+            self, "Partner archive for distro '%s' not found"
+            % (distribution.name,))
+
+
 # Monkey patching to fix circular imports done in
 # _schema_circular_imports.py

=== modified file 'lib/lp/registry/interfaces/sourcepackage.py'
--- lib/lp/registry/interfaces/sourcepackage.py	2009-11-15 23:23:12 +0000
+++ lib/lp/registry/interfaces/sourcepackage.py	2009-11-19 15:18:17 +0000
@@ -224,6 +224,20 @@
         title=u'The component in which the package was last published.',
         schema=IComponent, readonly=True, required=False)
 
+    def get_default_archive(component=None):
+        """Get the default archive of this package.
+
+        If 'component' is a partner component, then the default archive is the
+        partner archive. Otherwise, the primary archive of the associated
+        distribution.
+
+        :param component: The `IComponent` to base the default archive
+            decision on. If None, defaults to the last published component.
+        :raise NoPartnerArchive: If returning the partner archive is
+            appropriate, but no partner archive exists.
+        :return: `IArchive`.
+        """
+
     def getLatestTranslationsUploads():
         """Find latest Translations tarballs as produced by Soyuz.
 

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2009-11-18 11:52:25 +0000
+++ lib/lp/registry/model/sourcepackage.py	2009-11-19 15:18:17 +0000
@@ -23,10 +23,11 @@
 from canonical.database.sqlbase import flush_database_updates, sqlvalues
 from canonical.lazr.utils import smartquote
 from lp.code.model.branch import Branch
+from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
 from lp.bugs.model.bug import get_bug_tags_open_count
 from lp.bugs.model.bugtarget import BugTargetBase
 from lp.bugs.model.bugtask import BugTask
-from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
+from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
 from lp.soyuz.model.build import Build, BuildSet
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease)
@@ -52,6 +53,7 @@
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.packaging import PackagingType
 from lp.translations.interfaces.potemplate import IHasTranslationTemplates
+from lp.registry.interfaces.distribution import NoPartnerArchive
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.queue import PackageUploadCustomFormat
@@ -579,6 +581,21 @@
         else:
             return None
 
+    def get_default_archive(self, component=None):
+        """See `ISourcePackage`."""
+        if component is None:
+            component = self.latest_published_component
+        distribution = self.distribution
+        if component is not None and component.name == 'partner':
+            archive = getUtility(IArchiveSet).getByDistroPurpose(
+                distribution, ArchivePurpose.PARTNER)
+            if archive is None:
+                raise NoPartnerArchive(distribution)
+            else:
+                return archive
+        else:
+            return distribution.main_archive
+
     def getTranslationTemplates(self):
         """See `IHasTranslationTemplates`."""
         result = POTemplate.selectBy(

=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
--- lib/lp/registry/tests/test_sourcepackage.py	2009-08-28 06:39:38 +0000
+++ lib/lp/registry/tests/test_sourcepackage.py	2009-11-19 15:18:17 +0000
@@ -12,9 +12,13 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.ftests import login_person, logout
+from lp.registry.interfaces.distribution import NoPartnerArchive
 from lp.registry.interfaces.distroseries import DistroSeriesStatus
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.component import IComponentSet
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.code.interfaces.seriessourcepackagebranch import (
     IMakeOfficialBranchLinks)
 from lp.testing import TestCaseWithFactory
@@ -166,6 +170,59 @@
             distribution_sourcepackage,
             sourcepackage.distribution_sourcepackage)
 
+    def test_default_archive(self):
+        # The default archive of a source package is the primary archive of
+        # its distribution.
+        sourcepackage = self.factory.makeSourcePackage()
+        distribution = sourcepackage.distribution
+        self.assertEqual(
+            distribution.main_archive, sourcepackage.get_default_archive())
+
+    def test_default_archive_partner(self):
+        # If the source package was most recently uploaded to a partner
+        # component, then its default archive is the partner archive for the
+        # distribution.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagename=sourcepackage.sourcepackagename,
+            distroseries=sourcepackage.distroseries,
+            component=partner,
+            status=PackagePublishingStatus.PUBLISHED)
+        distribution = sourcepackage.distribution
+        expected_archive = self.factory.makeArchive(
+            distribution=distribution,
+            purpose=ArchivePurpose.PARTNER)
+        self.assertEqual(
+            expected_archive, sourcepackage.get_default_archive())
+
+    def test_default_archive_specified_component(self):
+        # If the component is explicitly specified as partner, then we return
+        # the partner archive.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        distribution = sourcepackage.distribution
+        expected_archive = self.factory.makeArchive(
+            distribution=distribution,
+            purpose=ArchivePurpose.PARTNER)
+        self.assertEqual(
+            expected_archive,
+            sourcepackage.get_default_archive(component=partner))
+
+    def test_default_archive_partner_doesnt_exist(self):
+        # If the default archive ought to be the partner archive (because the
+        # last published upload was to a partner component) then
+        # default_archive will raise an exception.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagename=sourcepackage.sourcepackagename,
+            distroseries=sourcepackage.distroseries,
+            component=partner,
+            status=PackagePublishingStatus.PUBLISHED)
+        self.assertRaises(
+            NoPartnerArchive, sourcepackage.get_default_archive)
+
 
 class TestSourcePackageSecurity(TestCaseWithFactory):
     """Tests for source package branch linking security."""

=== modified file 'lib/lp/soyuz/interfaces/component.py'
--- lib/lp/soyuz/interfaces/component.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/interfaces/component.py	2009-11-19 15:18:17 +0000
@@ -10,7 +10,7 @@
 __all__ = [
     'IComponent',
     'IComponentSelection',
-    'IComponentSet'
+    'IComponentSet',
     ]
 
 from zope.interface import Interface, Attribute
@@ -18,6 +18,7 @@
 
 from canonical.launchpad import _
 
+
 class IComponent(Interface):
     """Represents the Component table.
 
@@ -54,4 +55,3 @@
 
     def new(name):
         """Create a new component."""
-

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2009-11-14 22:44:10 +0000
+++ lib/lp/testing/factory.py	2009-11-19 15:18:17 +0000
@@ -34,17 +34,25 @@
 
 from canonical.autodecorate import AutoDecorate
 from canonical.config import config
+from canonical.database.constants import UTC_NOW
 from lp.codehosting.codeimport.worker import CodeImportSourceDetails
 from canonical.database.sqlbase import flush_database_updates
 from lp.soyuz.adapters.packagelocation import PackageLocation
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+from lp.soyuz.interfaces.section import ISectionSet
 from canonical.launchpad.database.account import Account
 from canonical.launchpad.database.emailaddress import EmailAddress
 from canonical.launchpad.database.message import Message, MessageChunk
 from lp.soyuz.model.processor import ProcessorFamilySet
+from lp.soyuz.model.publishing import (
+    SecureSourcePackagePublishingHistory,
+    SourcePackagePublishingHistory,
+    )
 from canonical.launchpad.interfaces import IMasterStore
 from canonical.launchpad.interfaces.account import (
     AccountCreationRationale, AccountStatus, IAccountSet)
-from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
+from lp.soyuz.interfaces.archive import (
+    default_name_by_purpose, IArchiveSet, ArchivePurpose)
 from lp.blueprints.interfaces.sprint import ISprintSet
 from lp.bugs.interfaces.bug import CreateBugParams, IBugSet
 from lp.bugs.interfaces.bugtask import BugTaskStatus
@@ -101,7 +109,8 @@
 from lp.registry.interfaces.product import IProductSet, License
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.project import IProjectSet
-from lp.registry.interfaces.sourcepackage import ISourcePackage
+from lp.registry.interfaces.sourcepackage import (
+    ISourcePackage, SourcePackageUrgency)
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageNameSet)
 from lp.registry.interfaces.ssh import ISSHKeySet, SSHKeyType
@@ -123,6 +132,7 @@
     password that needs to happen on the master store and this is forced.
     However, if we then read it back the default Store has to be used.
     """
+
     def with_default_master_store(*args, **kw):
         try:
             store_selector = getUtility(IStoreSelector)
@@ -137,9 +147,9 @@
     return mergeFunctionMetadata(func, with_default_master_store)
 
 
-# We use this for default paramters where None has a specific meaning.  For
-# example, makeBranch(product=None) means "make a junk branch".
-# None, because None means "junk branch".
+# We use this for default parameters where None has a specific meaning. For
+# example, makeBranch(product=None) means "make a junk branch". None, because
+# None means "junk branch".
 _DEFAULT = object()
 
 
@@ -176,10 +186,9 @@
         :return: A hexadecimal string, with 'a'-'f' in lower case.
         """
         hex_number = '%x' % self.getUniqueInteger()
-        if digits is None:
-            return hex_number
-        else:
-            return hex_number.zfill(digits)
+        if digits is not None:
+            hex_number = hex_number.zfill(digits)
+        return hex_number
 
     def getUniqueString(self, prefix=None):
         """Return a string unique to this factory instance.
@@ -263,9 +272,10 @@
 
     def makeGPGKey(self, owner):
         """Give 'owner' a crappy GPG key for the purposes of testing."""
+        key_id = self.getUniqueHexString(digits=8).upper()
         return getUtility(IGPGKeySet).new(
             owner.id,
-            keyid=self.getUniqueHexString(digits=8).upper(),
+            keyid=key_id,
             fingerprint='A' * 40,
             keysize=self.getUniqueInteger(),
             algorithm=GPGKeyAlgorithm.R,
@@ -1467,7 +1477,7 @@
         return getUtility(IComponentSet).ensure(name)
 
     def makeArchive(self, distribution=None, owner=None, name=None,
-                    purpose = None):
+                    purpose=None):
         """Create and return a new arbitrary archive.
 
         :param distribution: Supply IDistribution, defaults to a new one
@@ -1481,10 +1491,13 @@
             distribution = self.makeDistribution()
         if owner is None:
             owner = self.makePerson()
-        if name is None:
-            name = self.getUniqueString()
         if purpose is None:
             purpose = ArchivePurpose.PPA
+        if name is None:
+            try:
+                name = default_name_by_purpose[purpose]
+            except KeyError:
+                name = self.getUniqueString()
 
         # Making a distribution makes an archive, and there can be only one
         # per distribution.
@@ -1724,6 +1737,111 @@
             distroseries = self.makeDistroRelease()
         return distroseries.getSourcePackage(sourcepackagename)
 
+    def getAnySourcePackageUrgency(self):
+        return SourcePackageUrgency.MEDIUM
+
+    def makeSourcePackagePublishingHistory(self, sourcepackagename=None,
+                                           distroseries=None, maintainer=None,
+                                           creator=None, component=None,
+                                           section=None, urgency=None,
+                                           version=None, archive=None,
+                                           builddepends=None,
+                                           builddependsindep=None,
+                                           build_conflicts=None,
+                                           build_conflicts_indep=None,
+                                           architecturehintlist='all',
+                                           dateremoved=None,
+                                           date_uploaded=UTC_NOW,
+                                           pocket=None,
+                                           status=None,
+                                           scheduleddeletiondate=None,
+                                           dsc_standards_version='3.6.2',
+                                           dsc_format='1.0',
+                                           dsc_binaries='foo-bin',
+                                           ):
+        if sourcepackagename is None:
+            sourcepackagename = self.makeSourcePackageName()
+        spn = sourcepackagename
+
+        if distroseries is None:
+            distroseries = self.makeDistroRelease()
+
+        if archive is None:
+            archive = self.makeArchive(
+                distribution=distroseries.distribution,
+                purpose=ArchivePurpose.PRIMARY)
+
+        if component is None:
+            component = self.makeComponent()
+
+        if pocket is None:
+            pocket = self.getAnyPocket()
+
+        if status is None:
+            status = PackagePublishingStatus.PENDING
+
+        if urgency is None:
+            urgency = self.getAnySourcePackageUrgency()
+
+        if section is None:
+            section = self.getUniqueString('section')
+        section = getUtility(ISectionSet).ensure(section)
+
+        if maintainer is None:
+            maintainer = self.makePerson()
+
+        maintainer_email = '%s <%s>' % (
+            maintainer.displayname,
+            maintainer.preferredemail.email)
+
+        if creator is None:
+            creator = self.makePerson()
+
+        if version is None:
+            version = self.getUniqueString('version')
+
+        gpg_key = self.makeGPGKey(creator)
+
+        spr = distroseries.createUploadedSourcePackageRelease(
+            sourcepackagename=spn,
+            maintainer=maintainer,
+            creator=creator,
+            component=component,
+            section=section,
+            urgency=urgency,
+            version=version,
+            builddepends=builddepends,
+            builddependsindep=builddependsindep,
+            build_conflicts=build_conflicts,
+            build_conflicts_indep=build_conflicts_indep,
+            architecturehintlist=architecturehintlist,
+            changelog_entry=None,
+            dsc=None,
+            copyright=self.getUniqueString(),
+            dscsigningkey=gpg_key,
+            dsc_maintainer_rfc822=maintainer_email,
+            dsc_standards_version=dsc_standards_version,
+            dsc_format=dsc_format,
+            dsc_binaries=dsc_binaries,
+            archive=archive, dateuploaded=date_uploaded)
+
+        sspph = SecureSourcePackagePublishingHistory(
+            distroseries=distroseries,
+            sourcepackagerelease=spr,
+            component=spr.component,
+            section=spr.section,
+            status=status,
+            datecreated=date_uploaded,
+            dateremoved=dateremoved,
+            scheduleddeletiondate=scheduleddeletiondate,
+            pocket=pocket,
+            embargo=False,
+            archive=archive)
+
+        # SPPH and SSPPH IDs are the same, since they are SPPH is a SQLVIEW
+        # of SSPPH and other useful attributes.
+        return SourcePackagePublishingHistory.get(sspph.id)
+
     def makePackageset(self, name=None, description=None, owner=None,
                        packages=(), distroseries=None):
         """Make an `IPackageset`."""