Adopt namespace naming guidelines - part 1 (#1384)

google · Jul 5, 2024 · 73c1885 · 73c1885
1 parent 650f6fa
commit 73c1885
Show file tree

Hide file tree

Showing 44 changed files with 114 additions and 121 deletions.
diff --git a/Source/common/PrefixTree.h b/Source/common/PrefixTree.h
@@ -28,7 +28,7 @@
 #define DEBUG_LOG(format, ...)  // NOP
 #endif
 
-namespace santa::common {
+namespace santa {
 
 template <typename ValueT>
 class PrefixTree {
@@ -300,6 +300,6 @@ class PrefixTree {
   absl::Mutex lock_;
 };
 
-}  // namespace santa::common
+}  // namespace santa
 
 #endif
diff --git a/Source/common/PrefixTreeTest.mm b/Source/common/PrefixTreeTest.mm
@@ -17,7 +17,7 @@
 #define SANTA_PREFIX_TREE_DEBUG 1
 #include "Source/common/PrefixTree.h"
 
-using santa::common::PrefixTree;
+using santa::PrefixTree;
 
 @interface PrefixTreeTest : XCTestCase
 @end

diff --git a/Source/common/ScopedCFTypeRef.h b/Source/common/ScopedCFTypeRef.h
@@ -19,11 +19,11 @@
 
 #include "Source/common/ScopedTypeRef.h"
 
-namespace santa::common {
+namespace santa {
 
 template <typename CFT>
 using ScopedCFTypeRef = ScopedTypeRef<CFT, (CFT)NULL, CFRetain, CFRelease>;
 
-}  // namespace santa::common
+}  // namespace santa
 
 #endif
diff --git a/Source/common/ScopedCFTypeRefTest.mm b/Source/common/ScopedCFTypeRefTest.mm
@@ -19,7 +19,7 @@
 
 #include "Source/common/ScopedCFTypeRef.h"
 
-using santa::common::ScopedCFTypeRef;
+using santa::ScopedCFTypeRef;
 
 @interface ScopedCFTypeRefTest : XCTestCase
 @end

diff --git a/Source/common/ScopedIOObjectRef.h b/Source/common/ScopedIOObjectRef.h
@@ -19,12 +19,12 @@
 
 #include "Source/common/ScopedTypeRef.h"
 
-namespace santa::common {
+namespace santa {
 
 template <typename IOT>
 using ScopedIOObjectRef =
     ScopedTypeRef<IOT, (IOT)IO_OBJECT_NULL, IOObjectRetain, IOObjectRelease>;
 
 }
 
-#endif
+#endif  // namespace santa
diff --git a/Source/common/ScopedIOObjectRefTest.mm b/Source/common/ScopedIOObjectRefTest.mm
@@ -20,7 +20,7 @@
 #include "Source/common/ScopedIOObjectRef.h"
 #include "Source/santad/Logs/EndpointSecurity/Serializers/Utilities.h"
 
-using santa::common::ScopedIOObjectRef;
+using santa::ScopedIOObjectRef;
 using santa::santad::logs::endpoint_security::serializers::Utilities::GetDefaultIOKitCommsPort;
 
 @interface ScopedIOObjectRefTest : XCTestCase

diff --git a/Source/common/ScopedTypeRef.h b/Source/common/ScopedTypeRef.h
@@ -18,7 +18,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <assert.h>
 
-namespace santa::common {
+namespace santa {
 
 template <typename ElementT, ElementT InvalidV, auto RetainFunc,
           auto ReleaseFunc>
@@ -75,6 +75,6 @@ class ScopedTypeRef {
   ElementT object_;
 };
 
-}  // namespace santa::common
+}  // namespace santa
 
 #endif
diff --git a/Source/common/String.h b/Source/common/String.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <string_view>
 
-namespace santa::common {
+namespace santa {
 
 static inline std::string_view NSStringToUTF8StringView(NSString *str) {
   return std::string_view(str.UTF8String, [str lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
@@ -53,6 +53,6 @@ static inline std::string_view StringTokenToStringView(es_string_token_t es_str)
   return std::string_view(es_str.data, es_str.length);
 }
 
-}  // namespace santa::common
+}  // namespace santa
 
 #endif
diff --git a/Source/common/Unit.h b/Source/common/Unit.h
@@ -15,10 +15,10 @@
 #ifndef SANTA__COMMON__UNIT_H
 #define SANTA__COMMON__UNIT_H
 
-namespace santa::common {
+namespace santa {
 
 struct Unit {};
 
-}  // namespace santa::common
+}  // namespace santa
 
 #endif
diff --git a/Source/santad/DataLayer/WatchItemPolicy.h b/Source/santad/DataLayer/WatchItemPolicy.h
@@ -23,7 +23,7 @@
 #include <string_view>
 #include <vector>
 
-namespace santa::santad::data_layer {
+namespace santa {
 
 enum class WatchItemPathType {
   kPrefix,
@@ -117,6 +117,6 @@ struct WatchItemPolicy {
   std::string version = "temp_version";
 };
 
-}  // namespace santa::santad::data_layer
+}  // namespace santa
 
 #endif
diff --git a/Source/santad/DataLayer/WatchItems.h b/Source/santad/DataLayer/WatchItems.h
@@ -52,11 +52,11 @@ extern NSString *const kWatchItemConfigKeyProcessesCDHash;
 extern NSString *const kWatchItemConfigKeyProcessesPlatformBinary;
 
 // Forward declarations
-namespace santa::santad::data_layer {
+namespace santa {
 class WatchItemsPeer;
 }
 
-namespace santa::santad::data_layer {
+namespace santa {
 
 struct WatchItemsState {
   uint64_t rule_count;
@@ -69,7 +69,7 @@ class WatchItems : public std::enable_shared_from_this<WatchItems> {
  public:
   using VersionAndPolicies =
     std::pair<std::string, std::vector<std::optional<std::shared_ptr<WatchItemPolicy>>>>;
-  using WatchItemsTree = santa::common::PrefixTree<std::shared_ptr<WatchItemPolicy>>;
+  using WatchItemsTree = santa::PrefixTree<std::shared_ptr<WatchItemPolicy>>;
 
   // Factory
   static std::shared_ptr<WatchItems> Create(NSString *config_path,
@@ -99,7 +99,7 @@ class WatchItems : public std::enable_shared_from_this<WatchItems> {
   std::pair<NSString *, NSString *> EventDetailLinkInfo(
     const std::shared_ptr<WatchItemPolicy> &watch_item);
 
-  friend class santa::santad::data_layer::WatchItemsPeer;
+  friend class santa::WatchItemsPeer;
 
  private:
   static std::shared_ptr<WatchItems> CreateInternal(NSString *config_path, NSDictionary *config,
@@ -135,6 +135,6 @@ class WatchItems : public std::enable_shared_from_this<WatchItems> {
   NSString *policy_event_detail_text_ ABSL_GUARDED_BY(lock_);
 };
 
-}  // namespace santa::santad::data_layer
+}  // namespace santa
 
 #endif
diff --git a/Source/santad/DataLayer/WatchItems.mm b/Source/santad/DataLayer/WatchItems.mm
@@ -38,12 +38,12 @@
 #import "Source/common/Unit.h"
 #include "Source/santad/DataLayer/WatchItemPolicy.h"
 
-using santa::common::NSStringToUTF8String;
-using santa::common::NSStringToUTF8StringView;
-using santa::common::PrefixTree;
-using santa::common::Unit;
-using santa::santad::data_layer::WatchItemPathType;
-using santa::santad::data_layer::WatchItemPolicy;
+using santa::NSStringToUTF8String;
+using santa::NSStringToUTF8StringView;
+using santa::PrefixTree;
+using santa::Unit;
+using santa::WatchItemPathType;
+using santa::WatchItemPolicy;
 
 NSString *const kWatchItemConfigKeyVersion = @"Version";
 NSString *const kWatchItemConfigKeyEventDetailURL = @"EventDetailURL";
@@ -96,7 +96,7 @@
 // max is used here.
 static constexpr NSUInteger kWatchItemConfigEventDetailURLMaxLength = 6000;
 
-namespace santa::santad::data_layer {
+namespace santa {
 
 // Type aliases
 using ValidatorBlock = bool (^)(id, NSError **);
@@ -897,4 +897,4 @@ bool ParseConfig(NSDictionary *config, std::vector<std::shared_ptr<WatchItemPoli
   return {url, text};
 }
 
-}  // namespace santa::santad::data_layer
+}  // namespace santa
diff --git a/Source/santad/DataLayer/WatchItemsTest.mm b/Source/santad/DataLayer/WatchItemsTest.mm
@@ -32,23 +32,23 @@
 #include "Source/santad/DataLayer/WatchItemPolicy.h"
 #include "Source/santad/DataLayer/WatchItems.h"
 
-using santa::common::Unit;
-using santa::santad::data_layer::kWatchItemPolicyDefaultAllowReadAccess;
-using santa::santad::data_layer::kWatchItemPolicyDefaultAuditOnly;
-using santa::santad::data_layer::kWatchItemPolicyDefaultInvertProcessExceptions;
-using santa::santad::data_layer::kWatchItemPolicyDefaultPathType;
-using santa::santad::data_layer::WatchItemPathType;
-using santa::santad::data_layer::WatchItemPolicy;
-using santa::santad::data_layer::WatchItems;
-using santa::santad::data_layer::WatchItemsState;
+using santa::kWatchItemPolicyDefaultAllowReadAccess;
+using santa::kWatchItemPolicyDefaultAuditOnly;
+using santa::kWatchItemPolicyDefaultInvertProcessExceptions;
+using santa::kWatchItemPolicyDefaultPathType;
+using santa::Unit;
+using santa::WatchItemPathType;
+using santa::WatchItemPolicy;
+using santa::WatchItems;
+using santa::WatchItemsState;
 
 namespace santatest {
 using PathAndTypePair = std::pair<std::string, WatchItemPathType>;
 using PathList = std::vector<PathAndTypePair>;
 using ProcessList = std::vector<WatchItemPolicy::Process>;
 }  // namespace santatest
 
-namespace santa::santad::data_layer {
+namespace santa {
 
 extern bool ParseConfig(NSDictionary *config,
                         std::vector<std::shared_ptr<WatchItemPolicy>> &policies, NSError **err);
@@ -72,14 +72,14 @@ extern bool ParseConfigSingleWatchItem(NSString *name, NSDictionary *watch_item,
   using WatchItems::embedded_config_;
 };
 
-}  // namespace santa::santad::data_layer
+}  // namespace santa
 
-using santa::santad::data_layer::IsWatchItemNameValid;
-using santa::santad::data_layer::ParseConfig;
-using santa::santad::data_layer::ParseConfigSingleWatchItem;
-using santa::santad::data_layer::VerifyConfigWatchItemPaths;
-using santa::santad::data_layer::VerifyConfigWatchItemProcesses;
-using santa::santad::data_layer::WatchItemsPeer;
+using santa::IsWatchItemNameValid;
+using santa::ParseConfig;
+using santa::ParseConfigSingleWatchItem;
+using santa::VerifyConfigWatchItemPaths;
+using santa::VerifyConfigWatchItemProcesses;
+using santa::WatchItemsPeer;
 
 static constexpr std::string_view kBadPolicyName("__BAD_NAME__");
 static constexpr std::string_view kBadPolicyPath("__BAD_PATH__");

diff --git a/Source/santad/EventProviders/EndpointSecurity/EndpointSecurityAPI.h b/Source/santad/EventProviders/EndpointSecurity/EndpointSecurityAPI.h
@@ -43,9 +43,9 @@ class EndpointSecurityAPI : public std::enable_shared_from_this<EndpointSecurity
   virtual bool InvertTargetPathMuting(const Client &client);
 
   virtual bool MuteTargetPath(const Client &client, std::string_view path,
-                              santa::santad::data_layer::WatchItemPathType path_type);
+                              santa::WatchItemPathType path_type);
   virtual bool UnmuteTargetPath(const Client &client, std::string_view path,
-                                santa::santad::data_layer::WatchItemPathType path_type);
+                                santa::WatchItemPathType path_type);
 
   virtual void RetainMessage(const es_message_t *msg);
   virtual void ReleaseMessage(const es_message_t *msg);

diff --git a/Source/santad/EventProviders/EndpointSecurity/EndpointSecurityAPI.mm b/Source/santad/EventProviders/EndpointSecurity/EndpointSecurityAPI.mm
@@ -19,7 +19,7 @@
 
 #include "Source/common/Platform.h"
 
-using santa::santad::data_layer::WatchItemPathType;
+using santa::WatchItemPathType;
 
 namespace santa::santad::event_providers::endpoint_security {
 

diff --git a/Source/santad/EventProviders/EndpointSecurity/Enricher.mm b/Source/santad/EventProviders/EndpointSecurity/Enricher.mm
@@ -31,7 +31,7 @@
 #include "Source/santad/ProcessTree/process_tree.h"
 #include "Source/santad/ProcessTree/process_tree_macos.h"
 
-using santa::common::StringTokenToStringView;
+using santa::StringTokenToStringView;
 
 namespace santa::santad::event_providers::endpoint_security {
 

diff --git a/Source/santad/EventProviders/EndpointSecurity/MockEndpointSecurityAPI.h b/Source/santad/EventProviders/EndpointSecurity/MockEndpointSecurityAPI.h
@@ -48,11 +48,9 @@ class MockEndpointSecurityAPI
   MOCK_METHOD(bool, InvertTargetPathMuting, (const Client &client));
 
   MOCK_METHOD(bool, MuteTargetPath,
-              (const Client &client, std::string_view path,
-               santa::santad::data_layer::WatchItemPathType path_type));
+              (const Client &client, std::string_view path, santa::WatchItemPathType path_type));
   MOCK_METHOD(bool, UnmuteTargetPath,
-              (const Client &client, std::string_view path,
-               santa::santad::data_layer::WatchItemPathType path_type));
+              (const Client &client, std::string_view path, santa::WatchItemPathType path_type));
 
   MOCK_METHOD(void, RetainMessage, (const es_message_t *msg));
   MOCK_METHOD(void, ReleaseMessage, (const es_message_t *msg));

diff --git a/Source/santad/EventProviders/SNTEndpointSecurityClient.mm b/Source/santad/EventProviders/SNTEndpointSecurityClient.mm
@@ -37,10 +37,10 @@
 #include "Source/santad/EventProviders/EndpointSecurity/Message.h"
 #include "Source/santad/Metrics.h"
 
+using santa::WatchItemPathType;
 using santa::santad::EventDisposition;
 using santa::santad::Metrics;
 using santa::santad::Processor;
-using santa::santad::data_layer::WatchItemPathType;
 using santa::santad::event_providers::endpoint_security::Client;
 using santa::santad::event_providers::endpoint_security::EndpointSecurityAPI;
 using santa::santad::event_providers::endpoint_security::EnrichedMessage;

diff --git a/Source/santad/EventProviders/SNTEndpointSecurityClientBase.h b/Source/santad/EventProviders/SNTEndpointSecurityClientBase.h
@@ -52,9 +52,9 @@
 - (bool)unmuteAllTargetPaths;
 - (bool)enableTargetPathWatching;
 - (bool)muteTargetPaths:
-  (const std::vector<std::pair<std::string, santa::santad::data_layer::WatchItemPathType>> &)paths;
+  (const std::vector<std::pair<std::string, santa::WatchItemPathType>> &)paths;
 - (bool)unmuteTargetPaths:
-  (const std::vector<std::pair<std::string, santa::santad::data_layer::WatchItemPathType>> &)paths;
+  (const std::vector<std::pair<std::string, santa::WatchItemPathType>> &)paths;
 
 /// Responds to the Message with the given auth result
 ///

diff --git a/Source/santad/EventProviders/SNTEndpointSecurityClientTest.mm b/Source/santad/EventProviders/SNTEndpointSecurityClientTest.mm
@@ -34,8 +34,8 @@
 #import "Source/santad/EventProviders/SNTEndpointSecurityClient.h"
 #include "Source/santad/Metrics.h"
 
+using santa::WatchItemPathType;
 using santa::santad::Processor;
-using santa::santad::data_layer::WatchItemPathType;
 using santa::santad::event_providers::endpoint_security::Client;
 using santa::santad::event_providers::endpoint_security::EnrichedClose;
 using santa::santad::event_providers::endpoint_security::EnrichedFile;

diff --git a/Source/santad/EventProviders/SNTEndpointSecurityEventHandler.h b/Source/santad/EventProviders/SNTEndpointSecurityEventHandler.h
@@ -43,13 +43,10 @@
 // Called when a client should no longer receive events.
 - (void)disable;
 
-- (void)
-  watchItemsCount:(size_t)count
-         newPaths:
-           (const std::vector<std::pair<std::string, santa::santad::data_layer::WatchItemPathType>>
-              &)newPaths
-     removedPaths:
-       (const std::vector<std::pair<std::string, santa::santad::data_layer::WatchItemPathType>> &)
-         removedPaths;
+- (void)watchItemsCount:(size_t)count
+               newPaths:
+                 (const std::vector<std::pair<std::string, santa::WatchItemPathType>> &)newPaths
+           removedPaths:
+             (const std::vector<std::pair<std::string, santa::WatchItemPathType>> &)removedPaths;
 
 @end
diff --git a/Source/santad/EventProviders/SNTEndpointSecurityFileAccessAuthorizer.h b/Source/santad/EventProviders/SNTEndpointSecurityFileAccessAuthorizer.h
@@ -38,7 +38,7 @@ typedef void (^SNTFileAccessBlockCallback)(SNTFileAccessEvent *event, NSString *
     (std::shared_ptr<santa::santad::event_providers::endpoint_security::EndpointSecurityAPI>)esApi
         metrics:(std::shared_ptr<santa::santad::Metrics>)metrics
          logger:(std::shared_ptr<santa::santad::logs::endpoint_security::Logger>)logger
-     watchItems:(std::shared_ptr<santa::santad::data_layer::WatchItems>)watchItems
+     watchItems:(std::shared_ptr<santa::WatchItems>)watchItems
        enricher:
          (std::shared_ptr<santa::santad::event_providers::endpoint_security::Enricher>)enricher
   decisionCache:(SNTDecisionCache *)decisionCache

diff --git a/Source/santad/EventProviders/SNTEndpointSecurityFileAccessAuthorizer.mm b/Source/santad/EventProviders/SNTEndpointSecurityFileAccessAuthorizer.mm
@@ -51,15 +51,15 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 
-using santa::common::OptionalStringToNSString;
-using santa::common::StringToNSString;
+using santa::OptionalStringToNSString;
+using santa::StringToNSString;
+using santa::WatchItemPathType;
+using santa::WatchItemPolicy;
+using santa::WatchItems;
 using santa::santad::EventDisposition;
 using santa::santad::FileAccessMetricStatus;
 using santa::santad::Metrics;
 using santa::santad::TTYWriter;
-using santa::santad::data_layer::WatchItemPathType;
-using santa::santad::data_layer::WatchItemPolicy;
-using santa::santad::data_layer::WatchItems;
 using santa::santad::event_providers::RateLimiter;
 using santa::santad::event_providers::endpoint_security::EndpointSecurityAPI;
 using santa::santad::event_providers::endpoint_security::Enricher;