Skip to content
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

Jump to bottom

DRIVERS-2416 Add support for a second Azure client #360

Merged
merged 9 commits into from
Nov 15, 2023
Merged

DRIVERS-2416 Add support for a second Azure client #360

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1fc148
DRIVERS-2416 Add second Azure resource
blink1073 Oct 5, 2023
5ecc60c
skip legacy shell
blink1073 Oct 5, 2023
c3700e3
cleanup
blink1073 Oct 5, 2023
7329a0b
cleanup
blink1073 Oct 5, 2023
53bf354
try with two client_ids
blink1073 Oct 5, 2023
23e7e1f
debug
blink1073 Oct 5, 2023
e8b8e18
remove debug
blink1073 Oct 5, 2023
ecfc31c
Merge branch 'master' of github.com:mongodb-labs/drivers-evergreen-to…
blink1073 Oct 10, 2023
60535a8
use a closure for client_id
blink1073 Oct 30, 2023
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
26 changes: 20 additions & 6 deletions .evergreen/auth_oidc/azure/create-and-setup-vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ set -o errexit
set -o pipefail
set -o nounset

AZUREOIDC_DRIVERS_TOOLS=${AZUREOIDC_DRIVERS_TOOLS:-$DRIVERS_TOOLS}

if [ -z "${AZUREOIDC_VMNAME_PREFIX:-}" ] || \
[ -z "${AZUREOIDC_CLIENTID:-}" ] || \
[ -z "${AZUREOIDC_TENANTID:-}" ] || \
Expand Down Expand Up @@ -57,8 +59,8 @@ export AZUREKMS_VMNAME="$AZUREOIDC_VMNAME"

# Update expansions and env viles.
echo "AZUREOIDC_VMNAME: $AZUREOIDC_VMNAME" > testazureoidc-expansions.yml
echo "AZUREOIDC_VMNAME=${AZUREOIDC_VMNAME}" >> $AZUREOIDC_ENVPATH
echo "AZUREOIDC_DRIVERS_TOOLS=${AZUREOIDC_DRIVERS_TOOLS}" >> $AZUREOIDC_ENVPATH
echo "export AZUREOIDC_VMNAME=${AZUREOIDC_VMNAME}" >> $AZUREOIDC_ENVPATH
echo "export AZUREOIDC_DRIVERS_TOOLS=${AZUREOIDC_DRIVERS_TOOLS}" >> $AZUREOIDC_ENVPATH

# Install dependencies.
AZUREKMS_SRC="$AZUREOIDC_DRIVERS_TOOLS/.evergreen/csfle/azurekms/remote-scripts/setup-azure-vm.sh" \
Expand All @@ -72,11 +74,23 @@ AZUREKMS_SRC=$AZUREOIDC_ENVPATH \
AZUREKMS_DST="./" \
"$AZUREOIDC_DRIVERS_TOOLS"/.evergreen/csfle/azurekms/copy-file.sh

# Push Drivers Evergreen Tools onto the VM
TARFILE=/tmp/drivers-evergreen-tools.tgz
pushd $AZUREOIDC_DRIVERS_TOOLS
git archive --format=tar.gz -o $TARFILE --prefix=drivers-evergreen-tools/ HEAD
TARFILE_BASE=$(basename ${TARFILE})
AZUREKMS_SRC=${TARFILE} \
AZUREKMS_DST="~/" \
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
echo "Copying files ... end"
echo "Untarring file ... begin"
AZUREKMS_CMD="tar xf ${TARFILE_BASE}" \
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
echo "Untarring file ... end"
popd

# Start mongodb.
AZUREKMS_SRC="$AZUREOIDC_DRIVERS_TOOLS/.evergreen/auth_oidc/azure/start-mongodb.sh" \
AZUREKMS_DST="./" \
"$AZUREOIDC_DRIVERS_TOOLS"/.evergreen/csfle/azurekms/copy-file.sh
AZUREKMS_CMD="./start-mongodb.sh" \
AZUREKMS_CMD="./drivers-evergreen-tools/.evergreen/auth_oidc/azure/start-mongodb.sh" \
"$AZUREOIDC_DRIVERS_TOOLS"/.evergreen/csfle/azurekms/run-command.sh

# Run the self-test
Expand Down
8 changes: 5 additions & 3 deletions .evergreen/auth_oidc/azure/handle_secrets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,21 @@ def main():
client = SecretClient(vault_url=vault_uri, credential=credential)

