Skip to content

[v9] Access request compatibility for servers without v2 api #13428

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

Merged
merged 4 commits into from
Jun 13, 2022
Merged

[v9] Access request compatibility for servers without v2 api #13428

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c92293
Access request compatability for servers without v2 api
xacrimon Jun 10, 2022
a2b0145
fix double conversion
xacrimon Jun 10, 2022
112b3e3
add explanation
xacrimon Jun 10, 2022
288ad27
fix typo
xacrimon Jun 13, 2022
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
24 changes: 23 additions & 1 deletion api/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,12 @@ func (c *Client) GetBotUsers(ctx context.Context) ([]types.User, error) {
func (c *Client) GetAccessRequests(ctx context.Context, filter types.AccessRequestFilter) ([]types.AccessRequest, error) {
stream, err := c.grpc.GetAccessRequestsV2(ctx, &filter, c.callOpts...)
if err != nil {
return nil, trail.FromGRPC(err)
err := trail.FromGRPC(err)
if trace.IsNotImplemented(err) {
return c.getAccessRequestsLegacy(ctx, filter)
}

return nil, err
}
var reqs []types.AccessRequest
for {
Expand All @@ -765,6 +770,23 @@ func (c *Client) GetAccessRequests(ctx context.Context, filter types.AccessReque
return reqs, nil
}

// getAccessRequestsLegacy retrieves a list of all access requests matching the provided filter using the old access request API.
//
// DELETE IN: 11.0.0. Used for compatibility with old auth servers that don't support the GetAccessRequestsV2 RPC.
func (c *Client) getAccessRequestsLegacy(ctx context.Context, filter types.AccessRequestFilter) ([]types.AccessRequest, error) {
requests, err := c.grpc.GetAccessRequests(ctx, &filter, c.callOpts...)
if err != nil {
return nil, trail.FromGRPC(err)
}

reqs := make([]types.AccessRequest, len(requests.AccessRequests))
for i, request := range requests.AccessRequests {
reqs[i] = request
}

return reqs, nil
}

// CreateAccessRequest registers a new access request with the auth server.
func (c *Client) CreateAccessRequest(ctx context.Context, req types.AccessRequest) error {
r, ok := req.(*types.AccessRequestV3)
Expand Down