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.

Sign up for GitHub

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

Jump to bottom

merge: update branch with latest dev #6010

Merged
merged 2 commits into from
Nov 26, 2024
Merged

merge: update branch with latest dev #6010

merged 2 commits into from
Nov 26, 2024

Commits on Nov 26, 2024

  1. feat(security): RN-1108: Prevent too many login attempts (#5861) 

    * add migration

* Update authenticate.js

* unit test

* refactor

* add slowBruteForceRateLimiter

* fix tests

* comments

* generate types

* refactor tupaia rate limiter

* mocking

* update tests

* clean up

* fix tests

* Update OneTimeLogin.js

* Update authenticate.test.js

* update ip key

* Update authenticate.js

* Update LoginRoute.ts

* update X-Forwarded-For

* forward ip address

* add x-real-ip

* logging

* trust proxy

* add public ip

* update orchestration server

* add proxy to config

* use older version of public-ip

* update central server

* remove console logs

* update type for custom headers

* temp rollback ip changes

* fix(auth): RN-1108: Securely read client ip for rate limiting (#5962)

* forward client ip to auth server when logging in

* set trust proxy in central server

* Update ApiBuilder.ts

* Update createApp.js

* Update authenticate.js

* finish merge

* Update createApp.js

* Update errors.test.ts

* Update ConsecutiveFailsRateLimiter.js

* Update 20241122034517-addLoginAttemptsTable-modifies-schema.js

* Update servers.env.example

* Update createApp.js

---------

Co-authored-by: Andrew <[email protected]>
    @tcaiger @avaek
    tcaiger and avaek authored Nov 26, 2024
    Configuration menu
    Copy the full SHA
    7d1f9c1 View commit details
    Browse the repository at this point in the history

  2. feat(datatrakWeb): RN-1469 Mobile reports disabled page (#5996) 

    * Update ReportsPage.tsx

* Update ReportsPage.tsx

* Update ReportsPage.tsx

* Update packages/datatrak-web/src/views/ReportsPage.tsx

Co-authored-by: Jasper Lai <[email protected]>

* Update packages/datatrak-web/src/views/ReportsPage.tsx

Co-authored-by: Jasper Lai <[email protected]>

* Update packages/datatrak-web/src/views/ReportsPage.tsx

Co-authored-by: Jasper Lai <[email protected]>

* Update ReportsPage.tsx

---------

Co-authored-by: Jasper Lai <[email protected]>
Co-authored-by: Andrew <[email protected]>
    @tcaiger @jaskfla @avaek
    3 people authored Nov 26, 2024
    Configuration menu
    Copy the full SHA
    bb45af8 View commit details
    Browse the repository at this point in the history