Support for special characters and remove buggy functions (#1977)

- remove the use of encodeURI and encodeURIComponent functions and instead use encodeFileName and decodeFileName functions - support for users with special characters - support for users with special characters - support for users with special characters - fixed incorrectly group list display for policies Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
2022-05-13 13:13:56 -07:00
parent bd63817e37
commit 1532cc0e70
81 changed files with 666 additions and 555 deletions
--- a/integration/groups_test.go
+++ b/integration/groups_test.go
@@ -18,6 +18,7 @@ package integration

 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -113,7 +114,7 @@ func Test_GetGroupAPI(t *testing.T) {
 		{
 			name: "Get Group - Valid",
 			args: args{
-				api: "?name=getgroup1",
+				api: base64.StdEncoding.EncodeToString([]byte("getgroup1")),
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -121,7 +122,7 @@ func Test_GetGroupAPI(t *testing.T) {
 		{
 			name: "Get Group - Invalid",
 			args: args{
-				api: "?name=askfjalkd",
+				api: base64.StdEncoding.EncodeToString([]byte("askfjalkd")),
 			},
 			expectedStatus: 500,
 			expectedError:  nil,
@@ -139,7 +140,7 @@ func Test_GetGroupAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -223,7 +224,7 @@ func Test_PutGroupsAPI(t *testing.T) {
 		{
 			name: "Put Group - Valid",
 			args: args{
-				api:     "?name=putgroup1",
+				api:     base64.StdEncoding.EncodeToString([]byte("putgroup1")),
 				members: []string{"member3"},
 				status:  "enabled",
 			},
@@ -233,7 +234,7 @@ func Test_PutGroupsAPI(t *testing.T) {
 		{
 			name: "Put Group - Invalid",
 			args: args{
-				api:     "?name=gdgfdfgd",
+				api:     base64.StdEncoding.EncodeToString([]byte("gdgfdfgd")),
 				members: []string{"member3"},
 				status:  "enabled",
 			},
@@ -256,7 +257,7 @@ func Test_PutGroupsAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
+				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -293,7 +294,7 @@ func Test_DeleteGroupAPI(t *testing.T) {
 		{
 			name: "Delete Group - Valid",
 			args: args{
-				api: "?name=grouptests1",
+				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
 			},
 			verb:           "DELETE",
 			expectedStatus: 204,
@@ -302,7 +303,7 @@ func Test_DeleteGroupAPI(t *testing.T) {
 		{
 			name: "Delete Group - Invalid",
 			args: args{
-				api: "?name=grouptests12345",
+				api: base64.StdEncoding.EncodeToString([]byte("grouptests12345")),
 			},
 			verb:           "DELETE",
 			expectedStatus: 404,
@@ -311,7 +312,7 @@ func Test_DeleteGroupAPI(t *testing.T) {
 		{
 			name: "Access Group After Delete - Invalid",
 			args: args{
-				api: "?name=grouptests1",
+				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
 			},
 			verb:           "GET",
 			expectedStatus: 500,
@@ -330,7 +331,7 @@ func Test_DeleteGroupAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1/group%s", tt.args.api), requestDataBody)
+				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
--- a/integration/policy_test.go
+++ b/integration/policy_test.go
@@ -18,6 +18,7 @@ package integration

 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -519,7 +520,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Invalid",
 			args: args{
-				api: "/policy?name=test3",
+				api: base64.StdEncoding.EncodeToString([]byte("test3")),
 			},
 			expectedStatus: 500,
 			expectedError:  nil,
@@ -527,7 +528,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Valid",
 			args: args{
-				api: "/policy?name=getpolicytest",
+				api: base64.StdEncoding.EncodeToString([]byte("getpolicytest")),
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -541,7 +542,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 			}

 			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
@@ -594,7 +595,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/policylistusers/users",
+				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistusers")) + "/users",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -602,7 +603,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/test2/users",
+				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test2")) + "/users",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -673,7 +674,8 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/policylistgroups/groups",
+
+				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistgroups")) + "/groups",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -681,7 +683,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/test3/groups",
+				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test3")) + "/groups",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -750,7 +752,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Delete Policies - Valid",
 			args: args{
-				api:    "/policy?name=testdelete",
+				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
 				method: "DELETE",
 			},
 			expectedStatus: 204,
@@ -759,7 +761,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Get Policy After Delete - Invalid",
 			args: args{
-				api:    "/policy?name=testdelete",
+				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
 				method: "GET",
 			},
 			expectedStatus: 500,
@@ -774,7 +776,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 			}

 			request, err := http.NewRequest(
-				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
+				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
--- a/integration/service_account_test.go
+++ b/integration/service_account_test.go
@@ -18,6 +18,7 @@ package integration

 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -95,7 +96,7 @@ func TestAddServiceAccount(t *testing.T) {
 	requestDataJSON, _ = json.Marshal(requestDataPolicy)
 	requestDataBody = bytes.NewReader(requestDataJSON)
 	request, err = http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", requestDataBody)
 	if err != nil {
 		log.Println(err)
 		return
@@ -114,7 +115,7 @@ func TestAddServiceAccount(t *testing.T) {

 	// Test policy
 	request, err = http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", nil)
+		"GET", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -146,7 +147,7 @@ func TestAddServiceAccount(t *testing.T) {
 	// {{baseUrl}}/user?name=proident velit
 	// Investiga como se borra en el browser.
 	request, err = http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/service-accounts/testuser1", nil)
+		"DELETE", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1")), nil)
 	if err != nil {
 		log.Println(err)
 		return
--- a/integration/users_test.go
+++ b/integration/users_test.go
@@ -18,6 +18,7 @@ package integration

 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -62,6 +63,7 @@ func AddUser(accessKey, secretKey string, groups, policies []string) (*http.Resp
 }

 func DeleteUser(userName string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		This is an atomic function to delete user and can be reused across
 		different functions.
@@ -70,7 +72,7 @@ func DeleteUser(userName string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user?name="+userName, nil)
+		"DELETE", "http://localhost:9090/api/v1/user/"+userName, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -102,6 +104,7 @@ func ListUsers(offset, limit string) (*http.Response, error) {
 }

 func GetUserInformation(userName string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to get user information via API:
 		{{baseUrl}}/user?name=proident velit
@@ -111,7 +114,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 	}
 	request, err := http.NewRequest(
 		"GET",
-		"http://localhost:9090/api/v1/user?name="+userName,
+		"http://localhost:9090/api/v1/user/"+userName,
 		nil)
 	if err != nil {
 		log.Println(err)
@@ -123,6 +126,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 }

 func UpdateUserInformation(name, status string, groups []string) (*http.Response, error) {
+	name = base64.StdEncoding.EncodeToString([]byte(name))
 	/*
 		Helper function to update user information:
 		PUT: {{baseUrl}}/user?name=proident velit
@@ -145,7 +149,7 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 	requestDataJSON, _ := json.Marshal(requestDataAdd)
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/user?name="+name, requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/user/"+name, requestDataBody)
 	if err != nil {
 		log.Println(err)
 	}
@@ -156,6 +160,7 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 }

 func RemoveUser(name string) (*http.Response, error) {
+	name = base64.StdEncoding.EncodeToString([]byte(name))
 	/*
 		Helper function to remove user.
 		DELETE: {{baseUrl}}/user?name=proident velit
@@ -164,7 +169,7 @@ func RemoveUser(name string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user?name="+name, nil)
+		"DELETE", "http://localhost:9090/api/v1/user/"+name, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -175,6 +180,7 @@ func RemoveUser(name string) (*http.Response, error) {
 }

 func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to update groups for a user
 		PUT: {{baseUrl}}/user/groups?name=username
@@ -195,7 +201,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
 		"PUT",
-		"http://localhost:9090/api/v1/user/groups?name="+userName,
+		"http://localhost:9090/api/v1/user/"+userName+"/groups",
 		requestDataBody,
 	)
 	if err != nil {
@@ -208,6 +214,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 }

 func CreateServiceAccountForUser(userName, policy string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to Create Service Account for user
 		POST: api/v1/user/username/service-accounts
@@ -238,6 +245,7 @@ func CreateServiceAccountForUser(userName, policy string) (*http.Response, error
 }

 func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, secretKey string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	// Helper function to test "Create Service Account for User With Credentials" end point.
 	client := &http.Client{
 		Timeout: 3 * time.Second,
@@ -264,6 +272,7 @@ func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, sec
 }

 func ReturnsAListOfServiceAccountsForAUser(userName string) (*http.Response, error) {
+	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to return a list of service accounts for a user.
 		GET: {{baseUrl}}/user/:name/service-accounts
@@ -740,8 +749,10 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 	}

 	// 3. Verify the service account for the user
-	listOfAccountsResponse,
-		listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
+	listOfAccountsResponse, listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
+
+	fmt.Println(listOfAccountsResponse, listOfAccountsError)
+
 	if listOfAccountsError != nil {
 		log.Println(listOfAccountsError)
 		assert.Fail("Error in listOfAccountsError")
@@ -754,6 +765,7 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 			finalResponse,
 		)
 	}
+
 	assert.Equal(len(finalResponse), serviceAccountLengthInBytes, finalResponse)
 }