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

Simplify permissions fetching code

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2018-05-30 13:25:42 +01:00
parent db37b8378b
commit ba4f3c7e15
3 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
db/fetch.go
View file

@ -393,6 +393,18 @@ func (e *executor) fetchArray(ctx context.Context, val []interface{}, doc *data.
func (e *executor) fetchPerms(ctx context.Context, val sql.Expr, tb *sql.Ident) error { func (e *executor) fetchPerms(ctx context.Context, val sql.Expr, tb *sql.Ident) error {
// If the table does exist we reset the
// context to DB level so that no other
// embedded permissions are checked on
// records within these permissions.
ctx = context.WithValue(ctx, ctxKeyKind, cnf.AuthDB)
// We then try to process the relevant
// permissions expression, but only if
// the specified expression doesn't
// reference any document fields.
res, err := e.fetch(ctx, val, ign) res, err := e.fetch(ctx, val, ign)
// If we receive an 'ident failed' error // If we receive an 'ident failed' error

7
db/iterator.go
View file

@ -492,13 +492,6 @@ func (i *iterator) processPerms(ctx context.Context, nsv, dbv, tbv string) {
return return
} }
// If the table does exist we reset the
// context to DB level so that no other
// embedded permissions are checked on
// records within these permissions.
ctx = context.WithValue(ctx, ctxKeyKind, cnf.AuthDB)
// If the table does exist we then try // If the table does exist we then try
// to process the relevant permissions // to process the relevant permissions
// expression, but only if they don't // expression, but only if they don't

41
db/socket.go
View file

@ -176,42 +176,17 @@ func (s *socket) check(e *executor, ctx context.Context, ns, db, tb string) (err
return err return err
} }
// Once we have the table we reset the // If the table has any permissions
// context to DB level so that no other // specified, then let's check if this
// embedded permissions are checked on // query is allowed access to the table.
// records within these permissions.
ctx = context.WithValue(ctx, ctxKeyKind, cnf.AuthDB)
// If the table does exist we then try
// to process the relevant permissions
// expression, but only if they don't
// reference any document fields.
var val interface{}
switch p := tbv.Perms.(type) { switch p := tbv.Perms.(type) {
case *sql.PermExpression: case *sql.PermExpression:
val, err = e.fetch(ctx, p.Select, ign) return e.fetchPerms(ctx, p.Select, tbv.Name)
default: default:
return &PermsError{table: tb} return &PermsError{table: tb}
} }
// If we receive an 'ident failed' error
// it is because the table permission
// expression contains a field check,
// and therefore we must check each
// record individually to see if it can
// be accessed or not.
if err != queryIdentFailed {
if val, ok := val.(bool); ok && !val {
return &PermsError{table: tb}
}
}
return nil
} }
func (s *socket) deregister(id string) { func (s *socket) deregister(id string) {
@ -284,9 +259,9 @@ func (s *socket) executeLive(e *executor, ctx context.Context, stm *sql.LiveStat
case *sql.Table: case *sql.Table:
if err = s.check(e, ctx, stm.NS, stm.DB, what.TB); err != nil { /*if err = s.check(e, ctx, stm.NS, stm.DB, what.TB); err != nil {
return nil, err return nil, err
} }*/
key := &keys.LV{KV: stm.KV, NS: stm.NS, DB: stm.DB, TB: what.TB, LV: stm.ID} key := &keys.LV{KV: stm.KV, NS: stm.NS, DB: stm.DB, TB: what.TB, LV: stm.ID}
if _, err = e.dbo.Put(ctx, 0, key.Encode(), stm.Encode()); err != nil { if _, err = e.dbo.Put(ctx, 0, key.Encode(), stm.Encode()); err != nil {
@ -295,9 +270,9 @@ func (s *socket) executeLive(e *executor, ctx context.Context, stm *sql.LiveStat
case *sql.Ident: case *sql.Ident:
if err = s.check(e, ctx, stm.NS, stm.DB, what.ID); err != nil { /*if err = s.check(e, ctx, stm.NS, stm.DB, what.ID); err != nil {
return nil, err return nil, err
} }*/
key := &keys.LV{KV: stm.KV, NS: stm.NS, DB: stm.DB, TB: what.ID, LV: stm.ID} key := &keys.LV{KV: stm.KV, NS: stm.NS, DB: stm.DB, TB: what.ID, LV: stm.ID}
if _, err = e.dbo.Put(ctx, 0, key.Encode(), stm.Encode()); err != nil { if _, err = e.dbo.Put(ctx, 0, key.Encode(), stm.Encode()); err != nil {