Restrict owned public entities

PR-URL: #404
metarhia · Apr 25, 2019 · a065b6f · a065b6f
1 parent 92a99c8
commit a065b6f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/lib/metaschema-config/category.js b/lib/metaschema-config/category.js
@@ -18,9 +18,13 @@ const {
   HIERARCHICAL_RELATIONS,
 } = require('./utils');
 
-const preprocessCategoryData = entity => {
+const preprocessCategoryData = (type, entity) => {
   const [first, second] = entity.name.split('.');
-  if (!second) {
+  if (entity.definition.Public) {
+    return first && second
+      ? [new SchemaValidationError('ownedPublic', entity.name, { type })]
+      : [];
+  } else if (!second) {
     entity.category = entity.module;
   } else {
     entity.category = first;

diff --git a/lib/metaschema-config/config.js b/lib/metaschema-config/config.js
@@ -57,6 +57,9 @@ SchemaValidationError.serializers.illegalParamsResolving = ({
   info: { type },
 }) => `Params resolving is forbidden for ${type}: '${source}'`;
 
+SchemaValidationError.serializers.ownedPublic = ({ source, info: { type } }) =>
+  `Public ${type}: '${source}' can not be defined on a category`;
+
 const preprocessor = schemas => {
   const arr = [...schemas];
 
@@ -141,14 +144,14 @@ module.exports = {
         creator: categoryCreator,
       },
       action: {
-        preprocess: [preprocessCategoryData],
+        preprocess: [preprocessCategoryData.bind(null, 'action')],
         add: [addAction],
         postprocess: [processAction],
         validateInstance: validateAction,
         creator: actionCreator,
       },
       form: {
-        preprocess: [preprocessCategoryData, preprocessForm],
+        preprocess: [preprocessCategoryData.bind(null, 'form'), preprocessForm],
         add: [addForm],
         postprocess: [processForm],
         validateInstance: validateForm,

diff --git a/test/fixtures/owned-public-action/Category.Action.action b/test/fixtures/owned-public-action/Category.Action.action
@@ -0,0 +1,4 @@
+Action({
+  Public: true,
+  Execute: () => {},
+});
diff --git a/test/ms.owned-public-action.js b/test/ms.owned-public-action.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const metaschema = require('metaschema');
+const metatests = require('metatests');
+
+const { options, config } = require('../lib/metaschema-config/config');
+
+const { MetaschemaError, SchemaValidationError } = metaschema.errors;
+
+metatests.test('Fully supports schemas/system', async test => {
+  try {
+    await metaschema.fs.load(
+      'test/fixtures/owned-public-action',
+      options,
+      config
+    );
+    test.fail('Schema loading must fail');
+  } catch (error) {
+    test.strictSame(
+      error,
+      new MetaschemaError([
+        new SchemaValidationError('ownedPublic', 'Category.Action', {
+          type: 'action',
+        }),
+      ])
+    );
+  }
+  test.end();
+});