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

Pass old and new item data to rules checking code

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-09-14 22:24:22 +01:00
parent 3bbfa7919a
commit fbc94f90e5
5 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/delete.go
View file

@ -77,11 +77,11 @@ func executeDeleteStatement(txn kvs.TX, ast *sql.DeleteStatement) (out []interfa
func delete(doc *item.Doc, ast *sql.DeleteStatement) (out interface{}, err error) {
if !doc.Allow("DELETE") {
if !doc.Check(ast.Cond) {
return
}
if !doc.Check(ast.Cond) {
if !doc.Allow("DELETE") {
return
}

8
db/modify.go
View file

@ -77,10 +77,6 @@ func executeModifyStatement(txn kvs.TX, ast *sql.ModifyStatement) (out []interfa
func modify(doc *item.Doc, ast *sql.ModifyStatement) (out interface{}, err error) {
if !doc.Allow("UPDATE") {
return
}
if !doc.Check(ast.Cond) {
return
}
@ -89,6 +85,10 @@ func modify(doc *item.Doc, ast *sql.ModifyStatement) (out interface{}, err error
return
}
if !doc.Allow("UPDATE") {
return
}
if err = doc.StoreIndex(); err != nil {
return
}

8
db/select.go
View file

@ -70,14 +70,14 @@ func executeSelectStatement(txn kvs.TX, ast *sql.SelectStatement) (out []interfa
func detect(doc *item.Doc, ast *sql.SelectStatement) (out interface{}, err error) {
if !doc.Allow("SELECT") {
return nil, nil
}
if !doc.Check(ast.Cond) {
return
}
if !doc.Allow("SELECT") {
return nil, nil
}
out = doc.Blaze(ast)
return

8
db/update.go
View file

@ -77,10 +77,6 @@ func executeUpdateStatement(txn kvs.TX, ast *sql.UpdateStatement) (out []interfa
func update(doc *item.Doc, ast *sql.UpdateStatement) (out interface{}, err error) {
if !doc.Allow("UPDATE") {
return
}
if !doc.Check(ast.Cond) {
return
}
@ -89,6 +85,10 @@ func update(doc *item.Doc, ast *sql.UpdateStatement) (out interface{}, err error
return
}
if !doc.Allow("UPDATE") {
return
}
if err = doc.StoreIndex(); err != nil {
return
}

6
util/item/allow.go
View file

@ -35,7 +35,8 @@ func (this *Doc) Allow(cond string) (val bool) {
vm := otto.New()
vm.Set("doc", this.current.Copy())
vm.Set("data", this.initial.Copy())
vm.Set("edit", this.current.Copy())
ret, err := vm.Run("(function() { " + rule.Code + " })()")
if err != nil {
@ -56,7 +57,8 @@ func (this *Doc) Allow(cond string) (val bool) {
vm := lua.NewState()
defer vm.Close()
vm.SetGlobal("doc", toLUA(vm, this.current.Copy()))
vm.SetGlobal("data", toLUA(vm, this.initial.Copy()))
vm.SetGlobal("edit", toLUA(vm, this.current.Copy()))
if err := vm.DoString(rule.Code); err != nil {
return false