Merge branch 'access-control-module-prototype' into access-control-mo…

…dule-hookup

src/access/AccessControl.cpp

@@ -49,7 +49,7 @@ CHIP_ERROR AccessControl::Check(const SubjectDescriptor & subjectDescriptor, con
 {
     CHIP_ERROR err = CHIP_ERROR_ACCESS_DENIED;
 
-    EntryIterator* iterator = mDataProvider.Entries(subjectDescriptor.fabricIndex);
+    EntryIterator * iterator = mDataProvider.Entries(subjectDescriptor.fabricIndex);
 #if 0
     ReturnErrorCodeIf(iterator == nullptr, CHIP_ERROR_INTERNAL);
 #else

src/access/AccessControl.h

@@ -43,18 +43,15 @@ class AccessControl
      * uninitialized DataProvider must be provided, and the module must then be
      * initialized before use, and deinitialized when finished.
      */
-    AccessControl(DataProvider & dataProvider)
-        : mDataProvider(dataProvider)
-    {
-    }
+    AccessControl(DataProvider & dataProvider) : mDataProvider(dataProvider) {}
 
     AccessControl(const AccessControl &) = delete;
     AccessControl & operator=(const AccessControl &) = delete;
 
     /**
      * Initialize the access control module. Will also initialize its data
      * provider.
-     * 
+     *
      * @retval various errors, probably fatal.
      * @retval #CHIP_NO_ERROR on success.
      */
@@ -84,20 +81,14 @@ class AccessControl
      *
      * @retval nullptr if configured so.
      */
-    static AccessControl * GetInstance()
-    {
-        return mInstance;
-    }
+    static AccessControl * GetInstance() { return mInstance; }
 
     /**
      * Set the configured instance, for advanced use (e.g. testing). Does not
      * call Init or Finish (so ensure that happens appropriately). The
      * configured instance can be cleared (by setting to nullptr).
      */
-    static void SetInstance(AccessControl * instance)
-    {
-        mInstance = instance;
-    }
+    static void SetInstance(AccessControl * instance) { mInstance = instance; }
 
 private:
     DataProvider & mDataProvider;

src/access/AuthMode.h

@@ -29,9 +29,9 @@ namespace access {
  */
 enum AuthMode
 {
-    kNone = 0,
-    kPase = 1 << 5,
-    kCase = 1 << 6,
+    kNone  = 0,
+    kPase  = 1 << 5,
+    kCase  = 1 << 6,
     kGroup = 1 << 7
 };
 

src/access/Config.h

@@ -26,15 +26,14 @@ namespace access {
 struct Config
 {
 
-// Data provider implementation used by AccessControl configured instance.
-typedef DataProviderImpl DataProvider;
+    // Data provider implementation used by AccessControl configured instance.
+    typedef DataProviderImpl DataProvider;
 
-static const int kSubjectsPerEntry = 4;
+    static const int kSubjectsPerEntry = 4;
 
-static const int kTargetsPerEntry = 3;
-
-static const int kEntriesPerFabric = 3;
+    static const int kTargetsPerEntry = 3;
 
+    static const int kEntriesPerFabric = 3;
 };
 
 } // namespace access

src/access/DataProvider.h

@@ -83,14 +83,14 @@ class EntryIterator
     /**
      * Returns the next entry. Must only be called if a next entry exists (see
      * HasNext).
-     * 
+     *
      * @retval the next entry.
      */
-    virtual Entry& Next() = 0;
+    virtual Entry & Next() = 0;
 
     /**
      * Whether a next entry exists.
-     * 
+     *
      * @retval true if a next entry exists (next can be called).
      * @retval false if no next entry exists (next must not be called).
      */
@@ -124,7 +124,7 @@ class DataProvider
 
     /**
      * Initialize the data provider.
-     * 
+     *
      * @retval various errors, probably fatal.
      * @retval #CHIP_NO_ERROR on success.
      */
@@ -137,19 +137,19 @@ class DataProvider
 
     /**
      * Get an iterator over all entries.
-     * 
+     *
      * @retval iterator, release when finished.
      * @retval nullptr if error, probably fatal, generally should not happen.
      */
-    virtual EntryIterator* Entries() const = 0;
+    virtual EntryIterator * Entries() const = 0;
 
     /**
      * Get an iterator over all entries for a particular fabric.
-     * 
+     *
      * @retval iterator, release when finished.
      * @retval nullptr if error, probably fatal, generally should not happen.
      */
-    virtual EntryIterator* Entries(FabricIndex fabricIndex) const = 0;
+    virtual EntryIterator * Entries(FabricIndex fabricIndex) const = 0;
 };
 
 } // namespace access

src/access/DataProviderImpl.cpp

@@ -26,17 +26,15 @@ CHIP_ERROR DataProviderImpl::Init()
     return CHIP_NO_ERROR;
 }
 
-void DataProviderImpl::Finish()
-{
-}
+void DataProviderImpl::Finish() {}
 
-EntryIterator* DataProviderImpl::Entries() const
+EntryIterator * DataProviderImpl::Entries() const
 {
     // TODO: provide iterator
     return nullptr;
 }
 
-EntryIterator* DataProviderImpl::Entries(FabricIndex fabricIndex) const
+EntryIterator * DataProviderImpl::Entries(FabricIndex fabricIndex) const
 {
     // TODO: provide iterator
     return nullptr;

src/access/DataProviderImpl.h

@@ -31,14 +31,14 @@ namespace access {
 class DataProviderImpl : public DataProvider
 {
 public:
-    DataProviderImpl() = default;
+    DataProviderImpl()          = default;
     virtual ~DataProviderImpl() = default;
 
     CHIP_ERROR Init() override;
     void Finish() override;
 
-    EntryIterator* Entries() const override;
-    EntryIterator* Entries(FabricIndex fabricIndex) const override;
+    EntryIterator * Entries() const override;
+    EntryIterator * Entries(FabricIndex fabricIndex) const override;
 };
 
 } // namespace access

src/access/Privilege.h

@@ -29,10 +29,10 @@ namespace access {
  */
 enum Privilege
 {
-    kView = 1 << 0,
-    kProxyView = 1 << 1,
-    kOperate = 1 << 2,
-    kManage = 1 << 3,
+    kView       = 1 << 0,
+    kProxyView  = 1 << 1,
+    kOperate    = 1 << 2,
+    kManage     = 1 << 3,
     kAdminister = 1 << 4
 };
 

src/access/RequestPath.h

@@ -32,7 +32,7 @@ struct RequestPath
 {
     // TODO: don't worry about node for now (proxy source)
     EndpointId endpoint = 0;
-    ClusterId cluster = 0;
+    ClusterId cluster   = 0;
 };
 
 } // namespace access

src/access/SubjectDescriptor.h

@@ -26,15 +26,15 @@ namespace access {
 
 /**
  * @typedef SubjectId
- * 
+ *
  * @brief Access control subject identifier. Can store a PasscodeId, NodeId,
  * CatId, GroupId, etc. as appropriate.
  */
 typedef uint64_t SubjectId;
 
 /**
  * @class SubjectDescriptor
- * 
+ *
  * @brief Access control subject descriptor.
  */
 struct SubjectDescriptor

src/access/tests/BUILD.gn

@@ -21,9 +21,7 @@ import("${chip_root}/build/chip/chip_test_suite.gni")
 chip_test_suite("tests") {
   output_name = "libaccesstest"
 
-  test_sources = [
-    "TestAccessControl.cpp",
-  ]
+  test_sources = [ "TestAccessControl.cpp" ]
 
   cflags = [ "-Wconversion" ]