[AltServer] Fetches anisette data without Mail plug-in

Works on all macOS versions supported by AltServer.
This commit is contained in:
Riley Testut
2023-09-13 15:24:29 -05:00
committed by Magesh K
parent 9cf61bd4df
commit 07b1750a9c
3 changed files with 121 additions and 0 deletions

View File

@@ -0,0 +1,51 @@
//
// AnisetteError.swift
// AltServer
//
// Created by Riley Testut on 9/13/23.
// Copyright © 2023 Riley Testut. All rights reserved.
//
import Foundation
extension AnisetteError
{
enum Code: Int, ALTErrorCode
{
typealias Error = AnisetteError
case aosKitFailure
case missingValue
}
static func aosKitFailure(file: String = #fileID, line: UInt = #line) -> AnisetteError {
AnisetteError(code: .aosKitFailure, sourceFile: file, sourceLine: line)
}
static func missingValue(_ value: String?, file: String = #fileID, line: UInt = #line) -> AnisetteError {
AnisetteError(code: .missingValue, value: value, sourceFile: file, sourceLine: line)
}
}
struct AnisetteError: ALTLocalizedError
{
var code: Code
var errorTitle: String?
var errorFailure: String?
@UserInfoValue
var value: String?
var sourceFile: String?
var sourceLine: UInt?
var errorFailureReason: String {
switch self.code
{
case .aosKitFailure: return NSLocalizedString("AltServer could not retrieve anisette data from AOSKit.", comment: "")
case .missingValue:
let valueName = self.value.map { "anisette data value “\($0)" } ?? NSLocalizedString("anisette data values.", comment: "")
return String(format: NSLocalizedString("AltServer could not retrieve %@.", comment: ""), valueName)
}
}
}

View File

@@ -0,0 +1,54 @@
//
// ProcessInfo+Device.swift
// AltServer
//
// Created by Riley Testut on 9/13/23.
// Copyright © 2023 Riley Testut. All rights reserved.
//
import Foundation
import RegexBuilder
extension ProcessInfo
{
var deviceModel: String? {
let service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
defer {
IOObjectRelease(service)
}
guard
let modelData = IORegistryEntryCreateCFProperty(service, "model" as CFString, kCFAllocatorDefault, 0).takeRetainedValue() as? Data,
let cDeviceModel = String(data: modelData, encoding: .utf8)?.cString(using: .utf8) // Remove trailing NULL character
else { return nil }
let deviceModel = String(cString: cDeviceModel)
return deviceModel
}
var operatingSystemBuildVersion: String? {
let osVersionString = ProcessInfo.processInfo.operatingSystemVersionString
let buildVersion: String?
if #available(macOS 13, *), let match = osVersionString.firstMatch(of: Regex {
"(Build "
Capture {
OneOrMore(.anyNonNewline)
}
")"
})
{
buildVersion = String(match.1)
}
else if let build = osVersionString.split(separator: " ").last?.dropLast()
{
buildVersion = String(build)
}
else
{
buildVersion = nil
}
return buildVersion
}
}

View File

