Update to upstream v12.2.1 #2

ihalatci · 2025-12-25T08:42:13Z

Summary

rebase fork on upstream tag v12.2.1 and restore the Citus TCP kill safeguard
add a self-contained regression test covering the half-close behavior on killed flows

Testing

~/.local/bin/uv run --python 3.12 pytest
~/.local/bin/uv run --python 3.12 python -m build

…proxy#7431) Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.5.0...0.8.4) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps the github-actions group with 3 updates: [mhils/workflows](https://github.com/mhils/workflows), [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) and [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `mhils/workflows` from 12 to 15 - [Release notes](https://github.com/mhils/workflows/releases) - [Commits](mhils/workflows@v12...v15) Updates `docker/setup-buildx-action` from 3.7.1 to 3.8.0 - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@c47758b...6524bf6) Updates `actions/attest-build-provenance` from 1 to 2 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@v1...v2) --- updated-dependencies: - dependency-name: mhils/workflows dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: actions/attest-build-provenance dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…=6.123.4 in the pytest group (mitmproxy#7446) Update hypothesis requirement in the pytest group Updates the requirements on [hypothesis](https://github.com/HypothesisWorks/hypothesis) to permit the latest version. Updates `hypothesis` to 6.123.4 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](HypothesisWorks/hypothesis@hypothesis-python-6.104.2...hypothesis-python-6.123.4) --- updated-dependencies: - dependency-name: hypothesis dependency-type: direct:production dependency-group: pytest ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…proxy#7448) Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.5.0...0.8.6) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…10 (mitmproxy#7449) Updates the requirements on ruamel-yaml to permit the latest version. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Add missing HTTP status codes * chore: Update CHANGELOG.md * chore: Update CHANGELOG.md

…oxy#7456) * fix: Remove filter expression lowercasing in block_list addon * chore: CHANGELOG update * test: Add new test cases to verify URL case-sensitivity * test: Add new test cases to cover case-sensitive filter expressions * chore: Update test func name * fix nits --------- Co-authored-by: Maximilian Hils <github@maximilianhils.com>

* remove check status code * fix tests * update changelog * Update changelog Co-authored-by: lups2000 <100372313+lups2000@users.noreply.github.com> Co-authored-by: AdityaPatadiya <patadiyaaditya0079@gmail.com> --------- Co-authored-by: AdityaPatadiya <patadiyaaditya0079@gmail.com>

* Prompt user before clearing screen * [autofix.ci] apply automated fixes * Update CHANGELOG.md * [autofix.ci] apply automated fixes * nit --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

