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

Jump to bottom

fix: respect isEncrypted:false if supplied in notify: command, and ensure the correct value is always transmitted onwards #1983

Merged
merged 14 commits into from
Jul 25, 2024
Merged

fix: respect isEncrypted:false if supplied in notify: command, and ensure the correct value is always transmitted onwards #1983

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
39b62d1
fix: NotifyVerbHandler._getIsEncrypted should respect isEncrypted:fal…
gkc Jun 10, 2024
9ce499a
fix: ResourceManager.prepareNotifyCommandBody should always supply is…
gkc Jun 10, 2024
1e9d231
test: fix unit test of prepareNotifyCommandBody
gkc Jun 10, 2024
2b34e50
Merge remote-tracking branch 'origin/trunk' into gkc/fix-1944
gkc Jun 10, 2024
6edd6aa
Merge branch 'trunk' into gkc/fix-1944
gkc Jun 12, 2024
9176a8a
Merge remote-tracking branch 'origin/trunk' into gkc/fix-1944
gkc Jul 22, 2024
e2ce8cc
Merge branch 'trunk' into gkc/fix-1944
gkc Jul 22, 2024
62e4609
Merge branch 'trunk' into gkc/fix-1944
gkc Jul 24, 2024
19dcc8b
test: add test to notify_verb_test.dart to verify that isEncrypted:fa…
gkc Jul 24, 2024
aa725c1
refactor: rename `NotifyVerbHandler._getIsEncrypted` to `getIsEncrypt…
gkc Jul 24, 2024
ccc7fba
test: add unit tests of NotifyVerbHandler.getIsEncrypted
gkc Jul 24, 2024
dd8c3d2
Merge remote-tracking branch 'origin/trunk' into gkc/fix-1944
gkc Jul 24, 2024
c3b47e8
Merge remote-tracking branch 'origin/gkc/fix-1944' into gkc/fix-1944
gkc Jul 24, 2024
882e4b6
Merge branch 'trunk' into gkc/fix-1944
sitaram-kalluri Jul 24, 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
9 changes: 5 additions & 4 deletions packages/at_secondary_server/lib/src/notification/resource_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,11 @@ class ResourceManager {
commandBody =
'${AtConstants.sharedKeyEncrypted}:${atNotification.atMetadata!.sharedKeyEnc}:$commandBody';
}
if (atNotification.atMetadata!.isEncrypted != null &&
atNotification.atMetadata!.isEncrypted == true) {
commandBody = '${AtConstants.isEncrypted}:true:$commandBody';
}

String? isEncryptedStr =
(atNotification.atMetadata!.isEncrypted ?? false) ? 'true' : 'false';
commandBody = '${AtConstants.isEncrypted}:$isEncryptedStr:$commandBody';

Copy link
Contributor Author

@gkc gkc Jul 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above change is to ensure that the isEncrypted value in the notification's metadata is always passed on to the next atServer. Previously it was only passed on if the value was true

if (atMetaData.ttr != null) {
commandBody =
'ttr:${atMetaData.ttr}:ccd:${atMetaData.isCascade}:$commandBody';
Expand Down
11 changes: 8 additions & 3 deletions packages/at_secondary_server/lib/src/verb/handler/notify_verb_handler.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,16 @@ class NotifyVerbHandler extends AbstractVerbHandler {
MessageType messageType, String key, String? isEncryptedStr) {
if (messageType == MessageType.key && key.startsWith('public')) {
return false;
} else if (messageType == MessageType.text) {
}
if (messageType == MessageType.text) {
return SecondaryUtil.getBoolFromString(isEncryptedStr);
} else {
return true;
}
// respect the 'false' value if one was supplied
if (isEncryptedStr != null && isEncryptedStr.toLowerCase() == 'false') {
return false;
}
// At this point, has to return true for legacy reasons. See #1944
return true;
}

String _getFullFormedAtKey(
Expand Down
1 change: 1 addition & 0 deletions packages/at_secondary_server/test/resource_manager_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ void main() async {
'id:1234:update:messageType:key:notifier:system'
':ttln:$ttln'
':ttr:1:ccd:true'
':isEncrypted:false'
':sharedKeyEnc:abc:pubKeyCS:123'
':encKeyName:ekn:encAlgo:ea:ivNonce:ivn'
':skeEncKeyName:ske_ekn:skeEncAlgo:ske_ea'
Expand Down