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

Commits on Jul 18, 2023

  1. update html for py3 rework.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    1d81d34 View commit details
    Browse the repository at this point in the history
  2. rm v2 .py files

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    5afa0aa View commit details
    Browse the repository at this point in the history
  3. rm v2 .tac files

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a51758b View commit details
    Browse the repository at this point in the history
  4. Adds py3 test workflow.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    2a9cc6a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c353926 View commit details
    Browse the repository at this point in the history
  6. Adds develoment config.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f54de02 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7e33015 View commit details
    Browse the repository at this point in the history
  8. Adds canarytokens package.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    c9ec8fd View commit details
    Browse the repository at this point in the history
  9. Adds v3 backend

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    66edf68 View commit details
    Browse the repository at this point in the history
  10. Adds switchboard.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f6930eb View commit details
    Browse the repository at this point in the history
  11. Adds switchboard.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f893dca View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f99e968 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    c671dc8 View commit details
    Browse the repository at this point in the history
  14. remove unused files.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a1f94d1 View commit details
    Browse the repository at this point in the history
  15. Used awsid_url for testing.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    47f4475 View commit details
    Browse the repository at this point in the history
  16. Add dockerhub builds.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    29fad49 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    2c068a8 View commit details
    Browse the repository at this point in the history
  18. Bump the build workflow.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a78fba3 View commit details
    Browse the repository at this point in the history
  19. Rotate google maps.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    29e62a1 View commit details
    Browse the repository at this point in the history
  20. bump build.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    0dbf93d View commit details
    Browse the repository at this point in the history
  21. bump build.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    425d85e View commit details
    Browse the repository at this point in the history
  22. Bump the build.

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    4f1d2d5 View commit details
    Browse the repository at this point in the history
  23. Build both images

    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    04bf3b1 View commit details
    Browse the repository at this point in the history
  24. Return Url (aliased to token_url) in tokens response.

    fix html setting post.
    benjamin-thinkst authored and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    0cebf07 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    52beac5 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    b798873 View commit details
    Browse the repository at this point in the history
  27. T5211 py3 port google chat webhook formatting (#184)

    * 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>
    emmanuel-thinkst and wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f131f56 View commit details
    Browse the repository at this point in the history
  28. T5210 Add generic_data to v3 (#171)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ad9de06 View commit details
    Browse the repository at this point in the history
  29. T5182: Email and domain blocking port to v3 (#169)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    c3dffd0 View commit details
    Browse the repository at this point in the history
  30. Make kube ca/cert gen cleaner, put server ca in token (#161)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    65c292d View commit details
    Browse the repository at this point in the history
  31. Dev deployment workflow (#194)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    03beb60 View commit details
    Browse the repository at this point in the history
  32. T5212 Port adding request headers and GET/POST arguments to webhooks …

    …to v3 (#199)
    
    * add request headers and args to webhooks
    
    * minor changes and catch-ups with v2
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    5dab26d View commit details
    Browse the repository at this point in the history
  33. T5282 Add Mailgun (#202)

    * add mailgun support and a unit test, update test workflow
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    27116be View commit details
    Browse the repository at this point in the history
  34. T5281 Port CC Token (#205)

    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    b80074d View commit details
    Browse the repository at this point in the history
  35. T5285 Port Azure ID token to v3 (#208)

    * add azure id token to v3
    
    * exclude aws and azure tokens from auto-generation in frontend tests
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    e54a4a4 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    5e255fa View commit details
    Browse the repository at this point in the history
  37. make sentry optional (#211)

    add pdf_gen unit test
    
    remove invalid CSS
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ccebbbd View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    0e7e1a1 View commit details
    Browse the repository at this point in the history
  39. T5610: Miscellaneous fixes (#211)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    2b529a6 View commit details
    Browse the repository at this point in the history
  40. T5610 Add logging (#216)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    b2044ce View commit details
    Browse the repository at this point in the history
  41. T5610 More small fixes (#218)

    * Fix error log str fmt
    
    * Fix windir data extraction
    
    * Delete unused files
    
    * Fix typo
    
    * Improve test
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ea9dcff View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    11eb760 View commit details
    Browse the repository at this point in the history
  43. fix build branch path

    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d21bd98 View commit details
    Browse the repository at this point in the history
  44. T5610: Backwards compatibility (#219)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d6db04a View commit details
    Browse the repository at this point in the history
  45. T5610 more fixes and replacing ngrok with webhook.site (#223)

    * 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
    wleightond committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d297396 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Configuration menu
    Copy the full SHA
    5791f3e View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Configuration menu
    Copy the full SHA
    2f42cc1 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Configuration menu
    Copy the full SHA
    84b840f View commit details
    Browse the repository at this point in the history