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.

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

Move to using Vendored Dependnecies #98

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,3 @@ dmypy.json

# Pyre type checker
.pyre/

# for this POC we do not check-in the pipenv `lock` file
Pipfile.lock
5 changes: 5 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ flake8 = "~=7.1.1"

[requires]
python_version = "3"

[scripts]
gh2jira = "python -m jira2github.cli"
# Vendor Script
vendor = "./vendor/update.sh"
595 changes: 595 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ runs:
INPUTS_ISSUE_END_STATE: ${{ inputs.issue_end_state }}
INPUTS_ISSUE_REOPEN_STATE: ${{ inputs.issue_reopen_state }}
run: |
pip3 install pipenv
pipenv install
export PYTHONPATH=${{ github.action_path }}:${{ github.action_path }}/vendor
REPOSITORY_NAME="$(echo "$GITHUB_REPOSITORY" | cut -d/ -f 2)"
# Run pipenv from the temporary directory
pipenv run ./gh2jira sync \
Expand Down
4 changes: 4 additions & 0 deletions vendor/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Vendored Dependencies

This directory contains vendored dependencies for the `github.com/github/ghas-jira-integration` repository.
These dependencies are vendored using the `pipenv run vendor` command.
240 changes: 240 additions & 0 deletions vendor/_distutils_hack/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
# don't import any costly modules
import os
import sys

report_url = (
"https://github.com/pypa/setuptools/issues/new?"
"template=distutils-deprecation.yml"
)


def warn_distutils_present():
if 'distutils' not in sys.modules:
return
import warnings

warnings.warn(
"Distutils was imported before Setuptools, but importing Setuptools "
"also replaces the `distutils` module in `sys.modules`. This may lead "
"to undesirable behaviors or errors. To avoid these issues, avoid "
"using distutils directly, ensure that setuptools is installed in the "
"traditional way (e.g. not an editable install), and/or make sure "
"that setuptools is always imported before distutils."
)


def clear_distutils():
if 'distutils' not in sys.modules:
return
import warnings

warnings.warn(
"Setuptools is replacing distutils. Support for replacing "
"an already imported distutils is deprecated. In the future, "
"this condition will fail. "
f"Register concerns at {report_url}"
)
mods = [
name
for name in sys.modules
if name == "distutils" or name.startswith("distutils.")
]
for name in mods:
del sys.modules[name]


def enabled():
"""
Allow selection of distutils by environment variable.
"""
which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local')
if which == 'stdlib':
import warnings

warnings.warn(
"Reliance on distutils from stdlib is deprecated. Users "
"must rely on setuptools to provide the distutils module. "
"Avoid importing distutils or import setuptools first, "
"and avoid setting SETUPTOOLS_USE_DISTUTILS=stdlib. "
f"Register concerns at {report_url}"
)
return which == 'local'


def ensure_local_distutils():
import importlib

clear_distutils()

# With the DistutilsMetaFinder in place,
# perform an import to cause distutils to be
# loaded from setuptools._distutils. Ref #2906.
with shim():
importlib.import_module('distutils')

# check that submodules load as expected
core = importlib.import_module('distutils.core')
assert '_distutils' in core.__file__, core.__file__
assert 'setuptools._distutils.log' not in sys.modules


def do_override():
"""
Ensure that the local copy of distutils is preferred over stdlib.

See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
for more motivation.
"""
if enabled():
warn_distutils_present()
ensure_local_distutils()


class _TrivialRe:
def __init__(self, *patterns):
self._patterns = patterns

def match(self, string):
return all(pat in string for pat in self._patterns)


class DistutilsMetaFinder:
def find_spec(self, fullname, path, target=None):
# optimization: only consider top level modules and those
# found in the CPython test suite.
if path is not None and not fullname.startswith('test.'):
return None

method_name = 'spec_for_{fullname}'.format(**locals())
method = getattr(self, method_name, lambda: None)
return method()

def spec_for_distutils(self):
if self.is_cpython():
return None

import importlib
import importlib.abc
import importlib.util

try:
mod = importlib.import_module('setuptools._distutils')
except Exception:
# There are a couple of cases where setuptools._distutils
# may not be present:
# - An older Setuptools without a local distutils is
# taking precedence. Ref #2957.
# - Path manipulation during sitecustomize removes
# setuptools from the path but only after the hook
# has been loaded. Ref #2980.
# In either case, fall back to stdlib behavior.
return None

class DistutilsLoader(importlib.abc.Loader):
def create_module(self, spec):
mod.__name__ = 'distutils'
return mod

def exec_module(self, module):
pass

return importlib.util.spec_from_loader(
'distutils', DistutilsLoader(), origin=mod.__file__
)

