Skip to content

Limit the lenght of User Name #2764

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
HunsupJung merged 5 commits into from
Mar 11, 2026
Merged

Limit the lenght of User Name #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
120f200
Limit the lenght of User Name
HunsupJung Feb 6, 2026
93387e5
Merge branch 'main' into fix/limit-length-user-name
HunsupJung Mar 7, 2026
df7b173
Rename the variable and reduce code
HunsupJung Mar 7, 2026
2a6eaf4
Merge branch 'main' into fix/limit-length-user-name
HunsupJung Mar 11, 2026
bf23f18
Modify test units
HunsupJung Mar 11, 2026
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
77 changes: 77 additions & 0 deletions 0001-Rename-the-variable-and-reduce-code.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
From f19da9191362d70a020ab6852233eb327c19f906 Mon Sep 17 00:00:00 2001
From: Hunsup Jung <hunsup.jung@samsung.com>
Date: Sat, 7 Mar 2026 15:36:45 +0900
Subject: [PATCH] Rename the variable and reduce code

Signed-off-by: Hunsup Jung <hunsup.jung@samsung.com>
---
.../matter-lock/src/new-matter-lock/init.lua | 25 +++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
index d9b9c9f6..37a9493a 100644
--- a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
+++ b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
@@ -29,7 +29,8 @@ local PowerSource = clusters.PowerSource

