Put back AccessingFabricIndex

Author: andreilitvin

src/app/AttributeValueDecoder.h

@@ -46,19 +46,18 @@ class AttributeValueDecoder
         mTriedDecode = true;
         // The WriteRequest comes with no fabric index, this will happen when receiving a write request on a PASE session before
         // AddNOC.
-        VerifyOrReturnError(GetSubjectDescriptor().fabricIndex != kUndefinedFabricIndex, CHIP_IM_GLOBAL_STATUS(UnsupportedAccess));
+        VerifyOrReturnError(AccessingFabricIndex() != kUndefinedFabricIndex, CHIP_IM_GLOBAL_STATUS(UnsupportedAccess));
         ReturnErrorOnFailure(DataModel::Decode(mReader, aArg));
-        aArg.SetFabricIndex(GetSubjectDescriptor().fabricIndex);
+        aArg.SetFabricIndex(AccessingFabricIndex());
         return CHIP_NO_ERROR;
     }
 
     bool TriedDecode() const { return mTriedDecode; }
 
-    /**
-     * The accessing subject descriptor for this write interaction.
-     */
     const Access::SubjectDescriptor & GetSubjectDescriptor() const { return mSubjectDescriptor; }
 
+    FabricIndex AccessingFabricIndex() const { return GetSubjectDescriptor().fabricIndex; }
+
 private:
     TLV::TLVReader & mReader;
     bool mTriedDecode = false;

src/app/AttributeValueEncoder.h

@@ -53,10 +53,9 @@ class AttributeValueEncoder
             // If we are encoding for a fabric filtered attribute read and the fabric index does not match that present in the
             // request, skip encoding this list item.
             VerifyOrReturnError(!mAttributeValueEncoder.mIsFabricFiltered ||
-                                    aArg.GetFabricIndex() == mAttributeValueEncoder.GetSubjectDescriptor().fabricIndex,
+                                    aArg.GetFabricIndex() == mAttributeValueEncoder.AccessingFabricIndex(),
                                 CHIP_NO_ERROR);
-            return mAttributeValueEncoder.EncodeListItem(mAttributeValueEncoder.GetSubjectDescriptor().fabricIndex,
-                                                         std::forward<T>(aArg));
+            return mAttributeValueEncoder.EncodeListItem(mAttributeValueEncoder.AccessingFabricIndex(), std::forward<T>(aArg));
         }
 
         template <typename T, std::enable_if_t<!DataModel::IsFabricScoped<T>::value, bool> = true>
@@ -150,6 +149,8 @@ class AttributeValueEncoder
 
     const Access::SubjectDescriptor & GetSubjectDescriptor() const { return mSubjectDescriptor; }
 
+    FabricIndex AccessingFabricIndex() const { return GetSubjectDescriptor().fabricIndex; }
+
     /**
      * AttributeValueEncoder is a short lived object, and the state is persisted by mEncodeState and restored by constructor.
      */

src/app/clusters/access-control-server/access-control-server.cpp

