Received: by mail.netbsd.org (Postfix, from userid 605) id 7B96984D46; Tue, 16 Jan 2018 09:37:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0488184D3A for ; Tue, 16 Jan 2018 09:37:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 91__85xHXvKc for ; Tue, 16 Jan 2018 09:37:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9557784CE1 for ; Tue, 16 Jan 2018 09:37:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 96098FBDE; Tue, 16 Jan 2018 09:37:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1516095420286700" MIME-Version: 1.0 Date: Tue, 16 Jan 2018 09:37:00 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20180116093700.96098FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1516095420286700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Jan 16 09:37:00 UTC 2018 Modified Files: pkgsrc/net/transmission: Makefile distinfo pkgsrc/net/transmission-gtk: Makefile pkgsrc/net/transmission-qt: Makefile Added Files: pkgsrc/net/transmission/patches: patch-libtransmission_quark.c patch-libtransmission_quark.h patch-libtransmission_rpc-server.c patch-libtransmission_rpc-server.h patch-libtransmission_session.c patch-libtransmission_transmission.h patch-libtransmission_web.c Log Message: transmission*: Fix security issue Fix a weakness that allows remote code execution via the Transmission RPC server using DNS rebinding: https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 Patch adapted from Tavis Ormandy's patch on the Transmission master branch to the Transmission 2.92 release by Leo Famulari : https://github.com/transmission/transmission/pull/468/commits Via FreeBSD ports. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/transmission/Makefile \ pkgsrc/net/transmission/distinfo cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/transmission-gtk/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/transmission-qt/Makefile cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/transmission/patches/patch-libtransmission_quark.c \ pkgsrc/net/transmission/patches/patch-libtransmission_quark.h \ pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.c \ pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.h \ pkgsrc/net/transmission/patches/patch-libtransmission_session.c \ pkgsrc/net/transmission/patches/patch-libtransmission_transmission.h \ pkgsrc/net/transmission/patches/patch-libtransmission_web.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1516095420286700 Content-Disposition: inline Content-Length: 22726 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/transmission/Makefile diff -u pkgsrc/net/transmission/Makefile:1.12 pkgsrc/net/transmission/Makefile:1.13 --- pkgsrc/net/transmission/Makefile:1.12 Mon Jan 1 21:18:49 2018 +++ pkgsrc/net/transmission/Makefile Tue Jan 16 09:37:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/01/01 21:18:49 adam Exp $ +# $NetBSD: Makefile,v 1.13 2018/01/16 09:37:00 wiz Exp $ CONFLICTS+= Transmission-[0-9]* @@ -8,6 +8,6 @@ pre-configure: CONFIGURE_ARGS+= --disable-mac CONFIGURE_ARGS+= --without-gtk -PKGREVISION= 5 +PKGREVISION= 6 .include "../../net/transmission/Makefile.common" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/transmission/distinfo diff -u pkgsrc/net/transmission/distinfo:1.12 pkgsrc/net/transmission/distinfo:1.13 --- pkgsrc/net/transmission/distinfo:1.12 Thu Jul 13 13:38:59 2017 +++ pkgsrc/net/transmission/distinfo Tue Jan 16 09:37:00 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2017/07/13 13:38:59 wiz Exp $ +$NetBSD: distinfo,v 1.13 2018/01/16 09:37:00 wiz Exp $ SHA1 (transmission-2.92.tar.xz) = 2140feba45c4471392033d21b86b6f3ef780d88e RMD160 (transmission-2.92.tar.xz) = 6da78ce333fa2ea69aa4954c3b052a818ce7c93e @@ -6,4 +6,11 @@ SHA512 (transmission-2.92.tar.xz) = 4d99 Size (transmission-2.92.tar.xz) = 3378116 bytes SHA1 (patch-ab) = 796faa7c61762dc3ffe563748e55160c827149d2 SHA1 (patch-libtransmission_platform-quota.c) = 2d9758d24c4329021e0774ac9f8bb3dd94592965 +SHA1 (patch-libtransmission_quark.c) = 70b8d8d3de0ae480433464a1dbee4488af3b64d9 +SHA1 (patch-libtransmission_quark.h) = 5c4b0a24e2e142a3504c232b333fa7665fe8178f +SHA1 (patch-libtransmission_rpc-server.c) = 38aba449da55ae7f7c492b377d3ef6f5f54cc360 +SHA1 (patch-libtransmission_rpc-server.h) = b47127d42aaf1315719531f7af0c9f6a6dd14f6f +SHA1 (patch-libtransmission_session.c) = 29c159b6297eed2da9da51ec9ce254a871ce21c1 +SHA1 (patch-libtransmission_transmission.h) = 349c63f0ec98fe632aff32c71cdb3918d7e08a19 +SHA1 (patch-libtransmission_web.c) = 8483cbe1155ac07d82c6733ceda48274d157b207 SHA1 (patch-qt_qtr.pro) = 982c76669f41f154470a91b4b7c9cb5dcc41132c Index: pkgsrc/net/transmission-gtk/Makefile diff -u pkgsrc/net/transmission-gtk/Makefile:1.25 pkgsrc/net/transmission-gtk/Makefile:1.26 --- pkgsrc/net/transmission-gtk/Makefile:1.25 Mon Jan 1 21:18:49 2018 +++ pkgsrc/net/transmission-gtk/Makefile Tue Jan 16 09:37:00 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2018/01/01 21:18:49 adam Exp $ +# $NetBSD: Makefile,v 1.26 2018/01/16 09:37:00 wiz Exp $ PKGNAME= transmission-gtk-${VERSION} -PKGREVISION= 9 +PKGREVISION= 10 USE_LANGUAGES= c c++ INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}${PREFIX} Index: pkgsrc/net/transmission-qt/Makefile diff -u pkgsrc/net/transmission-qt/Makefile:1.29 pkgsrc/net/transmission-qt/Makefile:1.30 --- pkgsrc/net/transmission-qt/Makefile:1.29 Mon Jan 1 21:18:49 2018 +++ pkgsrc/net/transmission-qt/Makefile Tue Jan 16 09:37:00 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2018/01/01 21:18:49 adam Exp $ +# $NetBSD: Makefile,v 1.30 2018/01/16 09:37:00 wiz Exp $ PKGNAME= transmission-qt-${VERSION} -PKGREVISION= 12 +PKGREVISION= 13 USE_LANGUAGES= c c++ MAKE_ENV+= QTDIR=${QTDIR} Added files: Index: pkgsrc/net/transmission/patches/patch-libtransmission_quark.c diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_quark.c:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_quark.c Tue Jan 16 09:37:00 2018 @@ -0,0 +1,39 @@ +$NetBSD: patch-libtransmission_quark.c,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/quark.c.orig 2016-01-09 18:02:58.738698801 +0000 ++++ libtransmission/quark.c +@@ -289,6 +289,8 @@ static const struct tr_key_struct my_sta + { "rpc-authentication-required", 27 }, + { "rpc-bind-address", 16 }, + { "rpc-enabled", 11 }, ++ { "rpc-host-whitelist", 18 }, ++ { "rpc-host-whitelist-enabled", 26 }, + { "rpc-password", 12 }, + { "rpc-port", 8 }, + { "rpc-url", 7 }, Index: pkgsrc/net/transmission/patches/patch-libtransmission_quark.h diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_quark.h:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_quark.h Tue Jan 16 09:37:00 2018 @@ -0,0 +1,39 @@ +$NetBSD: patch-libtransmission_quark.h,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/quark.h.orig 2015-06-28 19:23:49.613528096 +0000 ++++ libtransmission/quark.h +@@ -291,6 +291,8 @@ enum + TR_KEY_rpc_authentication_required, + TR_KEY_rpc_bind_address, + TR_KEY_rpc_enabled, ++ TR_KEY_rpc_host_whitelist, ++ TR_KEY_rpc_host_whitelist_enabled, + TR_KEY_rpc_password, + TR_KEY_rpc_port, + TR_KEY_rpc_url, Index: pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.c diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.c:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.c Tue Jan 16 09:37:00 2018 @@ -0,0 +1,224 @@ +$NetBSD: patch-libtransmission_rpc-server.c,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/rpc-server.c.orig 2016-01-09 18:02:58.740698836 +0000 ++++ libtransmission/rpc-server.c +@@ -52,6 +52,7 @@ struct tr_rpc_server + bool isEnabled; + bool isPasswordEnabled; + bool isWhitelistEnabled; ++ bool isHostWhitelistEnabled; + tr_port port; + char * url; + struct in_addr bindAddress; +@@ -63,6 +64,7 @@ struct tr_rpc_server + char * password; + char * whitelistStr; + tr_list * whitelist; ++ tr_list * hostWhitelist; + + char * sessionId; + time_t sessionIdExpiresAt; +@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * + return false; + } + ++static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req) ++{ ++ /* If password auth is enabled, any hostname is permitted. */ ++ if (server->isPasswordEnabled) ++ { ++ return true; ++ } ++ ++ char const* const host = evhttp_find_header(req->input_headers, "Host"); ++ ++ // If whitelist is disabled, no restrictions. ++ if (!server->isHostWhitelistEnabled) ++ return true; ++ ++ /* No host header, invalid request. */ ++ if (host == NULL) ++ { ++ return false; ++ } ++ ++ /* Host header might include the port. */ ++ char* const hostname = tr_strndup(host, strcspn(host, ":")); ++ ++ /* localhost or ipaddress is always acceptable. */ ++ if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname)) ++ { ++ tr_free(hostname); ++ return true; ++ } ++ ++ /* Otherwise, hostname must be whitelisted. */ ++ for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) { ++ if (tr_wildmat(hostname, l->data)) ++ { ++ tr_free(hostname); ++ return true; ++ } ++ } ++ ++ tr_free(hostname); ++ return false; ++} ++ + static bool + test_session_id (struct tr_rpc_server * server, struct evhttp_request * req) + { +@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * + handle_upload (req, server); + } + #ifdef REQUIRE_SESSION_ID ++ else if (!isHostnameAllowed(server, req)) ++ { ++ char* tmp = tr_strdup_printf( ++ "

