matter: samples: Implement factory reset for persistent storage #20803

adigie · 2025-03-07T15:26:11Z

Remove old code handling clearing users/credentials from fabric as it's
unused and not spec compilant.
Handle factory reset for secure/non-secure configurations.
Add FactoryReset method to AccessStorage.
Add application specific factory reset handler.
Update sdk-connectedhomeip revision.

NordicBuilder · 2025-03-07T15:27:23Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
matter	nrfconnect/sdk-connectedhomeip@`4c46941`	nrfconnect/sdk-connectedhomeip#569	nrfconnect/sdk-connectedhomeip#569/files

⛔ DNM label due to: 1 project with PR revision

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2025-03-07T15:30:04Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 3

Inputs:

Sources:

sdk-nrf: PR head: 9cb1245d9895695c004516645505677cfed637e2
matter: PR head: 6ce9516c5d601c4b0cfa293aba82d73a09107a1d

more details

sdk-nrf:

PR head: 9cb1245d9895695c004516645505677cfed637e2
merge base: 889f9297e37700d95c4c1836a6b0dbc3afd29aa6
target head (main): 889f9297e37700d95c4c1836a6b0dbc3afd29aa6
Diff

matter:

PR head: 6ce9516c5d601c4b0cfa293aba82d73a09107a1d
merge base: 4c46941ef17b7b755c96c57e4ba42306cc524e1c
target head (master): 2c3f0a05295196b56e2c658686a1136f75d993df
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (17)

applications
│  ├── matter_bridge
│  │  ├── src
│  │  │  │ main.cpp
modules
│  ├── lib
│  │  ├── matter
│  │  │  ├── src
│  │  │  │  ├── platform
│  │  │  │  │  ├── Zephyr
│  │  │  │  │  │  │ ConfigurationManagerImpl.cpp
samples
│  ├── matter
│  │  ├── common
│  │  │  ├── src
│  │  │  │  ├── bridge
│  │  │  │  │  ├── bridge_storage_manager.cpp
│  │  │  │  │  │ bridge_storage_manager.h
│  │  │  │  ├── persistent_storage
│  │  │  │  │  ├── backends
│  │  │  │  │  │  ├── persistent_storage_secure.cpp
│  │  │  │  │  │  ├── persistent_storage_secure.h
│  │  │  │  │  │  ├── persistent_storage_settings.cpp
│  │  │  │  │  │  │ persistent_storage_settings.h
│  │  │  │  │  ├── persistent_storage.h
│  │  │  │  │  │ persistent_storage_impl.h
│  │  ├── lock
│  │  │  ├── Kconfig
│  │  │  ├── src
│  │  │  │  ├── access
│  │  │  │  │  ├── access_manager.h
│  │  │  │  │  ├── access_manager_credentials.cpp
│  │  │  │  │  ├── access_storage.cpp
│  │  │  │  │  │ access_storage.h
│  │  │  │  │ main.cpp
west.yml

Outputs:

Toolchain

Version: acee3b0b2b
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:acee3b0b2b_e579f9fbe6

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 90
✅ Integration tests
- ✅ test-fw-nrfconnect-chip

Disabled integration tests

- desktop52_verification
- doc-internal
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-boot
- test-fw-nrfconnect-fem
- test-fw-nrfconnect-nfc
- test-fw-nrfconnect-nrf-iot_cloud
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_mosh
- test-fw-nrfconnect-nrf-iot_positioning
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-nrf-iot_thingy91
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-proprietary_esb
- test-fw-nrfconnect-ps
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-rs
- test-fw-nrfconnect-tfm
- test-fw-nrfconnect-thread
- test-fw-nrfconnect-zigbee
- test-low-level
- test-sdk-audio
- test-sdk-dfu
- test-sdk-find-my
- test-sdk-mcuboot
- test-sdk-pmic-samples
- test-sdk-sidewalk
- test-sdk-wifi
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

github-actions · 2025-03-07T15:44:45Z

You can find the documentation preview for this PR here.

markaj-nordic

@adigie is the current implementation against the spec for door lock cluster?

markaj-nordic · 2025-03-10T08:55:00Z

samples/matter/common/src/persistent_storage/backends/persistent_storage_secure.h

