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

OTA-Provider: Implementation for obtaining user consent #13816

Merged
merged 13 commits into from
Feb 2, 2022
Merged

OTA-Provider: Implementation for obtaining user consent #13816

merged 13 commits into from
Feb 2, 2022

Conversation

shubhamdp
Copy link
Contributor

@shubhamdp shubhamdp commented Jan 21, 2022 •
edited
Loading

Problem

  • Handling user consent in OTA software upgrade flow is missing

Change overview

  • This PR adds support for handling user consent in provider side
  • Added support in Linux OTA Provider
  • Added UserConsentDelegate and DefaultUserConsentProvider.
  • DefaultUserConsentProvider has the methods to Grant and Revoke the UserConsent.
  • Since obtaining user consent is a SHOULD, considering user consent only if delegate is set.

Testing

  • Using Linux OTA Provider and Linux OTA requestor

@shubhamdp
Copy link
Contributor Author

/rebase

@github-actions
Copy link

github-actions bot commented Feb 2, 2022 •
edited
Loading

PR #13816: Size comparison from a2f9cad to f4aa472

Full report (34 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section a2f9cad f4aa472 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 577150 577150 0 0.0
.app_xip_area 484356 484356 0 0.0
.bss 75540 75540 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 535146 535146 0 0.0
.app_xip_area 443920 443920 0 0.0
.bss 74012 74012 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 559890 559890 0 0.0
.app_xip_area 459360 459360 0 0.0
.bss 82988 82988 0 0.0
.data 504 504 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 843616 843616 0 0.0
(read/write) 125072 125072 0 0.0
.bss 123176 123176 0 0.0
.data 1896 1896 0 0.0
.text 843608 843608 0 0.0
BRD4161A+rpc (read only) 830984 830984 0 0.0
(read/write) 141736 141736 0 0.0
.bss 139736 139736 0 0.0
.data 1996 1996 0 0.0
.text 830976 830976 0 0.0
window-app BRD4161A (read only) 816164 816164 0 0.0
(read/write) 123704 123704 0 0.0
.bss 121852 121852 0 0.0
.data 1852 1852 0 0.0
.text 816156 816156 0 0.0
esp32 all-clusters-app c3devkit (read only) 934242 934242 0 0.0
(read/write) 1399834 1399834 0 0.0
.dram0.bss 70344 70344 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 196320 196320 0 0.0
.flash.text 934242 934242 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 982267 982267 0 0.0
(read/write) 464180 464180 0 0.0
.dram0.bss 75096 75096 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 222932 222932 0 0.0
.flash.text 976883 976883 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 661876 661876 0 0.0
.bss 75228 75228 0 0.0
.data 1856 1856 0 0.0
.text 578992 578992 0 0.0
lock k32w061+release (read/write) 662888 662888 0 0.0
.bss 75548 75548 0 0.0
.data 1896 1896 0 0.0
.text 579644 579644 0 0.0
linux chip-tool-ipv6only arm64 (read only) 7036900 7036900 0 0.0
(read/write) 289857 289857 0 0.0
.bss 54593 54593 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 185152 185152 0 0.0
.dynamic 560 560 0 0.0
.got 45200 45200 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 387804 387804 0 0.0
.text 6050212 6050212 0 0.0
thermostat-no-ble arm64 (read only) 2086860 2086860 0 0.0
(read/write) 148513 148513 0 0.0
.bss 66209 66209 0 0.0
.data 952 952 0 0.0
.data.rel.ro 74240 74240 0 0.0
.dynamic 560 560 0 0.0
.got 4136 4136 0 0.0
.init 24 24 0 0.0
.init_array 344 344 0 0.0
.rodata 130716 130716 0 0.0
.text 1738864 1738864 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2384408 2384408 0 0.0
.bss 189260 189260 0 0.0
.data 5288 5288 0 0.0
.text 1347008 1347008 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2338192 2338192 0 0.0
.bss 178176 178176 0 0.0
.data 5568 5568 0 0.0
.text 1300792 1300792 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2302296 2302296 0 0.0
.bss 178056 178056 0 0.0
.data 5552 5552 0 0.0
.text 1264896 1264896 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292964 2292964 0 0.0
.bss 175332 175332 0 0.0
.data 5368 5368 0 0.0
.text 1255536 1255536 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 980539 980539 0 0.0
bss 118544 118544 0 0.0
rodata 115840 115840 0 0.0
text 668364 668364 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 966115 966115 0 0.0
bss 115588 115588 0 0.0
rodata 107312 107312 0 0.0
text 664808 664808 0 0.0
nrf52840dongle_nrf52840 (read/write) 996623 996623 0 0.0
bss 119716 119716 0 0.0
rodata 114672 114672 0 0.0
text 673756 673756 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 889754 889754 0 0.0
bss 115332 115332 0 0.0
rodata 109116 109116 0 0.0
text 584560 584560 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913151 913151 0 0.0
bss 116904 116904 0 0.0
rodata 104476 104476 0 0.0
text 614368 614368 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 823186 823186 0 0.0
bss 113720 113720 0 0.0
rodata 97684 97684 0 0.0
text 531344 531344 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 915875 915875 0 0.0
bss 116660 116660 0 0.0
rodata 104936 104936 0 0.0
text 616824 616824 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 911051 911051 0 0.0
bss 116668 116668 0 0.0
rodata 104040 104040 0 0.0
text 612872 612872 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798395 798395 0 0.0
bss 109776 109776 0 0.0
rodata 78352 78352 0 0.0
text 533760 533760 0 0.0
p6 all-clusters-app default (read/write) 2445744 2445744 0 0.0
.bss 117404 117404 0 0.0
.data 2576 2576 0 0.0
.text 1404008 1404008 0 0.0
light-app default (read/write) 2340320 2340320 0 0.0
.bss 103364 103364 0 0.0
.data 2408 2408 0 0.0
.text 1298584 1298584 0 0.0
lock-app default (read/write) 2305728 2305728 0 0.0
.bss 103084 103084 0 0.0
.data 2368 2368 0 0.0
.text 1263992 1263992 0 0.0
qpg lighting-app qpg6105+debug (read only) 570700 570700 0 0.0
(read/write) 146936 146936 0 0.0
.bss 87520 87520 0 0.0
.data 1060 1060 0 0.0
.text 565380 565380 0 0.0
lock-app qpg6105+debug (read only) 516816 516816 0 0.0
(read/write) 146936 146936 0 0.0
.bss 86960 86960 0 0.0
.data 996 996 0 0.0
.text 511496 511496 0 0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845134 845134 0 0.0
bss 85568 85568 0 0.0
noinit 37160 37160 0 0.0
text 592564 592564 0 0.0

@shubhamdp
Copy link
Contributor Author

/rebase

@shubhamdp
ota-provider: Implementation for obtaining user consent
31baa1e
@shubhamdp
ota-provider: Support for user consent in linux app
2b6b122
@shubhamdp
Added an API SourceNodeId() in CommandHandler
3644db3 
Using PRIu16 for logging endpoint and ChipLogFormatX64/ChipLogValueX64
for logging Node Id.

Use Clock::Seconds32 insetead of Clock::Milliseconds32
@shubhamdp
Modified the UserConsent delegate and added default implementation
cc0dbf8 
UserConsent is not a SHALL so, using it when its available.
Default implementation returns true by default, also added APIs to grant
and revoke the UserConsent.
@shubhamdp
Do not crash if it's a group session
a3bf4ca
@shubhamdp
Keep supporting query behaviour option and set DelayedActionTime in Busy
1cb36b6 
and NotAvailable Case
@shubhamdp
restyled
1fef15e
@shubhamdp
Fixing error after resolving merge conflict
99c2e8a
@shubhamdp
Remove unnecessary chip:: resolution usage
2f4bc80
@shubhamdp
Use GetSubjectDescriptor() to get SourceNodeId
2c2866b
@shubhamdp
Addressed review comments
1b3ce41
@shubhamdp
minor changes
fa45a7f
@shubhamdp
Addressed review comments and removed per subject handling, for now
cce6329 
supporting only global user consent poliy.
@github-actions
Copy link

github-actions bot commented Feb 2, 2022

PR #13816: Size comparison from 63a5c52 to cce6329

Full report (34 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 63a5c52 cce6329 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 577526 577526 0 0.0
.app_xip_area 484756 484756 0 0.0
.bss 75516 75516 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 535150 535150 0 0.0
.app_xip_area 443948 443948 0 0.0
.bss 73988 73988 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 559706 559706 0 0.0
.app_xip_area 459192 459192 0 0.0
.bss 82972 82972 0 0.0
.data 504 504 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 843824 843824 0 0.0
(read/write) 125056 125056 0 0.0
.bss 123160 123160 0 0.0
.data 1892 1892 0 0.0
.text 843816 843816 0 0.0
window-app BRD4161A (read only) 816076 816076 0 0.0
(read/write) 123684 123684 0 0.0
.bss 121836 121836 0 0.0
.data 1848 1848 0 0.0
.text 816068 816068 0 0.0
lighting-app BRD4161A+rpc (read only) 831200 831200 0 0.0
(read/write) 141712 141712 0 0.0
.bss 139720 139720 0 0.0
.data 1992 1992 0 0.0
.text 831192 831192 0 0.0
esp32 all-clusters-app c3devkit (read only) 934022 934022 0 0.0
(read/write) 1401482 1401482 0 0.0
.dram0.bss 70320 70320 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 198000 198000 0 0.0
.flash.text 934022 934022 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 982071 982071 0 0.0
(read/write) 465832 465832 0 0.0
.dram0.bss 75072 75072 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 224608 224608 0 0.0
.flash.text 976687 976687 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 661708 661708 0 0.0
.bss 75212 75212 0 0.0
.data 1852 1852 0 0.0
.text 578844 578844 0 0.0
lock k32w061+release (read/write) 662892 662892 0 0.0
.bss 75532 75532 0 0.0
.data 1892 1892 0 0.0
.text 579668 579668 0 0.0
linux chip-tool-ipv6only arm64 (read only) 7088532 7088532 0 0.0
(read/write) 290881 290881 0 0.0
.bss 54577 54577 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 186160 186160 0 0.0
.dynamic 560 560 0 0.0
.got 45232 45232 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 390460 390460 0 0.0
.text 6097780 6097780 0 0.0
thermostat-no-ble arm64 (read only) 2086380 2086380 0 0.0
(read/write) 148865 148865 0 0.0
.bss 66177 66177 0 0.0
.data 952 952 0 0.0
.data.rel.ro 74624 74624 0 0.0
.dynamic 560 560 0 0.0
.got 4136 4136 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 131004 131004 0 0.0
.text 1737648 1737648 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2385832 2385832 0 0.0
.bss 189236 189236 0 0.0
.data 5288 5288 0 0.0
.text 1348432 1348432 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2338640 2338640 0 0.0
.bss 178152 178152 0 0.0
.data 5568 5568 0 0.0
.text 1301240 1301240 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2302296 2302296 0 0.0
.bss 178032 178032 0 0.0
.data 5544 5544 0 0.0
.text 1264896 1264896 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292804 2292804 0 0.0
.bss 175316 175316 0 0.0
.data 5368 5368 0 0.0
.text 1255376 1255376 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 980927 980927 0 0.0
bss 118524 118524 0 0.0
rodata 116548 116548 0 0.0
text 668068 668068 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913143 913143 0 0.0
bss 116884 116884 0 0.0
rodata 104804 104804 0 0.0
text 614068 614068 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 915927 915927 0 0.0
bss 116640 116640 0 0.0
rodata 105324 105324 0 0.0
text 616524 616524 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 911135 911135 0 0.0
bss 116648 116648 0 0.0
rodata 104428 104428 0 0.0
text 612576 612576 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798379 798379 0 0.0
bss 109772 109772 0 0.0
rodata 78352 78352 0 0.0
text 533752 533752 0 0.0
lighting-app nrf52840dk_nrf52840+rpc (read/write) 966487 966487 0 0.0
bss 115568 115568 0 0.0
rodata 108020 108020 0 0.0
text 664508 664508 0 0.0
nrf52840dongle_nrf52840 (read/write) 996995 996995 0 0.0
bss 119696 119696 0 0.0
rodata 115380 115380 0 0.0
text 673460 673460 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 890126 890126 0 0.0
bss 115312 115312 0 0.0
rodata 109824 109824 0 0.0
text 584256 584256 0 0.0
lock-app nrf5340dk_nrf5340_cpuapp (read/write) 823210 823210 0 0.0
bss 113700 113700 0 0.0
rodata 98012 98012 0 0.0
text 531040 531040 0 0.0
p6 all-clusters-app default (read/write) 2446944 2446944 0 0.0
.bss 117388 117388 0 0.0
.data 2576 2576 0 0.0
.text 1405208 1405208 0 0.0
light-app default (read/write) 2340536 2340536 0 0.0
.bss 103348 103348 0 0.0
.data 2400 2400 0 0.0
.text 1298800 1298800 0 0.0
lock-app default (read/write) 2305560 2305560 0 0.0
.bss 103068 103068 0 0.0
.data 2360 2360 0 0.0
.text 1263824 1263824 0 0.0
qpg lighting-app qpg6105+debug (read only) 571104 571104 0 0.0
(read/write) 146940 146940 0 0.0
.bss 87496 87496 0 0.0
.data 1056 1056 0 0.0
.text 565784 565784 0 0.0
lock-app qpg6105+debug (read only) 516840 516840 0 0.0
(read/write) 146940 146940 0 0.0
.bss 86936 86936 0 0.0
.data 992 992 0 0.0
.text 511520 511520 0 0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845494 845494 0 0.0
bss 85552 85552 0 0.0
noinit 37160 37160 0 0.0
text 592264 592264 0 0.0

@andy31415 andy31415 merged commit 1ae483d into project-chip:master Feb 2, 2022
@shubhamdp shubhamdp deleted the user_consent_for_ota branch February 2, 2022 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple left review comments

@carol-apple carol-apple carol-apple approved these changes

@holbrookt holbrookt holbrookt approved these changes

@dhrishi dhrishi dhrishi approved these changes

@tcarmelveilleux tcarmelveilleux tcarmelveilleux approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pan-apple pan-apple Awaiting requested review from pan-apple

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

Assignees
No one assigned
Labels
app examples fast track platform review - pending V1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@shubhamdp @woody-apple @tcarmelveilleux @dhrishi @holbrookt @carol-apple @bzbarsky-apple @kpschoedel @andy31415 @franck-apple