IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-09-03 20:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

client: move custom env variable into client module

Browse Source 
There is no need to have env as parameter because this is used only
once, so it can eb safely moved to client.py module

NOTE: PATH should be overwritten to safe values before we execute any
command
https://www.securecoding.cert.org/confluence/display/c/ENV03-C.+Sanitize+the+environment+when+invoking+external+programs

https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti
2016-11-11 12:13:56 +01:00
committed by Jan Cholasta
parent fcea3b3fb8
commit 83fe6b626f
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ipa-client-install
+3 -5
View File
@@ -229,20 +229,18 @@ def main():
root_logger.debug("missing options might be asked for interactively later")
root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
env={"PATH":"/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"}
if options.uninstall:
rval_check = client.uninstall_check(options)
if rval_check != client.SUCCESS:
return rval_check
return client.uninstall(options, env)
return client.uninstall(options)
rval_check = client.install_check(options)
if rval_check != client.SUCCESS:
return rval_check
rval = client.install(options, env)
rval = client.install(options)
if rval == client.CLIENT_INSTALL_ERROR:
if options.force:
root_logger.warning(
@@ -255,7 +253,7 @@ def main():
else:
root_logger.error("Installation failed. Rolling back changes.")
options.unattended = True
client.uninstall(options, env)
client.uninstall(options)
return rval
ipaclient/install/client.py
+10 -2
View File
@@ -78,6 +78,10 @@ CLIENT_NOT_CONFIGURED = 2
CLIENT_ALREADY_CONFIGURED = 3
CLIENT_UNINSTALL_ERROR = 4 # error after restoring files/state
SECURE_PATH = (
"/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"
)
# global variables
hostname = None
hostname_source = None
@@ -2280,7 +2284,9 @@ def install_check(options):
return SUCCESS
def install(options, env):
def install(options):
env = {'PATH': SECURE_PATH}
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE)
@@ -2884,7 +2890,9 @@ def uninstall_check(options):
return SUCCESS
def uninstall(options, env):
def uninstall(options):
env = {'PATH': SECURE_PATH}
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE)