Account (Set|Change)Passsword (#267)

2020-08-17 09:37:15 -07:00
1 parent 4655f58365
commit e14f968fc3
@@ -0,0 +1,206 @@
+package authmethods_test
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/hashicorp/boundary/api"
+	"github.com/hashicorp/boundary/api/authmethods"
+	"github.com/hashicorp/boundary/internal/auth/password"
+	"github.com/hashicorp/boundary/internal/servers/controller"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAccounts_List(t *testing.T) {
+	assert, require := assert.New(t), require.New(t)
+	orgId := "o_1234567890"
+	amId := "paum_1234567890"
+	tc := controller.NewTestController(t, &controller.TestControllerOpts{
+		DisableAuthorizationFailures: true,
+		DefaultOrgId:                 orgId,
+		DefaultAuthMethodId:          amId,
+		DefaultLoginName:             "user",
+		DefaultPassword:              "passpass",
+	})
+	defer tc.Shutdown()
+
+	client := tc.Client()
+	accountClient := authmethods.NewAccountsClient(client)
+
+	expected, apiErr, err := accountClient.List(tc.Context(), amId)
+	assert.NoError(err)
+	assert.Nil(apiErr)
+	// A default account is created when a test controller is started.
+	assert.Len(expected, 1)
+
+	expected = append(expected, &authmethods.Account{Attributes: map[string]interface{}{"login_name": "loginname1"}})
+
+	expected[1], apiErr, err = accountClient.Create(tc.Context(), amId, authmethods.WithType("password"), authmethods.WithPasswordAccountLoginName(expected[1].Attributes["login_name"].(string)))
+	assert.NoError(err)
+	assert.Nil(apiErr)
+
+	ul, apiErr, err := accountClient.List(tc.Context(), amId)
+	assert.NoError(err)
+	assert.Nil(apiErr)
+	assert.ElementsMatch(comparableSlice(expected[:2]), comparableSlice(ul))
+
+	for i := 2; i < 10; i++ {
+		newAcct, apiErr, err := accountClient.Create(tc.Context(), amId, authmethods.WithType("password"), authmethods.WithPasswordAccountLoginName(fmt.Sprintf("loginname%d", i)))
+		expected = append(expected, newAcct)
+		assert.NoError(err)
+		assert.Nil(apiErr)
+	}
+	ul, apiErr, err = accountClient.List(tc.Context(), amId)
+	require.NoError(err)
+	assert.Nil(apiErr)
+	assert.ElementsMatch(comparableSlice(expected), comparableSlice(ul))
+}
+
+func comparableSlice(in []*authmethods.Account) []authmethods.Account {
+	var filtered []authmethods.Account
+	for _, i := range in {
+		p := authmethods.Account{
+			Id:          i.Id,
+			Name:        i.Name,
+			Description: i.Description,
+			CreatedTime: i.CreatedTime,
+			UpdatedTime: i.UpdatedTime,
+			Attributes:  i.Attributes,
+		}
+		filtered = append(filtered, p)
+	}
+	return filtered
+}
+
+func TestAccount_Crud(t *testing.T) {
+	assert, require := assert.New(t), require.New(t)
+	orgId := "o_1234567890"
+	amId := "paum_1234567890"
+	tc := controller.NewTestController(t, &controller.TestControllerOpts{
+		DisableAuthorizationFailures: true,
+		DefaultOrgId:                 orgId,
+		DefaultAuthMethodId:          amId,
+		DefaultLoginName:             "user",
+		DefaultPassword:              "passpass",
+	})
+	defer tc.Shutdown()
+
+	client := tc.Client()
+	accountClient := authmethods.NewAccountsClient(client)
+
+	checkAccount := func(step string, u *authmethods.Account, apiErr *api.Error, err error, wantedName string, wantedVersion uint32) {
+		assert.NoError(err, step)
+		if !assert.Nil(apiErr, step) && apiErr.Message != "" {
+			t.Errorf("ApiError message: %q", apiErr.Message)
+		}
+		require.NotNil(u, "returned no resource", step)
+		gotName := ""
+		if u.Name != "" {
+			gotName = u.Name
+		}
+		assert.Equal(wantedName, gotName, step)
+		assert.EqualValues(wantedVersion, u.Version)
+	}
+
+	u, apiErr, err := accountClient.Create(tc.Context(), amId, authmethods.WithType("password"), authmethods.WithName("foo"), authmethods.WithPasswordAccountLoginName("loginname"))
+	checkAccount("create", u, apiErr, err, "foo", 1)
+
+	u, apiErr, err = accountClient.Read(tc.Context(), amId, u.Id)
+	checkAccount("read", u, apiErr, err, "foo", 1)
+
+	u, apiErr, err = accountClient.Update(tc.Context(), amId, u.Id, u.Version, authmethods.WithName("bar"))
+	checkAccount("update", u, apiErr, err, "bar", 2)
+
+	u, apiErr, err = accountClient.Update(tc.Context(), amId, u.Id, u.Version, authmethods.DefaultName())
+	checkAccount("update", u, apiErr, err, "", 3)
+
+	existed, _, err := accountClient.Delete(tc.Context(), amId, u.Id)
+	require.NoError(err)
+	assert.Nil(apiErr)
+	assert.True(existed, "Expected existing account when deleted, but it wasn't.")
+
+	existed, apiErr, err = accountClient.Delete(tc.Context(), amId, u.Id)
+	require.NoError(err)
+	assert.Nil(apiErr)
+	assert.False(existed, "Expected account to not exist when deleted, but it did.")
+}
+
+func TestAccount_CustomMethods(t *testing.T) {
+	assert, require := assert.New(t), require.New(t)
+	orgId := "o_1234567890"
+	amId := "paum_1234567890"
+	tc := controller.NewTestController(t, &controller.TestControllerOpts{
+		DisableAuthorizationFailures: true,
+		DefaultOrgId:                 orgId,
+		DefaultAuthMethodId:          amId,
+		DefaultLoginName:             "user",
+		DefaultPassword:              "passpass",
+	})
+	defer tc.Shutdown()
+
+	client := tc.Client()
+	accountClient := authmethods.NewAccountsClient(client)
+
+	al, apiErr, err := accountClient.List(tc.Context(), amId)
+	require.NoError(err)
+	require.Nil(apiErr)
+	require.Len(al, 1)
+
+	acct := al[0]
+
+	setAcct, apiErr, err := accountClient.SetPassword(tc.Context(), amId, acct.Id, "setpassword", acct.Version)
+	require.NoError(err)
+	require.Nil(apiErr)
+	require.NotNil(setAcct)
+	assert.Equal(acct.Version+1, setAcct.Version)
+
+	changeAcct, apiErr, err := accountClient.ChangePassword(tc.Context(), amId, acct.Id, "setpassword", "changepassword", setAcct.Version)
+	require.NoError(err)
+	require.Nil(apiErr)
+	require.NotNil(changeAcct)
+	assert.Equal(setAcct.Version+1, changeAcct.Version)
+}
+
+func TestAccount_Errors(t *testing.T) {
+	assert, require := assert.New(t), require.New(t)
+	orgId := "o_1234567890"
+	amId := "paum_1234567890"
+	tc := controller.NewTestController(t, &controller.TestControllerOpts{
+		DisableAuthorizationFailures: true,
+		DefaultOrgId:                 orgId,
+		DefaultAuthMethodId:          amId,
+		DefaultLoginName:             "user",
+		DefaultPassword:              "passpass",
+	})
+	defer tc.Shutdown()
+
+	client := tc.Client()
+	accountClient := authmethods.NewAccountsClient(client)
+
+	u, apiErr, err := accountClient.Create(tc.Context(), amId, authmethods.WithType("password"), authmethods.WithPasswordAccountLoginName("first"))
+	require.NoError(err)
+	assert.Nil(apiErr)
+	assert.NotNil(u)
+
+	// Create another resource with the same name.
+	_, apiErr, err = accountClient.Create(tc.Context(), amId, authmethods.WithType("password"), authmethods.WithPasswordAccountLoginName("first"))
+	require.NoError(err)
+	assert.NotNil(apiErr)
+
+	_, apiErr, err = accountClient.Read(tc.Context(), amId, password.AccountPrefix+"_doesntexis")
+	require.NoError(err)
+	assert.NotNil(apiErr)
+	assert.EqualValues(http.StatusNotFound, apiErr.Status)
+
+	_, apiErr, err = accountClient.Read(tc.Context(), amId, "invalid id")
+	require.NoError(err)
+	assert.NotNil(apiErr)
+	assert.EqualValues(http.StatusForbidden, apiErr.Status)
+
+	_, apiErr, err = accountClient.Update(tc.Context(), amId, u.Id, u.Version)
+	require.NoError(err)
+	assert.NotNil(apiErr)
+	assert.EqualValues(http.StatusBadRequest, apiErr.Status)
+}
@@ -0,0 +1,65 @@
+package authmethods
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/hashicorp/boundary/api"
+	"github.com/kr/pretty"
+)
+
+func (c *AccountsClient) ChangePassword(ctx context.Context, authMethodId, accountId, oldPassword, newPassword string, version uint32, opt ...Option) (*Account, *api.Error, error) {
+	if authMethodId == "" {
+		return nil, nil, fmt.Errorf("empty authMethodId value passed into ChangePassword request")
+	}
+	if accountId == "" {
+		return nil, nil, fmt.Errorf("empty accountId value passed into ChangePassword request")
+	}
+	if c.client == nil {
+		return nil, nil, fmt.Errorf("nil client in ChangePassword request")
+	}
+
+	opts, apiOpts := getOpts(opt...)
+
+	if version == 0 {
+		if !opts.withAutomaticVersioning {
+			return nil, nil, errors.New("zero version number passed into Update request and automatic versioning not specified")
+		}
+		existingTarget, existingApiErr, existingErr := c.Read(ctx, authMethodId, accountId, opt...)
+		if existingErr != nil {
+			return nil, nil, fmt.Errorf("error performing initial check-and-set read: %w", existingErr)
+		}
+		if existingApiErr != nil {
+			return nil, nil, fmt.Errorf("error from controller when performing initial check-and-set read: %s", pretty.Sprint(existingApiErr))
+		}
+		if existingTarget == nil {
+			return nil, nil, errors.New("nil resource found when performing initial check-and-set read")
+		}
+		version = existingTarget.Version
+	}
+
+	reqBody := map[string]interface{}{
+		"version":      version,
+		"old_password": oldPassword,
+		"new_password": newPassword,
+	}
+
+	req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("auth-methods/%s/accounts/%s:change-password", authMethodId, accountId), reqBody, apiOpts...)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating ChangePassword request: %w", err)
+	}
+
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error performing client request during ChangePassword call: %w", err)
+	}
+
+	target := new(Account)
+	apiErr, err := resp.Decode(target)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error decoding ChangePassword response: %w", err)
+	}
+
+	return target, apiErr, nil
+}
@@ -0,0 +1,64 @@
+package authmethods
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/hashicorp/boundary/api"
+	"github.com/kr/pretty"
+)
+
+func (c *AccountsClient) SetPassword(ctx context.Context, authMethodId, accountId, password string, version uint32, opt ...Option) (*Account, *api.Error, error) {
+	if authMethodId == "" {
+		return nil, nil, fmt.Errorf("empty authMethodId value passed into SetPassword request")
+	}
+	if accountId == "" {
+		return nil, nil, fmt.Errorf("empty accountId value passed into SetPassword request")
+	}
+	if c.client == nil {
+		return nil, nil, fmt.Errorf("nil client in SetPassword request")
+	}
+
+	opts, apiOpts := getOpts(opt...)
+
+	if version == 0 {
+		if !opts.withAutomaticVersioning {
+			return nil, nil, errors.New("zero version number passed into Update request and automatic versioning not specified")
+		}
+		existingTarget, existingApiErr, existingErr := c.Read(ctx, authMethodId, accountId, opt...)
+		if existingErr != nil {
+			return nil, nil, fmt.Errorf("error performing initial check-and-set read: %w", existingErr)
+		}
+		if existingApiErr != nil {
+			return nil, nil, fmt.Errorf("error from controller when performing initial check-and-set read: %s", pretty.Sprint(existingApiErr))
+		}
+		if existingTarget == nil {
+			return nil, nil, errors.New("nil resource found when performing initial check-and-set read")
+		}
+		version = existingTarget.Version
+	}
+
+	reqBody := map[string]interface{}{
+		"version":  version,
+		"password": password,
+	}
+
+	req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("auth-methods/%s/accounts/%s:set-password", authMethodId, accountId), reqBody, apiOpts...)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating SetPassword request: %w", err)
+	}
+
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error performing client request during SetPassword call: %w", err)
+	}
+
+	target := new(Account)
+	apiErr, err := resp.Decode(target)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error decoding SetPassword response: %w", err)
+	}
+
+	return target, apiErr, nil
+}