Skip to content

cloud-setup-databases: shell-escape values passed to EncryptionCLI #14229

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
jdscreations wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+8 −2
Open

cloud-setup-databases: shell-escape values passed to EncryptionCLI #14229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions setup/bindir/cloud-setup-databases.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import os
import sys
import subprocess
import glob
import shlex
from random import choice
import string
from optparse import OptionParser
Expand Down Expand Up @@ -418,8 +419,13 @@ for example:

def processEncryptionStuff(self):
def encrypt(value):
cmd = ['java','-classpath','"' + self.encryptionJarPath + '"','com.cloud.utils.crypt.EncryptionCLI','-i','"' + value + '"', '-p', '"' +
self.mgmtsecretkey + '"', self.encryptorVersion]
# runCmd() joins this list with spaces and runs it through a shell, so each
# dynamic value must be shell-escaped with shlex.quote() rather than hand-wrapped
# in double quotes: double quotes still let the shell expand "$..." in the value
# (e.g. a password of pa$sword is truncated to pa), silently corrupting it.
cmd = ['java', '-classpath', shlex.quote(self.encryptionJarPath),
'com.cloud.utils.crypt.EncryptionCLI', '-i', shlex.quote(value),
'-p', shlex.quote(self.mgmtsecretkey), self.encryptorVersion]
return str(runCmd(cmd)).strip('\r\n')

def saveMgmtServerSecretKey():
Expand Down