From dfacd0d178defd7d4da489cf07a67d3d492633d0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 26 Feb 2019 18:59:01 +0100 Subject: [PATCH] Drop unused patches --- ...smission-build-against-openssl-1.1.0.patch | 124 ------- CVE-2018-5702.patch | 302 ------------------ transmission-2.84-overshoot.patch | 11 - transmission.spec | 1 - 4 files changed, 438 deletions(-) delete mode 100644 0001-transmission-build-against-openssl-1.1.0.patch delete mode 100644 CVE-2018-5702.patch delete mode 100644 transmission-2.84-overshoot.patch diff --git a/0001-transmission-build-against-openssl-1.1.0.patch b/0001-transmission-build-against-openssl-1.1.0.patch deleted file mode 100644 index 2b56a8d..0000000 --- a/0001-transmission-build-against-openssl-1.1.0.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 1108498d2a1a9c47931f41b04f248616b29383d6 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Mon, 5 Sep 2016 21:49:07 +0000 -Subject: [PATCH] transmission: build against openssl 1.1.0 - -Signed-off-by: Sebastian Andrzej Siewior ---- - libtransmission/crypto-utils-openssl.c | 73 ++++++++++++++++++++++++++++++++-- - 1 file changed, 69 insertions(+), 4 deletions(-) - -diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c -index 77a628bea..16a37b205 100644 ---- a/libtransmission/crypto-utils-openssl.c -+++ b/libtransmission/crypto-utils-openssl.c -@@ -230,6 +230,61 @@ tr_rc4_process (tr_rc4_ctx_t handle, - **** - ***/ - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+static inline int -+DH_set0_pqg (DH * dh, -+ BIGNUM * p, -+ BIGNUM * q, -+ BIGNUM * g) -+{ -+ /* If the fields p and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. q may remain NULL. -+ */ -+ if ((dh->p == NULL && p == NULL) -+ || (dh->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free (dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) { -+ BN_free (dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) { -+ BN_free (dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) { -+ dh->length = BN_num_bits (q); -+ } -+ -+ return 1; -+} -+ -+static inline int -+DH_set_length (DH * dh, -+ long length) -+{ -+ dh->length = length; -+ return 1; -+} -+ -+static inline void -+DH_get0_key(const DH * dh, -+ const BIGNUM ** pub_key, -+ const BIGNUM ** priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+#endif -+ - tr_dh_ctx_t - tr_dh_new (const uint8_t * prime_num, - size_t prime_num_length, -@@ -237,13 +292,19 @@ tr_dh_new (const uint8_t * prime_num, - size_t generator_num_length) - { - DH * handle = DH_new (); -+ BIGNUM * p, * g; - - assert (prime_num != NULL); - assert (generator_num != NULL); -+ p = BN_bin2bn (prime_num, prime_num_length, NULL); -+ g = BN_bin2bn (generator_num, generator_num_length, NULL); - -- if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) || -- !check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL))) -+ if (!check_pointer (p) || -+ !check_pointer (g) || -+ !DH_set0_pqg (handle, p, NULL, g)) - { -+ BN_free (p); -+ BN_free (g); - DH_free (handle); - handle = NULL; - } -@@ -268,16 +329,20 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle, - { - DH * handle = raw_handle; - int dh_size, my_public_key_length; -+ const BIGNUM * hand_pub_key; - - assert (handle != NULL); - assert (public_key != NULL); - -- handle->length = private_key_length * 8; -+ -+ DH_set_length(handle, private_key_length * 8); - - if (!check_result (DH_generate_key (handle))) - return false; - -- my_public_key_length = BN_bn2bin (handle->pub_key, public_key); -+ DH_get0_key (handle, &hand_pub_key, NULL); -+ -+ my_public_key_length = BN_bn2bin (hand_pub_key, public_key); - dh_size = DH_size (handle); - - tr_dh_align_key (public_key, my_public_key_length, dh_size); --- -2.14.3 - diff --git a/CVE-2018-5702.patch b/CVE-2018-5702.patch deleted file mode 100644 index a3a0cf1..0000000 --- a/CVE-2018-5702.patch +++ /dev/null @@ -1,302 +0,0 @@ -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(-) - -diff --git a/libtransmission/quark.c b/libtransmission/quark.c -index 30cc2bca4..b4fd7aabd 100644 ---- a/libtransmission/quark.c -+++ b/libtransmission/quark.c -@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] = - { "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 }, -diff --git a/libtransmission/quark.h b/libtransmission/quark.h -index 7f5212733..17464be8f 100644 ---- a/libtransmission/quark.h -+++ b/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, -diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c -index a3485f3fa..292cd5fce 100644 ---- a/libtransmission/rpc-server.c -+++ b/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 * server, const char * address) - 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 * req, void * arg) - 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 * req, void * arg) - "
  • 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 * server) - 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 * server, const char * whitelistStr) - 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 * server, const char * whitelistStr) - } - } - -+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_server * server) - 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_variant * settings) - 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); -diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h -index e0302c5ea..8c9e6b24e 100644 ---- a/libtransmission/rpc-server.h -+++ b/libtransmission/rpc-server.h -@@ -49,6 +49,10 @@ void tr_rpcSetWhitelist (tr_rpc_server * server, - - 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); - -diff --git a/libtransmission/session.c b/libtransmission/session.c -index 844cadba8..58b717913 100644 ---- a/libtransmission/session.c -+++ b/libtransmission/session.c -@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d) - 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); -diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h -index 4f76adfd6..e213a8f4e 100644 ---- a/libtransmission/transmission.h -+++ b/libtransmission/transmission.h -@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void); - #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" -diff --git a/libtransmission/web.c b/libtransmission/web.c -index ee495e9fc..c7f062730 100644 ---- a/libtransmission/web.c -+++ b/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"; diff --git a/transmission-2.84-overshoot.patch b/transmission-2.84-overshoot.patch deleted file mode 100644 index 44776be..0000000 --- a/transmission-2.84-overshoot.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/tr-window.c~ 2014-07-01 12:09:24.000000000 -0500 -+++ gtk/tr-window.c 2016-01-20 08:38:04.360267180 -0600 -@@ -625,7 +625,7 @@ - gtk_window_add_accel_group (win, gtk_ui_manager_get_accel_group (ui_mgr)); - /* Add style provider to the window. */ - /* Please move it to separate .css file if you’re adding more styles here. */ -- style = ".tr-workarea {border-width: 1px 0; border-style: solid; border-radius: 0;}"; -+ style = ".tr-workarea.frame {border-left-width: 0; border-right-width: 0; border-radius: 0;}"; - css_provider = gtk_css_provider_new (); - gtk_css_provider_load_from_data (css_provider, style, - strlen (style), NULL); diff --git a/transmission.spec b/transmission.spec index d21a19e..44cbb2e 100644 --- a/transmission.spec +++ b/transmission.spec @@ -11,7 +11,6 @@ URL: http://www.transmissionbt.com Source0: https://github.com/transmission/transmission-releases/raw/master/transmission-%{version}.tar.xz # https://bugzilla.redhat.com/show_bug.cgi?id=1221292 Source1: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/transmission-symbolic.svg -#Patch0: transmission-2.84-overshoot.patch Patch1: transmission-libsystemd.patch Patch2: transmission-fdlimits.patch # Fix the DBus name to match the app name for flatpak builds