diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-01 14:43:52 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-03-01 11:41:24 +0000 |
| commit | cc67debf273087c44f39a63363553577eb0fcb9c (patch) | |
| tree | 1ef10f169fc86b0c3775376171429f5172fa0b2f /apt-pkg/policy.cc | |
| parent | 25c024910b4c051461a9842d9fe0efc04748c908 (diff) | |
Add a Packages-Require-Authorization Release file field
This new field allows a repository to declare that access to
packages requires authorization. The current implementation will
set the pin to -32768 if no authorization has been provided in
the auth.conf(.d) files.
This implementation is suboptimal in two aspects:
(1) A repository should behave more like NotSource repositories
(2) We only have the host name for the repository, we cannot use
paths yet.
- We can fix those after an ABI break.
The code also adds a check to acquire-item.cc to not use the
specified repository as a download source, mimicking NotSource.
(cherry picked from commit c2b9b0489538fed4770515bd8853a960b13a2618)
LP: #1814727
(cherry picked from commit d75162bc67d5a1a690eb2a8747d31ad68353823e)
(cherry picked from commit 19075f52174199fe7665334ad1815c747c26c10b)
Conflicts:
apt-pkg/deb/debmetaindex.cc
apt-pkg/pkgcache.h
Diffstat (limited to 'apt-pkg/policy.cc')
| -rw-r--r-- | apt-pkg/policy.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index a44bd7efe..8fadc9fa0 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -35,6 +35,7 @@ #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> #include <apt-pkg/cacheiterators.h> +#include <apt-pkg/netrc.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/versionmatch.h> @@ -94,7 +95,7 @@ pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner) // --------------------------------------------------------------------- /* */ bool pkgPolicy::InitDefaults() -{ +{ // Initialize the priorities based on the status of the package file for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I != Cache->FileEnd(); ++I) { @@ -105,6 +106,8 @@ bool pkgPolicy::InitDefaults() PFPriority[I->ID] = 100; else if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic) PFPriority[I->ID] = 1; + if ((I->Flags & pkgCache::Flag::PackagesRequireAuthorization) == pkgCache::Flag::PackagesRequireAuthorization && !IsAuthorized(I)) + PFPriority[I->ID] = NEVER_PIN; } // Apply the defaults.. |