From 6b7948b6cd5a9b6ee02c677cf39a9d7c32eb1b38 Mon Sep 17 00:00:00 2001
From: adfost <adfost@comcast.net>
Date: Wed, 25 May 2022 16:04:01 -0700
Subject: [PATCH] Get access rules test and test for adding access rule to non
 existent bucket (#1998)

---
 .github/workflows/jobs.yaml      |  2 +-
 integration/access_rules_test.go | 67 +++++++++++++++++++++++++++++++-
 restapi/admin_policies.go        |  9 ++++-
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/jobs.yaml b/.github/workflows/jobs.yaml
index 946d151f1..c5aa918e5 100644
--- a/.github/workflows/jobs.yaml
+++ b/.github/workflows/jobs.yaml
@@ -1519,7 +1519,7 @@ jobs:
           go tool cover -func=all.out | grep total > tmp2
           result=`cat tmp2 | awk 'END {print $3}'`
           result=${result%\%}
-          threshold=47.7
+          threshold=50.5
           echo "Result:"
           echo "$result%"
           if (( $(echo "$result >= $threshold" |bc -l) )); then
diff --git a/integration/access_rules_test.go b/integration/access_rules_test.go
index 281ecf8c8..61e24eb9c 100644
--- a/integration/access_rules_test.go
+++ b/integration/access_rules_test.go
@@ -34,6 +34,7 @@ func Test_AddAccessRuleAPI(t *testing.T) {
 	AddBucket("testaccessruleadd", false, false, nil, nil)
 
 	type args struct {
+		bucket string
 		prefix string
 		access string
 	}
@@ -46,6 +47,7 @@ func Test_AddAccessRuleAPI(t *testing.T) {
 		{
 			name: "Create Access Rule - Valid",
 			args: args{
+				bucket: "testaccessruleadd",
 				prefix: "/test/",
 				access: "readonly",
 			},
@@ -53,14 +55,25 @@ func Test_AddAccessRuleAPI(t *testing.T) {
 			expectedError:  nil,
 		},
 		{
-			name: "Create Group - Invalid",
+			name: "Add Access Rule - Invalid",
 			args: args{
+				bucket: "testaccessruleadd",
 				prefix: "/test/",
 				access: "readonl",
 			},
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
+		{
+			name: "Add Access Rule - Invalid Bucket",
+			args: args{
+				bucket: "fakebucket",
+				prefix: "/test/",
+				access: "readonl",
+			},
+			expectedStatus: 404,
+			expectedError:  nil,
+		},
 	}
 
 	for _, tt := range tests {
@@ -76,7 +89,57 @@ func Test_AddAccessRuleAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"PUT", "http://localhost:9090/api/v1/bucket/testaccessruleadd/access-rules", requestDataBody)
+				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), requestDataBody)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+			response, err := client.Do(request)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			if response != nil {
+				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
+			}
+		})
+	}
+}
+
+func Test_GetAccessRulesAPI(t *testing.T) {
+	assert := assert.New(t)
+
+	AddBucket("testaccessruleget", false, false, nil, nil)
+
+	type args struct {
+		bucket string
+	}
+	tests := []struct {
+		name           string
+		args           args
+		expectedStatus int
+		expectedError  error
+	}{
+		{
+			name: "Get Access Rule - Valid",
+			args: args{
+				bucket: "testaccessruleget",
+			},
+			expectedStatus: 200,
+			expectedError:  nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client := &http.Client{
+				Timeout: 3 * time.Second,
+			}
+
+			request, err := http.NewRequest(
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), nil)
 			if err != nil {
 				log.Println(err)
 				return
diff --git a/restapi/admin_policies.go b/restapi/admin_policies.go
index 3aa6bfa7a..f809bdc06 100644
--- a/restapi/admin_policies.go
+++ b/restapi/admin_policies.go
@@ -25,9 +25,9 @@ import (
 	"strings"
 
 	"github.com/minio/console/pkg/utils"
-
 	bucketApi "github.com/minio/console/restapi/operations/bucket"
 	policyApi "github.com/minio/console/restapi/operations/policy"
+	s3 "github.com/minio/minio-go/v7"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/models"
@@ -169,7 +169,12 @@ func getSetAccessRuleWithBucketResponse(session *models.Principal, params bucket
 	}
 	errorVal := client.SetAccess(ctx, prefixAccess.Access, false)
 	if errorVal != nil {
-		return false, ErrorWithContext(ctx, errorVal.Cause)
+		returnError := ErrorWithContext(ctx, errorVal.Cause)
+		minioError := s3.ToErrorResponse(errorVal.Cause)
+		if minioError.Code == "NoSuchBucket" {
+			returnError.Code = 404
+		}
+		return false, returnError
 	}
 	return true, nil
 }