From 1637138f86747331bef665263d73cff2ace730e3 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Sat, 7 Mar 2015 02:49:36 -0800
Subject: [PATCH] If incoming request IP bucketfromHostname needs to be empty
 string

---
 pkg/utils/crypto/signers/signers.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/utils/crypto/signers/signers.go b/pkg/utils/crypto/signers/signers.go
index 4fb5853f4..60d9a7397 100644
--- a/pkg/utils/crypto/signers/signers.go
+++ b/pkg/utils/crypto/signers/signers.go
@@ -23,6 +23,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"net/url"
 	"sort"
@@ -99,6 +100,7 @@ func getStringToSign(req *http.Request) string {
 	buf.WriteByte('\n')
 	writeCanonicalizedAmzHeaders(buf, req)
 	writeCanonicalizedResource(buf, req)
+
 	return buf.String()
 }
 
@@ -188,14 +190,19 @@ func writeCanonicalizedResource(buf *bytes.Buffer, req *http.Request) {
 
 // Convert subdomain http request into bucketname if possible
 func bucketFromHostname(req *http.Request) string {
-	host := req.Host
+	host, _, _ := net.SplitHostPort(req.Host)
+	// Verify incoming request if only IP with no bucket subdomain
+	if net.ParseIP(host) != nil {
+		return ""
+	}
 	if host == "" {
 		host = req.URL.Host
 	}
 
+	// Grab the bucket from the incoming hostname
 	host = strings.TrimSpace(host)
 	hostParts := strings.Split(host, ".")
-	if len(hostParts) > 1 {
+	if len(hostParts) > 2 {
 		return hostParts[0]
 	}
 	return ""