noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable individual encryption per transaction

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-07-19 17:38:32 +01:00
parent 6ad1717f9f
commit a06263d738
4 changed files with 2 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kvs/boltdb/tx.go
View file

@ -163,11 +163,6 @@ func (tx *TX) Put(key, val []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if err = tx.bu.Put(key, val); err != nil { if err = tx.bu.Put(key, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -205,11 +200,6 @@ func (tx *TX) CPut(key, val, exp []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if err = tx.bu.Put(key, val); err != nil { if err = tx.bu.Put(key, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -359,12 +349,6 @@ func get(tx *TX, key, val []byte) (kv *KV, err error) {
val: val, val: val,
} }
kv.val, err = cryp.Decrypt(tx.ck, kv.val)
if err != nil {
err = &kvs.CKError{err}
return
}
kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val) kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val)
if err != nil { if err != nil {
err = &kvs.CKError{err} err = &kvs.CKError{err}

16
kvs/mysql/tx.go
View file

@ -191,11 +191,6 @@ func (tx *TX) Put(key, val []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `val` = ?", key, val, val); err != nil { if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `val` = ?", key, val, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -228,11 +223,6 @@ func (tx *TX) CPut(key, val, exp []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `val` = ?", key, val, val); err != nil { if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `val` = ?", key, val, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -340,12 +330,6 @@ func get(tx *TX, key, val []byte) (kv *KV, err error) {
val: val, val: val,
} }
kv.val, err = cryp.Decrypt(tx.ck, kv.val)
if err != nil {
err = &kvs.CKError{err}
return
}
kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val) kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val)
if err != nil { if err != nil {
err = &kvs.CKError{err} err = &kvs.CKError{err}

16
kvs/pgsql/tx.go
View file

@ -191,11 +191,6 @@ func (tx *TX) Put(key, val []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES ($1, $2) ON DUPLICATE KEY UPDATE `val` = $3", key, val, val); err != nil { if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES ($1, $2) ON DUPLICATE KEY UPDATE `val` = $3", key, val, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -228,11 +223,6 @@ func (tx *TX) CPut(key, val, exp []byte) (err error) {
return return
} }
if val, err = cryp.Encrypt(tx.ck, val); err != nil {
err = &kvs.CKError{err}
return
}
if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES ($1, $2) ON DUPLICATE KEY UPDATE `val` = $3", key, val, val); err != nil { if _, err = tx.tx.Exec("INSERT INTO kv (`key`, `val`) VALUES ($1, $2) ON DUPLICATE KEY UPDATE `val` = $3", key, val, val); err != nil {
err = &kvs.DBError{err} err = &kvs.DBError{err}
return return
@ -340,12 +330,6 @@ func get(tx *TX, key, val []byte) (kv *KV, err error) {
val: val, val: val,
} }
kv.val, err = cryp.Decrypt(tx.ck, kv.val)
if err != nil {
err = &kvs.CKError{err}
return
}
kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val) kv.val, err = cryp.Decrypt(tx.ds.ck, kv.val)
if err != nil { if err != nil {
err = &kvs.CKError{err} err = &kvs.CKError{err}

12
sql/use.go
View file

@ -21,7 +21,7 @@ func (p *Parser) parseUseStatement(explain bool) (stmt *UseStatement, err error)
var tok Token var tok Token
var exi bool var exi bool
tok, _, err = p.shouldBe(NAMESPACE, DATABASE, CIPHERKEY) tok, _, err = p.shouldBe(NAMESPACE, DATABASE)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -46,15 +46,7 @@ func (p *Parser) parseUseStatement(explain bool) (stmt *UseStatement, err error)
p.c.Set("DB", stmt.DB) p.c.Set("DB", stmt.DB)
} }
if is(tok, CIPHERKEY) { tok, _, exi = p.mightBe(NAMESPACE, DATABASE)
_, stmt.CK, err = p.shouldBe(IDENT, STRING)
if err != nil || (len(stmt.CK) != 16 && len(stmt.CK) != 24 && len(stmt.CK) != 32) {
return nil, &ParseError{Found: stmt.CK, Expected: []string{"16, 24, or 32 bit cipher key"}}
}
p.c.Set("CK", stmt.CK)
}
tok, _, exi = p.mightBe(NAMESPACE, DATABASE, CIPHERKEY)
if !exi { if !exi {
break break
} }