…g the same protocol (mitmproxy#7464) * dns resolver: make Hickory and `getaddrinfo` resolvers available using the same protocol * incorporate review feedback

* Update docs * fix typo * fix capitalization --------- Co-authored-by: Maximilian Hils <git@maximilianhils.com>

* ci: unify job actions, pin more things * ci: build linux arm64 binaries * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* use Python 3.13 for binaries * [autofix.ci] apply automated fixes * bump minimum mitmproxy_rs version * try to make mypy happy --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

web: harden `xsrf_token` usage

docs: add mitmweb tutorial

* add mitmweb tutorial videos to docs * update changelog * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

…n. (mitmproxy#7497) * fix console freeze * coverage * changelog

…itmproxy#7514) * check for killable flow * [autofix.ci] apply automated fixes * add test * changelog * restructure test * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* don't wait for host header based on alpn, fix mitmproxy#7516 * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

…itmproxy#7483) * make all filter expressions case-insensitive by default * [autofix.ci] apply automated fixes * add test cases. * added dedicated test case for case sensitivity check --------- Co-authored-by: Maximilian Hils <git@maximilianhils.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Bumps [pdoc](https://github.com/mitmproxy/pdoc) from 15.0.4 to 16.0.0. - [Changelog](https://github.com/mitmproxy/pdoc/blob/main/CHANGELOG.md) - [Commits](mitmproxy/pdoc@v15.0.4...v16) --- updated-dependencies: - dependency-name: pdoc dependency-version: 16.0.0 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>

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.14.0 to 0.14.3. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.14.0...0.14.3) --- updated-dependencies: - dependency-name: ruff dependency-version: 0.14.3 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>

dependabot: add more groups

* Bump awscli from 1.42.16 to 1.42.64 Bumps [awscli](https://github.com/aws/aws-cli) from 1.42.16 to 1.42.64. - [Release notes](https://github.com/aws/aws-cli/releases) - [Commits](aws/aws-cli@1.42.16...1.42.64) --- updated-dependencies: - dependency-name: awscli dependency-version: 1.42.64 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * [autofix.ci] apply automated fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Maximilian Hils <git@maximilianhils.com>

* Bump tox from 4.31.0 to 4.32.0 Bumps [tox](https://github.com/tox-dev/tox) from 4.31.0 to 4.32.0. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](tox-dev/tox@4.31.0...4.32.0) --- updated-dependencies: - dependency-name: tox dependency-version: 4.32.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * [autofix.ci] apply automated fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Maximilian Hils <git@maximilianhils.com>

* show query parameters for empty-body requests * [autofix.ci] apply automated fixes * update changelog * fix PR number * access directly the query attribute * [autofix.ci] apply automated fixes * nits * coverage++ * [autofix.ci] apply automated fixes * coverage ++ * [autofix.ci] apply automated fixes * review changes * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* migrate off pyOpenSSL's crypto module * `asyncio.iscoroutinefunction` -> `inspect.iscoroutinefunction`

…mproxy#7961) For html, css, js, and xml content types, the official specs tell us to use UTF-8 as fallback when charset are not specified. Relevant sections of the specs are included in the comments for the corresponding branches. This commit also uncovered incorrect decoding in the following har tests: test/mitmproxy/data/har_files/firefox.json test/mitmproxy/data/har_files/safari.json ```diff - * Licensed MIT © Zeno Rocha + * Licensed MIT Zeno Rocha ``` Noted that the UTF-8 char `©` was missing due to the incorrect encoding fallback.

* fixes gzip decoding issue. * [autofix.ci] apply automated fixes * comment added and handle error more precisely. * uses +47 range value. * review change done. * [autofix.ci] apply automated fixes * Update mitmproxy/net/encoding.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * tests++ --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Maximilian Hils <git@maximilianhils.com>

* fix: add flush to buffered file handle * chore: add changelog entry * [autofix.ci] apply automated fixes * fix: remove flush in favor of disabling buffering * fix: properly remove flush call * fix: add flush call into writer * Update mitmproxy/addons/save.py Co-authored-by: Sujal Singh <email.sujalsingh@gmail.com> * Update CHANGELOG.md --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Maximilian Hils <git@maximilianhils.com> Co-authored-by: Sujal Singh <email.sujalsingh@gmail.com>

* feat: Make TCP inactivity timeout configurable (currently fixed at 10 minutes) mitmproxy#7909 * docs: updated CHANGELOG * [autofix.ci] apply automated fixes * fix: add tests * fix: testcase * fix nits: - We currently only add command line flags for the most important options. `--set tcp_timeout=10` is the recommended approach for now. - Move timeout to the "wait for close" part specifically. --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Maximilian Hils <github@maximilianhils.com> Co-authored-by: Maximilian Hils <git@maximilianhils.com>

* fix mitmweb --web-host with ipv6 When using `--web-host ::1` the `web_url` was `http://::1:8081` instead of `http://[::1]:8081`. This lead for the wrong URL to be written in the logs, and the wrong URL to be opened with `--web-open-browser`. * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* add example addon for DNS flows * [autofix.ci] apply automated fixes * fix mypy --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Partially Revert "Web: harden `xsrf_token` usage (mitmproxy#7491)" This reverts commit b761cb4. The reason for this revert is that it's incompatible with Vite's server (mitmproxy#7969). We keep the parts that are compatible, and add an additional `Sec-Fetch-Site` check for for all requests. * use type imports for Vite compatibility * make flow columns work with function name minification * make modals work with function name minification * vite: move assets * web: switch builds to vite * move to vite * vite: move css and js * update CHANGELOG * [autofix.ci] apply automated fixes * fix test failures * fix static viewer * obtain xsrf cookie lazily * split js/css bundles into app/vendor * [autofix.ci] apply automated fixes * update compiled assets * fix nits --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

mitmproxy#7977) * Add 'local' to --mode help text * Fix whitespace nit * Fix spacing in mode help text --------- Co-authored-by: rohahann-tech <rohahann@gmail.com>

Co-authored-by: khanhkhanhlele <namkhanh20xx@gmail.com>

* Fix event loop leak when running tests Close event loop in `__exit__` method to avoid "OSError: [Errno 24] Too many open files" * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

update pinned dependencies

update node version

autofix-troubleshooter · 2025-12-25T08:58:47Z

Hi! I'm the autofix.ci troubleshooter bot.

It looks like you correctly set up a CI job that uses the autofix.ci GitHub Action, but the autofix.ci GitHub App has not been installed for this repository. This means that autofix.ci unfortunately does not have the permissions to fix this pull request. If you are the repository owner, please install the app and then restart the CI workflow! 😃

ihalatci · 2025-12-25T10:36:51Z

PR for new CI images with this mitmproxy version: citusdata/the-process#182
PR that uses updated images in Citus: citusdata/citus#8422
Once all above are green we can proceed

dependabot bot and others added 30 commits January 2, 2025 07:21

require Python 3.12+ (mitmproxy#7440)

6e4cb23

fix use of asyncio.create_task (mitmproxy#7443)

9957abf

try to fix dependabot

617806c

fix CHANGELOG.md

a18b1e3

fix: Add missing HTTP status codes (mitmproxy#7455)

a14df6b

* fix: Add missing HTTP status codes * chore: Update CHANGELOG.md * chore: Update CHANGELOG.md

chore: Fix CHANGELOG.md formatting glitch (mitmproxy#7461)

6a39a1d

Prompt user before clearing screen (mitmproxy#7445)

033732c

* Prompt user before clearing screen * [autofix.ci] apply automated fixes * Update CHANGELOG.md * [autofix.ci] apply automated fixes * nit --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

dns resolver: make Hickory and getaddrinfo resolvers available usin…

54829b5

…g the same protocol (mitmproxy#7464) * dns resolver: make Hickory and `getaddrinfo` resolvers available using the same protocol * incorporate review feedback

mitmproxy 11.1.0

277bf97

reopen main for development

ee1ead7

Updates docs for DNS and HTTP/3 mode (mitmproxy#7474)

dfb2b27

* Update docs * fix typo * fix capitalization --------- Co-authored-by: Maximilian Hils <git@maximilianhils.com>

fix run.ps1 being in %PATH% (mitmproxy#7481)

ffb40ae

windows: respect user console preference (mitmproxy#7482)

0e3b099

Build arm64 binaries (mitmproxy#7484)

2f4a506

* ci: unify job actions, pin more things * ci: build linux arm64 binaries * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Use Python 3.13 for binaries (mitmproxy#7485)

99e79f7

* use Python 3.13 for binaries * [autofix.ci] apply automated fixes * bump minimum mitmproxy_rs version * try to make mypy happy --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

web: remove unnecessary template copying build step (mitmproxy#7490)

e78ab0f

Web: harden xsrf_token usage (mitmproxy#7491)

b761cb4

web: harden `xsrf_token` usage

docs: Add mitmweb user interface tutorial (mitmproxy#7507)

562c4cd

docs: add mitmweb tutorial

Add mitmweb tutorial videos to docs (mitmproxy#7509)

ebf1f54

* add mitmweb tutorial videos to docs * update changelog * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Fix console freezing due to DNS queries with an empty question sectio…

ca8df49

…n. (mitmproxy#7497) * fix console freeze * coverage * changelog

Next Layer: Don't wait for host header based on alpn (mitmproxy#7519)

6138d2a

* don't wait for host header based on alpn, fix mitmproxy#7516 * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

dependabot bot and others added 25 commits November 2, 2025 23:46

Dependabot: add more groups (mitmproxy#7956)

bd64ef1

dependabot: add more groups

CI: update macOS version (mitmproxy#7957)

4ed781c

Update lockfile (mitmproxy#7962)

1f277b2

Move off deprecated pyOpenSSL functionality (mitmproxy#7968)

5898ebb

* migrate off pyOpenSSL's crypto module * `asyncio.iscoroutinefunction` -> `inspect.iscoroutinefunction`

Add example addon for DNS flows (mitmproxy#7973)

7093e50

* add example addon for DNS flows * [autofix.ci] apply automated fixes * fix mypy --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Add "local" mode to ‘--mode help’ command description (mitmproxy#7976) (

08a947b

mitmproxy#7977) * Add 'local' to --mode help text * Fix whitespace nit * Fix spacing in mode help text --------- Co-authored-by: rohahann-tech <rohahann@gmail.com>

docs: fix typos in some files (mitmproxy#7981)

7654286

Co-authored-by: khanhkhanhlele <namkhanh20xx@gmail.com>

Update pinned dependencies (mitmproxy#7991)

9f2cdea

update pinned dependencies

release ci: do not eat npm output

2d28a1b

Update node.js version (mitmproxy#7992)

4c0013a

update node version

mitmproxy 12.2.1

d9d5878

Add regression test for TCP kill behavior

c4491d2

Restore TCP kill behavior on upstream 12.2.1

00d77ce

ihalatci marked this pull request as draft December 25, 2025 08:43

Merge remote-tracking branch 'origin/main' into upgrade/12.2.1

06f9613

Fix import order in TCP layer test

66594bb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update to upstream v12.2.1 #2

Update to upstream v12.2.1 #2

Uh oh!

ihalatci commented Dec 25, 2025

Uh oh!

autofix-troubleshooter commented Dec 25, 2025

Uh oh!

ihalatci commented Dec 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Update to upstream v12.2.1 #2

Are you sure you want to change the base?

Update to upstream v12.2.1 #2

Uh oh!

Conversation

ihalatci commented Dec 25, 2025

Summary

Testing

Uh oh!

autofix-troubleshooter commented Dec 25, 2025

Uh oh!

ihalatci commented Dec 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants