mirror of
https://github.com/overleaf/overleaf.git
synced 2025-01-23 01:23:59 +00:00
Merge pull request #259 from sharelatex/fix-per-user-containers
Fix per user containers
This commit is contained in:
Brian Gough
GitHub
commit
fcd5582e6e
3 changed files with 57 additions and 27 deletions
|
|
@ -44,11 +44,20 @@ module.exports = CompileController =
|
|||
}
|
||||
|
||||
_compileAsUser: (req, callback) ->
|
||||
# callback with user_id if isolated flag is set on request, undefined otherwise
|
||||
isolated = req.query?.isolated is "true"
|
||||
if isolated
|
||||
AuthenticationController.getLoggedInUserId req, callback
|
||||
AuthenticationController.getLoggedInUserId req, callback # -> (error, user_id)
|
||||
else
|
||||
callback()
|
||||
callback() # do a per-project compile, not per-user
|
||||
|
||||
_downloadAsUser: (req, callback) ->
|
||||
# callback with user_id if isolated flag or user_id param is set on request, undefined otherwise
|
||||
isolated = req.query?.isolated is "true" or req.params.user_id?
|
||||
if isolated
|
||||
AuthenticationController.getLoggedInUserId req, callback # -> (error, user_id)
|
||||
else
|
||||
callback() # do a per-project compile, not per-user
|
||||
|
||||
downloadPdf: (req, res, next = (error) ->)->
|
||||
Metrics.inc "pdf-downloads"
|
||||
|
|
@ -82,7 +91,9 @@ module.exports = CompileController =
|
|||
logger.log project_id:project_id, ip:req.ip, "rate limit hit downloading pdf"
|
||||
res.send 500
|
||||
else
|
||||
CompileController.proxyToClsi(project_id, "/project/#{project_id}/output/output.pdf", req, res, next)
|
||||
CompileController._downloadAsUser req, (error, user_id) ->
|
||||
url = CompileController._getFileUrl project_id, user_id, req.params.build_id, "output.pdf"
|
||||
CompileController.proxyToClsi(project_id, url, req, res, next)
|
||||
|
||||
deleteAuxFiles: (req, res, next) ->
|
||||
project_id = req.params.Project_id
|
||||
|
|
@ -92,29 +103,37 @@ module.exports = CompileController =
|
|||
return next(error) if error?
|
||||
res.sendStatus(200)
|
||||
|
||||
# this is only used by templates, so is not called with a user_id
|
||||
compileAndDownloadPdf: (req, res, next)->
|
||||
project_id = req.params.project_id
|
||||
CompileController._compileAsUser req, (error, user_id) ->
|
||||
return next(error) if error?
|
||||
CompileManager.compile project_id, user_id, {}, (err)->
|
||||
if err?
|
||||
logger.err err:err, project_id:project_id, "something went wrong compile and downloading pdf"
|
||||
res.sendStatus 500
|
||||
url = "/project/#{project_id}/output/output.pdf"
|
||||
CompileController.proxyToClsi project_id, url, req, res, next
|
||||
# pass user_id as null, since templates are an "anonymous" compile
|
||||
CompileManager.compile project_id, null, {}, (err)->
|
||||
if err?
|
||||
logger.err err:err, project_id:project_id, "something went wrong compile and downloading pdf"
|
||||
res.sendStatus 500
|
||||
url = "/project/#{project_id}/output/output.pdf"
|
||||
CompileController.proxyToClsi project_id, url, req, res, next
|
||||
|
||||
getFileFromClsi: (req, res, next = (error) ->) ->
|
||||
project_id = req.params.Project_id
|
||||
build_id = req.params.build_id
|
||||
user_id = req.params.user_id
|
||||
if user_id? and build_id?
|
||||
url = "/project/#{project_id}/user/#{user_id}/build/#{build_id}/output/#{req.params.file}"
|
||||
else if build_id?
|
||||
url = "/project/#{project_id}/build/#{build_id}/output/#{req.params.file}"
|
||||
else
|
||||
url = "/project/#{project_id}/output/#{req.params.file}"
|
||||
CompileController.proxyToClsi(project_id, url, req, res, next)
|
||||
CompileController._downloadAsUser req, (error, user_id) ->
|
||||
return next(error) if error?
|
||||
url = CompileController._getFileUrl project_id, user_id, req.params.build_id, req.params.file
|
||||
CompileController.proxyToClsi(project_id, url, req, res, next)
|
||||
|
||||
# compute a GET file url for a given project, user (optional), build (optional) and file
|
||||
_getFileUrl: (project_id, user_id, build_id, file) ->
|
||||
if user_id? and build_id?
|
||||
url = "/project/#{project_id}/user/#{user_id}/build/#{build_id}/output/#{file}"
|
||||
else if user_id?
|
||||
url = "/project/#{project_id}/user/#{user_id}/output/#{file}"
|
||||
else if build_id?
|
||||
url = "/project/#{project_id}/build/#{build_id}/output/#{file}"
|
||||
else
|
||||
url = "/project/#{project_id}/output/#{file}"
|
||||
return url
|
||||
|
||||
# compute a POST url for a project, user (optional) and action
|
||||
_getUrl: (project_id, user_id, action) ->
|
||||
path = "/project/#{project_id}"
|
||||
path += "/user/#{user_id}" if user_id?
|
||||
|
|
|
|||
|
|
@ -106,7 +106,9 @@ module.exports = class Router
|
|||
webRouter.post '/project/:Project_id/settings/admin', AuthorizationMiddlewear.ensureUserCanAdminProject, ProjectController.updateProjectAdminSettings
|
||||
|
||||
webRouter.post '/project/:Project_id/compile', AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.compile
|
||||
webRouter.get '/Project/:Project_id/output/output.pdf', AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.downloadPdf
|
||||
# Used by the web download buttons, adds filename header
|
||||
webRouter.get '/project/:Project_id/output/output.pdf', AuthorizationMiddlewear.ensureUserCanReadProject, CompileController.downloadPdf
|
||||
# Used by the pdf viewers
|
||||
webRouter.get /^\/project\/([^\/]*)\/output\/(.*)$/,
|
||||
((req, res, next) ->
|
||||
params =
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@ define [
|
|||
else
|
||||
$scope.modifierKey = "Ctrl"
|
||||
|
||||
# utility for making a query string from a hash, could use jquery $.param
|
||||
createQueryString = (args) ->
|
||||
qs_args = ("#{k}=#{v}" for k, v of args)
|
||||
if qs_args.length then "?" + qs_args.join("&") else ""
|
||||
|
||||
$scope.$on "project:joined", () ->
|
||||
return if !autoCompile
|
||||
autoCompile = false
|
||||
|
|
@ -112,10 +117,12 @@ define [
|
|||
qs.clsiserverid = response.clsiServerId
|
||||
ide.clsiServerId = response.clsiServerId
|
||||
# convert the qs hash into a query string and append it
|
||||
qs_args = ("#{k}=#{v}" for k, v of qs)
|
||||
$scope.pdf.qs = if qs_args.length then "?" + qs_args.join("&") else ""
|
||||
$scope.pdf.qs = createQueryString qs
|
||||
$scope.pdf.url += $scope.pdf.qs
|
||||
$scope.pdf.downloadUrl = "/Project/#{$scope.project_id}/output/output.pdf" + $scope.pdf.qs
|
||||
# special case for the download url
|
||||
if perUserCompile
|
||||
qs.isolated = true
|
||||
$scope.pdf.downloadUrl = "/project/#{$scope.project_id}/output/output.pdf" + createQueryString(qs)
|
||||
|
||||
fetchLogs(fileByPath['output.log'], fileByPath['output.blg'])
|
||||
|
||||
|
|
@ -131,10 +138,12 @@ define [
|
|||
file.name = "#{file.path.replace(/^output\./, "")} file"
|
||||
else
|
||||
file.name = file.path
|
||||
if not file.url?
|
||||
file.url = "/project/#{project_id}/output/#{file.path}"
|
||||
qs = {}
|
||||
if perUserCompile
|
||||
qs.isolated = true
|
||||
if response.clsiServerId?
|
||||
file.url = file.url + "?clsiserverid=#{response.clsiServerId}"
|
||||
qs.clsiserverid = response.clsiServerId
|
||||
file.url = "/project/#{project_id}/output/#{file.path}" + createQueryString qs
|
||||
$scope.pdf.outputFiles.push file
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue