MG-2301 - Verify connections during adding of bootstrap config #2371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nyagamunene
changed the title
arvindh123
requested changes
Aug 8, 2024
things/things.go
Outdated
| @@ -33,6 +33,9 @@ type Service interface { | |||
| // the provided key. | |||
| ListClientsByGroup(ctx context.Context, token, groupID string, pm clients.Page) (clients.MembersPage, error) | |||
|
|
|||
| // VerifyConnections verifies if a list of channels is connected to a list of channels. | |||
| VerifyConnections(ctx context.Context, token string, thingID, groupID []string) (clients.ConnectionsPage, error) | |||
There was a problem hiding this comment.
instead of thingID groupID we can have like thingIDs and groupIDs, since they are slice
auth/service.go
Outdated
Comment on lines
1073
to
1121
| func (svc service) VerifyConnections(ctx context.Context, thingsId, channelsId []string) (ConnectionsPage, error) { | ||
| uniqueThings := getUniqueValues(thingsId) | ||
| uniqueChannels := getUniqueValues(channelsId) | ||
|
|
||
| cp := ConnectionsPage{} | ||
| totalConnectionsCount := len(uniqueChannels) * len(uniqueThings) | ||
| totalConnectedCount := 0 | ||
|
|
||
| cp.Connections = make([]ConnectionStatus, 0, totalConnectionsCount) | ||
|
|
||
| for _, th := range uniqueThings { | ||
| for _, ch := range uniqueChannels { | ||
| err := svc.agent.CheckPolicy(ctx, PolicyReq{ | ||
| Subject: ch, | ||
| SubjectType: GroupType, | ||
| Permission: GroupRelation, | ||
| Object: th, | ||
| ObjectType: ThingType, | ||
| }) | ||
| var status string | ||
| switch { | ||
| case err == nil: | ||
| status = connected | ||
| totalConnectedCount++ | ||
| case errors.Contains(err, svcerr.ErrAuthorization): | ||
| status = disconnected | ||
| default: | ||
| return ConnectionsPage{}, errors.Wrap(svcerr.ErrMalformedEntity, err) | ||
| } | ||
|
|
||
| cp.Connections = append(cp.Connections, ConnectionStatus{ | ||
| ThingId: th, | ||
| ChannelId: ch, | ||
| Status: status, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| switch { | ||
| case totalConnectedCount == totalConnectionsCount: | ||
| cp.Status = allConn | ||
| case totalConnectedCount == 0: | ||
| cp.Status = allDisConn | ||
| default: | ||
| cp.Status = partConn | ||
| } | ||
|
|
||
| return cp, nil | ||
| } |
There was a problem hiding this comment.
We can have this logic in Things service,
Like things service will verify connection via auth gRPC connection.
There was a problem hiding this comment.
This may be inefficent if we move this logic to things service, but in future we can have direct grpc connection to spiceDB from things service.
nyagamunene
force-pushed
the
MG-2301
branch
8 times, most recently
from
5b81926 to
0928b17
Compare
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Signed-off-by: nyagamunene <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
This is a bug fix because it fixes the following issue: absmach/magistrala#11
What does this do?
It adds verify connections in the
addmethod in bootstrap.Which issue(s) does this PR fix/relate to?
Have you included tests for your changes?
Yes
Did you document any new/modified feature?
N/A
Notes