Skip to content

Support Active Directory if joined on non-cross account #397

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: mainline
Choose a base branch
from
Open

Support Active Directory if joined on non-cross account #397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad74dbb
Update domainjoin_unix_script.go
icarusmiles Aug 3, 2021
68dedba
Support Active Directory if joined on non-cross account
icarusmiles Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions agent/plugins/domainjoin/domainjoin_unix_script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,20 @@ get_servicecreds() {
SECRET_ID="${SECRET_ID_PREFIX}/$DIRECTORY_ID/seamless-domain-join"
SECRET_VALUE=$($AWSCLI secretsmanager get-secret-value --secret-id "$SECRET_ID" --region $REGION --query "SecretString" --output text 2>/dev/null)
if [ $? -ne 0 ]; then
PARENT_DIRECTORY_ID=$($AWSCLI ds describe-directories --region $REGION --query "DirectoryDescriptions[?DirectoryId =='$DIRECTORY_ID'].OwnerDirectoryDescription.DirectoryId | [0]" | sed 's/"//g')
PARENT_DIRECTORY_ID=$($AWSCLI ds describe-directories --region $REGION --query "DirectoryDescriptions[?DirectoryId =='$DIRECTORY_ID'].DirectoryId | [0]" | sed 's/"//g')
if [ $? -ne 0 ] || [ -z "$PARENT_DIRECTORY_ID" ] || [ "$PARENT_DIRECTORY_ID" == null ]; then
echo "***Failed: Cannot find parent directory Id"
exit 1
fi
PARENT_ACCOUNT_ID=$($AWSCLI ds describe-directories --region $REGION --query "DirectoryDescriptions[?DirectoryId =='$DIRECTORY_ID'].OwnerDirectoryDescription.AccountId | [0]" | sed 's/"//g')
SHARED_DIRECTORY_ID=$($AWSCLI ds describe-directories --region $REGION --query "DirectoryDescriptions[?DirectoryId =='$DIRECTORY_ID'].OwnerDirectoryDescription.DirectoryId | [0]" | sed 's/"//g')
if [ $? -ne 0 ] || [ -z "$SHARED_DIRECTORY_ID" ] || [ "$SHARED_DIRECTORY_ID" == null ]; then
echo "No share exists, ignoring"

else
echo "Share exists, modifying PARENT_DIRECTORY"
PARENT_DIRECTORY_ID=$SHARED_DIRECTORY_ID
fi
PARENT_ACCOUNT_ID=$($AWSCLI ds describe-directories --region $REGION --query "DirectoryDescriptions[?DirectoryId =='$DIRECTORY_ID'].AccountId | [0]" | sed 's/"//g')
if [ $? -ne 0 ] || [ -z "$PARENT_ACCOUNT_ID" ] || [ "$PARENT_ACCOUNT_ID" == null ]; then
echo "***Failed: Cannot find parent account Id"
exit 1
Expand Down