From: Byron Jones <bjones@mozilla.com>
Date: Wed, 29 Feb 2012 04:51:35 +0000 (+0800)
Subject: Bug 731219: Fix XMLRPC breakage when content-type contains a charset
X-Git-Tag: bugzilla-4.2.1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda60403ea62b195b678dff88387d9b392c7f4be;p=thirdparty%2Fbugzilla.git

Bug 731219: Fix XMLRPC breakage when content-type contains a charset
r=dkl, a=LpSolit
---

diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm
index 822709d857..025fb8f192 100644
--- a/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/Bugzilla/WebService/Server/XMLRPC.pm
@@ -93,7 +93,10 @@ sub deserialize {
     my $self = shift;
 
     # Only allow certain content types to protect against CSRF attacks
-    if (!grep($_ eq $ENV{'CONTENT_TYPE'}, XMLRPC_CONTENT_TYPE_WHITELIST)) {
+    my $content_type = lc($ENV{'CONTENT_TYPE'});
+    # Remove charset, etc, if provided
+    $content_type =~ s/^([^;]+);.*/$1/;
+    if (!grep($_ eq $content_type, XMLRPC_CONTENT_TYPE_WHITELIST)) {
         ThrowUserError('xmlrpc_illegal_content_type',
                        { content_type => $ENV{'CONTENT_TYPE'} });
     }