version/prop: revert IsMacAppSandboxEnabled #11461
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barnstar
approved these changes
Mar 19, 2024
Fixes tailscale/corp#18441 For a few days, IsMacAppStore() has been returning `false` on App Store builds (IPN-macOS target in Xcode). I regressed this in #11369 by introducing logic to detect the sandbox by checking for the APP_SANDBOX_CONTAINER_ID environment variable. I thought that was a more robust approach instead of checking the name of the executable. However, it appears that on recent macOS versions this environment variable is no longer getting set, so we should go back to the previous logic that checks for the executable path, or HOME containing references to macsys. This PR also adds additional checks to the logic by also checking XPC_SERVICE_NAME in addition to HOME where possible. That environment variable is set inside the network extension, either macos or macsys and is good to look at if for any reason HOME is not set.
agottardo
force-pushed
the
angott/corp-18441-two
branch
from
8f36fd1
to
caffcf2
Compare
oxtoacart
approved these changes
Mar 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes tailscale/corp#18441
For a few days, IsMacAppStore() has been returning
falseon App Store builds (IPN-macOS target in Xcode).I regressed this in #11369 by introducing logic to detect the sandbox by checking for the
APP_SANDBOX_CONTAINER_IDenvironment variable. I thought that was a more robust approach instead of checking the name of the executable. However, it appears that in the CLI this environment variable is not set, so we should go back to the previous logic that checks for the executable path, orHOMEcontaining references to macsys.This PR also adds additional checks to the logic by also checking
XPC_SERVICE_NAMEin addition to HOME where possible. That environment variable is set inside the network extension, either macos or macsys and is good to look at if for any reasonHOMEis not set.