Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various OAuth fixes #1187

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Various OAuth fixes #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0028df2
Various OAuth fixes
alesstimec Apr 4, 2024
760c382
Merge branch 'feature-oidc' into oauth-various-fixes-01
alesstimec Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/jaas/cmd/addserviceaccount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type addServiceAccountSuite struct {
var _ = gc.Suite(&addServiceAccountSuite{})

func (s *addServiceAccountSuite) TestAddServiceAccount(c *gc.C) {
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af"
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com"
// alice is superuser
bClient := jimmtest.NewUserSessionLogin(c, "alice")
_, err := cmdtesting.RunCommand(c, cmd.NewAddServiceAccountCommandForTesting(s.ClientStore(), bClient), clientID)
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaas/cmd/grant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var _ = gc.Suite(&grantSuite{})
func (s *grantSuite) TestGrant(c *gc.C) {
ctx := context.Background()

clientID := "abda51b2-d735-4794-a8bd-49c506baa4af"
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com"

// alice is superuser
bClient := jimmtest.NewUserSessionLogin(c, "alice")
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaas/cmd/listserviceaccountcredentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (s *listServiceAccountCredentialsSuite) TestListServiceAccountCredentials(c
})
c.Assert(err, gc.IsNil)
// Create Alice Identity and Service Account Identity.
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af"
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com"
// alice is superuser
ctx := context.Background()
user := dbmodel.Identity{Name: "alice@canonical.com"}
Expand Down
18 changes: 9 additions & 9 deletions cmd/jaas/cmd/updatecredentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var _ = gc.Suite(&updateCredentialsSuite{})
func (s *updateCredentialsSuite) TestUpdateCredentialsWithNewCredentials(c *gc.C) {
ctx := context.Background()

clientID := "abda51b2-d735-4794-a8bd-49c506baa4af"
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com"

// alice is superuser
bClient := jimmtest.NewUserSessionLogin(c, "alice")
Expand Down Expand Up @@ -69,7 +69,7 @@ func (s *updateCredentialsSuite) TestUpdateCredentialsWithNewCredentials(c *gc.C
cmdContext, err := cmdtesting.RunCommand(c, cmd.NewUpdateCredentialsCommandForTesting(clientStore, bClient), clientID, "test-cloud", "test-credentials")
c.Assert(err, gc.IsNil)
c.Assert(cmdtesting.Stdout(cmdContext), gc.Equals, `results:
- credentialtag: cloudcred-test-cloud_abda51b2-d735-4794-a8bd-49c506baa4af_test-credentials
- credentialtag: cloudcred-test-cloud_abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com_test-credentials
error: null
models: []
`)
Expand All @@ -89,7 +89,7 @@ func (s *updateCredentialsSuite) TestUpdateCredentialsWithNewCredentials(c *gc.C
func (s *updateCredentialsSuite) TestUpdateCredentialsWithExistingCredentials(c *gc.C) {
ctx := context.Background()

clientID := "abda51b2-d735-4794-a8bd-49c506baa4af"
clientID := "abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com"

// alice is superuser
bClient := jimmtest.NewUserSessionLogin(c, "alice")
Expand Down Expand Up @@ -139,7 +139,7 @@ func (s *updateCredentialsSuite) TestUpdateCredentialsWithExistingCredentials(c
cmdContext, err := cmdtesting.RunCommand(c, cmd.NewUpdateCredentialsCommandForTesting(clientStore, bClient), clientID, "test-cloud", "test-credentials")
c.Assert(err, gc.IsNil)
c.Assert(cmdtesting.Stdout(cmdContext), gc.Equals, `results:
- credentialtag: cloudcred-test-cloud_abda51b2-d735-4794-a8bd-49c506baa4af_test-credentials
- credentialtag: cloudcred-test-cloud_abda51b2-d735-4794-a8bd-49c506baa4af@canonical.com_test-credentials
error: null
models: []
`)
Expand All @@ -159,7 +159,7 @@ func (s *updateCredentialsSuite) TestUpdateCredentialsWithExistingCredentials(c
func (s *updateCredentialsSuite) TestCloudNotInLocalStore(c *gc.C) {
bClient := jimmtest.NewUserSessionLogin(c, "alice")
_, err := cmdtesting.RunCommand(c, cmd.NewUpdateCredentialsCommandForTesting(s.ClientStore(), bClient),
"00000000-0000-0000-0000-000000000000",
"00000000-0000-0000-0000-000000000000@canonical.com",
"non-existing-cloud",
"foo",
)
Expand All @@ -178,7 +178,7 @@ func (s *updateCredentialsSuite) TestCredentialNotInLocalStore(c *gc.C) {
c.Assert(err, gc.IsNil)

_, err = cmdtesting.RunCommand(c, cmd.NewUpdateCredentialsCommandForTesting(clientStore, bClient),
"00000000-0000-0000-0000-000000000000",
"00000000-0000-0000-0000-000000000000@canonical.com",
"some-cloud",
"non-existing-credential-name",
)
Expand All @@ -196,15 +196,15 @@ func (s *updateCredentialsSuite) TestMissingArgs(c *gc.C) {
expectedError: "client ID not specified",
}, {
name: "missing cloud",
args: []string{"some-client-id"},
args: []string{"some-client-id@canonical.com"},
expectedError: "cloud not specified",
}, {
name: "missing credential name",
args: []string{"some-client-id", "some-cloud"},
args: []string{"some-client-id@canonical.com", "some-cloud"},
expectedError: "credential name not specified",
}, {
name: "too many args",
args: []string{"some-client-id", "some-cloud", "some-credential-name", "extra-arg"},
args: []string{"some-client-id@canonical.com", "some-cloud", "some-credential-name", "extra-arg"},
expectedError: "too many args",
}}

Expand Down
9 changes: 7 additions & 2 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ services:
interval: 10s
timeout: 5s
retries: 3

labels:
traefik.enable: true
traefik.http.routers.traefik.rule: Host(`127.0.0.1`)
traefik.http.routers.traefik.entrypoints: websecure
traefik.http.routers.traefik.tls: true

jimm:
image: cosmtrek/air:latest
profiles: ["dev"]
Expand All @@ -46,7 +51,7 @@ services:
JIMM_DSN: "postgresql://jimm:jimm@db/jimm"
# Not needed for local test (yet).
# BAKERY_AGENT_FILE: ""
JIMM_ADMINS: "jimm@candid.localhost"
JIMM_ADMINS: "jimm-test@canonical.com"
# Note: You can comment out the Vault ENV vars below and instead use INSECURE_SECRET_STORAGE to place secrets in Postgres.
VAULT_ADDR: "http://vault:8200"
VAULT_PATH: "/jimm-kv/"
Expand Down
17 changes: 8 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,15 @@ require (
github.com/dustinkirkland/golang-petname v0.0.0-20231002161417-6a283f1aaaf2
github.com/go-chi/chi/v5 v5.0.8
github.com/go-chi/render v1.0.2
github.com/gorilla/sessions v1.2.1
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/itchyny/gojq v0.12.12
github.com/juju/charm/v12 v12.0.0
github.com/juju/names/v5 v5.0.0
github.com/lestrrat-go/iter v1.0.2
github.com/lestrrat-go/jwx/v2 v2.0.19
github.com/lestrrat-go/jwx/v2 v2.0.21
github.com/oklog/ulid/v2 v2.1.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
golang.org/x/oauth2 v0.15.0
gopkg.in/errgo.v1 v1.0.1
gopkg.in/httprequest.v1 v1.2.1
Expand Down Expand Up @@ -121,7 +122,7 @@ require (
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.5.1 // indirect
github.com/go-goose/goose/v5 v5.0.0-20230421180421-abaee9096e3a // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
Expand All @@ -143,7 +144,6 @@ require (
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/schema v1.2.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/sessions v1.2.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down Expand Up @@ -212,7 +212,7 @@ require (
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.4 // indirect
github.com/lestrrat-go/httprc v1.0.5 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lestrrat/go-jspointer v0.0.0-20160229021354-f4881e611bdb // indirect
github.com/lestrrat/go-jsref v0.0.0-20160601013240-e452c7b5801d // indirect
Expand Down Expand Up @@ -251,7 +251,6 @@ require (
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oauth2-proxy/mockoidc v0.0.0-20240214162133-caebfff84d25 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.55.0 // indirect
github.com/packethost/packngo v0.28.1 // indirect
Expand Down Expand Up @@ -296,10 +295,10 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.154.0 // indirect
Expand Down
Loading
Loading