v2.4.2 (#1158)
* Pin `myst-parser` to avoid CI break (#1104) * Bump actions/setup-node from 2 to 3 (#1097) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 2 to 3 (#1106) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump types-setuptools from 57.4.7 to 57.4.10 (#1105) Bumps [types-setuptools](https://github.com/python/typeshed) from 57.4.7 to 57.4.10. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-setuptools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Upgrade `wemake-python-styleguide` (#1107) * Pin `wemake-python-styleguide` * Pin `wemake-python-styleguide` * Ignore `S324` for now * Bump actions/setup-python from 2 to 3 (#1110) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump chrome-devtools-frontend in /dashboard (#1109) Bumps [chrome-devtools-frontend](https://github.com/ChromeDevTools/devtools-frontend) from 1.0.956881 to 1.0.980332. - [Release notes](https://github.com/ChromeDevTools/devtools-frontend/releases) - [Changelog](https://github.com/ChromeDevTools/devtools-frontend/blob/main/docs/release_management.md) - [Commits](https://github.com/ChromeDevTools/devtools-frontend/commits) --- updated-dependencies: - dependency-name: chrome-devtools-frontend dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump mypy from 0.931 to 0.940 (#1111) Bumps [mypy](https://github.com/python/mypy) from 0.931 to 0.940. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.931...v0.940) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump furo from 2022.1.2 to 2022.3.4 (#1113) Bumps [furo](https://github.com/pradyunsg/furo) from 2022.1.2 to 2022.3.4. - [Release notes](https://github.com/pradyunsg/furo/releases) - [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md) - [Commits](https://github.com/pradyunsg/furo/compare/2022.01.02...2022.03.04) --- updated-dependencies: - dependency-name: furo dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix Towncrier link (#1119) * Bump actions/cache from 2.1.7 to 3.0.1 (#1118) Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.0.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2.1.7...v3.0.1) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * pip prod(deps): bump paramiko from 2.9.2 to 2.10.3 (#1116) Bumps [paramiko](https://github.com/paramiko/paramiko) from 2.9.2 to 2.10.3. - [Release notes](https://github.com/paramiko/paramiko/releases) - [Changelog](https://github.com/paramiko/paramiko/blob/main/NEWS) - [Commits](https://github.com/paramiko/paramiko/compare/2.9.2...2.10.3) --- updated-dependencies: - dependency-name: paramiko dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * npm: bump @types/jquery from 3.5.13 to 3.5.14 in /dashboard (#1115) Bumps [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery) from 3.5.13 to 3.5.14. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery) --- updated-dependencies: - dependency-name: "@types/jquery" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ncipollo/release-action from 1.9.0 to 1.10.0 (#1120) Bumps [ncipollo/release-action](https://github.com/ncipollo/release-action) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/ncipollo/release-action/releases) - [Commits](https://github.com/ncipollo/release-action/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: ncipollo/release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * Bump actions/upload-artifact from 2 to 3 (#1124) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * npm: bump async from 2.6.3 to 2.6.4 in /dashboard (#1125) Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix `myst_parser` config. Ref https://github.com/executablebooks/MyST-Parser/issues/519\#issuecomment-1037239655 (#1128) * Enable `pylint: disable=E0601` for upgrade * [FilterByClientIpPlugin] Implement the `whitelist` logic (#1127) * Implement the "whitelist" logic for the plugin "FilterByClientIpPlugin" * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix lint errors for the plugin FilterByClientIpPlugin Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * Update `README.md` flags to reflect `--filtered-client-ips-mode`. Autogenerated using `python check.py` * Bump actions/cache from 3.0.1 to 3.0.2 (#1126) Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump jasmine from 4.0.0 to 4.0.2 in /dashboard (#1122) Bumps [jasmine](https://github.com/jasmine/jasmine-npm) from 4.0.0 to 4.0.2. - [Release notes](https://github.com/jasmine/jasmine-npm/releases) - [Commits](https://github.com/jasmine/jasmine-npm/compare/v4.0.0...v4.0.2) --- updated-dependencies: - dependency-name: jasmine dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * Bump actions/download-artifact from 2 to 3 (#1133) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump pylint from 2.12.2 to 2.13.7 (#1129) Bumps [pylint](https://github.com/PyCQA/pylint) from 2.12.2 to 2.13.7. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/v2.12.2...v2.13.7) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * npm: bump ws from 8.4.2 to 8.5.0 in /dashboard (#1134) Bumps [ws](https://github.com/websockets/ws) from 8.4.2 to 8.5.0. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.0) --- updated-dependencies: - dependency-name: ws dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump codecov/codecov-action from 2 to 3 (#1137) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2 to 3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v2...v3) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump ts-node from 7.0.1 to 10.7.0 in /dashboard (#1136) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 7.0.1 to 10.7.0. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v7.0.1...v10.7.0) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump @types/js-cookie from 3.0.1 to 3.0.2 in /dashboard (#1138) Bumps [@types/js-cookie](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-cookie) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-cookie) --- updated-dependencies: - dependency-name: "@types/js-cookie" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github/codeql-action from 1 to 2 (#1140) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1...v2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump eslint-plugin-import from 2.25.4 to 2.26.0 in /dashboard (#1139) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.4 to 2.26.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.4...v2.26.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add a `Projects Using Proxy.Py` section * Upgrade paramiko to avoid blowfish ciphers (#1149) * Upgrade paramiko to avoid blowfish ciphers * Pin cryptography for python 3.6 * Bump docker/login-action from 1 to 2 (#1144) Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/setup-buildx-action from 1 to 2 (#1151) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * npm: bump jasmine and @types/jasmine in /dashboard (#1150) Bumps [jasmine](https://github.com/jasmine/jasmine-npm) and [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine). These dependencies needed to be updated together. Updates `jasmine` from 4.0.2 to 4.1.0 - [Release notes](https://github.com/jasmine/jasmine-npm/releases) - [Commits](https://github.com/jasmine/jasmine-npm/compare/v4.0.2...v4.1.0) Updates `@types/jasmine` from 3.10.2 to 4.0.3 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) --- updated-dependencies: - dependency-name: jasmine dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: "@types/jasmine" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump furo from 2022.3.4 to 2022.4.7 (#1143) Bumps [furo](https://github.com/pradyunsg/furo) from 2022.3.4 to 2022.4.7. - [Release notes](https://github.com/pradyunsg/furo/releases) - [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md) - [Commits](https://github.com/pradyunsg/furo/compare/2022.03.04...2022.04.07) --- updated-dependencies: - dependency-name: furo dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * npm: bump http-server from 14.0.0 to 14.1.0 in /dashboard (#1153) Bumps [http-server](https://github.com/http-party/http-server) from 14.0.0 to 14.1.0. - [Release notes](https://github.com/http-party/http-server/releases) - [Commits](https://github.com/http-party/http-server/compare/v14.0.0...v14.1.0) --- updated-dependencies: - dependency-name: http-server dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * pip prod(deps): bump tox from 3.24.5 to 3.25.0 (#1152) Bumps [tox](https://github.com/tox-dev/tox) from 3.24.5 to 3.25.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/3.24.5...3.25.0) --- updated-dependencies: - dependency-name: tox dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> * pip prod(deps): bump httpx from 0.21.3 to 0.22.0 (#1157) Bumps [httpx](https://github.com/encode/httpx) from 0.21.3 to 0.22.0. - [Release notes](https://github.com/encode/httpx/releases) - [Changelog](https://github.com/encode/httpx/blob/master/CHANGELOG.md) - [Commits](https://github.com/encode/httpx/compare/0.21.3...0.22.0) --- updated-dependencies: - dependency-name: httpx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LmR <letmer00t@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
commit
8a00695d56
|
@ -72,7 +72,7 @@ jobs:
|
|||
container-platforms: ${{ steps.container.outputs.platforms }}
|
||||
steps:
|
||||
- name: Switch to using Python 3.9 by default
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: 3.9
|
||||
- name: >-
|
||||
|
@ -95,7 +95,7 @@ jobs:
|
|||
- name: Check out src from Git
|
||||
if: >-
|
||||
steps.request-check.outputs.release-requested != 'true'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
|
@ -135,7 +135,7 @@ jobs:
|
|||
- name: Set up pip cache
|
||||
if: >-
|
||||
steps.request-check.outputs.release-requested != 'true'
|
||||
uses: actions/cache@v2.1.7
|
||||
uses: actions/cache@v3.0.2
|
||||
with:
|
||||
path: ${{ steps.pip-cache-dir.outputs.dir }}
|
||||
key: >-
|
||||
|
@ -225,7 +225,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Switch to using Python v3.10
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: '3.10'
|
||||
- name: >-
|
||||
|
@ -244,7 +244,7 @@ jobs:
|
|||
run: >-
|
||||
echo "::set-output name=dir::$(pip cache dir)"
|
||||
- name: Set up pip cache
|
||||
uses: actions/cache@v2.1.7
|
||||
uses: actions/cache@v3.0.2
|
||||
with:
|
||||
path: ${{ steps.pip-cache.outputs.dir }}
|
||||
key: >-
|
||||
|
@ -266,7 +266,7 @@ jobs:
|
|||
tox
|
||||
|
||||
- name: Grab the source from Git
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
|
@ -313,7 +313,7 @@ jobs:
|
|||
'dist/${{ needs.pre-setup.outputs.sdist-artifact-name }}'
|
||||
'dist/${{ needs.pre-setup.outputs.wheel-artifact-name }}'
|
||||
- name: Store the distribution packages
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
# NOTE: Exact expected file names are specified here
|
||||
|
@ -350,7 +350,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Switch to using Python v3.10
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: '3.10'
|
||||
- name: >-
|
||||
|
@ -369,7 +369,7 @@ jobs:
|
|||
run: >-
|
||||
echo "::set-output name=dir::$(pip cache dir)"
|
||||
- name: Set up pip cache
|
||||
uses: actions/cache@v2.1.7
|
||||
uses: actions/cache@v3.0.2
|
||||
with:
|
||||
path: ${{ steps.pip-cache.outputs.dir }}
|
||||
key: >-
|
||||
|
@ -391,7 +391,7 @@ jobs:
|
|||
tox
|
||||
|
||||
- name: Grab the source from Git
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
|
||||
|
@ -403,7 +403,7 @@ jobs:
|
|||
shell: bash
|
||||
- name: Download all the dists
|
||||
if: matrix.toxenv == 'metadata-validation'
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
|
@ -467,7 +467,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Switch to using Python v${{ matrix.python }}
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: ${{ matrix.python }}
|
||||
- name: >-
|
||||
|
@ -486,7 +486,7 @@ jobs:
|
|||
run: >-
|
||||
echo "::set-output name=dir::$(pip cache dir)"
|
||||
- name: Set up pip cache
|
||||
uses: actions/cache@v2.1.7
|
||||
uses: actions/cache@v3.0.2
|
||||
with:
|
||||
path: ${{ steps.pip-cache.outputs.dir }}
|
||||
key: >-
|
||||
|
@ -508,12 +508,12 @@ jobs:
|
|||
tox
|
||||
|
||||
- name: Grab the source from Git
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
|
@ -537,7 +537,7 @@ jobs:
|
|||
--skip-missing-interpreters false
|
||||
--skip-pkg-install
|
||||
- name: Upload coverage to Codecov
|
||||
uses: codecov/codecov-action@v2
|
||||
uses: codecov/codecov-action@v3
|
||||
with:
|
||||
flags: pytest, GHA, Python ${{ matrix.python }}, ${{ runner.os }}
|
||||
verbose: true
|
||||
|
@ -553,17 +553,17 @@ jobs:
|
|||
name: 🐳 Build & Test
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
# See https://github.com/docker/buildx/issues/850#issuecomment-996408167
|
||||
with:
|
||||
version: v0.7.0
|
||||
|
@ -621,7 +621,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
# We must fetch at least the immediate parents so that if this is
|
||||
# a pull request then we can checkout the head.
|
||||
|
@ -629,7 +629,7 @@ jobs:
|
|||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v1
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a
|
||||
|
@ -656,7 +656,7 @@ jobs:
|
|||
# make release
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
uses: github/codeql-action/analyze@v2
|
||||
|
||||
brew:
|
||||
runs-on: ${{ matrix.os }}-latest
|
||||
|
@ -668,9 +668,9 @@ jobs:
|
|||
# max-parallel: 1
|
||||
fail-fast: false
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: ${{ matrix.python }}
|
||||
- name: Brew
|
||||
|
@ -690,9 +690,9 @@ jobs:
|
|||
# max-parallel: 4
|
||||
fail-fast: false
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v2
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: ${{ matrix.node }}
|
||||
- name: Install Dependencies
|
||||
|
@ -720,11 +720,11 @@ jobs:
|
|||
python: ['3.10']
|
||||
fail-fast: false
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v2
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: ${{ matrix.python }}
|
||||
- name: Install Pip Dependencies
|
||||
|
@ -750,23 +750,23 @@ jobs:
|
|||
name: 🐳 ghcr:latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
- name: Login to GHCR
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
# See https://github.com/docker/buildx/issues/850#issuecomment-996408167
|
||||
with:
|
||||
version: v0.7.0
|
||||
|
@ -832,23 +832,23 @@ jobs:
|
|||
name: 🐳 ghcr:openssl
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
- name: Login to GHCR
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
# See https://github.com/docker/buildx/issues/850#issuecomment-996408167
|
||||
with:
|
||||
version: v0.7.0
|
||||
|
@ -912,17 +912,17 @@ jobs:
|
|||
name: 🐳 docker:latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
# See https://github.com/docker/buildx/issues/850#issuecomment-996408167
|
||||
with:
|
||||
version: v0.7.0
|
||||
|
@ -939,7 +939,7 @@ jobs:
|
|||
docker buildx inspect
|
||||
docker buildx ls
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: abhinavsingh
|
||||
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
|
||||
|
@ -1001,7 +1001,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
|
@ -1030,7 +1030,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
|
@ -1052,7 +1052,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Fetch the src snapshot
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 1
|
||||
ref: ${{ github.event.inputs.release-commitish }}
|
||||
|
@ -1089,7 +1089,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Download all the dists
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: python-package-distributions
|
||||
path: dist/
|
||||
|
@ -1097,7 +1097,7 @@ jobs:
|
|||
- name: >-
|
||||
Publish a GitHub Release for
|
||||
${{ needs.pre-setup.outputs.git-tag }}
|
||||
uses: ncipollo/release-action@v1.9.0
|
||||
uses: ncipollo/release-action@v1.10.0
|
||||
with:
|
||||
allowUpdates: false
|
||||
artifactErrorsFailBuild: false
|
||||
|
|
|
@ -149,15 +149,16 @@ repos:
|
|||
- flake8-2020 >= 1.6.0
|
||||
- flake8-docstrings >= 1.5.0
|
||||
- flake8-pytest-style >= 1.2.2
|
||||
- wemake-python-styleguide ~= 0.15.0
|
||||
- wemake-python-styleguide >= 0.16.1
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-mypy.git
|
||||
rev: v0.910
|
||||
hooks:
|
||||
- id: mypy
|
||||
additional_dependencies:
|
||||
- paramiko == 2.8.0
|
||||
- paramiko == 2.11.0
|
||||
- types-paramiko == 2.7.3
|
||||
- cryptography==36.0.2; python_version <= '3.6'
|
||||
- types-setuptools == 57.4.2
|
||||
args:
|
||||
# FIXME: get rid of missing imports ignore
|
||||
|
|
|
@ -9,7 +9,7 @@ This document describes how contributors can participate and iterate quickly whi
|
|||
|
||||
## Environment Setup
|
||||
|
||||
Contributors must start `proxy.py` from source to verify and develop new features / fixes. See [Run proxy.py from command line using repo source](#from-command-line-using-repo-source) for usage instructions.
|
||||
Contributors must start `proxy.py` from source to verify and develop new features / fixes. See `Run proxy.py from command line using repo source` in README.md for usage instructions.
|
||||
|
||||
[](https://github.com/abhinavsingh/proxy.py/issues/642#issuecomment-960819271) On `macOS` you must install `Python` using `pyenv`, as `Python` installed via `homebrew` tends to be problematic. See linked thread for more details.
|
||||
|
||||
|
|
23
README.md
23
README.md
|
@ -124,6 +124,7 @@
|
|||
- [Setup Local Environment](#setup-local-environment)
|
||||
- [Setup Git Hooks](#setup-git-hooks)
|
||||
- [Sending a Pull Request](#sending-a-pull-request)
|
||||
- [Projects Using Proxy.Py](#projects-using-proxypy)
|
||||
- [Benchmarks](#benchmarks)
|
||||
- [Flags](#flags)
|
||||
- [Changelog](https://proxypy.rtfd.io/en/latest/changelog)
|
||||
|
@ -2249,6 +2250,21 @@ Every pull request is tested using GitHub actions.
|
|||
See [GitHub workflow](https://github.com/abhinavsingh/proxy.py/tree/develop/.github/workflows)
|
||||
for list of tests.
|
||||
|
||||
# Projects Using Proxy.Py
|
||||
|
||||
Some of the projects using `proxy.py`
|
||||
|
||||
1. [ray-project](https://github.com/ray-project/ray)
|
||||
2. [aio-libs](https://github.com/aio-libs/aiohttp)
|
||||
3. [wifipumpkin3](https://github.com/P0cL4bs/wifipumpkin3)
|
||||
4. [MerossIot](https://github.com/albertogeniola/MerossIot)
|
||||
5. [pyshorteners](https://github.com/ellisonleao/pyshorteners)
|
||||
6. [Slack API](https://github.com/slackapi/python-slack-events-api)
|
||||
7. [ibeam](https://github.com/Voyz/ibeam)
|
||||
8. [PyPaperBot](https://github.com/ferru97/PyPaperBot)
|
||||
|
||||
For full list see [used by](https://github.com/abhinavsingh/proxy.py/network/dependents?package_id=UGFja2FnZS01MjQ0MDY5Ng%3D%3D)
|
||||
|
||||
# Benchmarks
|
||||
|
||||
See [Benchmark](https://github.com/abhinavsingh/proxy.py/tree/develop/benchmark) directory on how to run benchmark comparisons with other OSS web servers.
|
||||
|
@ -2295,10 +2311,11 @@ usage: -m [-h] [--tunnel-hostname TUNNEL_HOSTNAME] [--tunnel-port TUNNEL_PORT]
|
|||
[--pac-file-url-path PAC_FILE_URL_PATH]
|
||||
[--cloudflare-dns-mode CLOUDFLARE_DNS_MODE]
|
||||
[--filtered-upstream-hosts FILTERED_UPSTREAM_HOSTS]
|
||||
[--filtered-client-ips-mode FILTERED_CLIENT_IPS_MODE]
|
||||
[--filtered-client-ips FILTERED_CLIENT_IPS]
|
||||
[--filtered-url-regex-config FILTERED_URL_REGEX_CONFIG]
|
||||
|
||||
proxy.py v2.4.0rc10.dev13+g96428ae.d20220126
|
||||
proxy.py v2.4.2.dev11+g0beb02d.d20220420
|
||||
|
||||
options:
|
||||
-h, --help show this help message and exit
|
||||
|
@ -2469,6 +2486,10 @@ options:
|
|||
--filtered-upstream-hosts FILTERED_UPSTREAM_HOSTS
|
||||
Default: Blocks Facebook. Comma separated list of IPv4
|
||||
and IPv6 addresses.
|
||||
--filtered-client-ips-mode FILTERED_CLIENT_IPS_MODE
|
||||
Default: blacklist. Can be either "whitelist"
|
||||
(restrict access to specific IPs)or "blacklist" (allow
|
||||
everything except specific IPs).
|
||||
--filtered-client-ips FILTERED_CLIENT_IPS
|
||||
Default: 127.0.0.1,::1. Comma separated list of IPv4
|
||||
and IPv6 addresses.
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -25,20 +25,20 @@
|
|||
},
|
||||
"homepage": "https://github.com/abhinavsingh/proxy.py#readme",
|
||||
"devDependencies": {
|
||||
"@types/jasmine": "^3.10.2",
|
||||
"@types/jquery": "^3.5.13",
|
||||
"@types/js-cookie": "^3.0.1",
|
||||
"@types/jasmine": "^4.0.3",
|
||||
"@types/jquery": "^3.5.14",
|
||||
"@types/js-cookie": "^3.0.2",
|
||||
"@typescript-eslint/eslint-plugin": "^2.34.0",
|
||||
"@typescript-eslint/parser": "^2.34.0",
|
||||
"chrome-devtools-frontend": "^1.0.956881",
|
||||
"chrome-devtools-frontend": "^1.0.980332",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-config-standard": "^14.1.1",
|
||||
"eslint-plugin-import": "^2.25.4",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.2.1",
|
||||
"eslint-plugin-standard": "^5.0.0",
|
||||
"http-server": "^14.0.0",
|
||||
"jasmine": "^4.0.0",
|
||||
"http-server": "^14.1.0",
|
||||
"jasmine": "^4.1.0",
|
||||
"jasmine-ts": "^0.4.0",
|
||||
"jquery": "^3.6.0",
|
||||
"js-cookie": "^3.0.1",
|
||||
|
@ -48,8 +48,8 @@
|
|||
"rollup-plugin-copy": "^3.4.0",
|
||||
"rollup-plugin-javascript-obfuscator": "^1.0.4",
|
||||
"rollup-plugin-typescript": "^1.0.1",
|
||||
"ts-node": "^7.0.1",
|
||||
"ts-node": "^10.7.0",
|
||||
"typescript": "^4.5.4",
|
||||
"ws": "^8.4.2"
|
||||
"ws": "^8.5.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -73,4 +73,4 @@ See `pyproject.toml` for all available categories
|
|||
[MyST Markdown]:
|
||||
https://myst-parser.rtfd.io/en/latest/syntax/syntax.html
|
||||
[Towncrier philosophy]:
|
||||
https://towncrier.rtfd.io/en/actual-freaking-docs/#philosophy
|
||||
https://towncrier.readthedocs.io/en/latest/index.html#philosophy
|
||||
|
|
|
@ -254,6 +254,7 @@ myst_substitutions = {
|
|||
'release_l': f'`v{release}`',
|
||||
'version': version,
|
||||
}
|
||||
myst_heading_anchors = 3
|
||||
|
||||
# -- Strict mode -------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
myst-parser[linkify] >= 0.15.2
|
||||
myst-parser[linkify] == 0.17.2
|
||||
setuptools-scm >= 6.3.2
|
||||
Sphinx == 4.3.2
|
||||
furo >= 2021.11.15
|
||||
|
|
|
@ -41,9 +41,9 @@ docutils==0.17.1 \
|
|||
# via
|
||||
# myst-parser
|
||||
# sphinx
|
||||
furo==2022.1.2 \
|
||||
--hash=sha256:958016bfe1387c1e8ddf5b9d71696b69c4eaa5cd8afc9492abfb008aba2d300c \
|
||||
--hash=sha256:b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30
|
||||
furo==2022.4.7 \
|
||||
--hash=sha256:7f3e3d2fb977483590f8ecb2c2cd511bd82661b79c18efb24de9558bc9cdf2d7 \
|
||||
--hash=sha256:96204ab7cd047e4b6c523996e0279c4c629a8fc31f4f109b2efd470c17f49c80
|
||||
# via -r docs/requirements.in
|
||||
idna==3.3 \
|
||||
--hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \
|
||||
|
@ -145,13 +145,13 @@ markupsafe==2.0.1 \
|
|||
--hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \
|
||||
--hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872
|
||||
# via jinja2
|
||||
mdit-py-plugins==0.2.8 \
|
||||
--hash=sha256:1833bf738e038e35d89cb3a07eb0d227ed647ce7dd357579b65343740c6d249c \
|
||||
--hash=sha256:5991cef645502e80a5388ec4fc20885d2313d4871e8b8e320ca2de14ac0c015f
|
||||
mdit-py-plugins==0.3.0 \
|
||||
--hash=sha256:b1279701cee2dbf50e188d3da5f51fee8d78d038cdf99be57c6b9d1aa93b4073 \
|
||||
--hash=sha256:ecc24f51eeec6ab7eecc2f9724e8272c2fb191c2e93cf98109120c2cace69750
|
||||
# via myst-parser
|
||||
myst-parser==0.15.2 \
|
||||
--hash=sha256:40124b6f27a4c42ac7f06b385e23a9dcd03d84801e9c7130b59b3729a554b1f9 \
|
||||
--hash=sha256:f7f3b2d62db7655cde658eb5d62b2ec2a4631308137bd8d10f296a40d57bbbeb
|
||||
myst-parser==0.17.2 \
|
||||
--hash=sha256:1635ce3c18965a528d6de980f989ff64d6a1effb482e1f611b1bfb79e38f3d98 \
|
||||
--hash=sha256:4c076d649e066f9f5c7c661bae2658be1ca06e76b002bb97f02a09398707686c
|
||||
# via -r docs/requirements.in
|
||||
packaging==21.2 \
|
||||
--hash=sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966 \
|
||||
|
@ -281,6 +281,10 @@ towncrier==21.3.0 \
|
|||
--hash=sha256:6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe \
|
||||
--hash=sha256:e6ccec65418bbcb8de5c908003e130e37fe0e9d6396cb77c1338241071edc082
|
||||
# via sphinxcontrib-towncrier
|
||||
typing-extensions==4.2.0 \
|
||||
--hash=sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708 \
|
||||
--hash=sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376
|
||||
# via myst-parser
|
||||
uc-micro-py==1.0.1 \
|
||||
--hash=sha256:316cfb8b6862a0f1d03540f0ae6e7b033ff1fa0ddbe60c12cbe0d4cec846a69f \
|
||||
--hash=sha256:b7cdf4ea79433043ddfe2c82210208f26f7962c0cfbe3bacb05ee879a7fdb596
|
||||
|
|
|
@ -80,7 +80,7 @@ class cached_property: # pragma: no cover
|
|||
except AttributeError:
|
||||
cache, inst._cached_properties = {}, {}
|
||||
finally:
|
||||
cache[self.__name__] = (value, now)
|
||||
cache[self.__name__] = (value, now) # pylint: disable=E0601
|
||||
return value
|
||||
|
||||
|
||||
|
|
|
@ -178,6 +178,6 @@ class WebsocketFrame:
|
|||
|
||||
@staticmethod
|
||||
def key_to_accept(key: bytes) -> bytes:
|
||||
sha1 = hashlib.sha1()
|
||||
sha1 = hashlib.sha1() # noqa: S324
|
||||
sha1.update(key + WebsocketFrame.GUID)
|
||||
return base64.b64encode(sha1.digest())
|
||||
|
|
|
@ -21,6 +21,14 @@ from ..http.parser import HttpParser
|
|||
from ..http.exception import HttpRequestRejected
|
||||
|
||||
|
||||
flags.add_argument(
|
||||
'--filtered-client-ips-mode',
|
||||
type=str,
|
||||
default='blacklist',
|
||||
help='Default: blacklist. Can be either "whitelist" (restrict access to specific IPs)'
|
||||
'or "blacklist" (allow everything except specific IPs).',
|
||||
)
|
||||
|
||||
flags.add_argument(
|
||||
'--filtered-client-ips',
|
||||
type=str,
|
||||
|
@ -30,15 +38,23 @@ flags.add_argument(
|
|||
|
||||
|
||||
class FilterByClientIpPlugin(HttpProxyBasePlugin):
|
||||
"""Drop traffic by inspecting incoming client IP address."""
|
||||
"""Allow only (whitelist) or Drop only (blacklist) traffic by inspecting incoming client IP address."""
|
||||
|
||||
def before_upstream_connection(
|
||||
self, request: HttpParser,
|
||||
) -> Optional[HttpParser]:
|
||||
assert not self.flags.unix_socket_path and self.client.addr
|
||||
if self.client.addr[0] in self.flags.filtered_client_ips.split(','):
|
||||
raise HttpRequestRejected(
|
||||
status_code=httpStatusCodes.I_AM_A_TEAPOT,
|
||||
reason=b'I\'m a tea pot',
|
||||
)
|
||||
assert self.flags.filtered_client_ips_mode in ('blacklist', 'whitelist')
|
||||
if self.flags.filtered_client_ips_mode == 'blacklist':
|
||||
if self.client.addr[0] in self.flags.filtered_client_ips.split(','):
|
||||
raise HttpRequestRejected(
|
||||
status_code=httpStatusCodes.I_AM_A_TEAPOT,
|
||||
reason=b'I\'m a tea pot',
|
||||
)
|
||||
elif self.flags.filtered_client_ips_mode == 'whitelist':
|
||||
if self.client.addr[0] not in self.flags.filtered_client_ips.split(','):
|
||||
raise HttpRequestRejected(
|
||||
status_code=httpStatusCodes.I_AM_A_TEAPOT,
|
||||
reason=b'I\'m a tea pot',
|
||||
)
|
||||
return request
|
||||
|
|
|
@ -8,17 +8,17 @@ pytest-xdist == 2.5.0
|
|||
pytest-mock==3.6.1
|
||||
pytest-asyncio==0.16.0
|
||||
autopep8==1.6.0
|
||||
mypy==0.931
|
||||
mypy==0.940
|
||||
py-spy==0.3.11
|
||||
codecov==2.1.12
|
||||
tox==3.24.5
|
||||
tox==3.25.0
|
||||
mccabe==0.6.1
|
||||
pylint==2.12.2
|
||||
pylint==2.13.7
|
||||
rope==0.22.0
|
||||
# Required by test_http2.py
|
||||
httpx==0.21.3
|
||||
httpx==0.22.0
|
||||
h2==4.1.0
|
||||
hpack==4.0.0
|
||||
hyperframe==6.0.1
|
||||
pre-commit==2.16.0
|
||||
types-setuptools==57.4.7
|
||||
types-setuptools==57.4.10
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
paramiko==2.9.2
|
||||
paramiko==2.11.0
|
||||
types-paramiko==2.8.9
|
||||
cryptography==36.0.2; python_version <= '3.6'
|
||||
|
|
Loading…
Reference in New Issue