mirrors/Mist
1
0
Fork 0
mirror of https://github.com/ninxsoft/Mist.git synced 2025-05-12 22:26:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor Full Disk Access check

Browse source
This commit is contained in:
Nindi Gill 2023-06-09 20:27:28 +10:00
parent d6d5090327
commit 46bf6206ff
No known key found for this signature in database
GPG key ID: FF9A7FD590D4F4B1
4 changed files with 2 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mist.xcodeproj/project.pbxproj
View file

@ -130,8 +130,6 @@
39FF05F62859850F00A86670 /* SettingsFirmwaresView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FF05F52859850F00A86670 /* SettingsFirmwaresView.swift */; };
39FF05F82859851800A86670 /* SettingsApplicationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FF05F72859851800A86670 /* SettingsApplicationsView.swift */; };
39FF05FA285985DD00A86670 /* SettingsAboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FF05F9285985DD00A86670 /* SettingsAboutView.swift */; };
573A235E2A285E8900EC9470 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 573A235D2A285E8900EC9470 /* SQLite */; };
573A23602A285EAE00EC9470 /* FullDiskAccessVerifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A235F2A285EAE00EC9470 /* FullDiskAccessVerifier.swift */; };
573A23622A28711C00EC9470 /* Architecture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A23612A28711C00EC9470 /* Architecture.swift */; };
573A23642A28791F00EC9470 /* Scene+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A23632A28791F00EC9470 /* Scene+Extension.swift */; };
5795700B2A31B06F004C7051 /* ButtonStyle+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5795700A2A31B06F004C7051 /* ButtonStyle+Extension.swift */; };
@ -276,7 +274,6 @@
39FF05F52859850F00A86670 /* SettingsFirmwaresView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsFirmwaresView.swift; sourceTree = "<group>"; };
39FF05F72859851800A86670 /* SettingsApplicationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsApplicationsView.swift; sourceTree = "<group>"; };
39FF05F9285985DD00A86670 /* SettingsAboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAboutView.swift; sourceTree = "<group>"; };
573A235F2A285EAE00EC9470 /* FullDiskAccessVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullDiskAccessVerifier.swift; sourceTree = "<group>"; };
573A23612A28711C00EC9470 /* Architecture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Architecture.swift; sourceTree = "<group>"; };
573A23632A28791F00EC9470 /* Scene+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Scene+Extension.swift"; sourceTree = "<group>"; };
5795700A2A31B06F004C7051 /* ButtonStyle+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ButtonStyle+Extension.swift"; sourceTree = "<group>"; };
@ -288,7 +285,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
573A235E2A285E8900EC9470 /* SQLite in Frameworks */,
3935F4C5286B546A00760AB0 /* Sparkle in Frameworks */,
390451DF28573FAA00E0B563 /* Yams in Frameworks */,
39CF55AA286154A5006FB5D2 /* Blessed in Frameworks */,
@ -388,7 +384,6 @@
39CA25E22941D8BB0030711E /* FileAttributesUpdater.swift */,
39CF56162861BE66006FB5D2 /* FileCopier.swift */,
398734C728601FFC00B4C357 /* FileMover.swift */,
573A235F2A285EAE00EC9470 /* FullDiskAccessVerifier.swift */,
39D68B882861369B00A7848C /* InstallerCreator.swift */,
39CF56302862A8C5006FB5D2 /* InstallMediaCreator.swift */,
39CF562E2862A797006FB5D2 /* ISOConverter.swift */,
@ -577,7 +572,6 @@
39CF55A9286154A5006FB5D2 /* Blessed */,
39CF55B128615D30006FB5D2 /* SecureXPC */,
3935F4C4286B546A00760AB0 /* Sparkle */,
573A235D2A285E8900EC9470 /* SQLite */,
);
productName = Mist;
productReference = 390451A62856E1D900E0B563 /* Mist.app */;
@ -657,7 +651,6 @@
39CF55A8286154A5006FB5D2 /* XCRemoteSwiftPackageReference "Blessed" */,
39CF55B028615D30006FB5D2 /* XCRemoteSwiftPackageReference "SecureXPC" */,
3935F4C3286B546A00760AB0 /* XCRemoteSwiftPackageReference "Sparkle" */,
573A235C2A285E8900EC9470 /* XCRemoteSwiftPackageReference "SQLite" */,
);
productRefGroup = 390451A72856E1D900E0B563 /* Products */;
projectDirPath = "";
@ -824,7 +817,6 @@
39CA25E32941D8BB0030711E /* FileAttributesUpdater.swift in Sources */,
3935F4AB286B04BC00760AB0 /* HelperToolInfoPropertyList.swift in Sources */,
393F35BC28641181005B7165 /* RefreshState.swift in Sources */,
573A23602A285EAE00EC9470 /* FullDiskAccessVerifier.swift in Sources */,
390451CA2856F1D300E0B563 /* ScaledImage.swift in Sources */,
39252A95285BF83D00956C74 /* MistTask.swift in Sources */,
39CF56272861E10F006FB5D2 /* Codesigner.swift in Sources */,
@ -1270,14 +1262,6 @@
minimumVersion = 0.8.0;
};
};
573A235C2A285E8900EC9470 /* XCRemoteSwiftPackageReference "SQLite" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/stephencelis/SQLite.swift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.14.1;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@ -1311,11 +1295,6 @@
package = 39CF55B028615D30006FB5D2 /* XCRemoteSwiftPackageReference "SecureXPC" */;
productName = SecureXPC;
};
573A235D2A285E8900EC9470 /* SQLite */ = {
isa = XCSwiftPackageProductDependency;
package = 573A235C2A285E8900EC9470 /* XCRemoteSwiftPackageReference "SQLite" */;
productName = SQLite;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 3904519E2856E1D800E0B563 /* Project object */;

1
Mist/Extensions/String+Extension.swift
View file

@ -24,6 +24,7 @@ extension String {
static let packageIdentifierTemplate: String = "com.company.pkg.%NAME%.%VERSION%.%BUILD%"
static let temporaryDirectory: String = "/private/tmp/\(appIdentifier)"
static let cacheDirectory: String = "/Users/Shared/Mist/Cache"
static let tccDatabasePath: String = "/Library/Application Support/com.apple.TCC/TCC.db"
func stringWithSubstitutions(name: String, version: String, build: String) -> String {
self.replacingOccurrences(of: "%NAME%", with: name)

46
Mist/Helpers/FullDiskAccessVerifier.swift
View file

@ -1,46 +0,0 @@
//
// FullDiskAccessVerifier.swift
// Mist
//
// Created by Nindi Gill on 1/6/2023.
//
import SQLite
/// Helper struct to verify Full Disk Access.
struct FullDiskAccessVerifier {
private enum AuthValue: Int {
case denied = 0
case unknown = 1
case allowed = 2
case limited = 3
}
/// TCC Service identifier for Full Disk Access
private static let kTCCServiceSystemPolicyAllFiles: String = "kTCCServiceSystemPolicyAllFiles"
/// Verifies if the app has Full Disk Access.
///
/// - Returns: `true` if the app has Full Disk Access, otherwise `false`.
static func isAllowed() -> Bool {
do {
let database: Connection = try Connection("/Library/Application Support/com.apple.TCC/TCC.db")
let service: Expression = Expression<String>("service")
let client: Expression = Expression<String>("client")
let authValue: Expression = Expression<Int>("auth_value")
let access: Table = Table("access").filter(service == kTCCServiceSystemPolicyAllFiles && client == String.appIdentifier)
var allowed: Bool = false
for row in try database.prepare(access) where row[authValue] == AuthValue.allowed.rawValue {
allowed = true
break
}
return allowed
} catch {
// print(error.localizedDescription)
return false
}
}
}

2
Mist/Views/List/ListRow.swift
View file

@ -136,7 +136,7 @@ struct ListRow: View {
}
guard type == .installer,
FullDiskAccessVerifier.isAllowed() else {
FileManager.default.isReadableFile(atPath: .tccDatabasePath) else {
alertType = .fullDiskAccess
showAlert = true
return