add concurrent access in lru cache

.circleci/config.yml

@@ -37,7 +37,7 @@ jobs:
       - run: pip3 install -r $HOME/project/tests/requirements.txt
       # install from sources because pip install git+https://github.com/mysql/mysql-connector-python not support recursive submodules
       - run: git clone https://github.com/Lagovas/mysql-connector-python; cd mysql-connector-python; sudo python3 setup.py clean build_py install_lib
-      - run: cd $HOME && GOPATH=$HOME/$GOPATH_FOLDER go get -u -v github.com/golang/lint/golint
+      - run: cd $HOME && GOPATH=$HOME/$GOPATH_FOLDER go get -u -v golang.org/x/lint/golint
       - run: sudo ldconfig
     # testing
       # check that code formatted with gofmt

cmd/acra-rollback/acra-rollback.go

@@ -296,7 +296,7 @@ func main() {
 		}
 		decrypted, err := base.DecryptAcrastruct(data, privateKey, zone)
 		if err != nil {
-			log.WithError(err).Errorln("Can't decrypt acrastruct in row with number %v", i)
+			log.WithError(err).Errorf("Can't decrypt acrastruct in row with number %v", i)
 			continue
 		}
 		for e := executors.Front(); e != nil; e = e.Next() {

cmd/acra-server/acra-server.go

@@ -285,7 +285,7 @@ func main() {
 	server, err = NewServer(config, keyStore, errorSignalChannel, restartSignalsChannel)
 	if err != nil {
 		log.WithError(err).WithField(logging.FieldKeyEventCode, logging.EventCodeErrorCantStartService).
-			Errorln("System error: can't start %s", SERVICE_NAME)
+			Errorf("System error: can't start %s", SERVICE_NAME)
 		panic(err)
 	}
 

cmd/acra-translator/acra-translator.go

@@ -142,7 +142,7 @@ func main() {
 	readerServer, err = NewReaderServer(config, keyStore, waitTimeout)
 	if err != nil {
 		log.WithError(err).WithField(logging.FieldKeyEventCode, logging.EventCodeErrorCantStartService).
-			Errorln("System error: can't start %s", SERVICE_NAME)
+			Errorf("System error: can't start %s", SERVICE_NAME)
 		panic(err)
 	}
 

keystore/lru_cache/lru_cache.go

@@ -22,11 +22,13 @@ import (
 	"github.com/cossacklabs/acra/utils"
 	"github.com/cossacklabs/themis/gothemis/keys"
 	"github.com/golang/groupcache/lru"
+	"sync"
 )
 
 // LRUCache implement keystore.Cache
 type LRUCache struct {
-	lru *lru.Cache
+	lru   *lru.Cache
+	mutex sync.RWMutex
 }
 
 // clearCacheValue callback for lru.Cache that called on value remove operation
@@ -48,11 +50,15 @@ func NewLRUCacheKeystoreWrapper(size int) (*LRUCache, error) {
 
 // Add value by keyID
 func (cache *LRUCache) Add(keyID string, keyValue []byte) {
+	cache.mutex.Lock()
 	cache.lru.Add(keyID, keyValue)
+	cache.mutex.Unlock()
 }
 
 // Get value by keyID
 func (cache *LRUCache) Get(keyID string) ([]byte, bool) {
+	cache.mutex.RLock()
+	defer cache.mutex.RUnlock()
 	value, ok := cache.lru.Get(keyID)
 	if ok {
 		return value.([]byte), ok
@@ -62,5 +68,7 @@ func (cache *LRUCache) Get(keyID string) ([]byte, bool) {
 
 // Clear cache and remove all values with zeroing
 func (cache *LRUCache) Clear() {
+	cache.mutex.Lock()
 	cache.lru.Clear()
+	cache.mutex.Unlock()
 }