@staticmethod
def is_cpython():
"""
Suppress supplying distutils for CPython (build and tests).
Ref #2965 and #3007.
"""
return os.path.isfile('pybuilddir.txt')

def spec_for_pip(self):
"""
Ensure stdlib distutils when running under pip.
See pypa/pip#8761 for rationale.
"""
if sys.version_info >= (3, 12) or self.pip_imported_during_build():
return
clear_distutils()
self.spec_for_distutils = lambda: None

@classmethod
def pip_imported_during_build(cls):
"""
Detect if pip is being imported in a build script. Ref #2355.
"""
import traceback

return any(
cls.frame_file_is_setup(frame) for frame, line in traceback.walk_stack(None)
)

@staticmethod
def frame_file_is_setup(frame):
"""
Return True if the indicated frame suggests a setup.py file.
"""
# some frames may not have __file__ (#2940)
return frame.f_globals.get('__file__', '').endswith('setup.py')

def spec_for_sensitive_tests(self):
"""
Ensure stdlib distutils when running select tests under CPython.

python/cpython#91169
"""
clear_distutils()
self.spec_for_distutils = lambda: None

sensitive_tests = (
[
'test.test_distutils',
'test.test_peg_generator',
'test.test_importlib',
]
if sys.version_info < (3, 10)
else [
'test.test_distutils',
]
)


for name in DistutilsMetaFinder.sensitive_tests:
setattr(
DistutilsMetaFinder,
f'spec_for_{name}',
DistutilsMetaFinder.spec_for_sensitive_tests,
)


DISTUTILS_FINDER = DistutilsMetaFinder()


def add_shim():
DISTUTILS_FINDER in sys.meta_path or insert_shim()


class shim:
def __enter__(self) -> None:
insert_shim()

def __exit__(self, exc: object, value: object, tb: object) -> None:
_remove_shim()


def insert_shim():
sys.meta_path.insert(0, DISTUTILS_FINDER)


def _remove_shim():
try:
sys.meta_path.remove(DISTUTILS_FINDER)
except ValueError:
pass


if sys.version_info < (3, 12):
# DistutilsMetaFinder can only be disabled in Python < 3.12 (PEP 632)
remove_shim = _remove_shim
1 change: 1 addition & 0 deletions vendor/_distutils_hack/override.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__import__('_distutils_hack').do_override()
68 changes: 68 additions & 0 deletions vendor/anticrlf/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
""" a ``logging`` Formatter that escapes newline chars to avoid CRLF log injection (CWE-93)

Defines the class ``AntiCrlfFormatter``

"""
from __future__ import unicode_literals
import logging
import warnings

from anticrlf.types import SubstitutionMap


class LogFormatter(logging.Formatter):
"""logging Formatter to sanitize CRLF errors (CWE-93)

This class is a drop-in replacement for ``logging.Formatter``, and has the
exact same construction arguments. However, as a final step of formatting a
log line, it escapes carriage returns (\r) and linefeeds (\n).

By default, these are replaced with their escaped equivalents (see `Examples`_),
but the ``replacements`` dictionary can be modified to change this behabior.

Examples:
::

import anticrlf

handler = logging.StreamHandler(sys.stderr)
handler.setFormatter(anticrlf.LogFormatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s'))

logger = logging.getLogger(__name__)
logger.addHandler(handler)
logger.setLevel(logging.INFO)

logger.info("Example text with a newline\nhere")

This results in::

2017-02-03 08:43:52,557 - __main__ - INFO - Example text with a newline\nhere

Whereas with the default ``Formatter``, it would be::

2017-02-03 08:43:52,557 - __main__ - INFO - Example text with a newline
here

If you wanted newlines to be replaced with \x0A instead, you could::

formatter = anticrlf.LogFormatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
formatter.replacements["\n"] = "\\x0A" # Note the double backslash for literal!
handler.setFormatter(formatter)

"""
def __init__(self, fmt=None, datefmt=None):
super(self.__class__, self).__init__(fmt=fmt, datefmt=datefmt)
self.replacements = SubstitutionMap() # defaults to mapping \n: \\n and \r: \\r

def format(self, record):
"""calls logger.Formatter.format, then removes CR and LF from the resulting message before returning it"""
if type(self.replacements) != SubstitutionMap:
warnings.warn(UserWarning("replacements invalid: resetting to defaults"))
self.replacements = SubstitutionMap()

formatted_message = super(self.__class__, self).format(record)

for repl in self.replacements:
formatted_message = formatted_message.replace(repl, self.replacements[repl])

return formatted_message
2 changes: 2 additions & 0 deletions vendor/anticrlf/exception.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class UnsafeSubstitutionError(Exception):
pass
Empty file.
Loading
Loading