From 25354c4cf703cbc8bc360716eb6a0a71ac454404 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 09:42:07 +0100 Subject: [PATCH 1/9] Add ParaviewData configurable --- .../admin/vue-components/AccountingView.vue | 3 +- .../accounting/NewAccountingDialog.vue | 12 +++++-- frontend/user/configurables/ParaviewData.vue | 26 ++++++++++++++++ frontend/user/configurables/configurables.js | 15 +++++++++ .../user/vue-components/ApplicationView.vue | 16 +++++++--- remoteappmanager/cli/remoteappdb/__main__.py | 25 +++++++++++---- remoteappmanager/db/interfaces.py | 10 ++++-- remoteappmanager/db/orm.py | 21 ++++++++----- remoteappmanager/docker/configurables.py | 31 ++++++++++++++++++- .../tests/mocking/virtual/docker_client.py | 17 +++++++++- remoteappmanager/webapi/admin/accounting.py | 5 ++- remoteappmanager/webapi/application.py | 1 + 12 files changed, 157 insertions(+), 25 deletions(-) create mode 100644 frontend/user/configurables/ParaviewData.vue diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue index d1bb95fbb..49a2cc701 100644 --- a/frontend/admin/vue-components/AccountingView.vue +++ b/frontend/admin/vue-components/AccountingView.vue @@ -99,7 +99,8 @@ item.allow_home, item.volume_source, item.volume_target, - item.volume_mode === "ro" + item.volume_mode === "ro", + item.allow_srdata ]); }); }) diff --git a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue index 4090f712f..45a705c17 100644 --- a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue +++ b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue @@ -52,6 +52,12 @@ +
+ +
+

Both Volume Source and Target must be defined

