GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix leaking environment variables by Plazmaz · Pull Request #662 · gitpython-developers/GitPython

Fix leaking environment variables #662

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.

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

Merged

Byron merged 2 commits into gitpython-developers:master from Plazmaz:master

Sep 28, 2017

Uh oh!

There was an error while loading. Please reload this page.

Merged

Fix leaking environment variables #662

Changes from all commits

Commits

Show all changes

2 commits

Select commit Hold shift + click to select a range

54709d9

Fix leaking environment variables

Plazmaz Aug 21, 2017

67291f0

Fixed missing parameter and changed name

Plazmaz Aug 21, 2017

File filter

Filter by extension .py (1) All 1 file type selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

28 changes: 21 additions & 7 deletions 28 git/repo/base.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		import os
		import re
		import sys
		import warnings

		from git.cmd import (
		Git,
Expand Down Expand Up		@@ -50,8 +51,11 @@
		__all__ = ('Repo',)


		def _expand_path(p):
		return osp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))
		def _expand_path(p, expand_vars=True):
		p = osp.expanduser(p)
		if expand_vars:
		p = osp.expandvars(p)
		return osp.normpath(osp.abspath(p))


		class Repo(object):
Expand Down Expand Up		@@ -90,7 +94,7 @@ class Repo(object):
		# Subclasses may easily bring in their own custom types by placing a constructor or type here
		GitCommandWrapperType = Git

		def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False):
		def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, expand_vars=True):
		"""Create a new Repo instance

		:param path:
Expand All		@@ -116,12 +120,17 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
		:raise InvalidGitRepositoryError:
		:raise NoSuchPathError:
		:return: git.Repo """

		epath = path or os.getenv('GIT_DIR')
		if not epath:
		epath = os.getcwd()
		if Git.is_cygwin():
		epath = decygpath(epath)
		epath = _expand_path(epath or path or os.getcwd())
		epath = epath or path or os.getcwd()
		if expand_vars and ("%" in epath or "$" in epath):
		warnings.warn("The use of environment variables in paths is deprecated" +
		"\nfor security reasons and may be removed in the future!!")
		epath = _expand_path(epath, expand_vars)
		if not os.path.exists(epath):
		raise NoSuchPathError(epath)

Expand All		@@ -148,7 +157,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
		sm_gitpath = find_worktree_git_dir(dotgit)

		if sm_gitpath is not None:
		self.git_dir = _expand_path(sm_gitpath)
		self.git_dir = _expand_path(sm_gitpath, expand_vars)
		self._working_tree_dir = curpath
		break

Expand Down Expand Up		@@ -844,7 +853,7 @@ def blame(self, rev, file, incremental=False, **kwargs):
		return blames

		@classmethod
		def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
		def init(cls, path=None, mkdir=True, odbt=DefaultDBType, expand_vars=True, **kwargs):
		"""Initialize a git repository at the given path if specified

		:param path:
Expand All		@@ -862,12 +871,17 @@ def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
		the directory containing the database objects, i.e. .git/objects.
		It will be used to access all object data

		:param expand_vars:
		if specified, environment variables will not be escaped. This
		can lead to information disclosure, allowing attackers to
		access the contents of environment variables

		:parm kwargs:
		keyword arguments serving as additional options to the git-init command

		:return: ``git.Repo`` (the newly created repo)"""
		if path:
		path = _expand_path(path)
		path = _expand_path(path, expand_vars)
		if mkdir and path and not osp.exists(path):
		os.makedirs(path, 0o755)

Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.