Commitf7968d1

committed

Put remove password in the utils and use it also in cmd.execute

1 parentf7180d5 commitf7968d1Copy full SHA for f7968d1

File tree

+35

-14

lines changed

+35

-14

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`is_win,`
`29`	`29`	`)`
`30`	`30`	`fromgit.excimportCommandError`
`31`		`-fromgit.utilimportis_cygwin_git,cygpath,expand_path`
	`31`	`+fromgit.utilimportis_cygwin_git,cygpath,expand_path,remove_password_if_present`
`32`	`32`
`33`	`33`	`from .excimport (`
`34`	`34`	`GitCommandError,`
`@@ -682,8 +682,10 @@ def execute(self, command,`
`682`	`682`	`:note:`
`683`	`683`	`If you add additional keyword arguments to the signature of this method,`
`684`	`684`	`you must update the execute_kwargs tuple housed in this module."""`
	`685`	`+# Remove password for the command if present`
	`686`	`+redacted_command=remove_password_if_present(command)`
`685`	`687`	`ifself.GIT_PYTHON_TRACEand (self.GIT_PYTHON_TRACE!='full'oras_process):`
`686`		`-log.info(' '.join(command))`
	`688`	`+log.info(' '.join(redacted_command))`
`687`	`689`
`688`	`690`	`# Allow the user to have the command executed in their working dir.`
`689`	`691`	`cwd=self._working_diroros.getcwd()`

Lines changed: 3 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`importos`
`10`	`10`	`importre`
`11`	`11`	`importwarnings`
`12`		`-fromurllib.parseimporturlsplit,urlunsplit`
`13`	`12`
`14`	`13`	`fromgit.cmdimport (`
`15`	`14`	`Git,`
`@@ -27,7 +26,7 @@`
`27`	`26`	`fromgit.objectsimportSubmodule,RootModule,Commit`
`28`	`27`	`fromgit.refsimportHEAD,Head,Reference,TagReference`
`29`	`28`	`fromgit.remoteimportRemote,add_progress,to_progress_instance`
`30`		`-fromgit.utilimportActor,finalize_process,decygpath,hex_to_bin,expand_path`
	`29`	`+fromgit.utilimportActor,finalize_process,decygpath,hex_to_bin,expand_path,remove_password_if_present`
`31`	`30`	`importos.pathasosp`
`32`	`31`
`33`	`32`	`from .funimportrev_parse,is_git_dir,find_submodule_git_dir,touch,find_worktree_git_dir`
`@@ -971,16 +970,8 @@ def _clone(cls, git, url, path, odb_default_type, progress, multi_options=None,`
`971`	`970`	`else:`
`972`	`971`	`(stdout,stderr)=proc.communicate()`
`973`	`972`	`cmdline=getattr(proc,'args','')`
`974`		`-uri=cmdline[-2]`
`975`		`-try:`
`976`		`-url=urlsplit(uri)`
`977`		`-# Remove password from the URL if present`
`978`		`-ifurl.password:`
`979`		`-edited_url=url._replace(`
`980`		`-netloc=url.netloc.replace(url.password,"****"))`
`981`		`-cmdline[-2]=urlunsplit(edited_url)`
`982`		`-exceptValueError:`
`983`		`-log.debug("Unable to parse the URL %s",url)`
	`973`	`+cmdline=remove_password_if_present(cmdline)`
	`974`	`+`
`984`	`975`	`log.debug("Cmd(%s)'s unused stdout: %s",cmdline,stdout)`
`985`	`976`	`finalize_process(proc,stderr=stderr)`
`986`	`977`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`fromsysimportmaxsize`
`17`	`17`	`importtime`
`18`	`18`	`fromunittestimportSkipTest`
	`19`	`+fromurllib.parseimporturlsplit,urlunsplit`
`19`	`20`
`20`	`21`	`fromgitdb.utilimport (# NOQA @IgnorePep8`
`21`	`22`	`make_sha,`
`@@ -338,6 +339,33 @@ def expand_path(p, expand_vars=True):`
`338`	`339`	`exceptException:`
`339`	`340`	`returnNone`
`340`	`341`
	`342`	`+`
	`343`	`+defremove_password_if_present(cmdline):`
	`344`	`+"""`
	`345`	`+ Parse any command line argument and if on of the element is an URL with a`
	`346`	`+ password, replace it by stars. If nothing found just returns a copy of the`
	`347`	`+ command line as-is.`
	`348`	`+`
	`349`	`+ This should be used for every log line that print a command line.`
	`350`	`+ """`
	`351`	`+redacted_cmdline= []`
	`352`	`+forto_parseincmdline:`
	`353`	`+try:`
	`354`	`+url=urlsplit(to_parse)`
	`355`	`+# Remove password from the URL if present`
	`356`	`+ifurl.passwordisNone:`
	`357`	`+raiseValueError()`
	`358`	`+`
	`359`	`+edited_url=url._replace(`
	`360`	`+netloc=url.netloc.replace(url.password,"*****"))`
	`361`	`+redacted_cmdline.append(urlunsplit(edited_url))`
	`362`	`+exceptValueError:`
	`363`	`+redacted_cmdline.append(to_parse)`
	`364`	`+# This is not a valid URL`
	`365`	`+pass`
	`366`	`+returnredacted_cmdline`
	`367`	`+`
	`368`	`+`
`341`	`369`	`#} END utilities`
`342`	`370`
`343`	`371`	`#{ Classes`

Comments

(0)