Skip to content

Commit 308f72c

Browse files
authored
Update silent-auth.sh
1 parent 18dcf62 commit 308f72c

File tree

1 file changed

+39
-6
lines changed

1 file changed

+39
-6
lines changed

Mac/silent-auth.sh

+39-6
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,17 @@ if [ "$PING2" -eq "1" ]; then
124124
TSMNetName="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $3}' | awk -F'.' '{print $2}')"
125125
TSMHostname="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $2}' | awk -F'.' '{print $1}')"
126126
TSMIP="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $1}')"
127-
echo "• User is Authenticated"
127+
echo "• User is Authenticated"
128+
if [ "$TSEXITNODE" == "N" ]; then
129+
echo "• Exit Node NOT Enforced"
130+
else
131+
if [[ -z "$TSEXITNODE" ]]; then
132+
echo "• Exit Node NOT Enforced"
133+
else
134+
echo "• Exit Node Enforced"
135+
runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale set --exit-node=$TSEXITNODE
136+
fi
137+
fi
128138
echo
129139
echo NO INTERVENTION WAS NEEDED
130140
echo
@@ -159,8 +169,18 @@ if [ "$PING3" -eq "1" ]; then
159169
TSMNetName="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $3}' | awk -F'.' '{print $2}')"
160170
TSMHostname="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $2}' | awk -F'.' '{print $1}')"
161171
TSMIP="$(runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale status | head -n 1 | awk '{print $1}')"
162-
echo "• User is Authenticated"
163-
echo
172+
echo "• User is Authenticated"
173+
if [ "$TSEXITNODE" == "N" ]; then
174+
echo "• Exit Node NOT Enforced"
175+
else
176+
if [[ -z "$TSEXITNODE" ]]; then
177+
echo "• Exit Node NOT Enforced"
178+
else
179+
echo "• Exit Node Enforced"
180+
runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale set --exit-node=$TSEXITNODE
181+
fi
182+
fi
183+
echo
164184
echo "ATTEMPT 1:" AUTHENTICATED SUCCESSFULLY
165185
echo
166186
echo "Tailnet: $TSMNetName"
@@ -174,7 +194,7 @@ if [ "$PING3" -eq "1" ]; then
174194
else
175195
echo
176196
echo ATTEMPT"2:" NO AUTH... AUTHING WITH RESET...
177-
sleep 5
197+
sleep 2.5
178198
runAsUser osascript -e 'tell application "Tailscale"' -e 'activate' -e 'end tell'
179199
if [[ -z "$HOOKHELPER" ]]; then
180200
echo "• No Webhooks to Fire. Continuing..."
@@ -183,11 +203,24 @@ else
183203
curl -s --request POST "$HOOKHELPER" -H "Content-Type: application/json; charset=UTF-8" -d '{"tailnet": "'"$TAILSCALENET"'", "apikey": "'"$TAILSCALEAPIKEY"'", "targetname": "'"$TSUSER"'"}'
184204
curl -s --request POST "$HOOKHELPER" -H "Content-Type: application/json; charset=UTF-8" -d '{"tailnet": "'"$TAILSCALENET"'", "apikey": "'"$TAILSCALEAPIKEY"'", "targetname": "'"$OLDTSUSER"'"}'
185205
fi
186-
sleep 5
206+
sleep 2.5
207+
runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale up --authkey "$TAILSCALEAUTHKEY" --hostname "$TSUSER"
208+
sleep 1.5
187209
runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale login --authkey "$TAILSCALEAUTHKEY" --hostname "$TSUSER"
188210
echo
189211
fi
190-
212+
213+
if [ "$TSEXITNODE" == "N" ]; then
214+
echo "• Exit Node NOT Enforced"
215+
else
216+
if [[ -z "$TSEXITNODE" ]]; then
217+
echo "• Exit Node NOT Enforced"
218+
else
219+
echo "• Exit Node Enforced"
220+
runAsUser /Applications/Tailscale.app/Contents/MacOS/Tailscale set --exit-node=$TSEXITNODE
221+
fi
222+
fi
223+
191224
echo "End: TAILSCALE SILENT AUTH SCRIPT"
192225
echo "____________________________________________"
193226

0 commit comments

Comments
 (0)