From 132e661136bdda93d9c03ddf9c1a74a34f418c16 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Fri, 23 Jan 2015 01:55:01 -0800
Subject: [PATCH] List buckets response should be nested xml buckets

Additionally check for 'Header' content-type before
referencing it, as it may be empty value
---
 pkg/webapi/minioapi/definitions.go |  4 +++-
 pkg/webapi/minioapi/minioapi.go    | 27 +++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkg/webapi/minioapi/definitions.go b/pkg/webapi/minioapi/definitions.go
index 6f80d2ce6..6961fb40d 100644
--- a/pkg/webapi/minioapi/definitions.go
+++ b/pkg/webapi/minioapi/definitions.go
@@ -32,7 +32,9 @@ type ObjectListResponse struct {
 type BucketListResponse struct {
 	XMLName xml.Name `xml:"ListAllMyBucketsResult"`
 	Owner   Owner
-	Buckets []Bucket `xml:"Buckets",innerxml`
+	Buckets struct {
+		Bucket []*Bucket
+	} `xml:"Buckets",innerxml` // Buckets are nested
 }
 
 type Bucket struct {
diff --git a/pkg/webapi/minioapi/minioapi.go b/pkg/webapi/minioapi/minioapi.go
index 143c54fbf..325fc83b3 100644
--- a/pkg/webapi/minioapi/minioapi.go
+++ b/pkg/webapi/minioapi/minioapi.go
@@ -115,9 +115,12 @@ func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Requ
 	if ok == false {
 		prefix = ""
 	}
+
 	contentType := "xml"
-	if req.Header["Accept"][0] == "application/json" {
-		contentType = "json"
+	if _, ok := req.Header["Accept"]; ok {
+		if req.Header["Accept"][0] == "application/json" {
+			contentType = "json"
+		}
 	}
 	buckets := server.storage.ListBuckets(prefix)
 	response := generateBucketsListResult(buckets)
@@ -128,13 +131,11 @@ func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Requ
 		w.Header().Set("Content-Type", "application/json")
 		encoder = json.NewEncoder(&bytesBuffer)
 	} else {
-		w.Header().Set("Content-Type", "application/xml")
+		w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
 		encoder = xml.NewEncoder(&bytesBuffer)
 	}
 	encoder.Encode(response)
-
 	w.Write(bytesBuffer.Bytes())
-
 }
 
 func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Request) {
@@ -157,8 +158,10 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 
 	contentType := "xml"
 
-	if req.Header["Accept"][0] == "application/json" {
-		contentType = "json"
+	if _, ok := req.Header["Accept"]; ok {
+		if req.Header["Accept"][0] == "application/json" {
+			contentType = "json"
+		}
 	}
 
 	objects := server.storage.ListObjects(bucket, prefix, 1000)
@@ -170,7 +173,7 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 		w.Header().Set("Content-Type", "application/json")
 		encoder = json.NewEncoder(&bytesBuffer)
 	} else {
-		w.Header().Set("Content-Type", "application/xml")
+		w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
 		encoder = xml.NewEncoder(&bytesBuffer)
 	}
 	encoder.Encode(response)
@@ -202,7 +205,7 @@ func (server *minioApi) putBucketHandler(w http.ResponseWriter, req *http.Reques
 }
 
 func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketListResponse) {
-	listbuckets := []Bucket{}
+	var listbuckets []*Bucket
 
 	owner := Owner{
 		ID:          "minio",
@@ -210,7 +213,7 @@ func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketLi
 	}
 
 	for _, bucket := range buckets {
-		listbucket := Bucket{
+		listbucket := &Bucket{
 			Name:         bucket.Name,
 			CreationDate: formatDate(bucket.Created),
 		}
@@ -218,9 +221,9 @@ func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketLi
 	}
 
 	data = BucketListResponse{
-		Owner:   owner,
-		Buckets: listbuckets,
+		Owner: owner,
 	}
+	data.Buckets.Bucket = listbuckets
 	return
 }