From ee15bbeee07a53e867858ed0be815fc0b8239759 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 13 May 2016 10:33:38 +0100 Subject: [PATCH] support the direct path to a clsi output file /project/project_id/build/build_id/output/* this avoids use of the query string ?build=... and so we can match the url directly with the nginx location directive --- .../coffee/Features/Compile/CompileController.coffee | 7 ++++++- services/web/app/coffee/router.coffee | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index 89fbc87e2e..a273d38a35 100755 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -93,7 +93,12 @@ module.exports = CompileController = getFileFromClsi: (req, res, next = (error) ->) -> project_id = req.params.Project_id - CompileController.proxyToClsi(project_id, "/project/#{project_id}/output/#{req.params.file}", req, res, next) + build = req.params.build + if build? + url = "/project/#{project_id}/build/#{build}/output/#{req.params.file}" + else + 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) diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 854e852493..709b2541e1 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -113,6 +113,17 @@ module.exports = class Router req.params = params next() ), AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.getFileFromClsi + # direct url access to output files for a specific build (query string not required) + webRouter.get /^\/project\/([^\/]*)\/build\/([0-9a-f-]+)\/output\/(.*)$/, + ((req, res, next) -> + params = + "Project_id": req.params[0] + "build": req.params[1] + "file": req.params[2] + req.params = params + next() + ), 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