StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-18 07:35:02 +00:00
Code Releases Activity

Switch from ajv to io-ts for config validation; validate configs on save in the API/dashboard; start work on creating io-ts schemas for all plugins

Browse source
This commit is contained in:
Dragory 2019-07-11 12:23:57 +03:00
parent 1ecce52973
commit 3f4724b699
14 changed files with 256 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/api/guilds.ts
View file

@ -3,9 +3,11 @@ import passport from "passport";
import { AllowedGuilds } from "../data/AllowedGuilds";
import { requireAPIToken } from "./auth";
import { ApiPermissions } from "../data/ApiPermissions";
import { clientError, ok, unauthorized } from "./responses";
import { clientError, error, ok, serverError, unauthorized } from "./responses";
import { Configs } from "../data/Configs";
import { ApiRoles } from "../data/ApiRoles";
import { validateGuildConfig } from "../configValidator";
import yaml, { YAMLException } from "js-yaml";
export function initGuildsAPI(app: express.Express) {
const guildAPIRouter = express.Router();
@ -35,6 +37,28 @@ export function initGuildsAPI(app: express.Express) {
const config = req.body.config;
if (config == null) return clientError(res, "No config supplied");
// Validate config
let parsedConfig;
try {
parsedConfig = yaml.safeLoad(config);
} catch (e) {
if (e instanceof YAMLException) {
return error(res, e.message, 400);
}
console.error("Error when loading YAML: " + e.message);
return serverError(res, "Server error");
}
if (parsedConfig == null) {
parsedConfig = {};
}
const errors = validateGuildConfig(parsedConfig);
if (errors) {
return res.status(422).json({ errors });
}
await configs.saveNewRevision(`guild-${req.params.guildId}`, config, req.user.userId);
ok(res);
});