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 10:04:22 +0100 |
commit | 3bcecba71aa89511b17a8dbd9e176d8e88dc8be3 (patch) | |
tree | 3d3cbc3969552df5d7a4327a7710102dd216b135 /apt-pkg/acquire-item.cc | |
parent | 58ebfeb08cf979c1702dfca44c258e2f176e4212 (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)
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 6ac893b1b..1469c0edd 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -27,6 +27,7 @@ #include <apt-pkg/acquire.h> #include <apt-pkg/hashes.h> #include <apt-pkg/indexfile.h> +#include <apt-pkg/netrc.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> #include <apt-pkg/pkgrecords.h> @@ -2952,6 +2953,8 @@ bool pkgAcqArchive::QueueNext() // Ignore not source sources if (PkgF.Flagged(pkgCache::Flag::NotSource)) continue; + if (PkgF.Flagged(pkgCache::Flag::PackagesRequireAuthorization) && !IsAuthorized(PkgF)) + continue; // Try to cross match against the source list pkgIndexFile *Index; |