V3 fixes (#21)

Added missing functions

.golangci.yml

@@ -186,7 +186,6 @@ linters:
     - goconst
     - gosimple
     - gocyclo
-    - gofmt
     - nakedret
     - misspell
     - gosec
@@ -199,7 +198,6 @@ linters:
     - prealloc
     - gocritic
     - depguard
-    - stylecheck
 
     # - dupl
     # - wsl

.travis.yml

@@ -1,7 +1,6 @@
 language: go
 go:
 - stable
-- tip
 
 services: mysql
 

protocol_test.go

@@ -196,7 +196,7 @@ func TestPure_EncryptDecrypt(t *testing.T) {
 				require.NoError(t, err)
 				require.NotNil(t, res)
 
-				ciphertext, err := p.encrypt(userName, dataID, nil, nil, nil, []byte(plaintext))
+				ciphertext, err := p.EncryptGeneral(userName, dataID, nil, nil, nil, []byte(plaintext))
 				require.NoError(t, err)
 				decrypted, err := p.Decrypt(res.Grant, userName, dataID, ciphertext)
 				require.NoError(t, err)
@@ -241,7 +241,7 @@ func TestPure_EncryptDecrypt_Share_Unshare_Admin_ChangePassword(t *testing.T) {
 				kp, err := p.PureCrypto.GenerateUserKey()
 				require.NoError(t, err)
 
-				ciphertext, err := p.encrypt(userId1, dataId, nil, nil, []crypto.PublicKey{kp.PublicKey()}, []byte(plaintext))
+				ciphertext, err := p.EncryptGeneral(userId1, dataId, nil, nil, []crypto.PublicKey{kp.PublicKey()}, []byte(plaintext))
 				require.NoError(t, err)
 
 				err = p.Share(res1.Grant, dataId, []string{userId2}, nil)
@@ -408,7 +408,7 @@ func TestPure_CreateUserGrantAsAdmin(t *testing.T) {
 				err = p.RegisterUser(userId, password)
 				require.NoError(t, err)
 
-				ciphertext, err := p.encrypt(userId, dataId, nil, nil, nil, text)
+				ciphertext, err := p.EncryptGeneral(userId, dataId, nil, nil, nil, text)
 				require.NoError(t, err)
 
 				grant, err := p.CreateUserGrantAsAdmin(userId, bupk, DefaultGrantTTL)
@@ -461,7 +461,7 @@ func TestPure_Roles(t *testing.T) {
 				require.NoError(t, err)
 
 				//user1 encrypts to role
-				ciphertext, err := p.encrypt(userId1, dataId, nil, []string{roleName}, nil, []byte(plaintext))
+				ciphertext, err := p.EncryptGeneral(userId1, dataId, nil, []string{roleName}, nil, []byte(plaintext))
 				require.NoError(t, err)
 
 				decrypted1, err := p.Decrypt(res1.Grant, "", dataId, ciphertext)
@@ -698,7 +698,7 @@ func TestPure_DeleteUser_cascade(t *testing.T) {
 				err = p.RegisterUser(userName, password)
 				require.NoError(t, err)
 
-				ciphertext, err := p.encrypt(userName, dataID, nil, nil, nil, []byte(plaintext))
+				ciphertext, err := p.EncryptGeneral(userName, dataID, nil, nil, nil, []byte(plaintext))
 				require.NoError(t, err)
 
 				res, err := p.AuthenticateUser(userName, password, nil)
@@ -734,7 +734,7 @@ func TestPure_DeleteUser_nocascade(t *testing.T) {
 			err = p.RegisterUser(userName, password)
 			require.NoError(t, err)
 
-			ciphertext, err := p.encrypt(userName, dataID, nil, nil, nil, []byte(plaintext))
+			ciphertext, err := p.EncryptGeneral(userName, dataID, nil, nil, nil, []byte(plaintext))
 			require.NoError(t, err)
 
 			res, err := p.AuthenticateUser(userName, password, nil)
@@ -770,7 +770,7 @@ func TestPure_RecoverUser(t *testing.T) {
 			err = p.RegisterUser(userName, password)
 			require.NoError(t, err)
 
-			ciphertext, err := p.encrypt(userName, dataID, nil, nil, nil, []byte(plaintext))
+			ciphertext, err := p.EncryptGeneral(userName, dataID, nil, nil, nil, []byte(plaintext))
 			require.NoError(t, err)
 
 			require.NoError(t, p.RecoverUser(userName, password2))

pure.go

@@ -191,6 +191,17 @@ func (p *Pure) DeleteUser(userID string, cascade bool) error {
 	return p.Storage.DeleteUser(userID, cascade)
 }
 
+func (p *Pure) ResetUser(userID, newPassword string, cascade bool) error {
+	if err := p.DeleteUser(userID, cascade); err != nil {
+		return err
+	}
+	return p.RegisterUser(userID, newPassword)
+}
+
+func (p *Pure) DeleteKey(userID, dataID string) error {
+	return p.Storage.DeleteCellKey(userID, dataID)
+}
+
 func (p *Pure) PerformRotation() (*RotationResults, error) {
 	if p.CurrentVersion <= 1 {
 		return &RotationResults{0, 0}, nil
@@ -288,11 +299,11 @@ func (p *Pure) PerformRotation() (*RotationResults, error) {
 }
 
 func (p *Pure) Encrypt(userID, dataID string, plaintext []byte) ([]byte, error) {
-	return p.encrypt(userID, dataID, nil, nil, nil, plaintext)
+	return p.EncryptGeneral(userID, dataID, nil, nil, nil, plaintext)
 }
 
-//nolint: gocyclo,gocritic
-func (p *Pure) encrypt(
+//nolint: golint,gocyclo,gocritic
+func (p *Pure) EncryptGeneral(
 	userID, dataID string,
 	otherUserIDs []string,
 	roleNames []string,