summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2020-02-16 11:45:05 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2020-02-16 12:46:09 +0100
commit9cc0e2cab7c83ede99e21c70f248d884b8930983 (patch)
tree0f8d2492a879febd1f1010007c6c5b2b20d070cd /apt-pkg/contrib
parent2c1f718bb2b0d64a14ab53d323704f034b69c13a (diff)
Revert "Add a Packages-Require-Authorization Release file field"
This experiment did not turn out sensibly, as some servers do not accept credentials when none are expected and fail, so you cannot mirror such a repository. This reverts commit c2b9b0489538fed4770515bd8853a960b13a2618.
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/netrc.cc43
-rw-r--r--apt-pkg/contrib/netrc.h4
2 files changed, 0 insertions, 47 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 4f5206e6c..a6f408c0e 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -167,46 +167,3 @@ bool MaybeAddAuth(FileFd &NetRCFile, URI &Uri)
}
return false;
}
-
-/* Check if we are authorized. */
-bool IsAuthorized(pkgCache::PkgFileIterator const I, std::vector<std::unique_ptr<FileFd>> &authconfs)
-{
- if (authconfs.empty())
- {
- _error->PushToStack();
- auto const netrc = _config->FindFile("Dir::Etc::netrc");
- if (not netrc.empty())
- {
- authconfs.emplace_back(new FileFd());
- authconfs.back()->Open(netrc, FileFd::ReadOnly);
- }
-
- auto const netrcparts = _config->FindDir("Dir::Etc::netrcparts");
- if (not netrcparts.empty())
- {
- for (auto const &netrc : GetListOfFilesInDir(netrcparts, "conf", true, true))
- {
- authconfs.emplace_back(new FileFd());
- authconfs.back()->Open(netrc, FileFd::ReadOnly);
- }
- }
- _error->RevertToStack();
- }
-
- // FIXME: Use the full base url
- URI uri(std::string("https://") + I.Site() + "/");
- for (auto &authconf : authconfs)
- {
- if (not authconf->IsOpen())
- continue;
- if (not authconf->Seek(0))
- continue;
-
- MaybeAddAuth(*authconf, uri);
-
- if (not uri.User.empty() || not uri.Password.empty())
- return true;
- }
-
- return false;
-}
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index c8a03a4b7..b13f18187 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -13,12 +13,9 @@
#ifndef NETRC_H
#define NETRC_H
-#include <memory>
#include <string>
-#include <vector>
#include <apt-pkg/macros.h>
-#include <apt-pkg/pkgcache.h>
@@ -26,5 +23,4 @@ class URI;
class FileFd;
bool MaybeAddAuth(FileFd &NetRCFile, URI &Uri);
-bool IsAuthorized(pkgCache::PkgFileIterator const I, std::vector<std::unique_ptr<FileFd>> &authconfs) APT_HIDDEN;
#endif