@@ -83,7 +89,8 @@ volume_source: '', volume_target: '', volume_readonly: false, - volume_source_target: [] + volume_source_target: [], + allow_srdata: false }, imageNames: [] }; @@ -136,7 +143,8 @@ allow_home: this.model.allow_home, volume_source: this.model.volume_source, volume_target: this.model.volume_target, - volume_mode: (model.volume_readonly ? "ro" : "rw") + volume_mode: (model.volume_readonly ? "ro" : "rw"), + allow_srdata: this.model.allow_srdata }; resources.Accounting.create(rep) diff --git a/frontend/user/configurables/ParaviewData.vue b/frontend/user/configurables/ParaviewData.vue new file mode 100644 index 000000000..34b70afd0 --- /dev/null +++ b/frontend/user/configurables/ParaviewData.vue @@ -0,0 +1,26 @@ + + + diff --git a/frontend/user/configurables/configurables.js b/frontend/user/configurables/configurables.js index 348ed97c4..24fa3e180 100644 --- a/frontend/user/configurables/configurables.js +++ b/frontend/user/configurables/configurables.js @@ -1,6 +1,7 @@ let utils = require("utils"); require("./Resolution"); +require("./ParaviewData"); // Your configurable class must implement a tag and default configDict @@ -22,9 +23,23 @@ class ResolutionModel { } } +class ParaviewDataModel { + constructor() { + this.tag = "srdata"; + this.configDict = { srdata: '' }; + } + + asConfigDict() { + let srdata = this.configDict.srdata; + + return { srdata: srdata }; + } +} + let outputConfigurables = {}; // Export all your configurable models here respecting the tag (here resolution) outputConfigurables.resolution = ResolutionModel; +outputConfigurables.srdata = ParaviewDataModel; module.exports = outputConfigurables; diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue index a578de9da..66b9fb989 100644 --- a/frontend/user/vue-components/ApplicationView.vue +++ b/frontend/user/vue-components/ApplicationView.vue @@ -42,10 +42,18 @@
No configurable options for this image
- +
+ +
+
+ +
diff --git a/remoteappmanager/cli/remoteappdb/__main__.py b/remoteappmanager/cli/remoteappdb/__main__.py index f0fecaf88..77d06fc78 100644 --- a/remoteappmanager/cli/remoteappdb/__main__.py +++ b/remoteappmanager/cli/remoteappdb/__main__.py @@ -223,7 +223,7 @@ def list(ctx, no_decoration, show_apps): headers = ["ID", "Name"] if show_apps: headers += ["App", "License", "Home", "View", "Common", - "Vol. Source", "Vol. Target", "Vol. Mode"] + "Vol. Source", "Vol. Target", "Vol. Mode", 'SR Data'] session = ctx.obj.session @@ -240,7 +240,8 @@ def list(ctx, no_decoration, show_apps): entry.application_policy.allow_common, entry.application_policy.volume_source, entry.application_policy.volume_target, - entry.application_policy.volume_mode] + entry.application_policy.volume_mode, + entry.application_policy.allow_srdata] for entry in orm.accounting_for_user(session, user)] if len(apps) == 0: @@ -352,8 +353,13 @@ def list(ctx, no_decoration): @click.option("--volume", type=click.STRING, help="Application data volume, format=SOURCE:TARGET:MODE, " "where mode is 'ro' or 'rw'.") +@click.option("--allow-srdata", + is_flag=True, + help="Allow user to provide a file for the container to load" + "at startup.") @click.pass_context -def grant(ctx, image, user, app_license, allow_home, allow_view, volume): +def grant(ctx, image, user, app_license, allow_home, allow_view, volume, + allow_srdata): """Grants access to application identified by IMAGE to a specific user USER and specified access policy.""" allow_common = False @@ -389,7 +395,8 @@ def grant(ctx, image, user, app_license, allow_home, allow_view, volume): orm.ApplicationPolicy.allow_view == allow_view, orm.ApplicationPolicy.volume_source == source, orm.ApplicationPolicy.volume_target == target, - orm.ApplicationPolicy.volume_mode == mode).one_or_none() + orm.ApplicationPolicy.volume_mode == mode, + orm.ApplicationPolicy.allow_srdata == allow_srdata).one_or_none() if orm_policy is None: orm_policy = orm.ApplicationPolicy( @@ -400,6 +407,7 @@ def grant(ctx, image, user, app_license, allow_home, allow_view, volume): volume_source=source, volume_target=target, volume_mode=mode, + allow_srdata=allow_srdata, ) session.add(orm_policy) @@ -440,10 +448,14 @@ def grant(ctx, image, user, app_license, allow_home, allow_view, volume): @click.option("--volume", type=click.STRING, help="Application data volume, format=SOURCE:TARGET:MODE, " "where mode is 'ro' or 'rw'.") +@click.option("--allow-srdata", + is_flag=True, + help="Allow user to provide a file for the container to load" + "at startup.") @click.pass_context def revoke( ctx, image, user, revoke_all, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): """Revokes access to application identified by IMAGE to a specific user USER and specified parameters.""" allow_common = False @@ -478,7 +490,8 @@ def revoke( orm.ApplicationPolicy.allow_view == allow_view, orm.ApplicationPolicy.volume_source == source, orm.ApplicationPolicy.volume_target == target, - orm.ApplicationPolicy.volume_mode == mode).one() + orm.ApplicationPolicy.volume_mode == mode, + orm.ApplicationPolicy.allow_srdata == allow_srdata).one() session.query(orm.Accounting).filter( orm.Accounting.application == orm_app, diff --git a/remoteappmanager/db/interfaces.py b/remoteappmanager/db/interfaces.py index 417df1569..41800cbf5 100644 --- a/remoteappmanager/db/interfaces.py +++ b/remoteappmanager/db/interfaces.py @@ -203,7 +203,7 @@ def list_applications(self): @abstractmethod def grant_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): """Grant access for user to application. Parameters @@ -228,6 +228,9 @@ def grant_access(self, app_name, user_name, app_license, mode being "ro" or "rw". (e.g. "/host/path:/container/path:ro"). + allow_srdata : bool + If the user can provide a file for the container to load at startup + Raises ------ exception.NotFound: @@ -243,7 +246,7 @@ def grant_access(self, app_name, user_name, app_license, @abstractmethod def revoke_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): """Revoke access for user to application. Parameters @@ -268,6 +271,9 @@ def revoke_access(self, app_name, user_name, app_license, mode being "ro" or "rw". (e.g. "/host/path:/container/path:ro"). + allow_srdata : bool + If the user can provide a file for the container to load at startup + Raises ------ exception.NotFound: diff --git a/remoteappmanager/db/orm.py b/remoteappmanager/db/orm.py index 3c30b5f5b..9a3083bf5 100644 --- a/remoteappmanager/db/orm.py +++ b/remoteappmanager/db/orm.py @@ -67,15 +67,18 @@ class ApplicationPolicy(IdMixin, Base): #: If the container should be accessible by other people allow_view = Column(Boolean) - # Which volume to mount + #: Which volume to mount volume_source = Column(Unicode, nullable=True) - # Where to mount it in the container + #: Where to mount it in the container volume_target = Column(Unicode, nullable=True) - # In which mode + #: In which mode volume_mode = Column(Enum("ro", "rw"), nullable=True) + #: If the user can open a file at startup + allow_srdata = Column(Boolean) + class Accounting(Base): """Holds the information about who is allowed to run what.""" @@ -308,7 +311,7 @@ def list_applications(self): return applications def grant_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): allow_common = False source = target = mode = None @@ -334,7 +337,9 @@ def grant_access(self, app_name, user_name, app_license, ApplicationPolicy.allow_view == allow_view, ApplicationPolicy.volume_source == source, ApplicationPolicy.volume_target == target, - ApplicationPolicy.volume_mode == mode).one_or_none() + ApplicationPolicy.volume_mode == mode, + ApplicationPolicy.allow_srdata == allow_srdata + ).one_or_none() if orm_policy is None: orm_policy = ApplicationPolicy( @@ -345,6 +350,7 @@ def grant_access(self, app_name, user_name, app_license, volume_source=source, volume_target=target, volume_mode=mode, + allow_srdata=allow_srdata, ) session.add(orm_policy) @@ -372,7 +378,7 @@ def grant_access(self, app_name, user_name, app_license, return id def revoke_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): allow_common = False source = target = mode = None @@ -396,7 +402,8 @@ def revoke_access(self, app_name, user_name, app_license, ApplicationPolicy.allow_view == allow_view, ApplicationPolicy.volume_source == source, ApplicationPolicy.volume_target == target, - ApplicationPolicy.volume_mode == mode).one() + ApplicationPolicy.volume_mode == mode, + ApplicationPolicy.allow_srdata == allow_srdata).one() except NoResultFound: raise exceptions.NotFound() diff --git a/remoteappmanager/docker/configurables.py b/remoteappmanager/docker/configurables.py index df5682b9b..b411461eb 100644 --- a/remoteappmanager/docker/configurables.py +++ b/remoteappmanager/docker/configurables.py @@ -106,6 +106,35 @@ def default_env(cls): } +class ParaviewData(Configurable): + """ Support opening a specific file when ParaView starts up. """ + + tag = "srdata" + + @classmethod + def supported_by(cls, image): + return "SRDATA" in image.env + + @classmethod + def config_dict_to_env(cls, config_dict): + """ The config dict must contain the "srdata" key, e.g.: + + {"srdata": "/home/user/can.ex2"} + """ + if config_dict is None or len(config_dict) == 0: + return cls.default_env() + + data = config_dict["srdata"] + if not isinstance(data, str): + raise ValueError("invalid file path") + + return {"SRDATA": data} + + @classmethod + def default_env(cls): + return {"SRDATA": ""} + + def for_image(image): """Returns the configurables that are available for a specific image. @@ -122,7 +151,7 @@ def for_image(image): """ # We lack automatic registration. Add here new configurables - available = [Resolution] + available = [Resolution, ParaviewData] return [conf_class for conf_class in available diff --git a/remoteappmanager/tests/mocking/virtual/docker_client.py b/remoteappmanager/tests/mocking/virtual/docker_client.py index a4a79881d..15f7d6070 100644 --- a/remoteappmanager/tests/mocking/virtual/docker_client.py +++ b/remoteappmanager/tests/mocking/virtual/docker_client.py @@ -353,4 +353,19 @@ def _init_available_images(self): SIMPHONY_NS.description: 'A vanilla Ubuntu installation', # noqa }, exposed_ports=["8888/tcp"] - )] + ), + _Image( + id="sha256:df5f5184104426b65967e016ff2ac0bfcd44ad7899ca3bbcf8e44e4461491a9e", # noqa + name="simphonyproject/simphony-paraview", + labels={ + SIMPHONY_NS.description: 'Ubuntu machine with ParaView preinstalled', # noqa + SIMPHONY_NS.ui_name: 'ParaView', + SIMPHONY_NS.type: 'vncapp', + SIMPHONY_NS_ENV['x11-width']: '', + SIMPHONY_NS_ENV['x11-height']: '', + SIMPHONY_NS_ENV['x11-depth']: '', + SIMPHONY_NS_ENV['srdata']: '', + }, + exposed_ports=["8888/tcp"] + ) + ] diff --git a/remoteappmanager/webapi/admin/accounting.py b/remoteappmanager/webapi/admin/accounting.py index 27409c87b..def0bc94c 100644 --- a/remoteappmanager/webapi/admin/accounting.py +++ b/remoteappmanager/webapi/admin/accounting.py @@ -20,6 +20,7 @@ class Accounting(Resource): volume_source = Unicode(allow_none=True) volume_target = Unicode(allow_none=True) volume_mode = Unicode(allow_none=True) + allow_srdata = Bool() @classmethod def collection_name(cls): @@ -52,6 +53,7 @@ def create(self, resource, **kwargs): resource.allow_home, True, volume, + resource.allow_srdata, ) except db_exceptions.NotFound: raise exceptions.NotFound() @@ -97,7 +99,8 @@ def items(self, item_response, filter_=None, **kwargs): allow_home=acc.application_policy.allow_home, volume_source=acc.application_policy.volume_source, volume_target=acc.application_policy.volume_target, - volume_mode=acc.application_policy.volume_mode + volume_mode=acc.application_policy.volume_mode, + allow_srdata=acc.application_policy.allow_srdata, ) response.append(entry) item_response.set(response) diff --git a/remoteappmanager/webapi/application.py b/remoteappmanager/webapi/application.py index 3b1f11538..ce2697bfb 100644 --- a/remoteappmanager/webapi/application.py +++ b/remoteappmanager/webapi/application.py @@ -20,6 +20,7 @@ class Policy(ResourceFragment): volume_source = Unicode(allow_none=True) volume_target = Unicode(allow_none=True) volume_mode = Unicode(allow_none=True) + allow_srdata = Bool() class Image(ResourceFragment): From f5a989c50505bc14c5f85f5d595f66086be82aab Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 09:42:20 +0100 Subject: [PATCH 2/9] Update tests --- .../cli/tests/test_remoteappdb.py | 6 ++- .../db/tests/abc_test_interfaces.py | 2 +- remoteappmanager/db/tests/test_interfaces.py | 4 +- remoteappmanager/db/tests/test_orm.py | 44 +++++++++++++++---- .../docker/tests/test_configurables.py | 32 +++++++++++++- 5 files changed, 72 insertions(+), 16 deletions(-) diff --git a/remoteappmanager/cli/tests/test_remoteappdb.py b/remoteappmanager/cli/tests/test_remoteappdb.py index 68aaca4d7..46b6754c3 100644 --- a/remoteappmanager/cli/tests/test_remoteappdb.py +++ b/remoteappmanager/cli/tests/test_remoteappdb.py @@ -102,12 +102,14 @@ def test_app_grant(self): self._remoteappdb("app grant myapp user") self._remoteappdb("app grant myapp user " "--allow-view " - "--volume=frobniz:froble:ro") + "--volume=frobniz:froble:ro " + "--allow-srdata") _, out = self._remoteappdb("user list --show-apps") self.assertIn("myapp", out) self.assertIn("frobniz", out) self.assertIn("froble", out) - self.assertIn(" ro\n", out) + self.assertIn(" ro", out) + self.assertIn("1\n", out) def test_app_revoke(self): self._remoteappdb("app create myapp --no-verify") diff --git a/remoteappmanager/db/tests/abc_test_interfaces.py b/remoteappmanager/db/tests/abc_test_interfaces.py index f7fa45ec7..84155c4f9 100644 --- a/remoteappmanager/db/tests/abc_test_interfaces.py +++ b/remoteappmanager/db/tests/abc_test_interfaces.py @@ -145,7 +145,7 @@ def test_unsupported_ops(self): for method in [db.grant_access, db.revoke_access]: with self.assertRaises(exceptions.UnsupportedOperation): - method("bonkers", "uuu", 'key', True, False, "/a:/b:ro") + method("bonkers", "uuu", 'key', True, False, "/a:/b:ro", False) with self.assertRaises(exceptions.UnsupportedOperation): db.revoke_access_by_id(12345) diff --git a/remoteappmanager/db/tests/test_interfaces.py b/remoteappmanager/db/tests/test_interfaces.py index 483f06a6d..f51dba897 100644 --- a/remoteappmanager/db/tests/test_interfaces.py +++ b/remoteappmanager/db/tests/test_interfaces.py @@ -73,11 +73,11 @@ def list_applications(self): ] def grant_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): raise exceptions.UnsupportedOperation() def revoke_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): raise exceptions.UnsupportedOperation() def revoke_access_by_id(self, mapping_id): diff --git a/remoteappmanager/db/tests/test_orm.py b/remoteappmanager/db/tests/test_orm.py index 433894003..f8f1c73fd 100644 --- a/remoteappmanager/db/tests/test_orm.py +++ b/remoteappmanager/db/tests/test_orm.py @@ -324,19 +324,19 @@ def test_grant_revoke_access(self): with self.assertRaises(exceptions.NotFound): database.grant_access( "simphonyremote/amazing", "ciccio", '', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) database.create_user("ciccio") with self.assertRaises(exceptions.NotFound): database.grant_access( "simphonyremote/amazing", "ciccio", '', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) database.create_application("simphonyremote/amazing") id = database.grant_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) self.assertIsNotNone(id) user = database.get_user(user_name="ciccio") @@ -349,23 +349,24 @@ def test_grant_revoke_access(self): self.assertEqual(acc[0].application_policy.volume_source, "/foo") self.assertEqual(acc[0].application_policy.volume_target, "/bar") self.assertEqual(acc[0].application_policy.volume_mode, "ro") + self.assertEqual(acc[0].application_policy.allow_srdata, False) # Do it twice to check idempotency id2 = database.grant_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) self.assertEqual(id, id2) database.revoke_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) self.assertEqual(len(database.get_accounting_for_user(user)), 0) with self.assertRaises(exceptions.NotFound): database.revoke_access( "simphonyremote/amazing", "hello", 'some_key', - True, False, "/foo:/bar:ro") + True, False, "/foo:/bar:ro", False) def test_grant_revoke_access_volume(self): database = self.create_database() @@ -374,7 +375,7 @@ def test_grant_revoke_access_volume(self): database.create_application("simphonyremote/amazing") database.grant_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, None) + True, False, None, False) user = database.get_user(user_name="ciccio") acc = database.get_accounting_for_user(user) @@ -385,10 +386,11 @@ def test_grant_revoke_access_volume(self): self.assertEqual(acc[0].application_policy.volume_source, None) self.assertEqual(acc[0].application_policy.volume_target, None) self.assertEqual(acc[0].application_policy.volume_mode, None) + self.assertEqual(acc[0].application_policy.allow_srdata, False) database.revoke_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, None) + True, False, None, False) self.assertEqual(len(database.get_accounting_for_user(user)), 0) @@ -399,7 +401,7 @@ def test_revoke_by_id(self): database.create_application("simphonyremote/amazing") id = database.grant_access( "simphonyremote/amazing", "ciccio", 'some_key', - True, False, None) + True, False, None, False) user = database.get_user(user_name="ciccio") apps = database.get_accounting_for_user(user) @@ -414,6 +416,30 @@ def test_revoke_by_id(self): # Id not present, should do nothing database.revoke_access_by_id(3441) + def test_allow_srdata(self): + database = self.create_database() + + database.create_user("ciccio") + database.create_application("simphonyremote/amazing") + id = database.grant_access( + "simphonyremote/amazing", "ciccio", "some_key", + True, False, "/foo:/bar:ro", True + ) + + self.assertIsNotNone(id) + + user = database.get_user(user_name="ciccio") + acc = database.get_accounting_for_user(user) + self.assertEqual(acc[0].id, id) + self.assertEqual(acc[0].application.image, "simphonyremote/amazing") + self.assertEqual(acc[0].application_policy.app_license, 'some_key') + self.assertEqual(acc[0].application_policy.allow_home, True) + self.assertEqual(acc[0].application_policy.allow_view, False) + self.assertEqual(acc[0].application_policy.volume_source, "/foo") + self.assertEqual(acc[0].application_policy.volume_target, "/bar") + self.assertEqual(acc[0].application_policy.volume_mode, "ro") + self.assertEqual(acc[0].application_policy.allow_srdata, True) + def test_unsupported_ops(self): """Override to silence the base class assumption that most of our backends are unable to create.""" diff --git a/remoteappmanager/docker/tests/test_configurables.py b/remoteappmanager/docker/tests/test_configurables.py index 54cf2568c..d482e3ea5 100644 --- a/remoteappmanager/docker/tests/test_configurables.py +++ b/remoteappmanager/docker/tests/test_configurables.py @@ -1,5 +1,7 @@ import unittest -from remoteappmanager.docker.configurables import Resolution, for_image +from remoteappmanager.docker.configurables import ( + ParaviewData, Resolution, for_image, +) from remoteappmanager.docker.image import Image from remoteappmanager.tests.mocking.virtual.docker_client import ( VirtualDockerClient) @@ -16,15 +18,26 @@ def setUp(self): 'simphonyproject/ubuntu-image:latest') self.image_2 = Image.from_docker_dict(image_dict) + image_dict = docker_client.inspect_image( + 'simphonyproject/simphony-paraview') + self.image_3 = Image.from_docker_dict(image_dict) + def test_resolution(self): self.assertTrue(Resolution.supported_by(self.image_1)) self.assertFalse(Resolution.supported_by(self.image_2)) + self.assertTrue(Resolution.supported_by(self.image_3)) + + def test_srdata(self): + self.assertFalse(ParaviewData.supported_by(self.image_1)) + self.assertFalse(ParaviewData.supported_by(self.image_2)) + self.assertTrue(ParaviewData.supported_by(self.image_3)) def test_for_image(self): self.assertEqual(for_image(self.image_1), [Resolution]) self.assertEqual(for_image(self.image_2), []) + self.assertEqual(for_image(self.image_3), [Resolution, ParaviewData]) - def test_config_dict_to_env(self): + def test_config_dict_to_env_resolution(self): self.assertEqual( Resolution.config_dict_to_env({"resolution": "1280x800"}), {"X11_WIDTH": "1280", @@ -51,3 +64,18 @@ def test_config_dict_to_env(self): with self.assertRaises(ValueError): Resolution.config_dict_to_env({"resolution": "0x1024"}) + + def test_config_dict_to_env_srdata(self): + self.assertEqual( + ParaviewData.config_dict_to_env({"srdata": "/home/test/can.ex2"}), + {"SRDATA": "/home/test/can.ex2"} + + ) + + default = ParaviewData.default_env() + self.assertEqual(default, {"SRDATA": ""}) + self.assertEqual(ParaviewData.config_dict_to_env(None), default) + self.assertEqual(ParaviewData.config_dict_to_env({}), default) + + with self.assertRaises(ValueError): + ParaviewData.config_dict_to_env({"srdata": 123}) From f683c443c428f5436a88457341b9ade9e53f0042 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 09:42:26 +0100 Subject: [PATCH 3/9] Update docs --- doc/source/developer/docker.rst | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/source/developer/docker.rst b/doc/source/developer/docker.rst index a097fa9f5..bffcc52e8 100644 --- a/doc/source/developer/docker.rst +++ b/doc/source/developer/docker.rst @@ -11,7 +11,7 @@ Labels are defined with the prefix namespace:: eu.simphony-project.docker -The following labels are currently defined. +The following labels are currently defined. Their definition can be found in ``remoteappmanager.docker.docker_labels`` - ``ui_name``: the UI visible name of the image @@ -21,12 +21,12 @@ Their definition can be found in ``remoteappmanager.docker.docker_labels`` the original base image (vncapp or webapp) - ``env``: subnamespace for accepted environment variables. See below. -The env is a subnamespace defining the environment variables the image internals +The env is a subnamespace defining the environment variables the image internals can understand. This does not mean that they are the only ones that will be -passed to the image. +passed to the image. -The naming strategy works around the `docker label restrictions -`_ +The naming strategy works around the `docker label restrictions +`_ of having `kebab case `_ vs envvars that are traditionally MACRO_CASE. Additionally, it allows new variables to be added by layers without having to know the variables understood by the base layer. @@ -39,7 +39,7 @@ and dashes converted to underscores. For example: the value of the label is currently unused, and should be left empty. If your application uses variables with a different convention, or uses double underscores, -you will have to define an auxilliary variable and transfer the value in the image +you will have to define an auxilliary variable and transfer the value in the image startup scripts. Currently reserved env keys: @@ -47,15 +47,17 @@ Currently reserved env keys: - ``x11-width``: for the VNC images, the X11 width - ``x11-height``: for the VNC images, the X11 height - ``x11-depth``: for the VNC images, the X11 depth (currently unused, fixed at 16) + - ``srdata``: for the Simphony-ParaView image, this variable can be set to a file that + will be loaded by ParaView at startup Container Labels '''''''''''''''' When a container is started, the following labels will be added: - - ``url_id``: unique identifier that ends up in the URL when the + - ``url_id``: unique identifier that ends up in the URL when the user is redirected - - ``mapping_id``: a unique key identifying the combination of image + - ``mapping_id``: a unique key identifying the combination of image and policy used to start the container. - ``user``: the user that started the container From a3868a328778902f6bf70f16d7187c1184227561 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 10:07:54 +0100 Subject: [PATCH 4/9] Update CSVApplicationPolicy interface and fix tests --- remoteappmanager/db/csv_db.py | 14 +++++++++----- remoteappmanager/db/interfaces.py | 5 ++++- remoteappmanager/db/tests/test_csv_db.py | 9 ++++++--- remoteappmanager/webapi/tests/test_application.py | 9 +++++++-- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/remoteappmanager/db/csv_db.py b/remoteappmanager/db/csv_db.py index 6531ba913..1f97d6f11 100644 --- a/remoteappmanager/db/csv_db.py +++ b/remoteappmanager/db/csv_db.py @@ -85,7 +85,8 @@ def __init__(self, id, name): 'policy.allow_common', 'policy.volume_source', 'policy.volume_target', - 'policy.volume_mode') + 'policy.volume_mode', + 'policy.allow_srdata') @mergedocs(ABCDatabase) @@ -158,6 +159,7 @@ def __init__(self, csv_file_path, **kwargs): None) volume_mode = (record[indices['policy.volume_mode']] or None) + allow_srdata = record[indices['policy.allow_srdata']] == '1' application_policy = self.application_policies.setdefault( (app_license, @@ -166,7 +168,8 @@ def __init__(self, csv_file_path, **kwargs): allow_common, volume_source, volume_target, - volume_mode), + volume_mode, + allow_srdata), CSVApplicationPolicy( app_license=app_license, allow_home=allow_home, @@ -174,7 +177,8 @@ def __init__(self, csv_file_path, **kwargs): allow_common=allow_common, volume_source=volume_source, volume_target=volume_target, - volume_mode=volume_mode)) + volume_mode=volume_mode, + allow_srdata=allow_srdata)) # Save the configuration # Note that we don't filter existing duplicate entry @@ -222,11 +226,11 @@ def list_applications(self): return list(self.applications.values()) def grant_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): raise UnsupportedOperation() def revoke_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): raise UnsupportedOperation() def revoke_access_by_id(self, mapping_id): diff --git a/remoteappmanager/db/interfaces.py b/remoteappmanager/db/interfaces.py index 41800cbf5..c4b8cbe90 100644 --- a/remoteappmanager/db/interfaces.py +++ b/remoteappmanager/db/interfaces.py @@ -27,7 +27,7 @@ class ABCApplicationPolicy(metaclass=ABCMeta): def __init__(self, app_license=None, allow_home=False, allow_view=False, allow_common=False, volume_source=None, volume_target=None, - volume_mode=None): + volume_mode=None, allow_srdata=False): #: Application License (if specified) self.app_license = app_license @@ -50,6 +50,9 @@ def __init__(self, app_license=None, allow_home=False, allow_view=False, #: Mode for read-write access (ro = Read-only. rw = Read-write) self.volume_mode = volume_mode + #: Allow user to provide a file for the container to load at startup + self.allow_srdata = allow_srdata + def __repr__(self): args = _inspect.getargs( ABCApplicationPolicy.__init__.__code__).args[1:] diff --git a/remoteappmanager/db/tests/test_csv_db.py b/remoteappmanager/db/tests/test_csv_db.py index 0450dd51d..fe02d7313 100644 --- a/remoteappmanager/db/tests/test_csv_db.py +++ b/remoteappmanager/db/tests/test_csv_db.py @@ -85,14 +85,16 @@ def create_expected_configs(self, user): allow_common=False, volume_source=None, volume_target=None, - volume_mode=None)), + volume_mode=None, + allow_srdata=False)), (CSVApplication(id=1, image='simphonyproject/ubuntu-image:latest'), # noqa CSVApplicationPolicy(allow_home=True, allow_view=True, allow_common=True, volume_source='/src', volume_target='/target', - volume_mode='ro')) + volume_mode='ro', + allow_srdata=False)) ), 'johndoe': ( (CSVApplication(id=0, image='simphonyproject/simphony-mayavi:0.6.0'), # noqa @@ -101,7 +103,8 @@ def create_expected_configs(self, user): allow_common=False, volume_source='/src', volume_target='/target', - volume_mode='ro')), + volume_mode='ro', + allow_srdata=False)), )} return mappings[user.name] diff --git a/remoteappmanager/webapi/tests/test_application.py b/remoteappmanager/webapi/tests/test_application.py index 0c50be378..f8c54a90c 100644 --- a/remoteappmanager/webapi/tests/test_application.py +++ b/remoteappmanager/webapi/tests/test_application.py @@ -52,6 +52,7 @@ def get_app(self): volume_source="foo", volume_target="bar", volume_mode="ro", + allow_srdata=False, ) app.db.get_accounting_for_user = Mock(return_value=[ @@ -77,7 +78,8 @@ def test_items(self): 'volume_mode': 'ro', 'volume_source': 'foo', 'allow_home': True, - 'volume_target': 'bar' + 'volume_target': 'bar', + 'allow_srdata': False }, 'name': 'boo', 'icon_128': '', @@ -95,7 +97,8 @@ def test_items(self): 'volume_mode': 'ro', 'volume_source': 'foo', 'allow_home': True, - 'volume_target': 'bar' + 'volume_target': 'bar', + 'allow_srdata': False }, 'name': 'boo', 'type': '', @@ -144,6 +147,7 @@ def test_retrieve(self): "volume_mode": 'ro', "volume_source": "foo", "volume_target": "bar", + "allow_srdata": False, }, 'ui_name': 'foo_ui'}}) @@ -175,6 +179,7 @@ def test_retrieve(self): "volume_mode": 'ro', "volume_source": "foo", "volume_target": "bar", + "allow_srdata": False, }, 'configurables': [], } From 00ea88876b9c6d1db43ab18a1fc58db86e671c90 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 10:20:39 +0100 Subject: [PATCH 5/9] Fix db testing --- remoteappmanager/db/tests/test_csv_db.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/remoteappmanager/db/tests/test_csv_db.py b/remoteappmanager/db/tests/test_csv_db.py index fe02d7313..e7291be12 100644 --- a/remoteappmanager/db/tests/test_csv_db.py +++ b/remoteappmanager/db/tests/test_csv_db.py @@ -13,26 +13,26 @@ class GoodTable: 'policy.allow_home', 'policy.allow_view', 'policy.allow_common', 'policy.volume_source', 'policy.volume_target', - 'policy.volume_mode') + 'policy.volume_mode', 'policy.allow_srdata') - # name, image, home, view, common, source, target, mode + # name, image, home, view, common, source, target, mode, srdata records = [ - ('markdoe', 'simphonyproject/simphony-mayavi:0.6.0', '', '1', '1', '0', '', '', ''), # noqa - ('markdoe', 'simphonyproject/ubuntu-image:latest', '', '1', '1', '1', '/src', '/target', 'ro'), # noqa - ('johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '', '0', '0', '0', '/src', '/target', 'ro')] # noqa + ('markdoe', 'simphonyproject/simphony-mayavi:0.6.0', '', '1', '1', '0', '', '', '', '0'), # noqa + ('markdoe', 'simphonyproject/ubuntu-image:latest', '', '1', '1', '1', '/src', '/target', 'ro', '0'), # noqa + ('johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '', '0', '0', '0', '/src', '/target', 'ro', '0')] # noqa class BadTableMissingHeaders: # policy.volume_source and policy.volume_target are missing headers = ('user.name', 'application.image', 'policy.allow_home', 'policy.allow_view', 'policy.allow_common', - 'policy.volume_mode') + 'policy.volume_mode', 'policy.allow_srdata') # name, image, home, view, common, mode records = [ - ('markdoe', 'simphonyproject/simphony-mayavi:0.6.0', '1', '1', '0', ''), # noqa - ('markdoe', 'simphonyproject/ubuntu-image:latest', '1', '1', '1', 'ro'), # noqa - ('johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '0', '0', '0', 'ro')] # noqa + ('markdoe', 'simphonyproject/simphony-mayavi:0.6.0', '1', '1', '0', '', '0'), # noqa + ('markdoe', 'simphonyproject/ubuntu-image:latest', '1', '1', '1', 'ro', '0'), # noqa + ('johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '0', '0', '0', 'ro', '0')] # noqa class GoodTableWithDifferentHeaders: @@ -43,13 +43,13 @@ class GoodTableWithDifferentHeaders: 'policy.volume_source', 'policy.volume_target', 'policy.volume_mode', 'user.name', 'application.image', 'policy.allow_home', - 'extra_column') + 'policy.allow_srdata', 'extra_column') # view, common, source, target, mode, name, image, home, extra records = [ ('', '1', '0', '', '', '', 'markdoe', 'simphonyproject/simphony-mayavi:0.6.0', '1', 'anything'), # noqa - ('', '1', '1', '/src', '/target', 'ro', 'markdoe', 'simphonyproject/ubuntu-image:latest', '1', 'extra'), # noqa - ('', '0', '0', '/src', '/target', 'ro', 'johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '0', 'abc')] # noqa + ('', '1', '1', '/src', '/target', 'ro', '0', 'markdoe', 'simphonyproject/ubuntu-image:latest', '1', '0', 'extra'), # noqa + ('', '0', '0', '/src', '/target', 'ro', 'johndoe', 'simphonyproject/simphony-mayavi:0.6.0', '0', '0', 'abc')] # noqa def write_csv_file(file_name, headers, records): From 57ff43bdc159785862d9d159a969434feb375f09 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 10:39:07 +0100 Subject: [PATCH 6/9] Fix accounting tests --- .../webapi/admin/tests/test_accounting.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/remoteappmanager/webapi/admin/tests/test_accounting.py b/remoteappmanager/webapi/admin/tests/test_accounting.py index 6765c74e9..fdbab6c5c 100644 --- a/remoteappmanager/webapi/admin/tests/test_accounting.py +++ b/remoteappmanager/webapi/admin/tests/test_accounting.py @@ -49,7 +49,8 @@ def test_create(self): "allow_home": True, "volume_source": "/foo", "volume_target": "/bar", - "volume_mode": "ro" + "volume_mode": "ro", + "allow_srdata": False, }, httpstatus.CREATED) @@ -61,7 +62,8 @@ def test_create(self): "allow_home": True, "volume_source": "/foo", "volume_target": "/bar", - "volume_mode": "ro" + "volume_mode": "ro", + "allow_srdata": False, }, httpstatus.CREATED) @@ -77,7 +79,8 @@ def test_unable_to_create(self): "allow_home": True, "volume_source": "/foo", "volume_target": "/bar", - "volume_mode": "ro" + "volume_mode": "ro", + "allow_srdata": False, }, httpstatus.INTERNAL_SERVER_ERROR) @@ -89,7 +92,8 @@ def test_unexistent_user_at_create(self): "allow_home": True, "volume_source": "/foo", "volume_target": "/bar", - "volume_mode": "ro" + "volume_mode": "ro", + "allow_srdata": False, }, httpstatus.BAD_REQUEST) @@ -105,7 +109,8 @@ def test_absent_volume(self): "allow_home": True, "volume_source": "", "volume_target": "", - "volume_mode": "" + "volume_mode": "", + "allow_srdata": False, }, httpstatus.CREATED) self.assertEqual(mock_grant_access.call_args[0][5], None) From 16c493f18da29b7253010686b5efeaa9460b2764 Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Tue, 10 Aug 2021 10:50:59 +0100 Subject: [PATCH 7/9] Fix dummy db mock --- remoteappmanager/tests/mocking/dummy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/tests/mocking/dummy.py b/remoteappmanager/tests/mocking/dummy.py index cf6150146..fbda95416 100644 --- a/remoteappmanager/tests/mocking/dummy.py +++ b/remoteappmanager/tests/mocking/dummy.py @@ -129,13 +129,13 @@ def list_applications(self): # pragma: no cover return self.applications.values() def grant_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): app = self._get_application_id_by_name(app_name) user = self._get_user_id_by_name(user_name) source, target, mode = volume.split(':') policy = DummyDBApplicationPolicy( - app_license, allow_home, allow_view, False, + app_license, allow_home, allow_view, False, allow_srdata, source, target, mode) self.policies[len(self.policies)] = policy @@ -145,7 +145,7 @@ def grant_access(self, app_name, user_name, app_license, return id def revoke_access(self, app_name, user_name, app_license, - allow_home, allow_view, volume): + allow_home, allow_view, volume, allow_srdata): pass def revoke_access_by_id(self, mapping_id): From 95611f10065b97f8063bf356b0f85e3f8a5d0ebf Mon Sep 17 00:00:00 2001 From: Roberto Preste Date: Wed, 11 Aug 2021 13:08:44 +0100 Subject: [PATCH 8/9] Renaming srdata to StartupData --- .../admin/vue-components/AccountingView.vue | 2 +- .../accounting/NewAccountingDialog.vue | 6 ++--- frontend/user/configurables/ParaviewData.vue | 26 ------------------- frontend/user/configurables/StartupData.vue | 26 +++++++++++++++++++ frontend/user/configurables/configurables.js | 14 +++++----- .../user/vue-components/ApplicationView.vue | 2 +- remoteappmanager/cli/remoteappdb/__main__.py | 21 ++++++++------- .../cli/tests/test_remoteappdb.py | 2 +- remoteappmanager/db/csv_db.py | 14 +++++----- remoteappmanager/db/interfaces.py | 12 ++++----- remoteappmanager/db/orm.py | 13 +++++----- remoteappmanager/db/tests/test_csv_db.py | 14 +++++----- remoteappmanager/db/tests/test_interfaces.py | 4 +-- remoteappmanager/db/tests/test_orm.py | 8 +++--- remoteappmanager/docker/configurables.py | 16 +++++++----- .../docker/tests/test_configurables.py | 24 ++++++++--------- remoteappmanager/tests/mocking/dummy.py | 6 ++--- remoteappmanager/webapi/admin/accounting.py | 6 ++--- .../webapi/admin/tests/test_accounting.py | 10 +++---- remoteappmanager/webapi/application.py | 2 +- .../webapi/tests/test_application.py | 10 +++---- 21 files changed, 123 insertions(+), 115 deletions(-) delete mode 100644 frontend/user/configurables/ParaviewData.vue create mode 100644 frontend/user/configurables/StartupData.vue diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue index 49a2cc701..ae6ea82f1 100644 --- a/frontend/admin/vue-components/AccountingView.vue +++ b/frontend/admin/vue-components/AccountingView.vue @@ -100,7 +100,7 @@ item.volume_source, item.volume_target, item.volume_mode === "ro", - item.allow_srdata + item.allow_startup_data ]); }); }) diff --git a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue index 45a705c17..07277272a 100644 --- a/frontend/admin/vue-components/accounting/NewAccountingDialog.vue +++ b/frontend/admin/vue-components/accounting/NewAccountingDialog.vue @@ -54,7 +54,7 @@
@@ -90,7 +90,7 @@ volume_target: '', volume_readonly: false, volume_source_target: [], - allow_srdata: false + allow_startup_data: false }, imageNames: [] }; @@ -144,7 +144,7 @@ volume_source: this.model.volume_source, volume_target: this.model.volume_target, volume_mode: (model.volume_readonly ? "ro" : "rw"), - allow_srdata: this.model.allow_srdata + allow_startup_data: this.model.allow_startup_data }; resources.Accounting.create(rep) diff --git a/frontend/user/configurables/ParaviewData.vue b/frontend/user/configurables/ParaviewData.vue deleted file mode 100644 index 34b70afd0..000000000 --- a/frontend/user/configurables/ParaviewData.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/frontend/user/configurables/StartupData.vue b/frontend/user/configurables/StartupData.vue new file mode 100644 index 000000000..274d330cc --- /dev/null +++ b/frontend/user/configurables/StartupData.vue @@ -0,0 +1,26 @@ + + + diff --git a/frontend/user/configurables/configurables.js b/frontend/user/configurables/configurables.js index 24fa3e180..2e27a3f96 100644 --- a/frontend/user/configurables/configurables.js +++ b/frontend/user/configurables/configurables.js @@ -1,7 +1,7 @@ let utils = require("utils"); require("./Resolution"); -require("./ParaviewData"); +require("./StartupData"); // Your configurable class must implement a tag and default configDict @@ -23,16 +23,16 @@ class ResolutionModel { } } -class ParaviewDataModel { +class StartupDataModel { constructor() { - this.tag = "srdata"; - this.configDict = { srdata: '' }; + this.tag = "startupdata"; + this.configDict = { startupdata: '' }; } asConfigDict() { - let srdata = this.configDict.srdata; + let startupdata = this.configDict.startupdata; - return { srdata: srdata }; + return { startupdata: startupdata }; } } @@ -40,6 +40,6 @@ let outputConfigurables = {}; // Export all your configurable models here respecting the tag (here resolution) outputConfigurables.resolution = ResolutionModel; -outputConfigurables.srdata = ParaviewDataModel; +outputConfigurables.startupdata = StartupDataModel; module.exports = outputConfigurables; diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue index 66b9fb989..1477e7c89 100644 --- a/frontend/user/vue-components/ApplicationView.vue +++ b/frontend/user/vue-components/ApplicationView.vue @@ -42,7 +42,7 @@
No configurable options for this image
-
+
Date: Wed, 11 Aug 2021 14:09:49 +0100 Subject: [PATCH 9/9] Remove ParaView references from docs and docstrings --- doc/source/developer/docker.rst | 4 ++-- remoteappmanager/docker/configurables.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/developer/docker.rst b/doc/source/developer/docker.rst index bffcc52e8..af8faa40d 100644 --- a/doc/source/developer/docker.rst +++ b/doc/source/developer/docker.rst @@ -47,8 +47,8 @@ Currently reserved env keys: - ``x11-width``: for the VNC images, the X11 width - ``x11-height``: for the VNC images, the X11 height - ``x11-depth``: for the VNC images, the X11 depth (currently unused, fixed at 16) - - ``srdata``: for the Simphony-ParaView image, this variable can be set to a file that - will be loaded by ParaView at startup + - ``srdata``: this variable can be set to a file that will be loaded by an application + upon startup Container Labels '''''''''''''''' diff --git a/remoteappmanager/docker/configurables.py b/remoteappmanager/docker/configurables.py index db053a308..3d8e4536d 100644 --- a/remoteappmanager/docker/configurables.py +++ b/remoteappmanager/docker/configurables.py @@ -107,7 +107,7 @@ def default_env(cls): class StartupData(Configurable): - """ Support opening a specific file when ParaView starts up. """ + """ Support opening a specific file when an application starts up. """ tag = "srdata"