Skip to content
This repository has been archived by the owner on Feb 5, 2025. It is now read-only.

Make the sync client content encoding a tunable #1076

Merged
merged 6 commits into from
Apr 24, 2023
Merged

Make the sync client content encoding a tunable #1076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e342ddd
Make the sync client content encoding a tunable.
Apr 20, 2023
cd64f2f
Added options to documentation.
Apr 21, 2023
a2397ef
Incorporate review feedback.
Apr 21, 2023
f5dc560
Update docs/deployment/configuration.md
pmarkowsky Apr 21, 2023
dea0e8e
Made things consistent re:compression and encoding.
Apr 21, 2023
5d0b486
Rename Zlib enum with deflate.
Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Incorporate review feedback.
  • Loading branch information
Pete Markowsky committed Apr 21, 2023
commit a2397ef3e9d6b90d4a9c8c5eae855e7b34607969
1 change: 0 additions & 1 deletion Source/common/SNTCommonEnums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/// limitations under the License.

#import <Foundation/Foundation.h>
#include <objc/objc-api.h>

///
/// These enums are used in various places throughout the Santa client code.
Expand Down
4 changes: 2 additions & 2 deletions Source/common/SNTConfigurator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,14 +719,14 @@ - (NSString *)syncClientAuthCertificateIssuer {

- (SNTSyncCompressionEncoding)syncClientContentEncoding {
NSString *contentEncoding = [self.configState[kClientContentEncoding] lowercaseString];
if ([contentEncoding isEqualToString:@"zlib"]) {
if ([contentEncoding isEqualToString:@"deflate"]) {
return SNTSyncCompressionEncodingZlib;
} else if ([contentEncoding isEqualToString:@"gzip"]) {
return SNTSyncCompressionEncodingGzip;
} else if ([contentEncoding isEqualToString:@"none"]) {
return SNTSyncCompressionEncodingNone;
} else {
// Ensure we have the same
// Ensure we have the same default zlib behavior Santa's always had otherwise.
return SNTSyncCompressionEncodingZlib;
}
}
Expand Down
1 change: 0 additions & 1 deletion Source/santasyncservice/SNTSyncState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/// limitations under the License.

#import <Foundation/Foundation.h>
#include <objc/NSObjCRuntime.h>

#import "Source/common/SNTCommonEnums.h"

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ also known as mobileconfig files, which are in an Apple-specific XML format.
| RemountUSBMode | Array | Array of strings for arguments to pass to mount -o (any of "rdonly", "noexec", "nosuid", "nobrowse", "noowners", "nodev", "async", "-j"). when forcibly remounting devices. No default. |
| FileAccessPolicyPlist | String | (BETA) Path to a file access configuration plist. |
| FileAccessPolicyUpdateIntervalSec | Integer | (BETA) Number of seconds between re-reading the file access policy config and policies/monitored paths updated. |
| SyncClientContentEncoding | String | Sets the Content-Encoding header for requests sent to the sync service. Acceptable values are "", "zlib", "gzip", "none" (Defaults to "", which uses the Santa's default zlib behavior.) |
| SyncClientContentEncoding | String | Sets the Content-Encoding header for requests sent to the sync service. Acceptable values are "", "deflate", "gzip", "none" (Defaults to "", which uses the Santa's default zlib behavior.) |


\*overridable by the sync server: run `santactl status` to check the current
Expand Down