-
Notifications
You must be signed in to change notification settings - Fork 54
Add a feature to the tailscale devcontainer to auto-set the operator #58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
offbyone
wants to merge
2
commits into
tailscale:main
Choose a base branch
from
offbyone:ts-operator
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -3,8 +3,21 @@ | |||||
# Use of this source code is governed by a BSD-style | ||||||
# license that can be found in the LICENSE file. | ||||||
|
||||||
# if an operator argument has been provided, set the operator to | ||||||
# the specified value; if the value is the special value "$USER" | ||||||
# then set the operator to the default user for the devcontainer. | ||||||
# | ||||||
# This is done before the sudo switchover so we have the actual | ||||||
# user persisted. | ||||||
if [[ -n "$OPERATOR" ]]; then | ||||||
if [[ "$OPERATOR" == "\$USER" ]]; then | ||||||
OPERATOR=$(id -un) | ||||||
fi | ||||||
export OPERATOR | ||||||
fi | ||||||
|
||||||
if [[ $(id -u) -ne 0 ]]; then | ||||||
if ! command -v sudo > /dev/null; then | ||||||
if ! command -v sudo >/dev/null; then | ||||||
>&2 echo "tailscaled could not start as root." | ||||||
exit 1 | ||||||
fi | ||||||
|
@@ -31,7 +44,6 @@ EOF | |||||
fi | ||||||
fi | ||||||
|
||||||
|
||||||
TAILSCALED_PID="" | ||||||
TAILSCALED_SOCK=/var/run/tailscale/tailscaled.sock | ||||||
TAILSCALED_LOG=/var/log/tailscaled.log | ||||||
|
@@ -72,6 +84,12 @@ if [[ -n "$auth_key" ]]; then | |||||
if [[ -n "${CODESPACE_NAME}" ]]; then | ||||||
hostnamearg="--hostname=${CODESPACE_NAME}" | ||||||
fi | ||||||
/usr/local/bin/tailscale up --accept-routes --authkey="$auth_key" $hostnamearg | ||||||
|
||||||
operatorarg="" | ||||||
if [[ -n "${OPERATOR}" ]]; then | ||||||
operatorarg="--operator=${OPERATOR}" | ||||||
fi | ||||||
|
||||||
/usr/local/bin/tailscale up --accept-routes --authkey="$auth_key" $hostnamearg $operatorarg | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The variables $hostnamearg and $operatorarg should be quoted to prevent word splitting and glob expansion issues if they contain spaces or special characters.
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
fi | ||||||
fi |
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/usr/bin/env bash | ||
# Copyright (c) 2025 Tailscale Inc & AUTHORS All rights reserved. | ||
# Use of this source code is governed by a BSD-style | ||
# license that can be found in the LICENSE file. | ||
|
||
set -e | ||
|
||
source dev-container-features-test-lib | ||
|
||
# Wait for the auth key to be seen by the start script. | ||
count=100 | ||
while ((count--)); do | ||
[[ -f /tmp/test-auth-key-seen ]] && break | ||
sleep 0.1 | ||
done | ||
|
||
check "tailscale operator is set" bash -c 'tailscale debug prefs | grep -q OperatorUser' | ||
|
||
reportResults |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The string comparison uses escaped dollar sign '$USER' but the test scenario uses '$USER' without escaping. This comparison will never match the actual input from scenarios.json.
Copilot uses AI. Check for mistakes.