config update and modules (#152)

* santactl/sync: #150 * pch to modules
google · Mar 9, 2017 · a2a660d · a2a660d
1 parent 8684cc3
commit a2a660d
Show file tree

Hide file tree

Showing 73 changed files with 175 additions and 91 deletions.
diff --git a/Santa.xcodeproj/project.pbxproj b/Santa.xcodeproj/project.pbxproj
diff --git a/Source/SantaGUI/Resources/Santa-Prefix.pch b/Source/SantaGUI/Resources/Santa-Prefix.pch
diff --git a/Source/SantaGUI/SNTAboutWindowController.h b/Source/SantaGUI/SNTAboutWindowController.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 @interface SNTAboutWindowController : NSWindowController
 
 @property IBOutlet NSButton *moreInfoButton;

diff --git a/Source/SantaGUI/SNTAccessibleTextField.h b/Source/SantaGUI/SNTAccessibleTextField.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 /**
    An NSTextField subclass that provides an accessiblity label equal to:
    (self.toolTip + self.stringValue) where available. It also sets the

diff --git a/Source/SantaGUI/SNTAppDelegate.h b/Source/SantaGUI/SNTAppDelegate.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 ///
 /// Initiates and manages the connection to santad
 ///

diff --git a/Source/SantaGUI/SNTMessageWindow.h b/Source/SantaGUI/SNTMessageWindow.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 ///
 ///  An NSPanel that can become key/main and can fade in/out.
 ///

diff --git a/Source/SantaGUI/SNTMessageWindowController.h b/Source/SantaGUI/SNTMessageWindowController.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 @class SNTStoredEvent;
 
 @protocol SNTMessageWindowControllerDelegate

diff --git a/Source/SantaGUI/SNTMessageWindowController.m b/Source/SantaGUI/SNTMessageWindowController.m
@@ -14,7 +14,7 @@
 
 #import "SNTMessageWindowController.h"
 
-#import <SecurityInterface/SFCertificatePanel.h>
+@import SecurityInterface.SFCertificatePanel;
 
 #import "MOLCertificate.h"
 #import "SNTBlockMessage.h"

diff --git a/Source/SantaGUI/SNTNotificationManager.h b/Source/SantaGUI/SNTNotificationManager.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 #import "SNTMessageWindowController.h"
 #import "SNTXPCNotifierInterface.h"
 

diff --git a/Source/SantaGUI/main.m b/Source/SantaGUI/main.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Cocoa;
+
 #import "SNTAppDelegate.h"
 
 int main(int argc, const char *argv[]) {

diff --git a/Source/common/SNTBlockMessage.h b/Source/common/SNTBlockMessage.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 @class SNTStoredEvent;
 
 @interface SNTBlockMessage : NSObject

diff --git a/Source/common/SNTCommonEnums.h b/Source/common/SNTCommonEnums.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 ///
 ///  These enums are used in various places throughout the Santa client code.
 ///  The integer values are also stored in the database and so shouldn't be changed.

diff --git a/Source/common/SNTConfigurator.h b/Source/common/SNTConfigurator.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommonEnums.h"
 
 ///
@@ -162,6 +164,24 @@ extern NSString *const kDefaultConfigFilePath;
 ///
 @property(readonly, nonatomic) NSString *machineID;
 
+///
+///  The number of seconds in-between full syncs while connected to FCM
+///
+///  @note The default value is 14400.
+///  @note The minimum value is 600.
+///
+@property(readonly, nonatomic) NSInteger FCMFullSyncInterval;
+
+///
+///  The maximum number of seconds to wait before a rule sync when
+///  receiving a global rule sync message. Each client will choose a random
+///  number of seconds between 0 and FCMGlobalRuleLeeway.
+///
+///  @note The default value is 600.
+///  @note The minimum value is 60.
+///
+@property(readonly, nonatomic) NSInteger FCMGlobalRuleLeeway;
+
 #pragma mark Server Auth Settings
 
 ///

diff --git a/Source/common/SNTConfigurator.m b/Source/common/SNTConfigurator.m
@@ -71,6 +71,9 @@ @implementation SNTConfigurator
 static NSString *const kMachineIDPlistFileKey = @"MachineIDPlist";
 static NSString *const kMachineIDPlistKeyKey = @"MachineIDKey";
 
+static NSString *const kFCMFullSyncInterval = @"FCMFullSyncInterval";
+static NSString *const kFCMGlobalRuleLeeway = @"FCMGlobalRuleLeeway";
+
 - (instancetype)initWithFilePath:(NSString *)filePath {
   self = [super init];
   if (self) {
@@ -326,6 +329,16 @@ - (NSString *)machineID {
   return machineId;
 }
 
+- (NSInteger)FCMFullSyncInterval {
+  NSInteger interval = [self.configData[kFCMFullSyncInterval] integerValue];
+  return (interval < 600) ? 1440 : interval;
+}
+
+- (NSInteger)FCMGlobalRuleLeeway {
+  NSInteger leeway = [self.configData[kFCMGlobalRuleLeeway] integerValue];
+  return (leeway < 60) ? 600 : leeway;
+}
+
 - (void)reloadConfigData {
   NSFileManager *fm = [NSFileManager defaultManager];
   if (![fm fileExistsAtPath:self.configFilePath]) return;

diff --git a/Source/common/SNTDropRootPrivs.h b/Source/common/SNTDropRootPrivs.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 ///
 ///  Simple function to check and drop root privileges.
 ///

diff --git a/Source/common/SNTFileInfo.h b/Source/common/SNTFileInfo.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 ///
 ///  Represents a binary on disk, providing access to details about that binary
 ///  such as the SHA-1, SHA-256, Info.plist and the Mach-O data.

diff --git a/Source/common/SNTFileWatcher.h b/Source/common/SNTFileWatcher.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 ///
 ///  Simple file watching class using dispatch sources. Will automatically
 ///  reload the watch if the file is deleted and continue watching for

diff --git a/Source/common/SNTLogging.h b/Source/common/SNTLogging.h
@@ -34,6 +34,8 @@
 
 #else  // KERNEL
 
+@import Foundation;
+
 typedef enum : NSUInteger {
   LOG_LEVEL_ERROR,
   LOG_LEVEL_WARN,

diff --git a/Source/common/SNTRule.h b/Source/common/SNTRule.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommonEnums.h"
 
 ///

diff --git a/Source/common/SNTStoredEvent.h b/Source/common/SNTStoredEvent.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommonEnums.h"
 
 ///

diff --git a/Source/common/SNTSystemInfo.h b/Source/common/SNTSystemInfo.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 ///
 ///  Simple class for fetching system information
 ///

diff --git a/Source/common/SNTXPCConnection.h b/Source/common/SNTXPCConnection.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 /**
   A wrapper around NSXPCListener and NSXPCConnection to provide client multiplexing, signature
   validation of connecting clients and forced connection establishment.

diff --git a/Source/common/SNTXPCControlInterface.h b/Source/common/SNTXPCControlInterface.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import <MOLCertificate/MOLCertificate.h>
 
 #import "SNTCachedDecision.h"

diff --git a/Source/common/SNTXPCNotifierInterface.h b/Source/common/SNTXPCNotifierInterface.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommonEnums.h"
 
 @class SNTStoredEvent;

diff --git a/Source/common/SNTXPCSyncdInterface.h b/Source/common/SNTXPCSyncdInterface.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommonEnums.h"
 
 @class SNTStoredEvent;

diff --git a/Source/santactl/Commands/SNTCommandCheckCache.m b/Source/santactl/Commands/SNTCommandCheckCache.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #import "SNTLogging.h"

diff --git a/Source/santactl/Commands/SNTCommandFileInfo.m b/Source/santactl/Commands/SNTCommandFileInfo.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #import <MOLCertificate/MOLCertificate.h>

diff --git a/Source/santactl/Commands/SNTCommandFlushCache.m b/Source/santactl/Commands/SNTCommandFlushCache.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #import "SNTLogging.h"

diff --git a/Source/santactl/Commands/SNTCommandRule.m b/Source/santactl/Commands/SNTCommandRule.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #include "SNTLogging.h"

diff --git a/Source/santactl/Commands/SNTCommandStatus.m b/Source/santactl/Commands/SNTCommandStatus.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #import "SNTConfigurator.h"

diff --git a/Source/santactl/Commands/SNTCommandVersion.m b/Source/santactl/Commands/SNTCommandVersion.m
@@ -12,9 +12,11 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
-#include <IOKit/kext/KextManager.h>
+@import IOKit.kext;
 
 #import "SNTCommonEnums.h"
 #import "SNTFileInfo.h"

diff --git a/Source/santactl/Commands/sync/NSData+Zlib.h b/Source/santactl/Commands/sync/NSData+Zlib.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 /// Category on NSData providing the option of getting zlib or gzip compressed data.
 @interface NSData (Zlib)
 

diff --git a/Source/santactl/Commands/sync/SNTCommandSync.m b/Source/santactl/Commands/sync/SNTCommandSync.m
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandController.h"
 
 #import "SNTCommandSyncManager.h"

diff --git a/Source/santactl/Commands/sync/SNTCommandSyncConstants.h b/Source/santactl/Commands/sync/SNTCommandSyncConstants.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 extern NSString *const kXSRFToken;
 
 extern NSString *const kSerialNumber;

diff --git a/Source/santactl/Commands/sync/SNTCommandSyncEventUpload.h b/Source/santactl/Commands/sync/SNTCommandSyncEventUpload.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandSyncStage.h"
 
 @interface SNTCommandSyncEventUpload : SNTCommandSyncStage

diff --git a/Source/santactl/Commands/sync/SNTCommandSyncLogUpload.h b/Source/santactl/Commands/sync/SNTCommandSyncLogUpload.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTCommandSyncStage.h"
 
 @interface SNTCommandSyncLogUpload : SNTCommandSyncStage

diff --git a/Source/santactl/Commands/sync/SNTCommandSyncManager.h b/Source/santactl/Commands/sync/SNTCommandSyncManager.h
@@ -12,6 +12,8 @@
 ///    See the License for the specific language governing permissions and
 ///    limitations under the License.
 
+@import Foundation;
+
 #import "SNTXPCSyncdInterface.h"
 
 @class SNTXPCConnection;