From 7f332c04360e152e3a024d0b4e3a61508a187e01 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 20 May 2016 16:31:16 +0100 Subject: [PATCH 1/2] support url object with query-string when proxying to clsi --- .../app/coffee/Features/Compile/CompileController.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index d961de554a..bca23d75d9 100755 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -114,6 +114,9 @@ module.exports = CompileController = if err? logger.err err:err, "error getting cookie jar for clsi request" return callback(err) + # expand any url parameter passed in as {url:..., qs:...} + if typeof url is "object" + {url, qs} = url if limits.compileGroup == "priority" compilerUrl = Settings.apis.clsi_priority.url else @@ -123,9 +126,11 @@ module.exports = CompileController = oneMinute = 60 * 1000 # the base request options = { url: url, method: req.method, timeout: oneMinute, jar : jar } + # add any provided query string + options.qs = qs if qs? # if we have a build parameter, pass it through to the clsi if req.query?.pdfng && req.query?.build? # only for new pdf viewer - options.qs = {} + options.qs ?= {} options.qs.build = req.query.build # if we are byte serving pdfs, pass through If-* and Range headers # do not send any others, there's a proxying loop if Host: is passed! From c7363a9df67c54bf0e01ada983ffbbb75de2ae68 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 20 May 2016 16:32:51 +0100 Subject: [PATCH 2/2] provide separate routes for sync-pdf and sync-code with error checking --- .../Features/Compile/CompileController.coffee | 27 ++++++++++++++++--- services/web/app/coffee/router.coffee | 4 +-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index bca23d75d9..b50c6ffd1a 100755 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -9,7 +9,7 @@ AuthenticationController = require "../Authentication/AuthenticationController" UserGetter = require "../User/UserGetter" RateLimiter = require("../../infrastructure/RateLimiter") ClsiCookieManager = require("./ClsiCookieManager") - +Path = require("path") module.exports = CompileController = compile: (req, res, next = (error) ->) -> @@ -98,8 +98,29 @@ module.exports = CompileController = url = "/project/#{project_id}/output/#{req.params.file}" CompileController.proxyToClsi(project_id, url, req, res, next) - proxySync: (req, res, next = (error) ->) -> - CompileController.proxyToClsi(req.params.Project_id, req.url, req, res, next) + proxySyncPdf: (req, res, next = (error) ->) -> + project_id = req.params.Project_id + {page, h, v} = req.query + if not page?.match(/^\d+$/) + return next(new Error("invalid page parameter")) + if not h?.match(/^\d+\.\d+$/) + return next(new Error("invalid h parameter")) + if not v?.match(/^\d+\.\d+$/) + return next(new Error("invalid v parameter")) + destination = {url: "/project/#{project_id}/sync/pdf", qs: {page, h, v}} + CompileController.proxyToClsi(project_id, destination, req, res, next) + + proxySyncCode: (req, res, next = (error) ->) -> + project_id = req.params.Project_id + {file, line, column} = req.query + if not file? or Path.resolve("/", file) isnt "/#{file}" + return next(new Error("invalid file parameter")) + if not line?.match(/^\d+$/) + return next(new Error("invalid line parameter")) + if not column?.match(/^\d+$/) + return next(new Error("invalid column parameter")) + destination = {url:"/project/#{project_id}/sync/code", qs: {file, line, column}} + CompileController.proxyToClsi(project_id, destination, req, res, next) proxyToClsi: (project_id, url, req, res, next = (error) ->) -> if req.query?.compileGroup diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 709b2541e1..abdc5750e5 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -125,8 +125,8 @@ module.exports = class Router ), AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.getFileFromClsi webRouter.delete "/project/:Project_id/output", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.deleteAuxFiles - webRouter.get "/project/:Project_id/sync/code", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.proxySync - webRouter.get "/project/:Project_id/sync/pdf", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.proxySync + webRouter.get "/project/:Project_id/sync/code", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.proxySyncCode + webRouter.get "/project/:Project_id/sync/pdf", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.proxySyncPdf webRouter.get "/project/:Project_id/wordcount", AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.wordCount webRouter.delete '/Project/:Project_id', AuthorizationMiddlewear.ensureUserCanAdminProject, ProjectController.deleteProject