diff --git a/ocis-pkg/go.sum b/ocis-pkg/go.sum index ae74cba753..31343b072c 100644 --- a/ocis-pkg/go.sum +++ b/ocis-pkg/go.sum @@ -678,6 +678,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= +github.com/gomodule/redigo v1.8.4 h1:Z5JUg94HMTR1XpwBaSH4vq3+PNSIykBLxMdglbw10gg= github.com/gomodule/redigo v1.8.4/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= @@ -1819,6 +1820,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b h1:lAZ0/chPUDWwjqosYR0X4M490zQhMsiJ4K3DbA7o+3g= golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= diff --git a/ocis-pkg/indexer/test/data.go b/ocis-pkg/indexer/test/data.go index d36552f651..85534dab8a 100644 --- a/ocis-pkg/indexer/test/data.go +++ b/ocis-pkg/indexer/test/data.go @@ -83,7 +83,7 @@ func writeData(m map[string][]interface{}, privateKey string, rootDir string) er for dirName := range m { fileTypePath := path.Join(rootDir, dirName) - if err := os.MkdirAll(fileTypePath, 0777); err != nil { + if err := os.MkdirAll(fileTypePath, 0755); err != nil { return err } for _, u := range m[dirName] { @@ -93,7 +93,7 @@ func writeData(m map[string][]interface{}, privateKey string, rootDir string) er } pkVal := ValueOf(u, privateKey) - if err := ioutil.WriteFile(path.Join(fileTypePath, pkVal), data, 0777); err != nil { + if err := ioutil.WriteFile(path.Join(fileTypePath, pkVal), data, 0600); err != nil { return err } } diff --git a/ocis-pkg/middleware/openidconnect.go b/ocis-pkg/middleware/openidconnect.go index 20998d5ad5..c983c2fed8 100644 --- a/ocis-pkg/middleware/openidconnect.go +++ b/ocis-pkg/middleware/openidconnect.go @@ -52,7 +52,7 @@ func OpenIDConnect(opts ...ocisoidc.Option) func(http.Handler) http.Handler { tr := &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: opt.Insecure, + InsecureSkipVerify: opt.Insecure, //nolint:gosec }, } customHTTPClient := &http.Client{ diff --git a/ocis-pkg/sync/cache.go b/ocis-pkg/sync/cache.go index 694b228231..0ffddf56b7 100644 --- a/ocis-pkg/sync/cache.go +++ b/ocis-pkg/sync/cache.go @@ -49,7 +49,7 @@ func (c *Cache) Store(key string, val interface{}, expiration time.Time) { c.evict() } - poolEntry := c.pool.Get() + poolEntry := c.pool.Get() //nolint: ifshort if mapEntry, loaded := c.entries.LoadOrStore(key, poolEntry); loaded { entry := mapEntry.(*CacheEntry) entry.V = val