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

Python 3 Migration #225

Merged
merged 48 commits into from
Jul 24, 2023
Merged

Python 3 Migration #225

merged 48 commits into from
Jul 24, 2023

Conversation

wleightond
Copy link
Contributor

@wleightond wleightond commented Jul 19, 2023

This PR includes all our changes to migrate to Python 3. They have been reviewed and tested already in their respective PRs referenced in the commits.

There will be two additional commits:

  • fix deploy workflow issues
  • ensure tests pass before merging

And finally, before merging:

  • prepare staging environment for deployment

benjamin-thinkst and others added 30 commits July 18, 2023 12:13
* Add google chat api models

* add google chat webhook formatting

* improve webhook error handling

* update webhook tests

* Delete testdoc.xlsx

---------

Co-authored-by: William Leighton Dawson <leighton@thinkst.com>
* add generic data to DNS hits and alerts

* Add unit test for _generic()

* remove isort, update test, improve gen data b32 padding

* add toml to dev dependencies

* continue on unit test fail
* add initial email and domain blocking

* add unit test for email blocking and unblocking

* add error codes to responses (frontend still doesn't show the right thing)

* add v3 deploy workflow

* remove redundant build workflow

* add unit test for email blocking

* add /legal and banners, make script runnable directly

* enable tests, add integration test for error codes

* separate poetry call from install

use pipx to install poetry on windows

* exclude skipped tests from coverage
* make kube ca/cert gen cleaner, put server ca in token, match extensions with actual kubernetes setup

* reduce log output

* update mysql test

* use https for live v2
* rename backend to frontend

* target T5234_v3_deploy_workflow docker branch, and include commit sha

* hard-code env file locations & make tests run from inside /tests

* add option to disable sentry

* make test_custom_image.py::test_custom_image_web_image ~3x faster

* fix rate-limiting, move .env to .env.dist
…to v3 (#199)

* add request headers and args to webhooks

* minor changes and catch-ups with v2
* add mailgun support and a unit test, update test workflow
* add azure id token to v3

* exclude aws and azure tokens from auto-generation in frontend tests
add pdf_gen unit test

remove invalid CSS
* unify env tile formats

* make sentry optional

* add pdf_gen unit test

* remove invalid CSS

* add ipinfo api key and set globally in queries

* fix typo
* add log.ini

* add frontend log config and switchboard web logging

* update k8s key fetch url; fix kubectl install in devcontainer

* bump pyngrok to 6.0.0; update poetry.lock
* Fix error log str fmt

* Fix windir data extraction

* Delete unused files

* Fix typo

* Improve test
* make log.error use format strings, make l&r optional on SlowRedirectHit

* remove token_url

* fix canarydrops

* fix auth error for non-existent tokens

* fix QR code GIF return mimetype

* match v2 for alert_{email,webhook}_{url,enabled} defaults

* fix devcontainer frontend ports

* make location and referer optional and allow location to be PseudoUrl

* let clonedsite work on domains not urls

* fix slow redirect tokens
* fix email token rendering on /manage page

* fix timestamps on /history

* fix /generate not showing url for web & redirect tokens

* remove signed-exe /manage page download; fix broken links

* fix jpeg mimetype, make response error less confusing

* make error responses return 400 by default, configurable

* replace ngrok with webhook.site

* fix sensitive cmd token frontend and .reg template
Copy link
Contributor

@thinkst-pieter thinkst-pieter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked the two flagged commits
5791f3e — Enable tests on correct branches; update deploy workflow
2f42cc1 — move broken @staticmethods out of class; fix rare dns channel bug

The rest was already approve and this is to bring it to master

@wleightond wleightond merged commit 00dcd00 into master Jul 24, 2023
2 checks passed
@wleightond wleightond deleted the py3_master branch July 24, 2023 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants