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

Merged master into to develop #743

Merged
merged 8 commits into from
Aug 24, 2022
Merged

Merged master into to develop #743

merged 8 commits into from
Aug 24, 2022

Conversation

victor-salles
Copy link
Contributor

Merged the branch master into develop. Now applying the changes into develop.
The conflicts were resolved via local editor.

helllllllder and others added 8 commits May 3, 2022 15:59
* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user
* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* Develop (#709)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module (#712)

* Feature/internal endpoint organization (#713)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* Feature/internal endpoint repository (#714)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* code smells

* duplicated lines

* fix code smells

* Feature/internal endpoint user (#715)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* Feature/connect rest client (#716)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* implement connect rest client

* fix code smells

* black

* Feature/add csp (#717)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* add regex remotion of special characters from username when creating from keycloak

* add django_csp and settings

* configure csp

* fix settings

* black

* Feature/internal endpoint user (#718)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* fix user endpoints

* Feature/add csp (#719)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* add regex remotion of special characters from username when creating from keycloak

* add django_csp and settings

* configure csp

* fix settings

* black

* fix csp settings

* fix csp settings

* Feature/internal endpoint user (#720)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* fix user endpoints

* fix connect client

* Fix the repository get_user_authorization method

The updated method compares repository and organization authorizations and uses the highest role level without overwriting the repository's authorization level

* Update rule with repository authorization role overwriting

The method now overwrites the repository's authorization role if is lower than 4 (i.e. ROLE_TRANSLATOR), as of this level on, it no longer has corresponding roles at the client app.

* Linting

* feat: update list_project_organization endpoint removing the celery call

* feat: update list_project_organization endpoint removing the celery call (#725)

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* Feature/remove rest client from celery (#726)

* feat: update list_project_organization endpoint removing the celery call

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* bugfix: remove task.result after condition to user or not grpc endpoints, as it was conflicting with the rest call

* feat: cache request result in list_classifiers

Co-authored-by: Victor Salles <victorsalles1997@gmail.com>
Co-authored-by: vitusalis <49169676+vitusalis@users.noreply.github.com>
* Develop (#709)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* feat: Change gRPC call to REST calls

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module (#712)

* Feature/internal endpoint organization (#713)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* Feature/internal endpoint repository (#714)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* code smells

* duplicated lines

* fix code smells

* Feature/internal endpoint user (#715)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* Feature/connect rest client (#716)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* implement connect rest client

* fix code smells

* black

* Feature/add csp (#717)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* add regex remotion of special characters from username when creating from keycloak

* add django_csp and settings

* configure csp

* fix settings

* black

* Feature/internal endpoint user (#718)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* fix user endpoints

* Feature/add csp (#719)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* add regex remotion of special characters from username when creating from keycloak

* add django_csp and settings

* configure csp

* fix settings

* black

* fix csp settings

* fix csp settings

* Feature/internal endpoint user (#720)

* Create internal module, module permission and updated WeniOIDCAuthenticationBackend to add permission if the user is a module

* Add organization internal endpoints

* add repository endpoints

* add user endpoints

* flake8 and black

* fix user endpoints

* fix connect client

* Fix the repository get_user_authorization method

The updated method compares repository and organization authorizations and uses the highest role level without overwriting the repository's authorization level

* Update rule with repository authorization role overwriting

The method now overwrites the repository's authorization role if is lower than 4 (i.e. ROLE_TRANSLATOR), as of this level on, it no longer has corresponding roles at the client app.

* Linting

* feat: update list_project_organization endpoint removing the celery call (#725)

* Feature/remove rest client from celery (#726)

* feat: update list_project_organization endpoint removing the celery call

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* Feature/remove rest client from celery (#727)

* feat: update list_project_organization endpoint removing the celery call

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* bugfix: remove task.result after condition to user or not grpc endpoints, as it was conflicting with the rest call

* Feature/remove rest client from celery (#730)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* feat: update list_project_organization endpoint removing the celery call

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* bugfix: remove task.result after condition to user or not grpc endpoints, as it was conflicting with the rest call

* feat: cache request result in list_classifiers

* Feature/remove rest client from celery (#731)

* Develop (#709) (#710)

* Fix: Remove ai from project (#707)

* remove document deletion from delete_nlp_logs task

* inconsistency number and debug errors fixed

* add user_email to remove_authorizations_project

* Feature/health check blocklist (#708)

* remove document deletion from delete_nlp_logs task

* add a blocklist for not saving logs depending on the authorization user

* inconsistency number and debug errors fixed

* change the REPOSITORY_BLOCK_USER_LOGS values from users to repository authorizations

* change readme

* pass on sonarcloud

* change admins settings

* transform uuid into string

* convert uuid into string at test_blocked_user

* feat: update list_project_organization endpoint removing the celery call

* feat: update all code that called celery tasks for communicating with connect to calls directly into ConnectRESTClient

* bugfix: remove task.result after condition to user or not grpc endpoints, as it was conflicting with the rest call

* feat: cache request result in list_classifiers

* feat: delete cache when creating and removing a classifier

* Revert "Feature/remove rest client from celery (#731)" (#733)

This reverts commit 4a0b7f2.

* Revert "Feature/remove rest client from celery (#730)" (#734)

This reverts commit 8e42c7d.

Co-authored-by: Victor Salles <victorsalles1997@gmail.com>
Co-authored-by: vitusalis <49169676+vitusalis@users.noreply.github.com>

Co-authored-by: Victor Salles <victorsalles1997@gmail.com>
Co-authored-by: vitusalis <49169676+vitusalis@users.noreply.github.com>
The model property contained an outdated business rule that allowed
users to inherit the authorization role from any linked Organizations
that had permission to access the repository.

The updated property uses the repository's get_user_authorization
method, instead of searching for a higher authorization within the
users' organizations.
Update business rule inside the test, checking if an unauthorized user
has the corresponding authorization role at the repository.
Hotfix/update RepositoryAuthorization.get_role
@victor-salles victor-salles changed the title Merge main into to develop. Merged master into to develop Aug 22, 2022
@sonarcloud
Copy link

sonarcloud bot commented Aug 22, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@coveralls
Copy link

Pull Request Test Coverage Report for Build 4682

  • 4 of 4 (100.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 81.27%

Totals Coverage Status
Change from base Build 4679: 0.0%
Covered Lines: 4734
Relevant Lines: 5825

💛 - Coveralls

@victor-salles victor-salles merged commit 433dbb2 into develop Aug 24, 2022
@victor-salles victor-salles deleted the merge-to-develop branch August 24, 2022 20:40
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.

3 participants