@@ -20,12 +20,14 @@ class PersistentStorageSecure {
 	PSErrorCode _NonSecureLoad(PersistentStorageNode *node, void *data, size_t dataMaxSize, size_t &outSize);
 	PSErrorCode _NonSecureHasEntry(PersistentStorageNode *node);
 	PSErrorCode _NonSecureRemove(PersistentStorageNode *node);
+	PSErrorCode _NonSecureRemoveSubtree(const char *prefix);


Maybe we could pass the prefix when initializing NonSecure storage. I would make possible to have unified FactoryReset for Secure and NonSecure instead of Settings-specific RemoveSubtree

I would have to add prefix argument to SecureInit and NonSecureInit and ignore it SecureInit implementation. Would that be OK?

https://github.com/nrfconnect/sdk-nrf/blob/main/samples/matter/lock/src/access/access_storage.cpp#L50-L65

Yehh I know it's not that obvious which approach is better for the end user. Maybe we could have a default parameter set, or use std::optional? But this would require a bit more logic in both backends. And for the access_storage... maybe some preprocessor magic would work. Just throwing some ides, if none of them works, I'm ok with the current proposal.

Updated implementation.

adigie · 2025-03-10T09:12:36Z

@adigie is the current implementation against the spec for door lock cluster?

Yes, please see this comment:
project-chip/connectedhomeip#37900 (comment)

Remove old code handling clearing users/credentials from fabric as it's unused and not spec compilant. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Handle factory reset for secure/non-secure configurations. * Add `FactoryReset` method to `AccessStorage` and `BridgeStorageManager`. * Add application specific factory reset handlers. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Update sdk-connectedhomeip revision Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

sonarqubecloud · 2025-03-11T12:56:08Z

Quality Gate failed

Failed conditions
4.6% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

adigie requested review from a team as code owners March 7, 2025 15:26

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Mar 7, 2025

adigie mentioned this pull request Mar 7, 2025

[nrf noup] Add AppFactoryResetHandler nrfconnect/sdk-connectedhomeip#569

Closed

NordicBuilder added manifest-matter DNM labels Mar 7, 2025

markaj-nordic reviewed Mar 10, 2025

View reviewed changes

nordicjm approved these changes Mar 10, 2025

View reviewed changes

adigie force-pushed the doorlock branch from 3d7c5a3 to 1ed5a5f Compare March 10, 2025 15:08

adigie requested review from markaj-nordic and a team March 10, 2025 15:09

adigie added 3 commits March 11, 2025 13:50

matter: samples: Remove unused code

9d080c1

Remove old code handling clearing users/credentials from fabric as it's unused and not spec compilant. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

manifest: Update sdk-connectedhomeip revision

9cb1245

Update sdk-connectedhomeip revision Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

adigie force-pushed the doorlock branch from 1ed5a5f to 9cb1245 Compare March 11, 2025 12:50

adigie marked this pull request as draft March 13, 2025 15:47

adigie closed this Mar 14, 2025

adigie deleted the doorlock branch March 14, 2025 14:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

matter: samples: Implement factory reset for persistent storage #20803

matter: samples: Implement factory reset for persistent storage #20803

adigie commented Mar 7, 2025

NordicBuilder commented Mar 7, 2025 •

edited

Loading

NordicBuilder commented Mar 7, 2025 •

edited

Loading

github-actions bot commented Mar 7, 2025

markaj-nordic left a comment

markaj-nordic Mar 10, 2025

adigie Mar 10, 2025 •

edited

Loading

markaj-nordic Mar 10, 2025

adigie Mar 10, 2025

adigie commented Mar 10, 2025

sonarqubecloud bot commented Mar 11, 2025

matter: samples: Implement factory reset for persistent storage #20803

matter: samples: Implement factory reset for persistent storage #20803

Conversation

adigie commented Mar 7, 2025

NordicBuilder commented Mar 7, 2025 • edited Loading

NordicBuilder commented Mar 7, 2025 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

github-actions bot commented Mar 7, 2025

markaj-nordic left a comment

Choose a reason for hiding this comment

markaj-nordic Mar 10, 2025

Choose a reason for hiding this comment

adigie Mar 10, 2025 • edited Loading

Choose a reason for hiding this comment

markaj-nordic Mar 10, 2025

Choose a reason for hiding this comment

adigie Mar 10, 2025

Choose a reason for hiding this comment

adigie commented Mar 10, 2025

sonarqubecloud bot commented Mar 11, 2025

Quality Gate failed

NordicBuilder commented Mar 7, 2025 •

edited

Loading

NordicBuilder commented Mar 7, 2025 •

edited

Loading

adigie Mar 10, 2025 •

edited

Loading