Merge branch 'lp2150631' into 'main'

Warn if auth.conf is unreadable (LP: #2150631)

See merge request apt-team/apt!580

1 files changed, 12 insertions, 0 deletions

diff --git a/methods/basehttp.cc b/methods/basehttp.cc
index db0ed228f..8dd596f8f 100644
--- a/methods/basehttp.cc
+++ b/methods/basehttp.cc
@@ -506,6 +506,18 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
 	 std::string err;
 	 strprintf(err, "HttpError%u", Req.Result);
 	 SetFailReason(err);
+	 if (Req.Result == 401 && inaccessibleAuthConfs.empty() == false)
+	 {
+	    std::string conflist;
+	    std::string msg;
+	    for (auto const &path : inaccessibleAuthConfs)
+	       conflist += (conflist.empty() ? "" : ", ") + path;
+	    strprintf(msg, _("Authentication credentials may be configured in %s, "
+			     "but the file(s) are not readable by the current user. "
+			     "Try running this command as root."),
+		      conflist.c_str());
+	    Warning(std::move(msg));
+	 }
 	 _error->Error("%u %s", Req.Result, Req.Code);
       }
       if (Req.haveContent == HaveContent::TRI_TRUE)