secrets = dict()
for secret in ['RESOURCEGROUP', 'PUBLICKEY', 'PRIVATEKEY', 'TOKENCLIENT', 'AUTHCLAIM', 'AUTHPREFIX', 'IDENTITY']:
for secret in ['RESOURCEGROUP', 'PUBLICKEY', 'PRIVATEKEY', 'TOKENCLIENT', 'AUTHCLAIM', 'AUTHPREFIX', 'IDENTITY',
'TOKENCLIENT2', 'IDENTITY2']:
retrieved = client.get_secret(secret)
secrets[secret] = retrieved.value

with open(env_file, 'w') as fid:
fid.write(f'export AZUREOIDC_RESOURCEGROUP={secrets["RESOURCEGROUP"]}\n')
fid.write(f'export AZUREKMS_RESOURCEGROUP={secrets["RESOURCEGROUP"]}\n')
fid.write(f'export AZUREOIDC_TOKENCLIENT={secrets["TOKENCLIENT"]}\n')
fid.write(f'export AZUREOIDC_TOKENCLIENT2={secrets["TOKENCLIENT2"]}\n')
fid.write(f'export AZUREOIDC_AUTHCLAIM={secrets["AUTHCLAIM"]}\n')
fid.write(f'export AZUREOIDC_CLIENTID={client_id}\n')
fid.write(f'export AZUREOIDC_TENANTID={tenant_id}\n')
fid.write(f'export AZUREOIDC_AUTHPREFIX={secrets["AUTHPREFIX"]}\n')
fid.write(f'export AZUREKMS_IDENTITY={secrets["IDENTITY"]}\n')
fid.write(f'export AZUREKMS_IDENTITY="{secrets["IDENTITY"]} {secrets["IDENTITY2"]}"\n')

if os.path.exists(private_key_file):
os.remove(private_key_file)
Expand All @@ -56,4 +58,4 @@ def main():


if __name__ == '__main__':
main()
main()
5 changes: 1 addition & 4 deletions .evergreen/auth_oidc/azure/start-mongodb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ export ORCHESTRATION_FILE=auth-oidc.json
export DRIVERS_TOOLS=$HOME/drivers-evergreen-tools
export PROJECT_ORCHESTRATION_HOME=$DRIVERS_TOOLS/.evergreen/orchestration
export MONGO_ORCHESTRATION_HOME=$HOME
export SKIP_LEGACY_SHELL=true
export NO_IPV6=${NO_IPV6:-""}

if [ ! -d $DRIVERS_TOOLS ]; then
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
fi

cd $DRIVERS_TOOLS/.evergreen/auth_oidc
. ./activate-authoidcvenv.sh
python oidc_write_orchestration.py --azure
Expand Down
16 changes: 14 additions & 2 deletions .evergreen/auth_oidc/azure/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
_AUTH_MAP["MONGODB-OIDC"] = _authenticate_oidc

app_id = os.environ['AZUREOIDC_CLIENTID']
client_id = os.environ['AZUREOIDC_TOKENCLIENT']

def callback(client_info, server_info):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional: The side effect of setting client_id on callback is fairly confusing. Is there any way to encode the new client_id requirement in the callback function, or in a callback creator function?

E.g.

def callback_for(app_id, client_id):
    def callback(client_info, server_info):
        ...

    return callback

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use a closure.

url = "http://169.254.169.254/metadata/identity/oauth2/token"
url += "?api-version=2018-02-01"
url += f"&resource=api://{app_id}"
url += f"&client_id={client_id}"
headers = { "Metadata": "true", "Accept": "application/json" }
request = Request(url, headers=headers)
try:
Expand Down Expand Up @@ -41,8 +43,18 @@ def callback(client_info, server_info):


props = dict(request_token_callback=callback)
print('Testing MONGODB-OIDC on azure')
print('Testing MONGODB-OIDC on azure...')
print('Testing resource 1...')
c = MongoClient('mongodb://localhost:27017/?authMechanism=MONGODB-OIDC', authMechanismProperties=props)
c.test.test.insert_one({})
c.close()
print('Testing resource 1... done.')

print('Testing resource 2...')
client_id = os.environ['AZUREOIDC_TOKENCLIENT2']
c = MongoClient('mongodb://localhost:27017/?authMechanism=MONGODB-OIDC', authMechanismProperties=props)
c.test.test.find_one({})
c.close()
print('Self test complete!')
print('Testing resource 2... done.')
print('Testing MONGODB-OIDC on azure... done.')
print('Self test complete!')
3 changes: 1 addition & 2 deletions .evergreen/auth_oidc/oidc_write_orchestration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ def azure():
"issuer": f"https://sts.windows.net/{tenant_id}/",
"clientId": client_id,
"audience": f"api://{app_id}",
"authorizationClaim": "groups",

"authorizationClaim": "groups"
}
providers = json.dumps([provider_info], separators=(',',':'))

Expand Down
Loading