Merge pull request #106 from EmperorYP7/api-completion

feat: Added implementation and tests for UpdatePolicy API

.github/workflows/ci.yml

@@ -19,41 +19,65 @@ on: [push, pull_request]
 
 jobs:
   linux:
-    name: "Linux Ubuntu 20.04"
+    name: "Linux Ubuntu 20.04 (GNU 9.3.0)"
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         id: checkout
         uses: actions/checkout@v2
-      - name: Building files
+      - name: Configuring CMake files
         id: building-files
         run: |
-          make
+          mkdir build && cd build && cmake ..
       - name: Building library
         id: building-lib
         run: |
-          make library
+          cd build && cmake --build . --config Debug --target all -j 10 --
       - name: Cleanup
-        id: cleanup
+        id: clean-up
         run: |
-          make clean
+          rm -r build lib
+
+  windows:
+    name: "Windows 10 (MSVC 19.29)"
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v2
+      - name: Configuring CMake files
+        id: building-files
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+      - name: Building library
+        id: building-lib
+        run: |
+          cd build
+          cmake --build . --config Release --target casbin -j 10 --
+      - name: Cleanup
+        id: clean-up
+        run: |
+          rm -r build
+          rm -r lib
 
   macos:
-    name: "macOS Catalina 10.15"
+    name: "macOS Catalina 10.15 (AppleClang 12.0)"
     runs-on: macos-latest
     steps:
       - name: Checkout
         id: checkout
         uses: actions/checkout@v2
-      - name: Building files
+      - name: Configuring CMake files
         id: building-files
         run: |
-          make
+          mkdir build && cd build && cmake ..
       - name: Building library
         id: building-lib
         run: |
-          make library
+          cd build && cmake --build . --config Debug --target all -j 10 --
       - name: Cleanup
-        id: cleanup
+        id: clean-up
         run: |
-          make clean
+          rm -r build lib

.gitignore

@@ -354,6 +354,7 @@ MigrationBackup/
 .idea/
 *.iml
 .vscode
+.DS_Store
 
 # CMake work directory
 cmake-build/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_WARN_DEPRECATED ON)
 

README.md

@@ -13,7 +13,8 @@ Casbin-CPP
 Operating Systems | Availability status
 ----------------- | -------------------
 Windows (VS C++)  | :heavy_check_mark: Available
-Linux and MacOS   | :heavy_check_mark: Available
+Linux   | :heavy_check_mark: Available
+macOS   | :heavy_check_mark: Available
 
 
 ![casbin Logo](casbin-logo.png)

casbin/CMakeLists.txt

@@ -1,8 +1,15 @@
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-FILE(GLOB_RECURSE SC_FILES "*.cpp" "*.h")
+FILE(GLOB_RECURSE SRC_FILES "*.cpp" "*.h")
 
-add_library(casbin ${SC_FILES})
+add_library(casbin ${SRC_FILES})
+include_directories(${CMAKE_SOURCE_DIR}/casbin)
+
+target_precompile_headers(casbin PUBLIC "pch.h")
 
 set_target_properties(casbin PROPERTIES PREFIX "")
-set_target_properties(casbin PROPERTIES SUFFIX ".o")
+if(WIN32 OR MSVC)
+    set_target_properties(casbin PROPERTIES SUFFIX ".lib")
+elseif(UNIX)
+    set_target_properties(casbin PROPERTIES SUFFIX ".a")
+endif()

casbin/casbin.vcxproj

@@ -273,6 +273,7 @@
     <ClInclude Include="model\model.h" />
     <ClInclude Include="model\pch.h" />
     <ClInclude Include="model\scope_config.h" />
+    <ClInclude Include="pch.h" />
     <ClInclude Include="persist.h" />
     <ClInclude Include="persist\adapter.h" />
     <ClInclude Include="persist\batch_adapter.h" />
@@ -286,6 +287,7 @@
     <ClInclude Include="persist\pch.h" />
     <ClInclude Include="persist\watcher.h" />
     <ClInclude Include="persist\watcher_ex.h" />
+    <ClInclude Include="persist\watcher_update.h" />
     <ClInclude Include="rbac.h" />
     <ClInclude Include="rbac\default_role_manager.h" />
     <ClInclude Include="rbac\pch.h" />

casbin/casbin.vcxproj.filters

@@ -494,6 +494,12 @@
     <ClInclude Include="log\Logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="persist\watcher_update.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include=".clang-format" />

casbin/internal_api.cpp

@@ -25,11 +25,12 @@
 #include "./util/util.h"
 #include "./persist/watcher_ex.h"
 #include "./exception/unsupported_operation_exception.h"