@@ -230,7 +230,7 @@ CHIP_ERROR AccessControlAttribute::WriteImpl(const ConcreteDataAttributePath & a
 
 CHIP_ERROR AccessControlAttribute::WriteAcl(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder)
 {
-    FabricIndex accessingFabricIndex = aDecoder.GetSubjectDescriptor().fabricIndex;
+    FabricIndex accessingFabricIndex = aDecoder.AccessingFabricIndex();
 
     size_t oldCount;
     ReturnErrorOnFailure(GetAccessControl().GetEntryCount(accessingFabricIndex, oldCount));
@@ -293,7 +293,7 @@ CHIP_ERROR AccessControlAttribute::WriteExtension(const ConcreteDataAttributePat
 {
     auto & storage = Server::GetInstance().GetPersistentStorage();
 
-    FabricIndex accessingFabricIndex = aDecoder.GetSubjectDescriptor().fabricIndex;
+    FabricIndex accessingFabricIndex = aDecoder.AccessingFabricIndex();
 
     uint8_t buffer[kExtensionDataMaxLength] = { 0 };
     uint16_t size                           = static_cast<uint16_t>(sizeof(buffer));

src/app/clusters/bindings/bindings.cpp

@@ -200,7 +200,7 @@ void BindingTableAccess::OnListWriteEnd(const app::ConcreteAttributePath & aPath
 
 CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath & path, AttributeValueDecoder & decoder)
 {
-    mAccessingFabricIndex = decoder.GetSubjectDescriptor().fabricIndex;
+    mAccessingFabricIndex = decoder.AccessingFabricIndex();
     if (!path.IsListOperation() || path.mListOp == ConcreteDataAttributePath::ListOperation::ReplaceAll)
     {
         DecodableBindingListType newBindingList;

src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp

@@ -192,7 +192,7 @@ class GroupKeyManagementAttributeAccess : public AttributeAccessInterface
 
     CHIP_ERROR WriteGroupKeyMap(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder)
     {
-        auto fabric_index = aDecoder.GetSubjectDescriptor().fabricIndex;
+        auto fabric_index = aDecoder.AccessingFabricIndex();
         auto provider     = GetGroupDataProvider();
 
         if (!aPath.IsListItemOperation())

src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

@@ -117,7 +117,7 @@ class OperationalCredentialsAttrAccess : public AttributeAccessInterface
 
 CHIP_ERROR OperationalCredentialsAttrAccess::ReadNOCs(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    auto accessingFabricIndex = aEncoder.GetSubjectDescriptor().fabricIndex;
+    auto accessingFabricIndex = aEncoder.AccessingFabricIndex();
 
     return aEncoder.EncodeList([accessingFabricIndex](const auto & encoder) -> CHIP_ERROR {
         const auto & fabricTable = Server::GetInstance().GetFabricTable();
@@ -252,7 +252,7 @@ CHIP_ERROR OperationalCredentialsAttrAccess::Read(const ConcreteReadAttributePat
         return ReadRootCertificates(aPath.mEndpointId, aEncoder);
     }
     case Attributes::CurrentFabricIndex::Id: {
-        return aEncoder.Encode(aEncoder.GetSubjectDescriptor().fabricIndex);
+        return aEncoder.Encode(aEncoder.AccessingFabricIndex());
     }
     default:
         break;

src/app/clusters/ota-requestor/ota-requestor-server.cpp

@@ -120,7 +120,7 @@ CHIP_ERROR OtaSoftwareUpdateRequestorAttrAccess::WriteDefaultOtaProviders(const
         DataModel::DecodableList<OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType> list;
         ReturnErrorOnFailure(aDecoder.Decode(list));
 
-        ReturnErrorOnFailure(requestor->ClearDefaultOtaProviderList(aDecoder.GetSubjectDescriptor().fabricIndex));
+        ReturnErrorOnFailure(requestor->ClearDefaultOtaProviderList(aDecoder.AccessingFabricIndex()));
 
         auto iter = list.begin();
         while (iter.Next())

src/app/clusters/test-cluster-server/test-cluster-server.cpp

@@ -661,7 +661,7 @@ CHIP_ERROR TestAttrAccess::WriteListFabricScopedAttribute(const ConcreteDataAttr
         size_t srcIndex = 0, dstIndex = 0;
         while (srcIndex < gListFabricScopedAttributeLen)
         {
-            if (gListFabricScopedAttributeValue[srcIndex].fabricIndex != aDecoder.GetSubjectDescriptor().fabricIndex)
+            if (gListFabricScopedAttributeValue[srcIndex].fabricIndex != aDecoder.AccessingFabricIndex())
             {
                 auto & dstEntry = gListFabricScopedAttributeValue[dstIndex];
                 auto & srcEntry = gListFabricScopedAttributeValue[srcIndex];

src/app/util/ember-compatibility-functions.cpp

@@ -425,7 +425,7 @@ CHIP_ERROR GlobalAttributeReader::EncodeCommandList(const ConcreteClusterPath &
 // Helper function for trying to read an attribute value via an
 // AttributeAccessInterface.  On failure, the read has failed.  On success, the
 // aTriedEncode outparam is set to whether the AttributeAccessInterface tried to encode a value.
-CHIP_ERROR ReadViaAccessInterface(const SubjectDescriptor &subjectDescriptor, bool aIsFabricFiltered,
+CHIP_ERROR ReadViaAccessInterface(const SubjectDescriptor & subjectDescriptor, bool aIsFabricFiltered,
                                   const ConcreteReadAttributePath & aPath, AttributeReportIBs::Builder & aAttributeReports,
                                   AttributeEncodeState * aEncoderState, AttributeAccessInterface * aAccessInterface,
                                   bool * aTriedEncode)