* Adding explicit MPL license for sub-package. This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Adding explicit MPL license for sub-package This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Updating the license from MPL to Business Source License Going forward, this project will be licensed under the Business Source License v1.1. Please see our blog post for more details at https://hashi.co/bsl-blog, FAQ at www.hashicorp.com/licensing-faq, and details of the license at www.hashicorp.com/bsl. * Update copyright file headers to BUS-1.1 * Rerun make gen This will pick up the last of the license changes * Revert "Rerun make gen" This reverts commit dbe0968bffd92745d8663c6940debae098395a6b. * Remove copywrite from generation script The current version of copywrite is not sophisticated enough to only apply the copywrite changes to certain subdirectories, so to avoid accidentally relicensing our api and sdk modules, we will stop running the copywrite script until such time that it can do the right thing. * License protobuf API as MPL The protobuf API files are used to generate the SDK, since we want the SDK to be MPL, the protobuf files must also be MPL. This extends to all protobuf files whose sources end up in the SDK directory, including: - internal/proto/controller/api - internal/proto/controller/custom_options - internal/proto/plugin It also includes the generated service directory in internal/gen/controller/api/services, since they are generated from the protobuf sources used for the SDK. * Change website license file name This makes the naming scheme consistent with the rest of the repository. * Add note on licensing to README * Set copywrite license to BUSL * Revert "Add note on licensing to README" This reverts commit 4d865a91a7a4f11605f0dc4609355d7e3c3cfffe. --------- Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com> Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
481 lines
11 KiB
Go
481 lines
11 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package handlers
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
|
|
pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services"
|
|
pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/users"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/types/known/fieldmaskpb"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
"google.golang.org/protobuf/types/known/wrapperspb"
|
|
)
|
|
|
|
func errorIncludesFields(t *testing.T, err error, wantFields []string) {
|
|
t.Helper()
|
|
var apiErr *ApiError
|
|
require.True(t, errors.As(err, &apiErr))
|
|
var gotFields []string
|
|
for _, d := range apiErr.Inner.GetDetails().GetRequestFields() {
|
|
gotFields = append(gotFields, d.GetName())
|
|
}
|
|
assert.ElementsMatch(t, gotFields, wantFields)
|
|
}
|
|
|
|
// Throughout this test we will use the User requests, but we could use any request
|
|
// message. User was picked arbitrarily.
|
|
|
|
func TestValidId(t *testing.T) {
|
|
assert.True(t, ValidId(Id("prefix_somerandomid"), "prefix"))
|
|
assert.True(t, ValidId(Id("prefix_somerandomid"), "notprefix", "prefix"))
|
|
assert.True(t, ValidId(Id("prefix_short"), "prefix"))
|
|
assert.True(t, ValidId(Id("prefix_thisisalongidentifierwhichstillworks"), "prefix"))
|
|
|
|
assert.False(t, ValidId(Id("prefixsomerandomid"), "prefix"))
|
|
assert.False(t, ValidId(Id("prefixsomerandomid"), "prefix", "alsobadprefix"))
|
|
assert.False(t, ValidId(Id("prefix_this has spaces"), "prefix"))
|
|
assert.False(t, ValidId(Id("prefix_includes-dash"), "prefix"))
|
|
assert.False(t, ValidId(Id("prefix_other@strange!characters"), "prefix"))
|
|
assert.False(t, ValidId(Id("prefix_short"), "short"))
|
|
}
|
|
|
|
func TestValidNameDescription(t *testing.T) {
|
|
assert.True(t, ValidNameDescription("foobar"))
|
|
assert.False(t, ValidNameDescription("foo\u200Bbar"))
|
|
}
|
|
|
|
func TestValidateGetRequest(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
prefix string
|
|
req GetRequest
|
|
valFn CustomValidatorFunc
|
|
badFields []string
|
|
}{
|
|
{
|
|
name: "noopvalidator no error",
|
|
prefix: "prefix",
|
|
req: &pbs.GetUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "noopvalidator bad prefix",
|
|
prefix: "bad",
|
|
req: &pbs.GetUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id"},
|
|
},
|
|
{
|
|
name: "custom field error",
|
|
prefix: "prefix",
|
|
req: &pbs.GetUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"test"},
|
|
},
|
|
{
|
|
name: "both custom error and prefix",
|
|
prefix: "bad",
|
|
req: &pbs.GetUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"id", "test"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := ValidateGetRequest(tc.valFn, tc.req, tc.prefix)
|
|
if len(tc.badFields) == 0 {
|
|
if !assert.NoError(t, err) {
|
|
errorIncludesFields(t, err, []string{})
|
|
}
|
|
return
|
|
}
|
|
errorIncludesFields(t, err, tc.badFields)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateDeleteRequest(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
prefix string
|
|
req DeleteRequest
|
|
valFn CustomValidatorFunc
|
|
badFields []string
|
|
}{
|
|
{
|
|
name: "noopvalidator no error",
|
|
prefix: "prefix",
|
|
req: &pbs.DeleteUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "noopvalidator bad prefix",
|
|
prefix: "bad",
|
|
req: &pbs.DeleteUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id"},
|
|
},
|
|
{
|
|
name: "custom field error",
|
|
prefix: "prefix",
|
|
req: &pbs.DeleteUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"test"},
|
|
},
|
|
{
|
|
name: "both custom error and prefix",
|
|
prefix: "bad",
|
|
req: &pbs.DeleteUserRequest{
|
|
Id: "prefix_someidentifier",
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"id", "test"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := ValidateDeleteRequest(tc.valFn, tc.req, tc.prefix)
|
|
if len(tc.badFields) == 0 {
|
|
if !assert.NoError(t, err) {
|
|
errorIncludesFields(t, err, []string{})
|
|
}
|
|
return
|
|
}
|
|
errorIncludesFields(t, err, tc.badFields)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateCreateRequest(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
item ApiResource
|
|
valFn CustomValidatorFunc
|
|
badFields []string
|
|
}{
|
|
{
|
|
name: "valid",
|
|
item: &pb.User{},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "disallow set id",
|
|
item: &pb.User{
|
|
Id: "anything",
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id"},
|
|
},
|
|
{
|
|
name: "disallow set created",
|
|
item: &pb.User{
|
|
CreatedTime: timestamppb.Now(),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"created_time"},
|
|
},
|
|
{
|
|
name: "disallow set updated",
|
|
item: &pb.User{
|
|
UpdatedTime: timestamppb.Now(),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"updated_time"},
|
|
},
|
|
{
|
|
name: "disallow set version",
|
|
item: &pb.User{
|
|
Version: 4,
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"version"},
|
|
},
|
|
{
|
|
name: "custom validator error",
|
|
item: &pb.User{},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"test"},
|
|
},
|
|
{
|
|
name: "disallow several fields",
|
|
item: &pb.User{
|
|
Id: "anything",
|
|
CreatedTime: timestamppb.Now(),
|
|
Version: 4,
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{"test": "test"}
|
|
},
|
|
badFields: []string{"id", "created_time", "version", "test"},
|
|
},
|
|
{
|
|
name: "good name",
|
|
item: &pb.User{
|
|
Name: wrapperspb.String("foobar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "bad name",
|
|
item: &pb.User{
|
|
Name: wrapperspb.String("foo\u200Bbar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"name"},
|
|
},
|
|
{
|
|
name: "good description",
|
|
item: &pb.User{
|
|
Description: wrapperspb.String("foobar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "bad description",
|
|
item: &pb.User{
|
|
Description: wrapperspb.String("foo\u200Bbar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"description"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := ValidateCreateRequest(tc.item, tc.valFn)
|
|
if len(tc.badFields) == 0 {
|
|
if !assert.NoError(t, err) {
|
|
errorIncludesFields(t, err, []string{})
|
|
}
|
|
return
|
|
}
|
|
errorIncludesFields(t, err, tc.badFields)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateUpdateRequest(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
prefix string
|
|
req UpdateRequest
|
|
item ApiResource
|
|
valFn CustomValidatorFunc
|
|
badFields []string
|
|
}{
|
|
{
|
|
name: "valid",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "missing mask",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"update_mask"},
|
|
},
|
|
{
|
|
name: "bad id",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "mismatched_prefix",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id"},
|
|
},
|
|
{
|
|
name: "good name",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
Name: wrapperspb.String("foobar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "bad name",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
Name: wrapperspb.String("foo\u200Bbar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"name"},
|
|
},
|
|
{
|
|
name: "good description",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
Description: wrapperspb.String("foobar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
},
|
|
{
|
|
name: "bad description",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
Description: wrapperspb.String("foo\u200Bbar"),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"description"},
|
|
},
|
|
{
|
|
name: "missing version",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"version"},
|
|
},
|
|
{
|
|
name: "bad create time",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
CreatedTime: timestamppb.Now(),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"created_time"},
|
|
},
|
|
{
|
|
name: "bad updated time",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
UpdatedTime: timestamppb.Now(),
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"updated_time"},
|
|
},
|
|
{
|
|
name: "bad defined id on item",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Id: "prefix_something",
|
|
Version: 1,
|
|
},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id"},
|
|
},
|
|
{
|
|
name: "custom validator error",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{
|
|
Id: "prefix_something",
|
|
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"anything"}},
|
|
},
|
|
item: &pb.User{
|
|
Version: 1,
|
|
},
|
|
valFn: func() map[string]string {
|
|
return map[string]string{
|
|
"test": "test",
|
|
}
|
|
},
|
|
badFields: []string{"test"},
|
|
},
|
|
{
|
|
name: "multiple",
|
|
prefix: "prefix",
|
|
req: &pbs.UpdateUserRequest{},
|
|
item: &pb.User{},
|
|
valFn: NoopValidatorFn,
|
|
badFields: []string{"id", "update_mask", "version"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err := ValidateUpdateRequest(tc.req, tc.item, tc.valFn, tc.prefix)
|
|
if len(tc.badFields) == 0 {
|
|
if !assert.NoError(t, err) {
|
|
errorIncludesFields(t, err, []string{})
|
|
}
|
|
return
|
|
}
|
|
errorIncludesFields(t, err, tc.badFields)
|
|
})
|
|
}
|
|
}
|