grim/hgkeeper

Update to casbin v2

2019-09-12, Gary Kramlich
b6e0150db76d
Parents e2f2ff46f491
Children c27ecd0c7904
Update to casbin v2
4 files changed, 26 insertions(+), 6 deletions(-)
  • +16 -1
    access/access.go
  • +7 -2
    access/enforcer.go
  • +1 -1
    go.mod
  • +2 -2
    go.sum
    • --- a/access/access.go Thu Sep 12 05:55:03 2019 -0500
    +++ b/access/access.go Thu Sep 12 22:45:58 2019 -0500
    @@ -3,6 +3,8 @@
    import (
    "path/filepath"
    "sync"
    +
    + log "github.com/sirupsen/logrus"
    )
    const (
    @@ -51,7 +53,20 @@
    }
    func check(user, repo, action string) bool {
    - return enforcer.Enforce(user, repo, action)
    + r, err := enforcer.Enforce(user, repo, action)
    + if err != nil {
    + log.Errorf(
    + "failed to authenticate (%q, %q, %q): %v",
    + user,
    + repo,
    + action,
    + err,
    + )
    +
    + return false
    + }
    +
    + return r
    }
    func CanRead(user, repo string) bool {
    --- a/access/enforcer.go Thu Sep 12 05:55:03 2019 -0500
    +++ b/access/enforcer.go Thu Sep 12 22:45:58 2019 -0500
    @@ -4,7 +4,7 @@
    "path/filepath"
    "sync"
    - "github.com/casbin/casbin"
    + "github.com/casbin/casbin/v2"
    log "github.com/sirupsen/logrus"
    )
    @@ -23,7 +23,12 @@
    log.Debugf("reading model from %q", modelFile)
    log.Debugf("reading policy from %q", policyFile)
    - e := casbin.NewEnforcer(modelFile, policyFile)
    + e, err := casbin.NewEnforcer(modelFile, policyFile)
    + if err != nil {
    + log.Errorf("failed to create new enforcer: %v", err)
    +
    + return err
    + }
    enforcer = e
    --- a/go.mod Thu Sep 12 05:55:03 2019 -0500
    +++ b/go.mod Thu Sep 12 22:45:58 2019 -0500
    @@ -2,7 +2,7 @@
    require (
    github.com/alecthomas/kong v0.1.16
    - github.com/casbin/casbin v1.9.1
    + github.com/casbin/casbin/v2 v2.0.2
    github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
    github.com/sirupsen/logrus v1.4.1
    github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
    --- a/go.sum Thu Sep 12 05:55:03 2019 -0500
    +++ b/go.sum Thu Sep 12 22:45:58 2019 -0500
    @@ -2,8 +2,8 @@
    github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
    github.com/alecthomas/kong v0.1.16 h1:BheBKuvr6FE1unlZVdqkdZo/D/eDu90rrVIlpPbOdgw=
    github.com/alecthomas/kong v0.1.16/go.mod h1:0m2VYms8rH0qbCqVB2gvGHk74bqLIq0HXjCs5bNbNQU=
    -github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM=
    -github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
    +github.com/casbin/casbin/v2 v2.0.2 h1:TDRkBDCnsh3yWrdVHnIh8TL0I50u5kW3eRHBrw2ctME=
    +github.com/casbin/casbin/v2 v2.0.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
    github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
    github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
    github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=