fix: Server error if X-Editor-Version is not valid semver string

This commit is contained in:
Tom Moor
2021-12-13 20:28:29 -08:00
parent 1a3badbb8a
commit 74615bfe37
9 changed files with 25 additions and 38 deletions

View File

@@ -1,11 +1,8 @@
import stream from "stream";
import { Context } from "koa";
import { Context, Next } from "koa";
export default function apiWrapper() {
return async function apiWrapperMiddleware(
ctx: Context,
next: () => Promise<any>
) {
return async function apiWrapperMiddleware(ctx: Context, next: Next) {
await next();
const ok = ctx.status < 400;

View File

@@ -1,26 +1,24 @@
import { Context } from "koa";
import { Context, Next } from "koa";
import pkg from "rich-markdown-editor/package.json";
// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module 'semv... Remove this comment to see the full error message
import semver from "semver";
import { EditorUpdateError } from "@server/errors";
export default function editor() {
return async function editorMiddleware(
ctx: Context,
next: () => Promise<any>
) {
return async function editorMiddleware(ctx: Context, next: Next) {
const clientVersion = ctx.headers["x-editor-version"];
// If the editor version on the client is behind the current version being
// served in production by either a minor (new features), or major (breaking
// changes) then force a client reload.
if (clientVersion) {
const parsedClientVersion = semver.parse(clientVersion);
const parsedClientVersion = semver.parse(clientVersion as string);
const parsedCurrentVersion = semver.parse(pkg.version);
if (
parsedClientVersion.major < parsedCurrentVersion.major ||
parsedClientVersion.minor < parsedCurrentVersion.minor
parsedClientVersion &&
parsedCurrentVersion &&
(parsedClientVersion.major < parsedCurrentVersion.major ||
parsedClientVersion.minor < parsedCurrentVersion.minor)
) {
throw EditorUpdateError();
}

View File

@@ -1,12 +1,9 @@
import querystring from "querystring";
import { Context } from "koa";
import { Context, Next } from "koa";
import { InvalidRequestError } from "@server/errors";
export default function pagination(options?: Record<string, any>) {
return async function paginationMiddleware(
ctx: Context,
next: () => Promise<any>
) {
return async function paginationMiddleware(ctx: Context, next: Next) {
const opts = {
defaultLimit: 15,
defaultOffset: 0,