Transmission received your request, but the hostname was unrecognized.

" ++ "

To fix this, choose one of the following options:" ++ "

    " ++ "
  • Enable password authentication, then any hostname is allowed.
    • " ++ "
  • Add the hostname you want to use to the whitelist in settings.
    • " ++ "

" ++ "

If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.

" ++ "

This requirement has been added to help prevent " ++ "DNS Rebinding " ++ "attacks.

"); ++ send_simple_response(req, 421, tmp); ++ tr_free(tmp); ++ } ++ + else if (!test_session_id (server, req)) + { + const char * sessionId = get_current_session_id (server); +@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * + "
  • When you get this 409 error message, resend your request with the updated header" + "

    " + "

    This requirement has been added to help prevent " +- "CSRF " ++ "CSRF " + "attacks.

    " + "

    %s: %s

    ", + TR_RPC_SESSION_ID_HEADER, sessionId); +@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * serv + return server->url ? server->url : ""; + } + +-void +-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) ++static void ++tr_rpcSetList (char const* whitelistStr, tr_list** list) + { + void * tmp; + const char * walk; + +- /* keep the string */ +- tmp = server->whitelistStr; +- server->whitelistStr = tr_strdup (whitelistStr); +- tr_free (tmp); +- + /* clear out the old whitelist entries */ +- while ((tmp = tr_list_pop_front (&server->whitelist))) ++ while ((tmp = tr_list_pop_front (list)) != NULL) + tr_free (tmp); + + /* build the new whitelist entries */ +@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * serv + const char * delimiters = " ,;"; + const size_t len = strcspn (walk, delimiters); + char * token = tr_strndup (walk, len); +- tr_list_append (&server->whitelist, token); ++ tr_list_append (list, token); + if (strcspn (token, "+-") < len) + tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'! Are you using an old ACL by mistake?)", token); + else +@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * serv + } + } + ++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr) ++{ ++ tr_rpcSetList(whitelistStr, &server->hostWhitelist); ++} ++ ++void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr) ++{ ++ /* keep the string */ ++ char* const tmp = server->whitelistStr; ++ server->whitelistStr = tr_strdup(whitelistStr); ++ tr_free(tmp); ++ ++ tr_rpcSetList(whitelistStr, &server->whitelist); ++} ++ + const char* + tr_rpcGetWhitelist (const tr_rpc_server * server) + { +@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_ + return server->isWhitelistEnabled; + } + ++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled) ++{ ++ server->isHostWhitelistEnabled = isEnabled; ++} ++ + /**** + ***** PASSWORD + ****/ +@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session * session, tr_va + else + tr_rpcSetWhitelistEnabled (s, boolVal); + ++ key = TR_KEY_rpc_host_whitelist_enabled; ++ ++ if (!tr_variantDictFindBool(settings, key, &boolVal)) ++ { ++ missing_settings_key(key); ++ } ++ else ++ { ++ tr_rpcSetHostWhitelistEnabled(s, boolVal); ++ } ++ ++ key = TR_KEY_rpc_host_whitelist; ++ ++ if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL) ++ { ++ missing_settings_key(key); ++ } ++ else ++ { ++ tr_rpcSetHostWhitelist(s, str); ++ } ++ + key = TR_KEY_rpc_authentication_required; + if (!tr_variantDictFindBool (settings, key, &boolVal)) + missing_settings_key (key); Index: pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.h diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.h:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_rpc-server.h Tue Jan 16 09:37:00 2018 @@ -0,0 +1,41 @@ +$NetBSD: patch-libtransmission_rpc-server.h,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/rpc-server.h.orig 2014-12-10 19:22:42.938222700 +0000 ++++ libtransmission/rpc-server.h +@@ -49,6 +49,10 @@ void tr_rpcSetWhitelist (tr_r + + const char* tr_rpcGetWhitelist (const tr_rpc_server * server); + ++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled); ++ ++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist); ++ + void tr_rpcSetPassword (tr_rpc_server * server, + const char * password); + Index: pkgsrc/net/transmission/patches/patch-libtransmission_session.c diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_session.c:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_session.c Tue Jan 16 09:37:00 2018 @@ -0,0 +1,39 @@ +$NetBSD: patch-libtransmission_session.c,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/session.c.orig 2016-01-09 18:02:58.743698889 +0000 ++++ libtransmission/session.c +@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant + tr_variantDictAddStr (d, TR_KEY_rpc_username, ""); + tr_variantDictAddStr (d, TR_KEY_rpc_whitelist, TR_DEFAULT_RPC_WHITELIST); + tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled, true); ++ tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST); ++ tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true); + tr_variantDictAddInt (d, TR_KEY_rpc_port, atoi (TR_DEFAULT_RPC_PORT_STR)); + tr_variantDictAddStr (d, TR_KEY_rpc_url, TR_DEFAULT_RPC_URL_STR); + tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled, true); Index: pkgsrc/net/transmission/patches/patch-libtransmission_transmission.h diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_transmission.h:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_transmission.h Tue Jan 16 09:37:00 2018 @@ -0,0 +1,38 @@ +$NetBSD: patch-libtransmission_transmission.h,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/transmission.h.orig 2015-12-31 18:33:37.576878516 +0000 ++++ libtransmission/transmission.h +@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (vo + #define TR_DEFAULT_BIND_ADDRESS_IPV4 "0.0.0.0" + #define TR_DEFAULT_BIND_ADDRESS_IPV6 "::" + #define TR_DEFAULT_RPC_WHITELIST "127.0.0.1" ++#define TR_DEFAULT_RPC_HOST_WHITELIST "" + #define TR_DEFAULT_RPC_PORT_STR "9091" + #define TR_DEFAULT_RPC_URL_STR "/transmission/" + #define TR_DEFAULT_PEER_PORT_STR "51413" Index: pkgsrc/net/transmission/patches/patch-libtransmission_web.c diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_web.c:1.1 --- /dev/null Tue Jan 16 09:37:00 2018 +++ pkgsrc/net/transmission/patches/patch-libtransmission_web.c Tue Jan 16 09:37:00 2018 @@ -0,0 +1,38 @@ +$NetBSD: patch-libtransmission_web.c,v 1.1 2018/01/16 09:37:00 wiz Exp $ + +Fix a weakness that allows remote code execution via the Transmission +RPC server using DNS rebinding: + +https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 + +Patch adapted from Tavis Ormandy's patch on the Transmission master +branch to the Transmission 2.92 release by Leo Famulari +: + +https://github.com/transmission/transmission/pull/468/commits + +From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 +From: Tavis Ormandy +Date: Thu, 11 Jan 2018 10:00:41 -0800 +Subject: [PATCH] mitigate dns rebinding attacks against daemon + +--- + libtransmission/quark.c | 2 + + libtransmission/quark.h | 2 + + libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- + libtransmission/rpc-server.h | 4 ++ + libtransmission/session.c | 2 + + libtransmission/transmission.h | 1 + + libtransmission/web.c | 3 ++ + 7 files changed, 121 insertions(+), 9 deletions(-) + +--- libtransmission/web.c.orig 2015-12-31 18:33:37.567878356 +0000 ++++ libtransmission/web.c +@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code) + case 415: return "Unsupported Media Type"; + case 416: return "Requested Range Not Satisfiable"; + case 417: return "Expectation Failed"; ++ case 421: return "Misdirected Request"; + case 500: return "Internal Server Error"; + case 501: return "Not Implemented"; + case 502: return "Bad Gateway"; --_----------=_1516095420286700--