From 55394b65dbddba29a8c9a3a9aa4b8b9101a3314f Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 4 Oct 2018 14:24:35 -0400 Subject: [PATCH 1/3] Use workspace permissions to limit project viewability --- atst/domain/roles.py | 3 --- tests/domain/test_workspaces.py | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/atst/domain/roles.py b/atst/domain/roles.py index 2bed72a5..992ae815 100644 --- a/atst/domain/roles.py +++ b/atst/domain/roles.py @@ -120,7 +120,6 @@ WORKSPACE_ROLES = [ "permissions": [ Permissions.VIEW_USAGE_REPORT, Permissions.VIEW_WORKSPACE, - Permissions.VIEW_APPLICATION_IN_WORKSPACE, ], }, { @@ -131,7 +130,6 @@ WORKSPACE_ROLES = [ Permissions.VIEW_USAGE_REPORT, Permissions.VIEW_USAGE_DOLLARS, Permissions.VIEW_WORKSPACE, - Permissions.VIEW_APPLICATION_IN_WORKSPACE, ], }, { @@ -143,7 +141,6 @@ WORKSPACE_ROLES = [ Permissions.VIEW_ASSIGNED_CSP_ROLE_CONFIGURATIONS, Permissions.VIEW_ATAT_PERMISSIONS, Permissions.VIEW_WORKSPACE, - Permissions.VIEW_APPLICATION_IN_WORKSPACE, ], }, ] diff --git a/tests/domain/test_workspaces.py b/tests/domain/test_workspaces.py index 0781e91a..86064c1e 100644 --- a/tests/domain/test_workspaces.py +++ b/tests/domain/test_workspaces.py @@ -167,6 +167,13 @@ def test_scoped_workspace_only_returns_a_users_projects_and_environments( "My project", ["dev", "staging", "prod"], ) + Projects.create( + workspace_owner, + workspace, + "My Project 2", + "My project 2", + ["dev", "staging", "prod"], + ) developer = UserFactory.from_atat_role("developer") dev_environment = Environments.add_member( new_project.environments[0], developer, "developer" From db1521d92098c2f8642fbe76a57d557b0ffeebe1 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Thu, 4 Oct 2018 14:37:53 -0400 Subject: [PATCH 2/3] Missed an import --- atst/domain/projects.py | 1 + 1 file changed, 1 insertion(+) diff --git a/atst/domain/projects.py b/atst/domain/projects.py index e57c9fb1..ce9534bd 100644 --- a/atst/domain/projects.py +++ b/atst/domain/projects.py @@ -5,6 +5,7 @@ from atst.domain.exceptions import NotFoundError from atst.models.permissions import Permissions from atst.models.project import Project from atst.models.environment import Environment +from atst.models.environment_role import EnvironmentRole class Projects(object): From 6dd8562fc1791720779c473e5a8a91d19ec804c2 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Thu, 4 Oct 2018 14:38:09 -0400 Subject: [PATCH 3/3] Formatting --- atst/domain/roles.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/atst/domain/roles.py b/atst/domain/roles.py index 992ae815..25c08e8a 100644 --- a/atst/domain/roles.py +++ b/atst/domain/roles.py @@ -117,10 +117,7 @@ WORKSPACE_ROLES = [ "name": "developer", "display_name": "Developer", "description": "Views only the projects and environments they are granted access to. Can also view members associated with each environment.", - "permissions": [ - Permissions.VIEW_USAGE_REPORT, - Permissions.VIEW_WORKSPACE, - ], + "permissions": [Permissions.VIEW_USAGE_REPORT, Permissions.VIEW_WORKSPACE], }, { "name": "billing_auditor",