Pg_query integration

acrablock/dataEncryptor.go

@@ -2,10 +2,11 @@ package acrablock
 
 import (
 	"context"
+
 	"github.com/cossacklabs/acra/acrastruct"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 )
 

acrablock/dataEncryptor_test.go

@@ -3,12 +3,14 @@ package acrablock
 import (
 	"bytes"
 	"errors"
+	"testing"
+
+	"github.com/cossacklabs/themis/gothemis/keys"
+
 	"github.com/cossacklabs/acra/acrastruct"
-	"github.com/cossacklabs/acra/encryptor/config"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/keystore/mocks"
-	"github.com/cossacklabs/themis/gothemis/keys"
-	"testing"
 )
 
 func TestSuccessDataEncryptionWithClientID(t *testing.T) {

cmd/acra-keys/keys/generate.go

@@ -79,7 +79,7 @@ type GenerateKeySubcommand struct {
 	poisonRecord    bool
 }
 
-// GetParamsExtractor return service params extractor
+// GetExtractor return service params extractor
 func (g *GenerateKeySubcommand) GetExtractor() *args.ServiceExtractor {
 	return g.extractor
 }

cmd/acra-server/acra-server.go

@@ -55,7 +55,7 @@ import (
 	"github.com/cossacklabs/acra/decryptor/base"
 	"github.com/cossacklabs/acra/decryptor/mysql"
 	"github.com/cossacklabs/acra/decryptor/postgresql"
-	"github.com/cossacklabs/acra/encryptor/config_loader"
+	"github.com/cossacklabs/acra/encryptor/base/config_loader"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/keystore/filesystem"
 	"github.com/cossacklabs/acra/keystore/keyloader"

cmd/acra-server/common/client_session.go

@@ -21,10 +21,11 @@ import (
 	"net"
 	"sync/atomic"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/cossacklabs/acra/decryptor/base"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/network"
-	log "github.com/sirupsen/logrus"
 )
 
 // ClientSession handles connection between database and AcraServer.
@@ -34,7 +35,6 @@ type ClientSession struct {
 	connectionToDb net.Conn
 	ctx            context.Context
 	logger         *log.Entry
-	statements     base.PreparedStatementRegistry
 	protocolState  interface{}
 	data           map[string]interface{}
 }
@@ -100,17 +100,6 @@ func (clientSession *ClientSession) DatabaseConnection() net.Conn {
 	return clientSession.connectionToDb
 }
 
-// PreparedStatementRegistry returns prepared statement registry of this session.
-// The session does not have a registry by default, it must be set with SetPreparedStatementRegistry.
-func (clientSession *ClientSession) PreparedStatementRegistry() base.PreparedStatementRegistry {
-	return clientSession.statements
-}
-
-// SetPreparedStatementRegistry sets prepared statement registry for this session.
-func (clientSession *ClientSession) SetPreparedStatementRegistry(registry base.PreparedStatementRegistry) {
-	clientSession.statements = registry
-}
-
 // ProtocolState returns private protocol state of this session.
 // The session does not have any state by default, it must be set with SetProtocolState.
 func (clientSession *ClientSession) ProtocolState() interface{} {

cmd/acra-server/common/config.go

@@ -24,9 +24,9 @@ import (
 	"go.opencensus.io/trace"
 
 	acracensor "github.com/cossacklabs/acra/acra-censor"
-	"github.com/cossacklabs/acra/encryptor"
-	encryptorConfig "github.com/cossacklabs/acra/encryptor/config"
-	"github.com/cossacklabs/acra/encryptor/config_loader"
+	"github.com/cossacklabs/acra/encryptor/base"
+	encryptorConfig "github.com/cossacklabs/acra/encryptor/base/config"
+	"github.com/cossacklabs/acra/encryptor/base/config_loader"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/network"
@@ -56,7 +56,7 @@ type Config struct {
 	censor                     acracensor.AcraCensorInterface
 	TraceToLog                 bool
 	tableSchema                encryptorConfig.TableSchemaStore
-	dataEncryptor              encryptor.DataEncryptor
+	dataEncryptor              base.DataEncryptor
 	keystore                   keystore.ServerKeyStore
 	traceOptions               []trace.StartOption
 	serviceName                string

crypto/acrablock.go

@@ -2,13 +2,15 @@ package crypto
 
 import (
 	"fmt"
+
+	"github.com/sirupsen/logrus"
+
 	"github.com/cossacklabs/acra/acrablock"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/utils"
-	"github.com/sirupsen/logrus"
 )
 
 // AcraBlockEnvelopeID represent AcraBlock EnvelopeID will be serialized inside CryptoContainer

crypto/acrastruct.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/cossacklabs/acra/acrastruct"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/logging"
 	"github.com/cossacklabs/acra/utils"
 )

crypto/encryptor.go

@@ -1,7 +1,7 @@
 package crypto
 
 import (
-	"github.com/cossacklabs/acra/encryptor/config"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 )
 
 // EncryptHandler wraps RegistryHandler as standalone CryptoEnvelope encryptor

crypto/encryptor_test.go

@@ -2,12 +2,14 @@ package crypto
 
 import (
 	"bytes"
+	"testing"
+
+	"github.com/cossacklabs/themis/gothemis/keys"
+
 	"github.com/cossacklabs/acra/acrablock"
 	"github.com/cossacklabs/acra/acrastruct"
-	"github.com/cossacklabs/acra/encryptor/config"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore/mocks"
-	"github.com/cossacklabs/themis/gothemis/keys"
-	"testing"
 )
 
 func TestEncryptHandler(t *testing.T) {

crypto/matcher_test.go

@@ -3,13 +3,15 @@ package crypto
 import (
 	"context"
 	"crypto/rand"
+	"testing"
+
+	"github.com/cossacklabs/themis/gothemis/keys"
+
 	acrablock2 "github.com/cossacklabs/acra/acrablock"
 	acrastruct2 "github.com/cossacklabs/acra/acrastruct"
-	"github.com/cossacklabs/acra/encryptor"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/keystore/mocks"
-	"github.com/cossacklabs/themis/gothemis/keys"
-	"testing"
 )
 
 func TestEnvelopeMatcher(t *testing.T) {

crypto/prometheus.go

@@ -2,7 +2,7 @@ package crypto
 
 import (
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
 )
 
 // PrometheusContainerHandlerWrapper wraps ContainerHandler with adding prometheus metrics logic

crypto/reencryptor.go

@@ -2,8 +2,9 @@ package crypto
 
 import (
 	"context"
+
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor/config"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 )
 

crypto/reencryptor_test.go

@@ -2,13 +2,15 @@ package crypto
 
 import (
 	"bytes"
+	"testing"
+
 	"github.com/cossacklabs/acra/acrablock"
 	"github.com/cossacklabs/acra/acrastruct"
-	"testing"
 
-	"github.com/cossacklabs/acra/encryptor/config"
-	"github.com/cossacklabs/acra/keystore/mocks"
 	"github.com/cossacklabs/themis/gothemis/keys"
+
+	"github.com/cossacklabs/acra/encryptor/base/config"
+	"github.com/cossacklabs/acra/keystore/mocks"
 )
 
 func TestReEncryptHandler(t *testing.T) {

crypto/registry_handler.go

@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+
 	"github.com/cossacklabs/acra/acrablock"
 	"github.com/cossacklabs/acra/acrastruct"
 	"github.com/cossacklabs/acra/decryptor/base"
-	"github.com/cossacklabs/acra/encryptor"
-	"github.com/cossacklabs/acra/encryptor/config"
+	encryptor "github.com/cossacklabs/acra/encryptor/base"
+	"github.com/cossacklabs/acra/encryptor/base/config"
 	"github.com/cossacklabs/acra/keystore"
 )
 

decryptor/base/bound_value.go

@@ -0,0 +1,23 @@
+package base
+
+import "github.com/cossacklabs/acra/encryptor/base/config"
+
+// BoundValue is a value provided for prepared statement execution.
+// Its exact type and meaning depends on the corresponding query.
+type BoundValue interface {
+	Format() BoundValueFormat
+	Copy() BoundValue
+	SetData(newData []byte, setting config.ColumnEncryptionSetting) error
+	GetData(setting config.ColumnEncryptionSetting) ([]byte, error)
+	Encode() ([]byte, error)
+	GetType() byte
+}
+
+// BoundValueFormat specifies how to interpret the bound data.
+type BoundValueFormat uint16
+
+// Supported values of BoundValueFormat.
+const (
+	TextFormat BoundValueFormat = iota
+	BinaryFormat
+)

decryptor/base/clientSession.go

@@ -10,10 +10,6 @@ type ClientSession interface {
 	Context() context.Context
 	ClientConnection() net.Conn
 	DatabaseConnection() net.Conn
-
-	PreparedStatementRegistry() PreparedStatementRegistry
-	SetPreparedStatementRegistry(registry PreparedStatementRegistry)
-
 	ProtocolState() interface{}
 	SetProtocolState(state interface{})
 	GetData(string) (interface{}, bool)

decryptor/base/clientSession_test.go

@@ -21,14 +21,6 @@ func (s sessionStub) DatabaseConnection() net.Conn {
 	panic("implement me")
 }
 
-func (s sessionStub) PreparedStatementRegistry() PreparedStatementRegistry {
-	panic("implement me")
-}
-
-func (s sessionStub) SetPreparedStatementRegistry(registry PreparedStatementRegistry) {
-	panic("implement me")
-}
-
 func (s sessionStub) ProtocolState() interface{} {
 	panic("implement me")
 }