Revert "[nrf fromtree] Enforce length constraint for CountryCode in S…

…etRegulatoryConfig. (project-chip#27949)" This reverts commit 96ea933.
maciejbaczmanski · Nov 9, 2023 · fded3e8 · fded3e8
1 parent f7f2c3a
commit fded3e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
@@ -344,11 +344,7 @@ CHIP_ERROR BasicAttrAccess::WriteLocation(AttributeValueDecoder & aDecoder)
     ReturnErrorOnFailure(aDecoder.Decode(location));
 
     bool isValidLength = location.size() == DeviceLayer::ConfigurationManager::kMaxLocationLength;
-    if (!isValidLength)
-    {
-        ChipLogError(Zcl, "Invalid country code: '%.*s'", static_cast<int>(location.size()), location.data());
-        return CHIP_IM_GLOBAL_STATUS(ConstraintError);
-    }
+    VerifyOrReturnError(isValidLength, StatusIB(Protocols::InteractionModel::Status::InvalidValue).ToChipError());
 
     return DeviceLayer::ConfigurationMgr().StoreCountryCode(location.data(), location.size());
 }

diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -287,21 +287,10 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH
     DeviceControlServer * server = &DeviceLayer::DeviceControlServer::DeviceControlSvr();
     Commands::SetRegulatoryConfigResponse::Type response;
 
-    auto & countryCode = commandData.countryCode;
-    bool isValidLength = countryCode.size() == DeviceLayer::ConfigurationManager::kMaxLocationLength;
-    if (!isValidLength)
-    {
-        ChipLogError(Zcl, "Invalid country code: '%.*s'", static_cast<int>(countryCode.size()), countryCode.data());
-        commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::ConstraintError);
-        return true;
-    }
-
     if (commandData.newRegulatoryConfig > RegulatoryLocationType::kIndoorOutdoor)
     {
         response.errorCode = CommissioningError::kValueOutsideRange;
-        // TODO: How does using the country code in debug text make sense, if
-        // the real issue is the newRegulatoryConfig value?
-        response.debugText = countryCode;
+        response.debugText = commandData.countryCode;
     }
     else
     {
@@ -315,13 +304,11 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH
         if ((locationCapability != to_underlying(RegulatoryLocationType::kIndoorOutdoor)) && (location != locationCapability))
         {
             response.errorCode = CommissioningError::kValueOutsideRange;
-            // TODO: How does using the country code in debug text make sense, if
-            // the real issue is the newRegulatoryConfig value?
-            response.debugText = countryCode;
+            response.debugText = commandData.countryCode;
         }
         else
         {
-            CheckSuccess(server->SetRegulatoryConfig(location, countryCode), Failure);
+            CheckSuccess(server->SetRegulatoryConfig(location, commandData.countryCode), Failure);
             Breadcrumb::Set(commandPath.mEndpointId, commandData.breadcrumb);
             response.errorCode = CommissioningError::kOk;
         }