wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-12 08:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added joi plugin validation

Browse Source
This commit is contained in:
Wyatt Johnson
2017-04-06 10:39:36 -06:00
parent e70cfdfd00
commit 1f367e666b
10 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+3
View File
@@ -10,6 +10,7 @@ const enabled = require('debug').enabled;
const RedisStore = require('connect-redis')(session);
const redis = require('./services/redis');
const csrf = require('csurf');
const Joi = require('joi');
const errors = require('./errors');
const graph = require('./graph');
const apollo = require('graphql-server-express');
@@ -80,6 +81,8 @@ const passportDebug = require('debug')('talk:passport');
// Install the passport plugins.
plugins.get('server', 'passport').forEach((plugin) => {
Joi.assert(plugin.passport, Joi.func().arity(1), `Plugin '${plugin.name}' had an error loading the passport hook`);
passportDebug(`added plugin '${plugin.plugin.name}'`);
// Pass the passport.js instance to the plugin to allow it to inject it's
graph/context.js
+3
View File
@@ -3,6 +3,7 @@ const mutators = require('./mutators');
const plugins = require('../services/plugins');
const debug = require('debug')('talk:graph:context');
const Joi = require('joi');
/**
* Contains the array of plugins that provide context to the server, these top
@@ -10,6 +11,8 @@ const debug = require('debug')('talk:graph:context');
* @type {Array}
*/
const contextPlugins = plugins.get('server', 'context').map(({plugin, context}) => {
Joi.assert(context, Joi.object().pattern(/\w/, Joi.func().maxArity(1)), `Plugin '${plugin.name}' had an error loading the context`);
debug(`added plugin '${plugin.name}'`);
return {context};
});
graph/hooks.js
+5
View File
@@ -1,5 +1,6 @@
const {forEachField} = require('graphql-tools');
const debug = require('debug')('talk:graph:schema');
const Joi = require('joi');
/**
* XXX taken from graphql-js: src/execution/execute.js, because that function
@@ -46,6 +47,10 @@ const decorateWithHooks = (schema, hooks) => forEachField(schema, (field, typeNa
// Combine the pre/post hooks from each plugin into an array we can
// execute.
.reduce((acc, {plugin, hooks}) => {
Joi.assert(hooks, Joi.object({
pre: Joi.func(),
post: Joi.func()
}), `Plugin '${plugin.name}' had an error loading the hooks`);
// Itterate over the hooks on the fields and look at it with a switch
// block to check for misconfigured plugins.
graph/loaders/index.js
+3
View File
@@ -1,4 +1,5 @@
const _ = require('lodash');
const Joi = require('joi');
const debug = require('debug')('talk:graph:loaders');
const Actions = require('./actions');
@@ -23,6 +24,8 @@ let loaders = [
// Load the plugin loaders from the manager.
...plugins
.get('server', 'loaders').map(({plugin, loaders}) => {
Joi.assert(loaders, Joi.object().pattern(/\w/, Joi.object().pattern(/\w/, Joi.func())), `Plugin '${plugin.name}' had an error loading the loaders`);
debug(`added plugin '${plugin.name}'`);
return loaders;
graph/mutators/index.js
+3
View File
@@ -1,4 +1,5 @@
const _ = require('lodash');
const Joi = require('joi');
const debug = require('debug')('talk:graph:mutators');
const Comment = require('./comment');
@@ -17,6 +18,8 @@ let mutators = [
// Load the plugin mutators from the manager.
...plugins
.get('server', 'mutators').map(({plugin, mutators}) => {
Joi.assert(mutators, Joi.object().pattern(/\w/, Joi.object().pattern(/\w/, Joi.func())), `Plugin '${plugin.name}' had an error loading the mutators`);
debug(`added plugin '${plugin.name}'`);
return mutators;
graph/resolvers/index.js
+3
View File
@@ -1,4 +1,5 @@
const _ = require('lodash');
const Joi = require('joi');
const debug = require('debug')('talk:graph:resolvers');
const ActionSummary = require('./action_summary');
@@ -50,6 +51,8 @@ let resolvers = {
* as provide new ones.
*/
resolvers = plugins.get('server', 'resolvers').reduce((acc, {plugin, resolvers}) => {
Joi.assert(resolvers, Joi.object().pattern(/\w/, Joi.object().pattern(/\w/, Joi.func())), `Plugin '${plugin.name}' had an error loading the resolvers`);
debug(`added plugin '${plugin.name}'`);
return _.merge(acc, resolvers);
graph/typeDefs.js
+3
View File
@@ -3,6 +3,7 @@
// this change is done now everything will likely break on the front end.
const fs = require('fs');
const Joi = require('joi');
const path = require('path');
const {mergeStrings} = require('gql-merge');
const debug = require('debug')('talk:graph:typeDefs');
@@ -20,6 +21,8 @@ const typeDefs = mergeStrings([
// Load the plugin definitions from the manager.
...plugins.get('server', 'typeDefs').map(({plugin, typeDefs}) => {
Joi.assert(typeDefs, Joi.string(), `Plugin '${plugin.name}' had an error loading the typeDefs`);
debug(`added plugin '${plugin.name}'`);
return typeDefs;
package.json
+1
View File
@@ -74,6 +74,7 @@
"graphql-tools": "^0.9.0",
"helmet": "^3.5.0",
"inquirer": "^3.0.6",
"joi": "^10.4.1",
"jsonwebtoken": "^7.3.0",
"kue": "^0.11.5",
"linkify-it": "^2.0.3",
routes/index.js
+3
View File
@@ -1,5 +1,6 @@
const express = require('express');
const path = require('path');
const Joi = require('joi');
const plugins = require('../services/plugins');
const debug = require('debug')('talk:routes');
@@ -27,6 +28,8 @@ if (process.env.NODE_ENV !== 'production') {
// Inject server route plugins.
plugins.get('server', 'router').forEach((plugin) => {
Joi.assert(plugin.router, Joi.func().arity(1), `Plugin '${plugin.name}' had an error loading the passport router`);
debug(`added plugin '${plugin.plugin.name}'`);
// Pass the root router to the plugin to mount it's routes.
yarn.lock
+27
View File
@@ -3567,6 +3567,10 @@ hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
hoek@4.x.x:
version "4.1.1"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.1.1.tgz#9cc573ffba2b7b408fb5e9c2a13796be94cddce9"
hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
@@ -4097,6 +4101,10 @@ isemail@1.x.x:
version "1.2.0"
resolved "https://registry.yarnpkg.com/isemail/-/isemail-1.2.0.tgz#be03df8cc3e29de4d2c5df6501263f1fa4595e9a"
isemail@2.x.x:
version "2.2.1"
resolved "https://registry.yarnpkg.com/isemail/-/isemail-2.2.1.tgz#0353d3d9a62951080c262c2aa0a42b8ea8e9e2a6"
isexe@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
@@ -4195,6 +4203,10 @@ istanbul@^1.1.0-alpha.1:
which "^1.1.1"
wordwrap "^1.0.0"
items@2.x.x:
version "2.1.1"
resolved "https://registry.yarnpkg.com/items/-/items-2.1.1.tgz#8bd16d9c83b19529de5aea321acaada78364a198"
iterall@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.0.2.tgz#41a2e96ce9eda5e61c767ee5dc312373bb046e91"
@@ -4212,6 +4224,15 @@ jodid25519@^1.0.0:
dependencies:
jsbn "~0.1.0"
joi@^10.4.1:
version "10.4.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-10.4.1.tgz#a2fca1f0d603d1b843f2c1e086b52461f6be1f36"
dependencies:
hoek "4.x.x"
isemail "2.x.x"
items "2.x.x"
topo "2.x.x"
joi@^6.10.1:
version "6.10.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-6.10.1.tgz#4d50c318079122000fe5f16af1ff8e1917b77e06"
@@ -7658,6 +7679,12 @@ topo@1.x.x:
dependencies:
hoek "2.x.x"
topo@2.x.x:
version "2.0.2"
resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
dependencies:
hoek "4.x.x"
touch@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de"