gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 07:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #973 from openziti/add.authenticator.ids.to.identity

Browse Source 
adds ids to identity authenticator detail
This commit is contained in:
Andrew
2022-04-14 10:49:57 -04:00
committed by GitHub
parent 462459df33 01bba9a4d1
commit 06e690628d
8 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/internal/routes/identity_api_model.go
+2
View File
@@ -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,
}
}
rest_client_api_server/embedded_spec.go
+18
View File
@@ -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"
}
rest_management_api_server/embedded_spec.go
+18
View File
@@ -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"
}
rest_model/identity_authenticators.go
+6
View File
@@ -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"`
}
specs/client.yml
+4
View File
@@ -3423,9 +3423,13 @@ definitions:
properties:
fingerprint:
type: string
id:
type: string
updb:
type: object
properties:
id:
type: string
username:
type: string
identityDetail:
specs/management.yml
+4
View File
@@ -13937,9 +13937,13 @@ definitions:
properties:
fingerprint:
type: string
id:
type: string
updb:
type: object
properties:
id:
type: string
username:
type: string
identityCreate:
specs/source/shared/identities.yml
+4
View File
@@ -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:
tests/transit_router_test.go
+2
View File
@@ -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) {