@@ -383,6 +383,8 @@
D57F2C9126E0070200B9FA39 /* EnableJITOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57F2C9026E0070200B9FA39 /* EnableJITOperation.swift */; };
D57F2C9426E01BC700B9FA39 /* UIDevice+Vibration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57F2C9326E01BC700B9FA39 /* UIDevice+Vibration.swift */; };
D57FE84428C7DB7100216002 /* ErrorLogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57FE84328C7DB7100216002 /* ErrorLogViewController.swift */; };
D58032EE2AB241D100878F5E /* AnisetteError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58032ED2AB241D100878F5E /* AnisetteError.swift */; };
D58032F02AB2429D00878F5E /* ProcessInfo+Device.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58032EF2AB2429D00878F5E /* ProcessInfo+Device.swift */; };
D586D39B28EF58B0000E101F /* AltTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586D39A28EF58B0000E101F /* AltTests.swift */; };
D58916FE28C7C55C00E39C8B /* LoggedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58916FD28C7C55C00E39C8B /* LoggedError.swift */; };
D5893F802A1419E800E767CD /* NSManagedObjectContext+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5893F7E2A14183200E767CD /* NSManagedObjectContext+Conveniences.swift */; };
@@ -1033,6 +1035,8 @@
D57F2C9026E0070200B9FA39 /* EnableJITOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnableJITOperation.swift; sourceTree = "<group>"; };
D57F2C9326E01BC700B9FA39 /* UIDevice+Vibration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+Vibration.swift"; sourceTree = "<group>"; };
D57FE84328C7DB7100216002 /* ErrorLogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorLogViewController.swift; sourceTree = "<group>"; };
D58032ED2AB241D100878F5E /* AnisetteError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnisetteError.swift; sourceTree = "<group>"; };
D58032EF2AB2429D00878F5E /* ProcessInfo+Device.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProcessInfo+Device.swift"; sourceTree = "<group>"; };
D581822C2A218A140087965B /* AltStore 13.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "AltStore 13.xcdatamodel"; sourceTree = "<group>"; };
D586D39828EF58B0000E101F /* AltTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AltTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D586D39A28EF58B0000E101F /* AltTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AltTests.swift; sourceTree = "<group>"; };
@@ -1211,6 +1215,7 @@
BF541C0A25E5A5FA00CD46B2 /* FileManager+URLs.swift */,
D5C8ACDA2A956B2B00669F92 /* Process+STPrivilegedTask.swift */,
D59A6B832AA932F700F61259 /* Logger+AltServer.swift */,
D58032EF2AB2429D00878F5E /* ProcessInfo+Device.swift */,
B343F84D295F6323002B1159 /* em_proxy.xcodeproj */,
19104DB42909C06D00C49C7B /* EmotionalDamage.swift */,
);
@@ -1397,6 +1402,7 @@
D5F5AF7C28ECEA990067C736 /* ErrorDetailsViewController.swift */,
BFC15ADB27BC3AD100ED2FB4 /* Plugin */,
BF703195229F36FF006E110F /* Devices */,
D58032EC2AB241B900878F5E /* Anisette Data */,
BFD52BDC22A0A659000B7ED1 /* Connections */,
D59A6B792AA919E500F61259 /* JIT */,
BF055B4A233B528B0086DEA9 /* Extensions */,
@@ -2194,6 +2200,14 @@
path = Components;
sourceTree = "<group>";
};
D58032EC2AB241B900878F5E /* Anisette Data */ = {
isa = PBXGroup;
children = (
D58032ED2AB241D100878F5E /* AnisetteError.swift */,
);
path = "Anisette Data";
sourceTree = "<group>";
};
D586D39928EF58B0000E101F /* AltTests */ = {
isa = PBXGroup;
children = (
@@ -2887,9 +2901,11 @@
BF718BD123C91BD300A89F2D /* ALTWiredConnection.mm in Sources */,
BFAD678E25E0649500D4C4D1 /* ALTDebugConnection.mm in Sources */,
BFECAC8524FD950B0077C41F /* Connection.swift in Sources */,
D58032EE2AB241D100878F5E /* AnisetteError.swift in Sources */,
BF458690229872EA00BD7491 /* AppDelegate.swift in Sources */,
BFECAC8424FD950B0077C41F /* ALTConstants.m in Sources */,
BF4586C52298CDB800BD7491 /* ALTDeviceManager.mm in Sources */,
D58032F02AB2429D00878F5E /* ProcessInfo+Device.swift in Sources */,
D59A6B842AA932F700F61259 /* Logger+AltServer.swift in Sources */,
BF0241AA22F29CCD00129732 /* UserDefaults+AltServer.swift in Sources */,
BFECAC9424FD98BA0077C41F /* NSError+ALTServerError.m in Sources */,