Compare commits
120 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 002ae561cb | |||
|
3c7787a0eb
|
|||
|
521df4ec4c
|
|||
| e347883c05 | |||
| 078d6fee28 | |||
| 79bd756ddd | |||
| ae9e79eec5 | |||
| cef1c9d166 | |||
| 3d4341dbb3 | |||
| 968ee335dd | |||
| 6b1ada6155 | |||
| c4c70ab5f3 | |||
| d68ed4e55b | |||
| 1e66b292fa | |||
| 81f19bafd9 | |||
|
b3f4330aa4
|
|||
| f876c2a964 | |||
| 01006d5713 | |||
| 62ee90cb93 | |||
| 54e8bbc9a3 | |||
| d8fb015d1f | |||
| 3c53f6d19e | |||
| cce56c2fd4 | |||
| 8088b2e9c0 | |||
| f1ebe5f920 | |||
| e474981df4 | |||
| 3519a15cfd | |||
| ede05d8335 | |||
| 2e151d003f | |||
| 2347345cc9 | |||
| 7543e07add | |||
| 1823219b05 | |||
| 43b988801b | |||
| 1c3e889a6e | |||
| 72d27535f5 | |||
| 950470c49a | |||
| 71d8e85610 | |||
| da4ad80ab5 | |||
| f030c9ec07 | |||
| d72e3c3422 | |||
| afa66d0a6d | |||
| d64fabb1a4 | |||
| 529069439c | |||
| cf05e91286 | |||
| fd2c013368 | |||
| a9123af4ff | |||
| 8d9920c108 | |||
| 50a4930038 | |||
| 7c2d1e75b2 | |||
| 9a3a3c9de7 | |||
| fd862c499b | |||
| e02b3c92f3 | |||
| 49af247019 | |||
| 46e1bd284c | |||
| 16e5ad4f23 | |||
| f5c18e4515 | |||
| e3c79092c2 | |||
| 7815c85c92 | |||
| de664d7a05 | |||
| 67963fcdc1 | |||
| d3a504ca68 | |||
| 233197999f | |||
| 1ea2469c77 | |||
| 775553c2d5 | |||
| 4203f4474f | |||
| cc7de2e5a1 | |||
| f14aec80d9 | |||
| cbd358ba85 | |||
| df845a7b4b | |||
| d8f6785032 | |||
| ff779d9456 | |||
| eba7784e59 | |||
| d022eb8ebd | |||
| 9c802b1239 | |||
| 2e3bd451df | |||
| 0608960a02 | |||
| bbbfb99dd9 | |||
| eef42d4b32 | |||
| d1a9414390 | |||
| dee3bb5d60 | |||
| dcbdef35cf | |||
| 1794fcd2ad | |||
| abfeb751b2 | |||
| 51f0aaf0ca | |||
| 8604a3568a | |||
| fee49889cf | |||
| 7e70411553 | |||
| 610edd6576 | |||
| 2f232e6850 | |||
| be4409a745 | |||
| 83b513ebf8 | |||
| 51e8d43795 | |||
| e816866e75 | |||
| ad1bf3cbfa | |||
| f4e3891f62 | |||
| cf73d6c399 | |||
| 74e81114de | |||
| 2299434912 | |||
| 3c6ab4bfde | |||
| a305db2206 | |||
| 6e8b78c6e2 | |||
| 4578694015 | |||
| dbc4412b9b | |||
| f151464330 | |||
| bcfa15e4a2 | |||
| 41c7e4a3ef | |||
| 5cdd3bd244 | |||
| 398d267ee5 | |||
| 26f8e762c7 | |||
| e395518de2 | |||
| 60795d413d | |||
| a2164c4beb | |||
| 90e028b173 | |||
| 6ce176b927 | |||
| 48a063eba2 | |||
| 5634c26039 | |||
| 429f45935a | |||
| 3c36225665 | |||
| f6417140cb | |||
| fb0273fe3c |
+36
-29
@@ -1,41 +1,48 @@
|
||||
variables:
|
||||
GOCACHE: "${CI_PROJECT_DIR}/_go/cache"
|
||||
include:
|
||||
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
|
||||
- project: unboundsoftware/ci-templates
|
||||
file: Release.gitlab-ci.yml
|
||||
|
||||
before_script:
|
||||
- mkdir -p ${CI_PROJECT_DIR}/_go/{pkg,bin,cache}
|
||||
- rm -rf /go/pkg || true
|
||||
- mkdir -p /go
|
||||
- ln -s ${CI_PROJECT_DIR}/_go/pkg /go/pkg
|
||||
- ln -s ${CI_PROJECT_DIR}/_go/bin /go/bin
|
||||
|
||||
cache:
|
||||
key: "$CI_COMMIT_REF_NAME"
|
||||
paths:
|
||||
- _go
|
||||
untracked: true
|
||||
image: golang:1.23.2
|
||||
|
||||
stages:
|
||||
- deps
|
||||
- test
|
||||
- deps
|
||||
- test
|
||||
|
||||
run-pre-commit:
|
||||
stage: .pre
|
||||
image: unbound/pre-commit
|
||||
variables:
|
||||
PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
|
||||
cache:
|
||||
- key:
|
||||
files:
|
||||
- .pre-commit-config.yaml
|
||||
paths:
|
||||
- ${PRE_COMMIT_HOME}
|
||||
script:
|
||||
- pre-commit run --all-files
|
||||
|
||||
deps:
|
||||
stage: deps
|
||||
image: golang:1.14
|
||||
script:
|
||||
- go mod download
|
||||
- go mod download
|
||||
|
||||
test:
|
||||
stage: test
|
||||
dependencies:
|
||||
- deps
|
||||
image: golang:1.14
|
||||
- deps
|
||||
script:
|
||||
- go fmt $(go list ./...)
|
||||
- go vet $(go list ./...)
|
||||
- unset "${!CI@}"
|
||||
- CGO_ENABLED=1 go test -p 1 -mod=readonly -race -coverprofile=.testCoverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
|
||||
- go tool cover -html=.testCoverage.txt -o coverage.html
|
||||
- go tool cover -func=.testCoverage.txt
|
||||
artifacts:
|
||||
paths:
|
||||
- coverage.html
|
||||
- CGO_ENABLED=1 go test -mod=readonly -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
|
||||
- go tool cover -html=coverage.txt -o coverage.html
|
||||
- go tool cover -func=coverage.txt
|
||||
- curl -Os https://uploader.codecov.io/latest/linux/codecov
|
||||
- chmod +x codecov
|
||||
- ./codecov -t ${CODECOV_TOKEN} -R $CI_PROJECT_DIR -C $CI_COMMIT_SHA -r $CI_PROJECT_PATH
|
||||
|
||||
vulnerabilities:
|
||||
stage: test
|
||||
image: golang:1.23.2
|
||||
script:
|
||||
- go install golang.org/x/vuln/cmd/govulncheck@latest
|
||||
- govulncheck ./...
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
run:
|
||||
allow-parallel-runners: true
|
||||
@@ -0,0 +1,46 @@
|
||||
# See https://pre-commit.com for more information
|
||||
# See https://pre-commit.com/hooks.html for more hooks
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.6.0
|
||||
hooks:
|
||||
- id: trailing-whitespace
|
||||
- id: end-of-file-fixer
|
||||
- id: check-yaml
|
||||
args:
|
||||
- --allow-multiple-documents
|
||||
- id: check-added-large-files
|
||||
- repo: https://gitlab.com/devopshq/gitlab-ci-linter
|
||||
rev: v1.0.6
|
||||
hooks:
|
||||
- id: gitlab-ci-linter
|
||||
args:
|
||||
- --project
|
||||
- unboundsoftware/shiny/authz_client
|
||||
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
|
||||
rev: v9.18.0
|
||||
hooks:
|
||||
- id: commitlint
|
||||
stages: [ commit-msg ]
|
||||
additional_dependencies: [ '@commitlint/config-conventional' ]
|
||||
- repo: https://github.com/dnephin/pre-commit-golang
|
||||
rev: v0.5.1
|
||||
hooks:
|
||||
- id: go-mod-tidy
|
||||
- id: go-imports
|
||||
args:
|
||||
- -local
|
||||
- gitlab.com/unboundsoftware/shiny/authz_client
|
||||
- repo: https://github.com/lietu/go-pre-commit
|
||||
rev: v0.1.0
|
||||
hooks:
|
||||
- id: go-test
|
||||
- id: gofumpt
|
||||
- repo: https://github.com/golangci/golangci-lint
|
||||
rev: v1.61.0
|
||||
hooks:
|
||||
- id: golangci-lint-full
|
||||
- repo: https://github.com/gitleaks/gitleaks
|
||||
rev: v8.20.0
|
||||
hooks:
|
||||
- id: gitleaks
|
||||
+171
@@ -0,0 +1,171 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [0.1.4] - 2024-10-05
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- *(deps)* Update module github.com/stretchr/testify to v1.9.0
|
||||
- *(deps)* Update module github.com/sparetimecoders/goamqp to v0.3.1
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Update to Go 1.21.6
|
||||
- Update to Go 1.22.0
|
||||
- Add gitleaks to pre-commit setup
|
||||
- Update golangci-lint to use full version
|
||||
- Add release flow
|
||||
- Remove old release job
|
||||
|
||||
### Build
|
||||
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.2.1 to 0.3.0
|
||||
|
||||
## [0.1.3] - 2023-12-26
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Prohibit concurrent read/write
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Update Go version
|
||||
- Make releases handle multi-line release notes
|
||||
- Update to Go 1.20.7
|
||||
- Update pre-commit versions
|
||||
- Update to Golang 1.21.0
|
||||
- Update to Go 1.21.1 for vulnerabilities
|
||||
- Use 1.21.1 in go.mod for Dependabot
|
||||
- Update to go 1.21.3 and remove patch level
|
||||
- Update version of Go
|
||||
|
||||
### Build
|
||||
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.1.4 to 0.1.5
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.1.5 to 0.2.0
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.2.0 to 0.2.1
|
||||
|
||||
## [0.1.2] - 2023-06-04
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Update pre-commit and fix golangci-lint
|
||||
- Update golangci-lint
|
||||
|
||||
### Build
|
||||
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.8.2 to 1.8.3
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.8.3 to 1.8.4
|
||||
|
||||
## [0.1.1] - 2023-05-11
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Run builds with Go 1.19.2 to fix vulnerabilities
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Add vulnerability-check
|
||||
- Replace deprecated ioutil.ReadAll
|
||||
- Add pre-commit and remove those checks from test step
|
||||
- Add local module to pre-commit config
|
||||
- Add release handling
|
||||
- Update to Go 1.19.5
|
||||
- Change dependabot rebase strategy
|
||||
- Update to golang 1.20.1
|
||||
- Update Go verion for vulnerabilities scan
|
||||
- Update to Go 1.20.3
|
||||
- Update Go version and fix gitlabci lint
|
||||
|
||||
### Build
|
||||
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.8.0 to 1.8.1
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.1.1 to 0.1.2
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.1.2 to 0.1.3
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.8.1 to 1.8.2
|
||||
- *(deps)* Bump github.com/sparetimecoders/goamqp from 0.1.3 to 0.1.4
|
||||
|
||||
## [0.1.0] - 2022-07-20
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Pipeline
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Add dependabot config
|
||||
- Remove dependabot-standalone
|
||||
- Change to codecov binary instead of bash uploader
|
||||
- Switch to moved goamqp
|
||||
|
||||
### Build
|
||||
|
||||
- Add params to codecov
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.7.0 to 1.7.1
|
||||
- *(deps)* Bump gitlab.com/sparetimecoders/goamqp from 0.4.0 to 0.5.0
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.7.1 to 1.7.2
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.7.2 to 1.7.4
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.7.4 to 1.7.5
|
||||
- *(deps)* Bump github.com/stretchr/testify from 1.7.5 to 1.8.0
|
||||
|
||||
## [0.0.8] - 2021-05-15
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Add codecov upload
|
||||
- Simplify pipeline
|
||||
- Change coverage badge to codecov.io
|
||||
- Add CI workflows
|
||||
- Rename master -> main
|
||||
- Group imports
|
||||
- Update to latest version of goamqp
|
||||
|
||||
## [0.0.7] - 2020-04-12
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Update to Go 1.14 to fix test errors
|
||||
- Use go mod download
|
||||
- Sort companies before comparing since map-iteration is not stable
|
||||
|
||||
## [0.0.6] - 2020-04-12
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Path to repo
|
||||
|
||||
### ⚙️ Miscellaneous Tasks
|
||||
|
||||
- Add tests
|
||||
- Modify event structure
|
||||
|
||||
## [0.0.5] - 2019-12-31
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- Add handling of removed privilege
|
||||
|
||||
## [0.0.4] - 2019-12-08
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- Add name and registration number to event
|
||||
|
||||
## [0.0.3] - 2019-11-22
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Print unexpected messages
|
||||
|
||||
## [0.0.2] - 2019-11-06
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- Initial version
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
|
||||
- Rename module
|
||||
|
||||
<!-- generated by git-cliff -->
|
||||
@@ -1,3 +1,4 @@
|
||||
# Shiny authz-client
|
||||
|
||||
[](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/master)[](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/master)
|
||||
[](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/main)
|
||||
[](https://codecov.io/gl/unboundsoftware:shiny/authz_client)
|
||||
|
||||
@@ -3,9 +3,12 @@ package client
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"io"
|
||||
"net/http"
|
||||
"reflect"
|
||||
"sync"
|
||||
|
||||
"github.com/sparetimecoders/goamqp"
|
||||
)
|
||||
|
||||
// CompanyPrivileges contains the privileges for a combination of email address and company id
|
||||
@@ -21,6 +24,7 @@ type CompanyPrivileges struct {
|
||||
|
||||
// PrivilegeHandler processes PrivilegeAdded-events and fetches the initial set of privileges from an authz-service
|
||||
type PrivilegeHandler struct {
|
||||
*sync.RWMutex
|
||||
client *http.Client
|
||||
baseURL string
|
||||
privileges map[string]map[string]*CompanyPrivileges
|
||||
@@ -39,6 +43,7 @@ func WithBaseURL(url string) OptsFunc {
|
||||
// New creates a new PrivilegeHandler. Pass OptsFuncs to configure.
|
||||
func New(opts ...OptsFunc) *PrivilegeHandler {
|
||||
handler := &PrivilegeHandler{
|
||||
RWMutex: &sync.RWMutex{},
|
||||
client: &http.Client{},
|
||||
baseURL: "http://authz-service",
|
||||
privileges: map[string]map[string]*CompanyPrivileges{},
|
||||
@@ -56,11 +61,13 @@ func (h *PrivilegeHandler) Fetch() error {
|
||||
return err
|
||||
}
|
||||
|
||||
buff, err := ioutil.ReadAll(resp.Body)
|
||||
buff, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
h.RLock()
|
||||
defer h.RUnlock()
|
||||
err = json.Unmarshal(buff, &h.privileges)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -69,31 +76,39 @@ func (h *PrivilegeHandler) Fetch() error {
|
||||
}
|
||||
|
||||
// Process privilege-related events and update the internal state
|
||||
func (h *PrivilegeHandler) Process(msg interface{}) bool {
|
||||
func (h *PrivilegeHandler) Process(msg interface{}, _ goamqp.Headers) (interface{}, error) {
|
||||
switch ev := msg.(type) {
|
||||
case *UserAdded:
|
||||
if priv, exists := h.privileges[ev.Email]; exists {
|
||||
priv[ev.CompanyID] = &CompanyPrivileges{}
|
||||
} else {
|
||||
h.Lock()
|
||||
defer h.Unlock()
|
||||
h.privileges[ev.Email] = map[string]*CompanyPrivileges{
|
||||
ev.CompanyID: {},
|
||||
}
|
||||
}
|
||||
return true
|
||||
return nil, nil
|
||||
case *UserRemoved:
|
||||
if priv, exists := h.privileges[ev.Email]; exists {
|
||||
h.Lock()
|
||||
defer h.Unlock()
|
||||
delete(priv, ev.CompanyID)
|
||||
}
|
||||
return true
|
||||
return nil, nil
|
||||
case *PrivilegeAdded:
|
||||
h.Lock()
|
||||
defer h.Unlock()
|
||||
h.setPrivileges(ev.Email, ev.CompanyID, ev.Privilege, true)
|
||||
return true
|
||||
return nil, nil
|
||||
case *PrivilegeRemoved:
|
||||
h.Lock()
|
||||
defer h.Unlock()
|
||||
h.setPrivileges(ev.Email, ev.CompanyID, ev.Privilege, false)
|
||||
return true
|
||||
return nil, nil
|
||||
default:
|
||||
fmt.Printf("Got unexpected message type (%s): '%+v'\n", reflect.TypeOf(msg).String(), msg)
|
||||
return false
|
||||
return nil, fmt.Errorf("unexpected event type: '%s'", reflect.TypeOf(msg))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,6 +143,8 @@ func (h *PrivilegeHandler) setPrivileges(email, companyId string, privilege Priv
|
||||
|
||||
// CompaniesByUser return a slice of company ids matching the provided email and predicate func
|
||||
func (h *PrivilegeHandler) CompaniesByUser(email string, predicate func(privileges CompanyPrivileges) bool) []string {
|
||||
h.RLock()
|
||||
defer h.RUnlock()
|
||||
var result []string
|
||||
if p, exists := h.privileges[email]; exists {
|
||||
for k, v := range p {
|
||||
@@ -141,6 +158,8 @@ func (h *PrivilegeHandler) CompaniesByUser(email string, predicate func(privileg
|
||||
|
||||
// IsAllowed return true if the provided predicate return true for the privileges matching the provided email and companyID, return false otherwise
|
||||
func (h *PrivilegeHandler) IsAllowed(email, companyID string, predicate func(privileges CompanyPrivileges) bool) bool {
|
||||
h.RLock()
|
||||
defer h.RUnlock()
|
||||
if p, exists := h.privileges[email]; exists {
|
||||
if v, exists := p[companyID]; exists {
|
||||
return predicate(*v)
|
||||
|
||||
+54
-41
@@ -2,30 +2,34 @@ package client
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"sort"
|
||||
"testing"
|
||||
|
||||
"github.com/sparetimecoders/goamqp"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestPrivilegeHandler_Process_InvalidType(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process("abc")
|
||||
result, err := handler.Process("abc", goamqp.Headers{})
|
||||
|
||||
assert.False(t, result)
|
||||
assert.Nil(t, result)
|
||||
assert.EqualError(t, err, "unexpected event type: 'string'")
|
||||
}
|
||||
|
||||
func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process(&PrivilegeAdded{
|
||||
result, err := handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeAdmin,
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Admin
|
||||
@@ -33,12 +37,13 @@ func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
|
||||
|
||||
assert.Equal(t, []string{"abc-123"}, companies)
|
||||
|
||||
result = handler.Process(&PrivilegeRemoved{
|
||||
result, err = handler.Process(&PrivilegeRemoved{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeAdmin,
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Admin
|
||||
@@ -50,17 +55,19 @@ func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
|
||||
func TestPrivilegeHandler_Process_UserAdded_And_UserRemoved(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process(&UserAdded{
|
||||
result, err := handler.Process(&UserAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
result = handler.Process(&UserAdded{
|
||||
result, err = handler.Process(&UserAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-456",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return true
|
||||
@@ -68,17 +75,19 @@ func TestPrivilegeHandler_Process_UserAdded_And_UserRemoved(t *testing.T) {
|
||||
sort.Strings(companies)
|
||||
assert.Equal(t, []string{"abc-123", "abc-456"}, companies)
|
||||
|
||||
result = handler.Process(&UserRemoved{
|
||||
result, err = handler.Process(&UserRemoved{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
result = handler.Process(&UserRemoved{
|
||||
result, err = handler.Process(&UserRemoved{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-456",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return true
|
||||
@@ -99,11 +108,12 @@ func TestPrivilegeHandler_GetCompanies_Email_Not_Found(t *testing.T) {
|
||||
func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process(&UserAdded{
|
||||
result, err := handler.Process(&UserAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Admin
|
||||
@@ -117,11 +127,12 @@ func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
|
||||
|
||||
assert.Equal(t, []string{"abc-123"}, companies)
|
||||
|
||||
result = handler.Process(&UserRemoved{
|
||||
result, err = handler.Process(&UserRemoved{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return true
|
||||
@@ -132,12 +143,13 @@ func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
|
||||
func TestPrivilegeHandler_GetCompanies_Company_With_Company_Access_Found(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process(&PrivilegeAdded{
|
||||
result, err := handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeCompany,
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Company
|
||||
@@ -149,12 +161,13 @@ func TestPrivilegeHandler_GetCompanies_Company_With_Company_Access_Found(t *test
|
||||
func TestPrivilegeHandler_GetCompanies_Company_With_Admin_Access_Found(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
result := handler.Process(&PrivilegeAdded{
|
||||
result, err := handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeConsumer,
|
||||
})
|
||||
assert.True(t, result)
|
||||
}, goamqp.Headers{})
|
||||
assert.Nil(t, result)
|
||||
assert.NoError(t, err)
|
||||
|
||||
companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Consumer
|
||||
@@ -176,11 +189,11 @@ func TestPrivilegeHandler_IsAllowed_Return_False_If_No_Privileges(t *testing.T)
|
||||
func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T) {
|
||||
handler := New(WithBaseURL("base"))
|
||||
|
||||
handler.Process(&PrivilegeAdded{
|
||||
_, _ = handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeTime,
|
||||
})
|
||||
}, goamqp.Headers{})
|
||||
|
||||
result := handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Time
|
||||
@@ -188,11 +201,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
|
||||
|
||||
assert.True(t, result)
|
||||
|
||||
handler.Process(&PrivilegeAdded{
|
||||
_, _ = handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeInvoicing,
|
||||
})
|
||||
}, goamqp.Headers{})
|
||||
|
||||
result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Invoicing
|
||||
@@ -200,11 +213,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
|
||||
|
||||
assert.True(t, result)
|
||||
|
||||
handler.Process(&PrivilegeAdded{
|
||||
_, _ = handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeAccounting,
|
||||
})
|
||||
}, goamqp.Headers{})
|
||||
|
||||
result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Accounting
|
||||
@@ -212,11 +225,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
|
||||
|
||||
assert.True(t, result)
|
||||
|
||||
handler.Process(&PrivilegeAdded{
|
||||
_, _ = handler.Process(&PrivilegeAdded{
|
||||
Email: "jim@example.org",
|
||||
CompanyID: "abc-123",
|
||||
Privilege: PrivilegeSupplier,
|
||||
})
|
||||
}, goamqp.Headers{})
|
||||
|
||||
result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
|
||||
return privileges.Supplier
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
module gitlab.com/unboundsoftware/shiny/authz_client
|
||||
|
||||
go 1.13
|
||||
go 1.21
|
||||
|
||||
require github.com/stretchr/testify v1.4.0
|
||||
require (
|
||||
github.com/sparetimecoders/goamqp v0.3.1
|
||||
github.com/stretchr/testify v1.9.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/rabbitmq/amqp091-go v1.10.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
@@ -1,11 +1,20 @@
|
||||
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=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
|
||||
github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
|
||||
github.com/sparetimecoders/goamqp v0.3.1 h1:NCzdyAz84G679HlO+ivhyoI1aMgXEe3qfqpn4EChu1s=
|
||||
github.com/sparetimecoders/goamqp v0.3.1/go.mod h1:PjkgrmsuMVgRbiQDTLs0pCWYrcQgqcUee38JjCDZdlk=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user