Merge lp:~verterok/ubuntu-push/support-media-type into lp:ubuntu-push/automatic

[Guillermo Gonzalez]

Add support to media-type in the Content-Type check at server/api handlers

Add support to media-type in the Content-Type check at server/api/handlers.go
This is needed as some clients, like the qml XmlHTTPRequest, append "; charset=UTF-8" to the content-type.

see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17

[Bret Barker (noise)]

minor nitpick comment below

[Bret Barker (noise)]

Hmm, shouldn't the request header be "Accept"? Content-type is the response header.

[lp:~verterok/ubuntu-push/support-media-type]

354. By Guillermo Gonzalez on 2014-11-17

use mime.ParseMediaType

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'server/api/handlers.go'
--- server/api/handlers.go	2014-11-04 17:59:43 +0000
+++ server/api/handlers.go	2014-11-17 19:54:49 +0000
@@ -23,6 +23,7 @@
 	"encoding/json"
 	"fmt"
 	"io"
+	"mime"
 	"net/http"
 	"time"
 
@@ -274,7 +275,8 @@
 	if err := checkContentLength(request, maxBodySize); err != nil {
 		return err
 	}
-	if request.Header.Get("Content-Type") != JSONMediaType {
+	mediaType, _, err := mime.ParseMediaType(request.Header.Get("Content-Type"))
+	if err != nil || mediaType != JSONMediaType {
 		return ErrWrongContentType
 	}
 	return nil

=== modified file 'server/api/handlers_test.go'
--- server/api/handlers_test.go	2014-11-04 16:29:21 +0000
+++ server/api/handlers_test.go	2014-11-17 19:54:49 +0000
@@ -933,6 +933,22 @@
 	checkError(c, response, ErrWrongContentType)
 }
 
+func (s *handlersSuite) TestContentTypeWithCharset(c *C) {
+	testServer := httptest.NewServer(&JSONPostHandler{})
+	defer testServer.Close()
+
+	dataString := `{"foo":"bar"}`
+
+	request := newPostRequest("/", &Broadcast{
+		Channel:  "some-channel",
+		ExpireOn: future,
+		Data:     json.RawMessage([]byte(dataString)),
+	}, testServer)
+	request.Header.Set("Content-Type", "application/json; charset=UTF-8")
+	result := checkRequestAsPost(request, 1024)
+	c.Assert(result, IsNil)
+}
+
 func (s *handlersSuite) TestCannotBroadcastNonPostMessages(c *C) {
 	testServer := httptest.NewServer(&JSONPostHandler{})
 	defer testServer.Close()