From 59de4af68131a9810fcc5c5c948ca75eb3e399ec Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Wed, 13 Apr 2022 09:58:09 -0400 Subject: [PATCH 1/2] adds ids to identity authenticator detail --- .../internal/routes/identity_api_model.go | 2 ++ rest_client_api_server/embedded_spec.go | 18 ++++++++++++++++++ rest_management_api_server/embedded_spec.go | 18 ++++++++++++++++++ rest_model/identity_authenticators.go | 6 ++++++ specs/client.yml | 4 ++++ specs/management.yml | 4 ++++ specs/source/shared/identities.yml | 4 ++++ 7 files changed, 56 insertions(+) diff --git a/controller/internal/routes/identity_api_model.go b/controller/internal/routes/identity_api_model.go index 4f2990943..4d2f5d5ae 100644 --- a/controller/internal/routes/identity_api_model.go +++ b/controller/internal/routes/identity_api_model.go @@ -298,12 +298,14 @@ func MapIdentityToRestModel(ae *env.AppEnv, identity *model.Identity) (*rest_mod if err = ae.GetHandlers().Identity.CollectAuthenticators(identity.Id, func(entity *model.Authenticator) error { if entity.Method == persistence.MethodAuthenticatorUpdb { ret.Authenticators.Updb = &rest_model.IdentityAuthenticatorsUpdb{ + ID: entity.Id, Username: entity.ToUpdb().Username, } } if entity.Method == persistence.MethodAuthenticatorCert { ret.Authenticators.Cert = &rest_model.IdentityAuthenticatorsCert{ + ID: entity.Id, Fingerprint: entity.ToCert().Fingerprint, } } diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index df852411f..655e0652e 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -4719,12 +4719,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "updb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } @@ -9705,12 +9711,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "IdentityAuthenticatorsUpdb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } @@ -10701,12 +10713,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "updb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go index b29fd913d..4be93012a 100644 --- a/rest_management_api_server/embedded_spec.go +++ b/rest_management_api_server/embedded_spec.go @@ -19329,12 +19329,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "updb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } @@ -39551,12 +39557,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "IdentityAuthenticatorsUpdb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } @@ -42175,12 +42187,18 @@ func init() { "properties": { "fingerprint": { "type": "string" + }, + "id": { + "type": "string" } } }, "updb": { "type": "object", "properties": { + "id": { + "type": "string" + }, "username": { "type": "string" } diff --git a/rest_model/identity_authenticators.go b/rest_model/identity_authenticators.go index dd9b8cfa5..5b14ddd7c 100644 --- a/rest_model/identity_authenticators.go +++ b/rest_model/identity_authenticators.go @@ -180,6 +180,9 @@ type IdentityAuthenticatorsCert struct { // fingerprint Fingerprint string `json:"fingerprint,omitempty"` + + // id + ID string `json:"id,omitempty"` } // Validate validates this identity authenticators cert @@ -215,6 +218,9 @@ func (m *IdentityAuthenticatorsCert) UnmarshalBinary(b []byte) error { // swagger:model IdentityAuthenticatorsUpdb type IdentityAuthenticatorsUpdb struct { + // id + ID string `json:"id,omitempty"` + // username Username string `json:"username,omitempty"` } diff --git a/specs/client.yml b/specs/client.yml index 2438d3af3..645e6bec7 100644 --- a/specs/client.yml +++ b/specs/client.yml @@ -3423,9 +3423,13 @@ definitions: properties: fingerprint: type: string + id: + type: string updb: type: object properties: + id: + type: string username: type: string identityDetail: diff --git a/specs/management.yml b/specs/management.yml index 270dbed37..8acd0d521 100644 --- a/specs/management.yml +++ b/specs/management.yml @@ -13937,9 +13937,13 @@ definitions: properties: fingerprint: type: string + id: + type: string updb: type: object properties: + id: + type: string username: type: string identityCreate: diff --git a/specs/source/shared/identities.yml b/specs/source/shared/identities.yml index 527711dd3..b6d906b54 100644 --- a/specs/source/shared/identities.yml +++ b/specs/source/shared/identities.yml @@ -88,12 +88,16 @@ definitions: properties: updb: properties: + id: + type: string username: type: string type: object cert: type: object properties: + id: + type: string fingerprint: type: string identityEnrollments: From 01bba9a4d1bccf62e3a2bb880224574411d652ed Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Thu, 14 Apr 2022 09:45:31 -0400 Subject: [PATCH 2/2] fix test, shutdown lost transit router --- tests/transit_router_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/transit_router_test.go b/tests/transit_router_test.go index 1f9b694a7..102802ffb 100644 --- a/tests/transit_router_test.go +++ b/tests/transit_router_test.go @@ -40,6 +40,8 @@ func Test_TransitRouters(t *testing.T) { t.Run("transit routers can be created, enrolled, and started", func(t *testing.T) { ctx.testContextChanged(t) ctx.createEnrollAndStartTransitRouter() + + ctx.Req.NoError(ctx.router.Shutdown()) }) t.Run("transit routers can be created, enrolled, and listed", func(t *testing.T) {