+#include "./persist/watcher_update.h"
 
 namespace casbin {
 
 // addPolicy adds a rule to the current policy.
-bool Enforcer :: addPolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& rule) {
+bool Enforcer::addPolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& rule) {
     bool rule_added = m_model->AddPolicy(sec, p_type, rule);
     if(!rule_added)
         return rule_added;
@@ -59,7 +60,7 @@ bool Enforcer :: addPolicy(const std::string& sec, const std::string& p_type, co
 }
 
 // addPolicies adds rules to the current policy.
-bool Enforcer :: addPolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& rules) {
+bool Enforcer::addPolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& rules) {
     bool rules_added = m_model->AddPolicies(sec, p_type, rules);
     if (!rules_added)
         return rules_added;
@@ -83,7 +84,7 @@ bool Enforcer :: addPolicies(const std::string& sec, const std::string& p_type,
 }
 
 // removePolicy removes a rule from the current policy.
-bool Enforcer :: removePolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& rule) {
+bool Enforcer::removePolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& rule) {
     bool rule_removed = m_model->RemovePolicy(sec, p_type, rule);
     if(!rule_removed)
         return rule_removed;
@@ -113,7 +114,7 @@ bool Enforcer :: removePolicy(const std::string& sec, const std::string& p_type,
 }
 
 // removePolicies removes rules from the current policy.
-bool Enforcer :: removePolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& rules) {
+bool Enforcer::removePolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& rules) {
     bool rules_removed = m_model->AddPolicies(sec, p_type, rules);
     if (!rules_removed)
         return rules_removed;
@@ -136,7 +137,7 @@ bool Enforcer :: removePolicies(const std::string& sec, const std::string& p_typ
 }
 
 // removeFilteredPolicy removes rules based on field filters from the current policy.
-bool Enforcer :: removeFilteredPolicy(const std::string& sec, const std::string& p_type, int field_index, const std::vector<std::string>& field_values){
+bool Enforcer::removeFilteredPolicy(const std::string& sec, const std::string& p_type, int field_index, const std::vector<std::string>& field_values){
     std::pair<int, std::vector<std::vector<std::string>>> p = m_model->RemoveFilteredPolicy(sec, p_type, field_index, field_values);
     bool rule_removed = p.first;
     std::vector<std::vector<std::string>> effects = p.second;
@@ -166,12 +167,46 @@ bool Enforcer :: removeFilteredPolicy(const std::string& sec, const std::string&
     return rule_removed;
 }
 
-bool Enforcer :: updatePolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& oldRule, const std::vector<std::string>& newRule) {
-    return true;
+bool Enforcer::updatePolicy(const std::string& sec, const std::string& p_type, const std::vector<std::string>& oldRule, const std::vector<std::string>& newRule) {
+    bool is_rule_updated = m_model->UpdatePolicy(sec, p_type, oldRule, newRule);
+    if(!is_rule_updated)
+        return false;
+
+    if(sec == "g") {
+        this->BuildIncrementalRoleLinks(policy_remove, p_type, { oldRule });
+        this->BuildIncrementalRoleLinks(policy_add, p_type, { newRule });
+    }
+    if (m_watcher && m_auto_notify_watcher) {
+        if(IsInstanceOf<WatcherUpdatable>(m_watcher.get())) {
+            std::dynamic_pointer_cast<WatcherUpdatable>(m_watcher)->UpdateForUpdatePolicy(oldRule, newRule);
+        }
+        else {
+            m_watcher->Update();
+        }
+    }
+    return is_rule_updated;
 }
 
-bool Enforcer :: updatePolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& p1, const std::vector<std::vector<std::string>>& p2) {
-    return true;
+bool Enforcer::updatePolicies(const std::string& sec, const std::string& p_type, const std::vector<std::vector<std::string>>& oldRules, const std::vector<std::vector<std::string>>& newRules) {
+    bool is_rules_updated = m_model->UpdatePolicies(sec, p_type, oldRules, newRules);
+    if(!is_rules_updated)
+        return false;
+
+    if(sec == "g") {
+        this->BuildIncrementalRoleLinks(policy_remove, p_type, oldRules);
+        this->BuildIncrementalRoleLinks(policy_add, p_type, newRules);
+    }
+
+    if (m_watcher && m_auto_notify_watcher) {
+        if(IsInstanceOf<WatcherUpdatable>(m_watcher.get())) {
+            std::dynamic_pointer_cast<WatcherUpdatable>(m_watcher)->UpdateForUpdatePolicies(oldRules, newRules);
+        }
+        else {
+            m_watcher->Update();
+        }
+    }
+
+    return is_rules_updated;
 }
 
 } // namespace casbin

casbin/ip_parser/parser/Print.h

@@ -1,8 +1,6 @@
 #ifndef IP_PARSER_PARSER_PRINT
 #define IP_PARSER_PARSER_PRINT
 
-#include <iostream>
-
 #include "./IP.h"
 
 namespace casbin {

casbin/ip_parser/parser/pch.h

@@ -1,4 +1,6 @@
 #ifndef IPPARSER_PARSER_PCH
 #define IPPARSER_PARSER_PCH
 
+#include <iostream>
+
 #endif

casbin/logger.cpp

@@ -3,9 +3,8 @@
 #ifndef LOGGER_CPP
 #define LOGGER_CPP
 
-#include <iostream>
-#include "log/Logger.h"
-#include "log/log_util.h"
+#include "./log/Logger.h"
+#include "./log/log_util.h"
 
 namespace casbin {