10309967616

Committed 08 Aug 2024 09:43PM UTC coverage: 62.69% (-0.4%) from 63.125%

Build # 10309967616

Build Type

push

github

Committed by

web-flow

Commit Message

sync: Fix Content-Type logic bug, add test (#1412)

Run Details

5612 of 13404 branches covered (41.87%)

Branch coverage included in aggregate %.

12 of 12 new or added lines in 2 files covered. (100.0%)

170 existing lines in 8 files now uncovered.

18659 of 25312 relevant lines covered (73.72%)

6451.94 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

10.94

/Source/common/SNTSystemInfo.m

/// Copyright 2015-2022 Google Inc. All rights reserved.
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
///    http://www.apache.org/licenses/LICENSE-2.0
///
///    Unless required by applicable law or agreed to in writing, software
///    distributed under the License is distributed on an "AS IS" BASIS,
///    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
///    See the License for the specific language governing permissions and
///    limitations under the License.

#import "Source/common/SNTSystemInfo.h"
#include <sys/sysctl.h>

@implementation SNTSystemInfo

+ (NSString *)serialNumber {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
  io_service_t platformExpert =
    IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
#pragma clang diagnostic pop
  if (!platformExpert) return nil;

  NSString *serial = CFBridgingRelease(IORegistryEntryCreateCFProperty(
    platformExpert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0));

  IOObjectRelease(platformExpert);

  return serial;
}

+ (NSString *)hardwareUUID {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
  io_service_t platformExpert =
    IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
#pragma clang diagnostic pop
  if (!platformExpert) return nil;

  NSString *uuid = CFBridgingRelease(IORegistryEntryCreateCFProperty(
    platformExpert, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0));

  IOObjectRelease(platformExpert);

  return uuid;
}

+ (NSString *)osVersion {
  return [SNTSystemInfo _systemVersionDictionary][@"ProductVersion"];
}

+ (NSString *)osBuild {
  return [SNTSystemInfo _systemVersionDictionary][@"ProductBuildVersion"];
}

+ (NSString *)shortHostname {
  return [[[SNTSystemInfo longHostname] componentsSeparatedByString:@"."] firstObject];
}

+ (NSString *)longHostname {
  char hostname[MAXHOSTNAMELEN];
  gethostname(hostname, (int)sizeof(hostname));
  return @(hostname);
}

+ (NSString *)modelIdentifier {
  char model[32];
  size_t len = 32;
  sysctlbyname("hw.model", model, &len, NULL, 0);
  return @(model);
}

+ (NSString *)santaProductVersion {
  NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];
  return info_dict[@"CFBundleShortVersionString"];
}

+ (NSString *)santaBuildVersion {
  NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];
  return [[info_dict[@"CFBundleVersion"] componentsSeparatedByString:@"."] lastObject];
}

+ (NSString *)santaFullVersion {
  NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];
  return info_dict[@"CFBundleVersion"];
}

#pragma mark - Internal

+ (NSDictionary *)_systemVersionDictionary {
  return
    [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
}

@end

1	/// Copyright 2015-2022 Google Inc. All rights reserved.
2	///
3	/// Licensed under the Apache License, Version 2.0 (the "License");
4	/// you may not use this file except in compliance with the License.
5	/// You may obtain a copy of the License at
6	///
7	/// http://www.apache.org/licenses/LICENSE-2.0
8	///
9	/// Unless required by applicable law or agreed to in writing, software
10	/// distributed under the License is distributed on an "AS IS" BASIS,
11	/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	/// See the License for the specific language governing permissions and
13	/// limitations under the License.
14
15	#import "Source/common/SNTSystemInfo.h"
16	#include <sys/sysctl.h>
17
18	@implementation SNTSystemInfo
19
UNCOV 20	+ (NSString *)serialNumber {	×
UNCOV 21	#pragma clang diagnostic push	×
UNCOV 22	#pragma clang diagnostic ignored "-Wdeprecated-declarations"	×
UNCOV 23	io_service_t platformExpert =	×
UNCOV 24	IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));	×
UNCOV 25	#pragma clang diagnostic pop	×
UNCOV 26	if (!platformExpert) return nil;	×
27
UNCOV 28	NSString *serial = CFBridgingRelease(IORegistryEntryCreateCFProperty(	×
UNCOV 29	platformExpert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0));	×
30
UNCOV 31	IOObjectRelease(platformExpert);	×
32
UNCOV 33	return serial;	×
UNCOV 34	}	×
35
UNCOV 36	+ (NSString *)hardwareUUID {	×
UNCOV 37	#pragma clang diagnostic push	×
UNCOV 38	#pragma clang diagnostic ignored "-Wdeprecated-declarations"	×
UNCOV 39	io_service_t platformExpert =	×
UNCOV 40	IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));	×
UNCOV 41	#pragma clang diagnostic pop	×
UNCOV 42	if (!platformExpert) return nil;	×
43
UNCOV 44	NSString *uuid = CFBridgingRelease(IORegistryEntryCreateCFProperty(	×
UNCOV 45	platformExpert, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0));	×
46
UNCOV 47	IOObjectRelease(platformExpert);	×
48
UNCOV 49	return uuid;	×
UNCOV 50	}	×
51
52	+ (NSString *)osVersion {	4✔
53	return [SNTSystemInfo _systemVersionDictionary][@"ProductVersion"];	4✔
54	}	4✔
55
56	+ (NSString *)osBuild {	×
57	return [SNTSystemInfo _systemVersionDictionary][@"ProductBuildVersion"];	×
58	}	×
59
60	+ (NSString *)shortHostname {	×
61	return [[[SNTSystemInfo longHostname] componentsSeparatedByString:@"."] firstObject];	×
62	}	×
63
UNCOV 64	+ (NSString *)longHostname {	×
UNCOV 65	char hostname[MAXHOSTNAMELEN];	×
UNCOV 66	gethostname(hostname, (int)sizeof(hostname));	×
UNCOV 67	return @(hostname);	×
UNCOV 68	}	×
69
70	+ (NSString *)modelIdentifier {	×
71	char model[32];	×
72	size_t len = 32;	×
73	sysctlbyname("hw.model", model, &len, NULL, 0);	×
74	return @(model);	×
75	}	×
76
77	+ (NSString *)santaProductVersion {	×
78	NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];	×
79	return info_dict[@"CFBundleShortVersionString"];	×
80	}	×
81
82	+ (NSString *)santaBuildVersion {	×
83	NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];	×
84	return [[info_dict[@"CFBundleVersion"] componentsSeparatedByString:@"."] lastObject];	×
85	}	×
86
87	+ (NSString *)santaFullVersion {	×
88	NSDictionary *info_dict = [[NSBundle mainBundle] infoDictionary];	×
89	return info_dict[@"CFBundleVersion"];	×
90	}	×
91
92	#pragma mark - Internal
93
94	+ (NSDictionary *)_systemVersionDictionary {	4✔
95	return	4✔
96	[NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];	4✔
97	}	4✔
98
99	@end

google / santa / 10309967616

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous