Merge pull request #1148 from harshavardhana/fix-bug

web: Add targetProto for putObjectURL,getObjectURL SSL requests.

routers.go

@@ -52,7 +52,6 @@ type webAPI struct {
 	Client minio.CloudStorageClient
 
 	// private params.
-	inSecure   bool   // Enabled if TLS is false.
 	apiAddress string // api destination address.
 	// accessKeys kept to be used internally.
 	accessKeyID     string
@@ -130,7 +129,6 @@ func initWeb(conf cloudServerConfig) *webAPI {
 		FSPath:          conf.Path,
 		AccessLog:       conf.AccessLog,
 		Client:          client,
-		inSecure:        inSecure,
 		apiAddress:      conf.Address,
 		accessKeyID:     conf.AccessKeyID,
 		secretAccessKey: conf.SecretAccessKey,

web-handlers.go

@@ -243,6 +243,7 @@ func (web *webAPI) ListObjects(r *http.Request, args *ListObjectsArgs, reply *Li
 // PutObjectURLArgs - args to generate url for upload access.
 type PutObjectURLArgs struct {
 	TargetHost  string `json:"targetHost"`
+	TargetProto string `json:"targetProto"`
 	BucketName  string `json:"bucketName"`
 	ObjectName  string `json:"objectName"`
 }
@@ -258,7 +259,11 @@ func (web *webAPI) PutObjectURL(r *http.Request, args *PutObjectURLArgs, reply *
 	if !isJWTReqAuthenticated(r) {
 		return &json2.Error{Message: "Unauthorized request"}
 	}
-	client, e := minio.New(args.TargetHost, web.accessKeyID, web.secretAccessKey, web.inSecure)
+
+	// disableSSL is true if no 'https:' proto is found.
+	disableSSL := (args.TargetProto != "https:")
+
+	client, e := minio.New(args.TargetHost, web.accessKeyID, web.secretAccessKey, disableSSL)
 	if e != nil {
 		return &json2.Error{Message: e.Error()}
 	}
@@ -274,6 +279,7 @@ func (web *webAPI) PutObjectURL(r *http.Request, args *PutObjectURLArgs, reply *
 // GetObjectURLArgs - args to generate url for download access.
 type GetObjectURLArgs struct {
 	TargetHost  string `json:"targetHost"`
+	TargetProto string `json:"targetProto"`
 	BucketName  string `json:"bucketName"`
 	ObjectName  string `json:"objectName"`
 }
@@ -296,7 +302,10 @@ func (web *webAPI) GetObjectURL(r *http.Request, args *GetObjectURLArgs, reply *
 		return &json2.Error{Message: e.Error()}
 	}
 
-	client, e := minio.New(args.TargetHost, web.accessKeyID, web.secretAccessKey, web.inSecure)
+	// disableSSL is true if no 'https:' proto is found.
+	disableSSL := (args.TargetProto != "https:")
+
+	client, e := minio.New(args.TargetHost, web.accessKeyID, web.secretAccessKey, disableSSL)
 	if e != nil {
 		return &json2.Error{Message: e.Error()}
 	}