Skip to content

Commit

Permalink
Merge pull request #480 from XcodesOrg/matt/privilegedHelperUpdate
Browse files Browse the repository at this point in the history
Update privilege helper to xcodesOrg and Team
  • Loading branch information
MattKiazyk authored Jan 24, 2024
2 parents 8a0595a + 9ec90a3 commit fb7e1f6
Show file tree
Hide file tree
Showing 17 changed files with 128 additions and 42 deletions.
4 changes: 2 additions & 2 deletions HelperXPCShared/HelperXPCShared.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

let machServiceName = "com.robotsandpencils.XcodesApp.Helper"
let clientBundleID = "com.robotsandpencils.XcodesApp"
let machServiceName = "com.xcodesorg.xcodesapp.Helper"
let clientBundleID = "com.xcodesorg.xcodesapp"
let subjectOrganizationalUnit = Bundle.main.infoDictionary!["CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT"] as! String

@objc(HelperXPCProtocol)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ Follow the steps below to build and release a new version of Xcodes.app. For any
# Update the version number in Xcode and commit the change, if necessary

# Question: Did anything in XPCHelper change?
# - com.robotsandpencils.XcodesApp.Helper folder and HelperXPCShared
# - if so, bump the version number in com.robotsandpencils.XcodesApp.Helper target.
# - com.xcodesorg.xcodesapp.Helper folder and HelperXPCShared
# - if so, bump the version number in com.xcodesorg.xcodesapp.Helper target.
# Note: you do not have to bump the version number if nothing has changed.
# Note2: If you do bump the version, the end user, must re-install the XPCHelper and give permission again.

Expand Down
2 changes: 1 addition & 1 deletion Scripts/uninstall_privileged_helper.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

PRIVILEGED_HELPER_LABEL=com.robotsandpencils.XcodesApp.Helper
PRIVILEGED_HELPER_LABEL=com.xcodesorg.xcodesapp.Helper

sudo rm /Library/PrivilegedHelperTools/$PRIVILEGED_HELPER_LABEL
sudo rm /Library/LaunchDaemons/$PRIVILEGED_HELPER_LABEL.plist
Expand Down
72 changes: 40 additions & 32 deletions Xcodes.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
BuildableName = "com.xcodesorg.xcodesapp.Helper"
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
ReferencedContainer = "container:Xcodes.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
viewDebuggingEnabled = "No">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
BuildableName = "com.xcodesorg.xcodesapp.Helper"
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
ReferencedContainer = "container:Xcodes.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
BuildableName = "com.xcodesorg.xcodesapp.Helper"
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
ReferencedContainer = "container:Xcodes.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
4 changes: 2 additions & 2 deletions Xcodes/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<true/>
<key>SMPrivilegedExecutables</key>
<dict>
<key>com.robotsandpencils.XcodesApp.Helper</key>
<string>identifier &quot;com.robotsandpencils.XcodesApp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
<key>com.xcodesorg.xcodesapp.Helper</key>
<string>identifier &quot;com.xcodesorg.xcodesapp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
</dict>
<key>SUFeedURL</key>
<string>https://www.xcodes.app/appcast.xml</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string>$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)</string>
<key>SMAuthorizedClients</key>
<array>
<string>identifier "com.robotsandpencils.XcodesApp" and info [CFBundleShortVersionString] &gt;= "1.0.0" and anchor apple generic and certificate leaf[subject.OU] = "$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)"</string>
<string>identifier &quot;com.xcodesorg.xcodesapp&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
</array>
</dict>
</plist>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.robotsandpencils.XcodesApp.Helper</string>
<string>com.xcodesorg.xcodesapp.Helper</string>
<key>MachServices</key>
<dict>
<key>com.robotsandpencils.XcodesApp.Helper</key>
<key>com.xcodesorg.xcodesapp.Helper</key>
<true/>
</dict>
</dict>
Expand Down
File renamed without changes.

0 comments on commit fb7e1f6

Please sign in to comment.