local INITIAL_CREDENTIAL_INDEX = 1
local ALL_INDEX = 0xFFFE
-local NAME_MAX_L = 10
+-- maximum as defined by the Matter specification
+local MAX_USER_NAME_LENGTH = 10
local MIN_EPOCH_S = 0
local MAX_EPOCH_S = 0xffffffff
local THIRTY_YEARS_S = 946684800 -- 1970-01-01T00:00:00 ~ 2000-01-01T00:00:00
@@ -1274,10 +1275,7 @@ local function handle_update_user(driver, device, command)
local cmdName = "updateUser"
local userIdx = command.args.userIndex
local userName = command.args.userName
- local userNameMatter = userName
- if #userNameMatter > NAME_MAX_L then
- userNameMatter = string.sub(userNameMatter, 1, NAME_MAX_L)
- end
+ local userNameMatter = string.sub(userName, 1, MAX_USER_NAME_LENGTH)
local userType = command.args.userType
local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
if userType == "guest" then
@@ -1307,7 +1305,7 @@ local function handle_update_user(driver, device, command)
device:send(
DoorLock.server.commands.SetUser(
device, ep,
- DoorLock.types.DataOperationTypeEnum.MODIFY, -- Operation Type: Add(0), Modify(2)
+ DoorLock.types.DataOperationTypeEnum.MODIFY,
userIdx,
userNameMatter,
nil, -- Unique ID
@@ -1355,6 +1353,7 @@ local function get_user_response_handler(driver, device, ib, response)
-- Found available user index
if status == nil or status == DoorLock.types.UserStatusEnum.AVAILABLE then
local userName = device:get_field(lock_utils.USER_NAME)
+ local userNameMatter = string.sub(userName, 1, MAX_USER_NAME_LENGTH)
local userType = device:get_field(lock_utils.USER_TYPE)
local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
if userType == "guest" then
@@ -1368,13 +1367,13 @@ local function get_user_response_handler(driver, device, ib, response)
device:send(
DoorLock.server.commands.SetUser(
device, ep,
- DoorLock.types.DataOperationTypeEnum.ADD, -- Operation Type: Add(0), Modify(2)
- userIdx, -- User Index
- userName, -- User Name
- nil, -- Unique ID
- nil, -- User Status
- userTypeMatter, -- User Type
- nil -- Credential Rule
+ DoorLock.types.DataOperationTypeEnum.ADD,
+ userIdx,
+ userNameMatter,
+ nil, -- Unique ID
+ nil, -- User Status
+ userTypeMatter,
+ nil -- Credential Rule
)
)
elseif userIdx >= maxUser then -- There's no available user index
--
2.39.5 (Apple Git-154)

40 changes: 23 additions & 17 deletions drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ local PowerSource = clusters.PowerSource

local INITIAL_CREDENTIAL_INDEX = 1
local ALL_INDEX = 0xFFFE
-- maximum as defined by the Matter specification
local MAX_USER_NAME_LENGTH = 10
local MIN_EPOCH_S = 0
local MAX_EPOCH_S = 0xffffffff
local THIRTY_YEARS_S = 946684800 -- 1970-01-01T00:00:00 ~ 2000-01-01T00:00:00
Expand Down Expand Up @@ -1220,6 +1222,7 @@ local function handle_update_user(driver, device, command)
local cmdName = "updateUser"
local userIdx = command.args.userIndex
local userName = command.args.userName
local userNameMatter = string.sub(userName, 1, MAX_USER_NAME_LENGTH)
local userType = command.args.userType
local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
if userType == "guest" then
Expand Down Expand Up @@ -1249,13 +1252,13 @@ local function handle_update_user(driver, device, command)
device:send(
DoorLock.server.commands.SetUser(
device, ep,
DoorLock.types.DataOperationTypeEnum.MODIFY, -- Operation Type: Add(0), Modify(2)
userIdx, -- User Index
userName, -- User Name
nil, -- Unique ID
nil, -- User Status
userTypeMatter, -- User Type
nil -- Credential Rule
DoorLock.types.DataOperationTypeEnum.MODIFY,
userIdx,
userNameMatter,
nil, -- Unique ID
nil, -- User Status
userTypeMatter,
nil -- Credential Rule
)
)
end
Expand Down Expand Up @@ -1297,6 +1300,7 @@ local function get_user_response_handler(driver, device, ib, response)
-- Found available user index
if status == nil or status == DoorLock.types.UserStatusEnum.AVAILABLE then
local userName = device:get_field(lock_utils.USER_NAME)
local userNameMatter = string.sub(userName, 1, MAX_USER_NAME_LENGTH)
local userType = device:get_field(lock_utils.USER_TYPE)
local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
if userType == "guest" then
Expand All @@ -1310,13 +1314,13 @@ local function get_user_response_handler(driver, device, ib, response)
device:send(
DoorLock.server.commands.SetUser(
device, ep,
DoorLock.types.DataOperationTypeEnum.ADD, -- Operation Type: Add(0), Modify(2)
userIdx, -- User Index
userName, -- User Name
nil, -- Unique ID
nil, -- User Status
userTypeMatter, -- User Type
nil -- Credential Rule
DoorLock.types.DataOperationTypeEnum.ADD,
userIdx,
userNameMatter,
nil, -- Unique ID
nil, -- User Status
userTypeMatter,
nil -- Credential Rule
)
)
elseif userIdx >= maxUser then -- There's no available user index
Expand Down Expand Up @@ -1477,14 +1481,16 @@ local function handle_add_credential(driver, device, command)
-- Get parameters
local cmdName = "addCredential"
local userIdx = command.args.userIndex
if userIdx == 0 then
userIdx = nil
end
local userType = command.args.userType
local userTypeMatter = DoorLock.types.UserTypeEnum.UNRESTRICTED_USER
if userType == "guest" then
userTypeMatter = DoorLock.types.UserTypeEnum.SCHEDULE_RESTRICTED_USER
end
if userIdx == 0 then
userIdx = nil
else
userTypeMatter = nil
end
local credential = {
credential_type = DoorLock.types.CredentialTypeEnum.PIN,
credential_index = INITIAL_CREDENTIAL_INDEX
Expand Down
8 changes: 4 additions & 4 deletions drivers/SmartThings/matter-lock/src/test/test_new_matter_lock.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ test.register_coroutine_test(
"654123", -- credential_data
1, -- user_index
nil, -- user_status
DoorLock.types.DlUserType.UNRESTRICTED_USER -- user_type
nil -- user_type
),
}
)
Expand Down Expand Up @@ -1496,7 +1496,7 @@ test.register_coroutine_test(
"654123", -- credential_data
1, -- user_index
nil, -- user_status
DoorLock.types.DlUserType.UNRESTRICTED_USER -- user_type
nil -- user_type
),
}
)
Expand Down Expand Up @@ -1552,7 +1552,7 @@ test.register_coroutine_test(
"654123", -- credential_data
1, -- user_index
nil, -- user_status
DoorLock.types.DlUserType.UNRESTRICTED_USER -- user_type
nil -- user_type
),
}
)
Expand Down Expand Up @@ -1615,7 +1615,7 @@ test.register_coroutine_test(
"654123", -- credential_data
1, -- user_index
nil, -- user_status
DoorLock.types.DlUserType.UNRESTRICTED_USER -- user_type
nil -- user_type
),
}
)
Expand Down
Loading