Revert "Add credential to OpenDataChannel request"

This reverts commit 5c7e9585ae628c7f8ba6b0c281d0d05ca6351a1c.

cr: https://code.amazon.com/reviews/CR-160901328

Author: ziwangj

src/communicator/mocks/IWebSocketChannel.go

@@ -16,12 +16,9 @@ package communicator
 
 import (
 	"errors"
-	"net/http"
-	"net/url"
 	"sync"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/aws/session-manager-plugin/src/config"
 	"github.com/aws/session-manager-plugin/src/log"
 	"github.com/aws/session-manager-plugin/src/websocketutil"
@@ -30,7 +27,7 @@ import (
 
 // IWebSocketChannel is the interface for DataChannel.
 type IWebSocketChannel interface {
-	Initialize(log log.T, channelUrl string, channelToken string, region string, signer *v4.Signer)
+	Initialize(log log.T, channelUrl string, channelToken string)
 	Open(log log.T) error
 	Close(log log.T) error
 	SendMessage(log log.T, input []byte, inputType int) error
@@ -52,8 +49,6 @@ type WebSocketChannel struct {
 	writeLock    *sync.Mutex
 	Connection   *websocket.Conn
 	ChannelToken string
-	Region       string
-	Signer       *v4.Signer
 }
 
 // GetChannelToken gets the channel token
@@ -82,11 +77,9 @@ func (webSocketChannel *WebSocketChannel) SetOnMessage(onMessageHandler func([]b
 }
 
 // Initialize initializes websocket channel fields
-func (webSocketChannel *WebSocketChannel) Initialize(log log.T, channelUrl string, channelToken string, region string, signer *v4.Signer) {
+func (webSocketChannel *WebSocketChannel) Initialize(log log.T, channelUrl string, channelToken string) {
 	webSocketChannel.ChannelToken = channelToken
 	webSocketChannel.Url = channelUrl
-	webSocketChannel.Region = region
-	webSocketChannel.Signer = signer
 }
 
 // StartPings starts the pinging process to keep the websocket channel alive.
@@ -128,47 +121,6 @@ func (webSocketChannel *WebSocketChannel) SendMessage(log log.T, input []byte, i
 	return err
 }
 
-// getV4SignatureHeader gets the signed header.
-func (webSocketChannel *WebSocketChannel) getV4SignatureHeader(log log.T, Url string) (http.Header, error) {
-	request, err := http.NewRequest("GET", Url, nil)
-
-	if webSocketChannel.Signer != nil {
-		_, err = webSocketChannel.Signer.Sign(request, nil, config.ServiceName, webSocketChannel.Region, time.Now())
-		if err != nil {
-			log.Errorf("Failed to sign websocket, %v", err)
-		}
-	}
-	return request.Header, err
-}
-
-// isPresignedURL check is the url presigned.
-func isPresignedURL(rawURL string) (bool, error) {
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		return false, err
-	}
-
-	queryParams := parsedURL.Query()
-
-	presignedURLParams := []string{
-		"X-Amz-Algorithm",
-		"X-Amz-Credential",
-		"X-Amz-Date",
-		"X-Amz-Expires",
-		"X-Amz-SignedHeaders",
-		"X-Amz-Signature",
-		"X-Amz-Security-Token",
-	}
-
-	for _, param := range presignedURLParams {
-		if _, exists := queryParams[param]; exists {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
 // Close closes the corresponding connection.
 func (webSocketChannel *WebSocketChannel) Close(log log.T) error {
 
@@ -187,22 +139,9 @@ func (webSocketChannel *WebSocketChannel) Close(log log.T) error {
 func (webSocketChannel *WebSocketChannel) Open(log log.T) error {
 	// initialize the write mutex
 	webSocketChannel.writeLock = &sync.Mutex{}
-	presigned, err := isPresignedURL(webSocketChannel.Url)
-	if err != nil {
-		return err
-	}
-
-	var header http.Header
-	if !presigned {
-		header, err = webSocketChannel.getV4SignatureHeader(log, webSocketChannel.Url)
-		if err != nil {
-			log.Errorf("Failed to get the v4 signature, %v", err)
-		}
-	}
 
-	ws, err := websocketutil.NewWebsocketUtil(log, nil).OpenConnection(webSocketChannel.Url, header)
+	ws, err := websocketutil.NewWebsocketUtil(log, nil).OpenConnection(webSocketChannel.Url)
 	if err != nil {
-		log.Errorf("Failed to open WebSocket connection: %v", err)
 		return err
 	}
 	webSocketChannel.Connection = ws

src/communicator/websocketchannel.go

@@ -20,12 +20,9 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"strings"
 	"sync"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/aws/session-manager-plugin/src/log"
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/assert"
@@ -38,8 +35,6 @@ var (
 	defaultStreamUrl    = "streamUrl"
 	defaultError        = errors.New("Default Error")
 	defaultMessage      = []byte("Default Message")
-	defaultRegion       = "us-east-1"
-	mockSigner          = &v4.Signer{Credentials: credentials.NewStaticCredentials("AKID", "SECRET", "SESSION")}
 )
 
 type ErrorCallbackWrapper struct {
@@ -146,11 +141,10 @@ func TestWebsocketChannel_SetOnMessage(t *testing.T) {
 func TestWebsocketchannel_Initialize(t *testing.T) {
 	t.Log("Starting test: webSocketChannel.Initialize")
 	channel := &WebSocketChannel{}
-	channel.Initialize(mockLogger, defaultStreamUrl, defaultChannelToken, defaultRegion, mockSigner)
+	channel.Initialize(mockLogger, defaultStreamUrl, defaultChannelToken)
 
 	assert.Equal(t, defaultStreamUrl, channel.Url)
 	assert.Equal(t, defaultChannelToken, channel.ChannelToken)
-	assert.Equal(t, mockSigner, channel.Signer)
 }
 
 func TestOpenCloseWebSocketChannel(t *testing.T) {
@@ -175,48 +169,6 @@ func TestOpenCloseWebSocketChannel(t *testing.T) {
 	t.Log("Ending test: TestOpenCloseWebSocketChannel")
 }
 
-func TestOpenWebSocketChannelWithPresignedURL(t *testing.T) {
-	t.Log("Starting test: TestOpenWebSocketChannelWithPresignedURL")
-	srv := httptest.NewServer(http.HandlerFunc(handlerToBeTested))
-	u, _ := url.Parse(srv.URL)
-	u.Scheme = "ws"
-	var log = log.NewMockLog()
-
-	query := u.Query()
-	query.Set("X-Amz-Signature", "SAMPLE_SIGNATURE")
-	u.RawQuery = query.Encode()
-
-	websocketchannel := WebSocketChannel{
-		Url:    u.String(),
-		Signer: nil,
-	}
-
-	err := websocketchannel.Open(log)
-	assert.Nil(t, err, "Error opening the websocket connection.")
-	assert.NotNil(t, websocketchannel.Connection, "Open connection failed.")
-	assert.True(t, websocketchannel.IsOpen, "IsOpen is not set to true.")
-	assert.True(t, strings.Contains(websocketchannel.Url, "SAMPLE_SIGNATURE"),
-		"URL not included signature as expected")
-
-	err = websocketchannel.Close(log)
-	assert.Nil(t, err, "Error closing the websocket connection.")
-	assert.False(t, websocketchannel.IsOpen, "IsOpen is not set to false.")
-	t.Log("Ending test: TestOpenCloseWebSocketChannel")
-}
-
-func TestOpenWebSocketChannelWithInvalidURL(t *testing.T) {
-	t.Log("Starting test: TestOpenWebSocketChannelWithInvalidURL")
-	var log = log.NewMockLog()
-	websocketchannel := WebSocketChannel{
-		Url:    "invalid_url",
-		Signer: nil,
-	}
-
-	err := websocketchannel.Open(log)
-	assert.NotNil(t, err, "malformed ws or wss URL.")
-	assert.Nil(t, websocketchannel.Connection, "Open connection failed.")
-}
-
 func TestReadWriteTextToWebSocketChannel(t *testing.T) {
 	t.Log("Starting test: TestReadWriteWebSocketChannel ")
 	srv := httptest.NewServer(http.HandlerFunc(handlerToBeTested))

src/communicator/websocketchannel_test.go

@@ -17,7 +17,6 @@ package config
 import "time"
 
 const (
-	ServiceName                        = "ssmmessages"
 	RolePublishSubscribe               = "publish_subscribe"
 	MessageSchemaVersion               = "1.0"
 	DefaultTransmissionTimeout         = 200 * time.Millisecond