Support db schema
diff --git a/adapter.go b/adapter.go index 4f97d51..c7608d7 100644 --- a/adapter.go +++ b/adapter.go
@@ -18,15 +18,21 @@ // Adapter is a postgresql adaptor for casbin type Adapter struct { db *sql.DB + dbSchema string tableName string casbinRuleRepository *repository.CasbinRuleRepository } // NewAdapter returns a new casbin postgresql adapter func NewAdapter(db *sql.DB, tableName string) (*Adapter, error) { - casbinRuleRepository := repository.NewCasbinRuleRepository(tableName, db) + return NewAdapterWithDBSchema(db, "public", tableName) +} + +func NewAdapterWithDBSchema(db *sql.DB, dbSchema string, tableName string) (*Adapter, error) { + casbinRuleRepository := repository.NewCasbinRuleRepository(dbSchema, tableName, db) adapter := &Adapter{ db, + dbSchema, tableName, casbinRuleRepository, } @@ -52,7 +58,7 @@ return err } _, err = tx.Exec(fmt.Sprintf(` - CREATE TABLE IF NOT EXISTS "%v" ( + CREATE TABLE IF NOT EXISTS "%s"."%s" ( p_type varchar(256) not null default '', v0 varchar(256) not null default '', v1 varchar(256) not null default '', @@ -61,9 +67,9 @@ v4 varchar(256) not null default '', v5 varchar(256) not null default '' ) - `, adapter.tableName)) + `, adapter.dbSchema, adapter.tableName)) if err != nil { - tx.Rollback() + _ = tx.Rollback() log.Printf("Cannot create table %v", err) return err } @@ -78,18 +84,18 @@ } for _, column := range columns { _, err = tx.Exec(fmt.Sprintf(` - CREATE INDEX IF NOT EXISTS idx_%[1]v_%[2]v ON %[1]v (%[2]v) - `, adapter.tableName, column)) + CREATE INDEX IF NOT EXISTS idx_%[2]s_%[3]s ON "%[1]s"."%[2]s" (%[3]s) + `, adapter.dbSchema, adapter.tableName, column)) if err != nil { log.Printf("Cannot create index for column: %v. Error: %v", column, err) - tx.Rollback() + _ = tx.Rollback() return err } } err = tx.Commit() if err != nil { log.Printf("Cannot commit transaction %v", err) - tx.Rollback() + _ = tx.Rollback() return err } return nil
diff --git a/adapter_test.go b/adapter_test.go index e908d38..9377729 100644 --- a/adapter_test.go +++ b/adapter_test.go
@@ -32,13 +32,16 @@ return } + adapter, err = NewAdapter(db, "casbin") if err != nil { t.Fatalf("Cannot create adapter %v", err) return } - - adapter, err = NewAdapter(db, "casbin") enforcer, err = casbin.NewEnforcer("./example/model.conf", adapter) + if err != nil { + t.Fatalf("Cannot create enforcer %v", err) + return + } enforcerPolicy := enforcer.GetPolicy() want := [][]string{{"alice", "data1", "read"}, {"bob", "data2", "write"}, {"data2_admin", "data2", "read"}, {"data2_admin", "data2", "write"}} if !util.Array2DEquals(enforcerPolicy, want) { @@ -47,8 +50,14 @@ } enforcer.EnableAutoSave(false) - enforcer.AddPolicy("alice", "data1", "write") - enforcer.LoadPolicy() + if _, err = enforcer.AddPolicy("alice", "data1", "write"); err != nil { + t.Fatalf("Cannot add policy") + return + } + if err = enforcer.LoadPolicy(); err != nil { + t.Fatalf("Cannot load policy") + return + } enforcerPolicy = enforcer.GetPolicy() if !util.Array2DEquals(enforcerPolicy, want) { t.Fatalf("Want %v but got %v", want, enforcerPolicy) @@ -57,8 +66,14 @@ enforcer.EnableAutoSave(true) - enforcer.AddPolicy("alice", "data1", "write") - enforcer.LoadPolicy() + if _, err = enforcer.AddPolicy("alice", "data1", "write"); err != nil { + t.Fatalf("Cannot add policy") + return + } + if err = enforcer.LoadPolicy(); err != nil { + t.Fatalf("Cannot load policy") + return + } enforcerPolicy = enforcer.GetPolicy() want = [][]string{{"alice", "data1", "read"}, {"bob", "data2", "write"}, {"data2_admin", "data2", "read"}, {"data2_admin", "data2", "write"}, {"alice", "data1", "write"}} if !util.Array2DEquals(enforcerPolicy, want) { @@ -66,8 +81,14 @@ return } - enforcer.RemovePolicy("alice", "data1", "write") - enforcer.LoadPolicy() + if _, err = enforcer.RemovePolicy("alice", "data1", "write"); err != nil { + t.Fatalf("Cannot remove policy") + return + } + if err = enforcer.LoadPolicy(); err != nil { + t.Fatalf("Cannot load policy") + return + } enforcerPolicy = enforcer.GetPolicy() want = [][]string{{"alice", "data1", "read"}, {"bob", "data2", "write"}, {"data2_admin", "data2", "read"}, {"data2_admin", "data2", "write"}} if !util.Array2DEquals(enforcerPolicy, want) { @@ -75,8 +96,14 @@ return } - enforcer.RemoveFilteredPolicy(0, "data2_admin") - enforcer.LoadPolicy() + if _, err = enforcer.RemoveFilteredPolicy(0, "data2_admin"); err != nil { + t.Fatalf("Cannot remove filtered policy") + return + } + if err = enforcer.LoadPolicy(); err != nil { + t.Fatalf("Cannot load policy") + return + } enforcerPolicy = enforcer.GetPolicy() want = [][]string{{"alice", "data1", "read"}, {"bob", "data2", "write"}} if !util.Array2DEquals(enforcerPolicy, want) {
diff --git a/go.mod b/go.mod index 2f00046..f980dcb 100644 --- a/go.mod +++ b/go.mod
@@ -1,6 +1,6 @@ module github.com/cychiuae/casbin-pg-adapter -go 1.13 +go 1.14 require ( github.com/casbin/casbin/v2 v2.1.2
diff --git a/pkg/repository/casbin.go b/pkg/repository/casbin.go index 6193b69..6c03aeb 100644 --- a/pkg/repository/casbin.go +++ b/pkg/repository/casbin.go
@@ -10,13 +10,15 @@ // CasbinRuleRepository is the bridge for adapter and db type CasbinRuleRepository struct { + dbSchema string tableName string db *sql.DB } // NewCasbinRuleRepository returns a new CasbinRuleRepository -func NewCasbinRuleRepository(tableName string, db *sql.DB) *CasbinRuleRepository { +func NewCasbinRuleRepository(dbSchema string, tableName string, db *sql.DB) *CasbinRuleRepository { return &CasbinRuleRepository{ + dbSchema: dbSchema, tableName: tableName, db: db, } @@ -25,8 +27,8 @@ // LoadAllCasbinRules loads all casbin rules from db func (repository *CasbinRuleRepository) LoadAllCasbinRules() ([]model.CasbinRule, error) { rows, err := repository.db.Query(fmt.Sprintf(` - SELECT p_type, v0, v1, v2, v3, v4, v5 FROM %s - `, repository.tableName)) + SELECT p_type, v0, v1, v2, v3, v4, v5 FROM "%s"."%s" + `, repository.dbSchema, repository.tableName)) if err != nil { return nil, err } @@ -74,10 +76,10 @@ } _, err = tx.Exec( fmt.Sprintf(` - INSERT INTO %s (p_type, v0, v1, v2, v3, v4, v5) + INSERT INTO "%s"."%s" (p_type, v0, v1, v2, v3, v4, v5) VALUES ($1, $2, $3, $4, $5, $6, $7) - `, repository.tableName), + `, repository.dbSchema, repository.tableName), casbinRule.PType, casbinRule.V0, casbinRule.V1, @@ -87,11 +89,11 @@ casbinRule.V5, ) if err != nil { - tx.Rollback() + _ = tx.Rollback() return err } if err = tx.Commit(); err != nil { - tx.Rollback() + _ = tx.Rollback() return err } return nil @@ -106,10 +108,10 @@ var queryBuilder strings.Builder args := make([]interface{}, 0) queryBuilder.WriteString(fmt.Sprintf(` - DELETE FROM %s + DELETE FROM "%s"."%s" WHERE p_type = $1 - `, repository.tableName)) + `, repository.dbSchema, repository.tableName)) args = append(args, casbinRule.PType) if casbinRule.V0 != "" { @@ -142,11 +144,11 @@ args..., ) if err != nil { - tx.Rollback() + _ = tx.Rollback() return err } if err = tx.Commit(); err != nil { - tx.Rollback() + _ = tx.Rollback() return err } return nil @@ -159,10 +161,10 @@ return err } _, err = tx.Exec(fmt.Sprintf(` - TRUNCATE TABLE %s - `, repository.tableName)) + TRUNCATE TABLE "%s"."%s" + `, repository.dbSchema, repository.tableName)) if err != nil { - tx.Rollback() + _ = tx.Rollback() return err } @@ -183,19 +185,20 @@ _, err = tx.Exec( fmt.Sprintf( ` - INSERT INTO %s (p_type, v0, v1, v2, v3, v4, v5) + INSERT INTO "%s".%s (p_type, v0, v1, v2, v3, v4, v5) VALUES %s `, + repository.dbSchema, repository.tableName, strings.Join(values, ",")), ) if err != nil { - tx.Rollback() + _ = tx.Rollback() return err } if err = tx.Commit(); err != nil { - tx.Rollback() + _ = tx.Rollback() return err } return nil