Fix CVE-2019-3500: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3500 https://github.com/aria2/aria2/issues/1329 Patch copied from upstream source repository: https://github.com/aria2/aria2/commit/37368130ca7de5491a75fd18a20c5c5cc641824a From 37368130ca7de5491a75fd18a20c5c5cc641824a Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 5 Jan 2019 09:32:40 +0900 Subject: [PATCH] Mask headers --- src/HttpConnection.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc index 77cb9d27a..be5b97723 100644 --- a/src/HttpConnection.cc +++ b/src/HttpConnection.cc @@ -102,11 +102,17 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request) std::string result; std::string line; while (getline(istr, line)) { - if (util::startsWith(line, "Authorization: Basic")) { - result += "Authorization: Basic ********\n"; + if (util::istartsWith(line, "Authorization: ")) { + result += "Authorization: \n"; } - else if (util::startsWith(line, "Proxy-Authorization: Basic")) { - result += "Proxy-Authorization: Basic ********\n"; + else if (util::istartsWith(line, "Proxy-Authorization: ")) { + result += "Proxy-Authorization: \n"; + } + else if (util::istartsWith(line, "Cookie: ")) { + result += "Cookie: \n"; + } + else if (util::istartsWith(line, "Set-Cookie: ")) { + result += "Set-Cookie: \n"; } else { result += line; @@ -154,8 +160,8 @@ std::unique_ptr HttpConnection::receiveResponse() const auto& proc = outstandingHttpRequests_.front()->getHttpHeaderProcessor(); if (proc->parse(socketRecvBuffer_->getBuffer(), socketRecvBuffer_->getBufferLength())) { - A2_LOG_INFO( - fmt(MSG_RECEIVE_RESPONSE, cuid_, proc->getHeaderString().c_str())); + A2_LOG_INFO(fmt(MSG_RECEIVE_RESPONSE, cuid_, + eraseConfidentialInfo(proc->getHeaderString()).c_str())); auto result = proc->getResult(); if (result->getStatusCode() / 100 == 1) { socketRecvBuffer_->drain(proc->getLastBytesProcessed()); fbabe8'>gnu/machine/digital-ocean.scm
AgeCommit message (Expand)Author
2020-07-25Use 'formatted-message' instead of '&message' where appropriate....* gnu.scm (%try-use-modules): Use 'formatted-message' instead of '&message'. * gnu/machine/digital-ocean.scm (maybe-raise-unsupported-configuration-error): Likewise. * gnu/machine/ssh.scm (machine-check-file-system-availability): Likewise. (machine-check-building-for-appropriate-system): Likewise. (deploy-managed-host): Likewise. (maybe-raise-unsupported-configuration-error): Likewise. * gnu/packages.scm (search-patch): Likewise. * gnu/services.scm (%service-with-default-value): Likewise. (files->etc-directory): Likewise. (fold-services): Likewise. * gnu/system.scm (locale-name->definition*): Likewise. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Likewise. (check-luks-device): Likewise. * guix/channels.scm (latest-channel-instance): Likewise. * guix/cve.scm (json->cve-items): Likewise. * guix/git-authenticate.scm (commit-signing-key): Likewise. (commit-authorized-keys): Likewise. (authenticate-commit): Likewise. (verify-introductory-commit): Likewise. * guix/remote.scm (remote-pipe-for-gexp): Likewise. * guix/scripts/graph.scm (assert-package): Likewise. * guix/scripts/offload.scm (private-key-from-file*): Likewise. * guix/ssh.scm (authenticate-server*): Likewise. (open-ssh-session): Likewise. (remote-inferior): Likewise. * guix/ui.scm (matching-generations): Likewise. * guix/upstream.scm (package-update): Likewise. * tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"): Catch 'formatted-message?'. ("authenticate-channel, wrong first commit signer"): Likewise. * tests/lint.scm ("patches: not found"): Adjust message string. * tests/packages.scm ("patch not found yields a run-time error"): Catch 'formatted-message?'. * guix/lint.scm (check-patch-file-names): Handle 'formatted-message?'. (check-derivation): Ditto. Ludovic Courtès
2020-02-09Update e-mail address for Jakob L. Kreuze....As requested here: <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00128.html>. * .mailmap: Add an entry for Jakob. * gnu/machine.scm, gnu/machine/digital-ocean.scm, gnu/machine/ssh.scm, gnu/packages/admin.scm, gnu/packages/i2p.scm, gnu/packages/music.scm, gnu/packages/web.scm, gnu/tests/reconfigure.scm, guix/scripts/deploy.scm, guix/scripts/system/reconfigure.scm: Update their e-mail address. Tobias Geerinckx-Rice