Merge lp:~pedronis/ubuntu-push/check-data into lp:ubuntu-push

[Samuele Pedroni]

check that the data field is not missing

check that the data field is not missing (later bits will be very sad otherwise)

[John Lenton (chipaca)]

Thank you.

review: Approve

=== modified file 'server/api/handlers.go'
--- server/api/handlers.go	2014-01-16 16:22:19 +0000
+++ server/api/handlers.go	2014-01-29 10:12:43 +0000
@@ -91,6 +91,11 @@
 		ioError,
 		"Could not read request body",
 	}
+	ErrMissingData = &APIError{
+		http.StatusBadRequest,
+		invalidRequest,
+		"Missing data field",
+	}
 	ErrUnknownChannel = &APIError{
 		http.StatusBadRequest,
 		unknownChannel,
@@ -172,6 +177,13 @@
 	return body, nil
 }
 
+func checkBroadcast(bcast *Broadcast) *APIError {
+	if len(bcast.Data) == 0 {
+		return ErrMissingData
+	}
+	return nil
+}
+
 // state holds the interfaces to delegate to serving requests
 type state struct {
 	store  store.PendingStore
@@ -182,6 +194,10 @@
 type BroadcastHandler state
 
 func (h *BroadcastHandler) doBroadcast(bcast *Broadcast) *APIError {
+	apiErr := checkBroadcast(bcast)
+	if apiErr != nil {
+		return apiErr
+	}
 	chanId, err := h.store.GetInternalChannelId(bcast.Channel)
 	if err != nil {
 		switch err {

=== modified file 'server/api/handlers_test.go'
--- server/api/handlers_test.go	2014-01-14 15:35:20 +0000
+++ server/api/handlers_test.go	2014-01-29 10:12:43 +0000
@@ -232,7 +232,7 @@
 	payload := json.RawMessage(`{"foo":"bar"}`)
 
 	request := newPostRequest("/broadcast", &Broadcast{
-		Channel:     "unkown",
+		Channel:     "unknown",
 		ExpireAfter: 60,
 		Data:        payload,
 	}, testServer)
@@ -242,6 +242,23 @@
 	checkError(c, response, ErrUnknownChannel)
 }
 
+func (s *handlersSuite) TestMissingData(c *C) {
+	testServer := httptest.NewServer(&BroadcastHandler{})
+	defer testServer.Close()
+
+	packedMessage := []byte(`{"channel": "system"}`)
+	reader := bytes.NewReader(packedMessage)
+
+	request, err := http.NewRequest("POST", testServer.URL, reader)
+	c.Assert(err, IsNil)
+	request.ContentLength = int64(len(packedMessage))
+	request.Header.Set("Content-Type", "application/json")
+
+	response, err := s.client.Do(request)
+	c.Assert(err, IsNil)
+	checkError(c, response, ErrMissingData)
+}
+
 func (s *handlersSuite) TestCannotBroadcastMalformedData(c *C) {
 	testServer := httptest.NewServer(&BroadcastHandler{})
 	defer testServer.Close()