sockethub 4.1.0 → 5.0.0-alpha.2

package/dist/middleware/validate.js

@@ -25,124 +25,50 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * responsible for handling the validation and expansion (when applicable) of all incoming objects
  */
-const tv4_1 = __importDefault(require("tv4"));
 const debug_1 = __importDefault(require("debug"));
-const urijs_1 = __importDefault(require("urijs"));
-const activity_streams_1 = __importDefault(require("activity-streams"));
-const SockethubSchemas = __importStar(require("sockethub-schemas"));
+const Schemas = __importStar(require("sockethub-schemas"));
+// @ts-ignore
 const init_1 = __importDefault(require("../bootstrap/init"));
-const config_1 = __importDefault(require("../config"));
-const activity = (0, activity_streams_1.default)(config_1.default.get('activity-streams:opts'));
-// load sockethub-activity-stream schema and register it with tv4
-// http://sockethub.org/schemas/v0/activity-stream#
-tv4_1.default.addSchema(SockethubSchemas.ActivityStream.id, SockethubSchemas.ActivityStream);
-// load sockethub-activity-object schema and register it with tv4
-// http://sockethub.org/schemas/v0/activity-object#
-tv4_1.default.addSchema(SockethubSchemas.ActivityObject.id, SockethubSchemas.ActivityObject);
-// educated guess on what the displayName is, if it's not defined
-// since we know the @id is a URI, we prioritize by username, then fragment (no case yet for path)
-function ensureDisplayName(msg) {
-    if ((msg['@id']) && (!msg.displayName)) {
-        const uri = new urijs_1.default(msg['@id']);
-        return uri.username() || getUriFragment(uri) || uri.path();
-    }
-    return msg.displayName;
-}
-function ensureObject(msg) {
-    return !((typeof msg !== 'object') || (Array.isArray(msg)));
-}
-// expand given prop to full object if they are just strings
-// FIXME are we sure this works? What's propName for?
-function expandProp(propName, prop) {
-    return (typeof prop === 'string') ? activity.Object.get(prop, true) : prop;
-}
-function expandStream(msg) {
-    msg.actor.displayName = ensureDisplayName(msg.actor);
-    if (msg.target) {
-        msg.target.displayName = ensureDisplayName(msg.target);
-    }
-    return msg;
-}
-function getUriFragment(uri) {
-    const frag = uri.fragment();
-    return (frag) ? '#' + frag : undefined;
-}
-function processActivityObject(msg, done) {
-    if (!validateActivityObject(msg)) {
-        return done(new Error(`activity-object schema validation failed: ${tv4_1.default.error.dataPath} = ${tv4_1.default.error.message}`));
-    }
-    msg.displayName = ensureDisplayName(msg);
-    return done(msg); // passed validation, on to next handler in middleware chain
-}
-function processActivityStream(msg, done) {
-    let stream;
-    try { // expands the AS object to a full object with the expected properties
-        stream = activity.Stream(msg);
-    }
-    catch (e) {
-        return done(new Error(e));
-    }
-    msg = stream; // overwrite message with expanded as object stream
-    if (!validateActivityStream(msg)) {
-        return done(new Error(`actvity-stream schema validation failed: ${tv4_1.default.error.dataPath}: ${tv4_1.default.error.message}`));
-    }
-    // passed validation, on to next handler in middleware chain
-    return done(expandStream(msg));
-}
-function processCredentials(msg, done) {
-    msg.actor = expandProp('actor', msg.actor);
-    msg.target = expandProp('target', msg.target);
-    let credentialsSchema = tv4_1.default.getSchema(`http://sockethub.org/schemas/v0/context/${msg.context}/credentials`);
-    if (!credentialsSchema) {
-        return done(new Error(`no credentials schema found for ${msg.context} context`));
-    }
-    if (!validateCredentials(msg, credentialsSchema)) {
-        return done(new Error(`credentials schema validation failed: ${tv4_1.default.error.dataPath} = ${tv4_1.default.error.message}`));
-    }
-    // passed validation, on to next handler in middleware chain
-    return done(expandStream(msg));
-}
-function validateActivityObject(msg) {
-    return tv4_1.default.validate({ object: msg }, SockethubSchemas.ActivityObject);
-}
-function validateCredentials(msg, schema) {
-    return tv4_1.default.validate(msg, schema);
-}
-function validateActivityStream(msg) {
-    // TODO figure out a way to allow for special objects from platforms, without
-    // ignoring failed activity stream schema checks
-    if (!tv4_1.default.validate(msg, SockethubSchemas.ActivityStream)) {
-        return tv4_1.default.getSchema(`http://sockethub.org/schemas/v0/context/${msg.context}/messages`);
-    }
-    return true;
-}
+init_1.default.platforms.forEach((platform) => {
+    Object.keys(platform.schemas).forEach((key) => {
+        if (!platform.schemas[key]) {
+            return;
+        }
+        Schemas.validator.addPlatformSchema(platform.schemas[key], `${platform.id}/${key}`);
+    });
+});
 // called when registered with the middleware function, define the type of validation
 // that will be called when the middleware eventually does.
 function validate(type, sockethubId) {
     const sessionLog = (0, debug_1.default)(`sockethub:validate:${sockethubId}`);
-    // called by the middleware with the message and the next (callback) in the chain
     return (msg, done) => {
         sessionLog('applying schema validation for ' + type);
-        if (!ensureObject(msg)) {
-            done(new Error(`message received is not an object.`));
-        }
-        else if (type === 'activity-object') {
-            processActivityObject(msg, done);
-        }
-        else if (typeof msg.context !== 'string') {
-            done(new Error('message must contain a context property'));
+        if (type === 'activity-object') {
+            const err = Schemas.validator.validateActivityObject(msg);
+            err ? done(new Error(err)) : done(msg);
         }
         else if (!init_1.default.platforms.has(msg.context)) {
-            done(new Error(`platform context ${msg.context} not registered with this sockethub instance.`));
-        }
-        else if ((type === 'message') && (typeof msg['@type'] !== 'string')) {
-            done(new Error('message must contain a @type property.'));
+            return done(new Error(`platform context ${msg.context} not registered with this sockethub instance.`));
         }
         else if (type === 'credentials') {
-            processCredentials(msg, done);
+            const err = Schemas.validator.validateCredentials(msg);
+            err ? done(new Error(err)) : done(msg);
         }
         else {
-            processActivityStream(msg, done);
+            const err = Schemas.validator.validateActivityStream(msg);
+            if (err) {
+                done(new Error(err));
+            }
+            else {
+                const platformMeta = init_1.default.platforms.get(msg.context);
+                if (!platformMeta.types.includes(msg.type)) {
+                    return done(new Error(`platform type ${msg.type} not supported by ${msg.context} ` +
+                        `platform. (types: ${platformMeta.types.join(', ')})`));
+                }
+                else {
+                    done(msg);
+                }
+            }
         }
     };
 }

package/dist/middleware/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"/","sources":["middleware/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"/","sources":["middleware/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,kDAA0B;AAC1B,2DAA6C;AAG7C,aAAa;AACb,6DAAqC;AAErC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;IAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;SAAE;QACxC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,qFAAqF;AACrF,2DAA2D;AAC3D,SAAwB,QAAQ,CAAC,IAAY,EAAE,WAAmB;IAChE,MAAM,UAAU,GAAG,IAAA,eAAK,EAAC,sBAAsB,WAAW,EAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAmB,EAAE,IAAc,EAAE,EAAE;QAC7C,UAAU,CAAC,iCAAiC,GAAG,IAAI,CAAC,CAAC;QACrD,IAAI,IAAI,KAAK,iBAAiB,EAAE;YAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAC1D,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM,IAAI,CAAE,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC5C,OAAO,IAAI,CACT,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,OAAO,+CAA+C,CAAC,CAC1F,CAAC;SACH;aAAM,IAAI,IAAI,KAAK,aAAa,EAAE;YACjC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACvD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM;YACL,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAC1D,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,YAAY,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,IAAI,qBAAqB,GAAG,CAAC,OAAO,GAAG;wBAChF,qBAAqB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC3D;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,CAAC;iBACX;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AA7BD,2BA6BC;AAAA,CAAC"}

package/dist/middleware/validate.test.data.js

@@ -2,39 +2,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = [
     {
-        "name": "basic",
-        "valid": true,
+        "name": "mismatched types",
+        "valid": false,
         "type": "credentials",
         "input": {
-            "@id": "blah",
-            "@type": "send",
+            "id": "blah",
+            "type": "send",
             "context": "dummy",
             "actor": {
-                "@id": "dood@irc.freenode.net",
-                "@type": "person",
-                "displayName": "dood"
+                "id": "dood@irc.freenode.net",
+                "type": "person",
+                "name": "dood"
             },
             "target": {
-                "@id": "irc.freenode.net/sockethub",
-                "@type": "person",
-                "displayName": "sockethub"
+                "id": "irc.freenode.net/sockethub",
+                "type": "person",
+                "name": "sockethub"
             },
             "object": {
-                "@type": "credentials"
+                "type": "credentials",
+                "user": 'foo',
+                "pass": 'bar'
+            }
+        },
+        'error': "Error: credential activity streams must have credentials set as type"
+    },
+    {
+        "name": "basic",
+        "valid": true,
+        "type": "credentials",
+        "input": {
+            "id": "blah",
+            "type": "credentials",
+            "context": "dummy",
+            "actor": {
+                "id": "dood@irc.freenode.net",
+                "type": "person",
+                "name": "dood"
+            },
+            "object": {
+                'type': 'credentials',
+                "user": 'foo',
+                "pass": 'bar'
             }
         },
         "output": "same"
     },
     {
-        "name": "new format",
+        "name": "irc credentials",
         "valid": true,
         "type": "credentials",
         "input": {
             "context": "irc",
+            "type": "credentials",
             "actor": {
-                "@id": "sh-9K3Vk@irc.freenode.net",
-                "@type": "person",
-                "displayName": "sh-9K3Vk",
+                "id": "sh-9K3Vk@irc.freenode.net",
+                "type": "person",
+                "name": "sh-9K3Vk",
                 "image": {
                     "height": 250,
                     "mediaType": "image/jpeg",
@@ -44,7 +68,7 @@ exports.default = [
                 "url": "http://sockethub.org"
             },
             "object": {
-                "@type": "credentials",
+                "type": "credentials",
                 "nick": "sh-9K3Vk",
                 "port": 6667,
                 "secure": false,
@@ -53,6 +77,35 @@ exports.default = [
         },
         "output": "same"
     },
+    {
+        "name": "bad irc credentials: user/nick host/server",
+        "valid": false,
+        "type": "credentials",
+        "input": {
+            "context": "irc",
+            "type": "credentials",
+            "actor": {
+                "id": "sh-9K3Vk@irc.freenode.net",
+                "type": "person",
+                "name": "sh-9K3Vk",
+                "image": {
+                    "height": 250,
+                    "mediaType": "image/jpeg",
+                    "url": "http://example.org/image.jpg",
+                    "width": 250
+                },
+                "url": "http://sockethub.org"
+            },
+            "object": {
+                "type": "credentials",
+                "user": "sh-9K3Vk",
+                "port": 6667,
+                "secure": false,
+                "host": "irc.freenode.net"
+            }
+        },
+        "error": "Error: /object: must NOT have additional properties"
+    },
     {
         "name": "no type specified",
         "valid": false,
@@ -67,16 +120,17 @@ exports.default = [
                 "port": 5222,
                 "resource": "laptop"
             }
-        }
+        },
+        "error": "Error: credential activity streams must have credentials set as type"
     },
     {
-        "name": "person",
+        "name": "basic person",
         "type": "activity-object",
         "valid": true,
         "input": {
-            "@id": "blah",
-            "@type": "person",
-            "displayName": "dood"
+            "id": "blah",
+            "type": "person",
+            "name": "dood"
         },
         "output": "same"
     },
@@ -85,9 +139,9 @@ exports.default = [
         "valid": true,
         "type": "activity-object",
         "input": {
-            "@id": "blah",
-            "@type": "person",
-            "displayName": "bob",
+            "id": "blah",
+            "type": "person",
+            "name": "bob",
             "hello": "there",
             "i": [
                 "am",
@@ -101,33 +155,37 @@ exports.default = [
         "valid": false,
         "type": "activity-object",
         "input": {
-            "@type": "credentials",
+            "type": "credentials",
             "nick": "sh-9K3Vk",
             "port": 6667,
             "secure": false,
             "server": "irc.freenode.net"
-        }
+        },
+        "error": "Error: /object: must match exactly one schema in oneOf: " +
+            "credentials, feed, message, me, person, room, service, website, " +
+            "attendance, presence, relationship, topic, address"
     },
     {
         "name": "alone credentials (as credentials)",
         "valid": false,
         "type": "credentials",
         "input": {
-            "@type": "credentials",
+            "type": "credentials",
             "nick": "sh-9K3Vk",
             "port": 6667,
             "secure": false,
             "server": "irc.freenode.net"
-        }
+        },
+        "error": "Error: platform context undefined not registered with this sockethub instance."
     },
     {
         "name": "new person",
         "valid": true,
         "type": "activity-object",
         "input": {
-            "@id": "sh-9K3Vk@irc.freenode.net",
-            "@type": "person",
-            "displayName": "sh-9K3Vk",
+            "id": "sh-9K3Vk@irc.freenode.net",
+            "type": "person",
+            "name": "sh-9K3Vk",
             "image": {
                 "height": 250,
                 "mediaType": "image/jpeg",
@@ -143,9 +201,9 @@ exports.default = [
         "valid": true,
         "type": "activity-object",
         "input": {
-            "@id": "irc://sh-9K3Vk@irc.freenode.net",
-            "@type": "person",
-            "displayName": "sh-9K3Vk",
+            "id": "irc://sh-9K3Vk@irc.freenode.net",
+            "type": "person",
+            "name": "sh-9K3Vk",
             "url": "http://sockethub.org"
         },
         "output": "same"
@@ -153,7 +211,7 @@ exports.default = [
     {
         "name": "bad parent object",
         "valid": false,
-        "type": "activity-object",
+        "type": "activity-stream",
         "input": {
             "string": "this is a string",
             "array": [
@@ -164,118 +222,100 @@ exports.default = [
                 }
             ],
             "as": {
-                "@id": "blah",
-                "@type": "send",
+                "id": "blah",
+                "type": "send",
                 "context": "hello",
                 "actor": {
-                    "displayName": "dood"
+                    "name": "dood"
                 },
                 "target": {
-                    "@type": "person",
-                    "displayName": "bob"
+                    "type": "person",
+                    "name": "bob"
                 },
                 "object": {
-                    "@type": "credentials"
+                    "type": "credentials"
                 }
             },
             "noId": {
-                "displayName": "dood"
+                "name": "dood"
             },
             "noId2": {
-                "@type": "person",
-                "displayName": "bob"
+                "type": "person",
+                "name": "bob"
             },
             "noDisplayName": {
-                "@id": "larg"
+                "id": "larg"
             }
-        }
+        },
+        "error": "Error: platform context undefined not registered with this sockethub instance."
     },
     {
-        "name": "expand actor and target of unknowns",
-        "valid": true,
+        "name": "unexpected AS",
+        "valid": false,
         "type": "message",
         "input": {
             "actor": "irc://uuu@localhost",
-            "@type": "join",
+            "type": "join",
             "context": "irc",
             "target": "irc://irc.dooder.net/a-room"
         },
-        "output": {
-            "actor": {
-                "@id": "irc://uuu@localhost",
-                "displayName": "uuu"
-            },
-            "@type": "join",
+        "error": "Error: /actor: must be object"
+    },
+    {
+        "name": "missing type property",
+        "valid": false,
+        "type": "message",
+        "input": {
+            "actor": { "id": "irc://uuu@localhost", "type": "person" },
             "context": "irc",
-            "target": {
-                "@id": "irc://irc.dooder.net/a-room",
-                "displayName": "/a-room"
-            }
-        }
+            "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
+        },
+        "error": "Error: activity stream: must have required property \'type\'"
     },
     {
-        "name": "expand actor and target of unknowns",
-        "valid": true,
+        "name": "invalid context property",
+        "valid": false,
         "type": "message",
         "input": {
-            "actor": "hyper_rau@localhost",
-            "@type": "join",
-            "context": "xmpp",
-            "object": {},
-            "target": "dooder"
+            "actor": { "id": "irc://uuu@localhost", "type": "person" },
+            "type": "foo",
+            "context": "foobar",
+            "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
         },
-        "output": {
-            "actor": {
-                "@id": "hyper_rau@localhost",
-                "displayName": "hyper_rau@localhost"
-            },
-            "@type": "join",
-            "context": "xmpp",
-            "object": {},
-            "target": {
-                "@id": "dooder",
-                "displayName": "dooder"
-            }
-        }
+        "error": "Error: platform context foobar not registered with this sockethub instance."
     },
     {
-        "name": "expand known person",
-        "valid": true,
+        "name": "missing actor property",
+        "valid": false,
         "type": "message",
         "input": {
-            "actor": "sh-9K3Vk@irc.freenode.net",
-            "target": "blah",
-            "@type": "send",
+            "type": "foo",
             "context": "irc",
-            "object": {}
+            "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
         },
-        "output": {
-            "actor": {
-                "@id": "sh-9K3Vk@irc.freenode.net",
-                "@type": "person",
-                "displayName": "sh-9K3Vk",
-                "image": {
-                    "height": 250,
-                    "mediaType": "image/jpeg",
-                    "url": "http://example.org/image.jpg",
-                    "width": 250
-                },
-                "url": "http://sockethub.org"
-            },
-            "target": {
-                "@id": "blah",
-                "@type": "person",
-                "displayName": "bob",
-                "hello": "there",
-                "i": [
-                    "am",
-                    "extras"
-                ]
-            },
-            "@type": "send",
+        "error": "Error: activity stream: must have required property \'actor\'"
+    },
+    {
+        "name": "traditional message",
+        "valid": true,
+        "type": "message",
+        "input": {
+            "type": "update",
             "context": "irc",
-            "object": {}
+            "actor": { "id": "irc://uuu@localhost", "type": "person" }
         }
+    },
+    {
+        "name": "message with wrong type",
+        "valid": false,
+        "type": "message",
+        "input": {
+            "type": "foorg",
+            "context": "irc",
+            "actor": { "id": "irc://uuu@localhost", "type": "person" }
+        },
+        "error": "Error: platform type foorg not supported by irc platform. " +
+            "(types: credentials, connect, update, join, leave, send, query, announce)"
     }
 ];
 //# sourceMappingURL=/middleware/validate.test.data.js.map

package/dist/middleware/validate.test.data.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.test.data.js","sourceRoot":"/","sources":["middleware/validate.test.data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.test.data.js","sourceRoot":"/","sources":["middleware/validate.test.data.ts"],"names":[],"mappings":"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"}