github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3546 from overleaf/revert-3516-jpa-clsi-urls

Browse source 
Revert "[frontend] PdfController: cleanup the composing of download urls"

GitOrigin-RevId: 3243bd864ac0090c964ba2c471fa659a11528660
This commit is contained in:
Jakob Ackermann 2021-01-07 14:18:27 +00:00 committed by Copybot
parent 3e3d683a2f
commit 274dd56300
1 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
services/web/frontend/js/ide/pdf/controllers/PdfController.js
View file

@ -315,11 +315,16 @@ App.controller('PdfController', function(
)
}
function buildPdfDownloadUrl(pdfDownloadDomain, url) {
if (pdfDownloadDomain) {
return `${pdfDownloadDomain}${url}`
function buildPdfDownloadUrl(pdfDownloadDomain, path) {
// we only download builds from compiles server for security reasons
if (
pdfDownloadDomain != null &&
path != null &&
path.indexOf('build') !== -1
) {
return `${pdfDownloadDomain}${path}`
} else {
return url
return path
}
}
@ -364,30 +369,49 @@ App.controller('PdfController', function(
ide.clsiServerId = qs.clsiserverid = response.clsiServerId
}
// TODO(das7pad): drop this hack once 2747f0d40af8729304 has landed in clsi
if (response.status === 'success' && !fileByPath['output.pdf']) {
response.status = 'failure'
}
if (response.status === 'success') {
$scope.pdf.view = 'pdf'
$scope.shouldShowLogs = false
$scope.pdf.lastCompileTimestamp = Date.now()
$scope.pdf.validation = {}
$scope.pdf.url = buildPdfDownloadUrl(
pdfDownloadDomain,
fileByPath['output.pdf'].url
)
// define the base url. if the pdf file has a build number, pass it to the clsi in the url
if (fileByPath['output.pdf'] && fileByPath['output.pdf'].url) {
$scope.pdf.url = buildPdfDownloadUrl(
pdfDownloadDomain,
fileByPath['output.pdf'].url
)
} else if (fileByPath['output.pdf'] && fileByPath['output.pdf'].build) {
const { build } = fileByPath['output.pdf']
$scope.pdf.url = buildPdfDownloadUrl(
pdfDownloadDomain,
`/project/${$scope.project_id}/build/${build}/output/output.pdf`
)
} else {
$scope.pdf.url = buildPdfDownloadUrl(
pdfDownloadDomain,
`/project/${$scope.project_id}/output/output.pdf`
)
}
// check if we need to bust cache (build id is unique so don't need it in that case)
if (!(fileByPath['output.pdf'] && fileByPath['output.pdf'].build)) {
qs.cache_bust = `${Date.now()}`
}
// convert the qs hash into a query string and append it
$scope.pdf.url += createQueryString(qs)
// Save all downloads as files
qs.popupDownload = true
const { build: buildId } = fileByPath['output.pdf']
// Pass build id to download if we have it
let buildId = null
if (fileByPath['output.pdf'] && fileByPath['output.pdf'].build) {
buildId = fileByPath['output.pdf'].build
}
$scope.pdf.downloadUrl =
`/download/project/${$scope.project_id}/build/${buildId}/output/output.pdf` +
createQueryString(qs)
`/download/project/${$scope.project_id}${
buildId ? '/build/' + buildId : ''
}/output/output.pdf` + createQueryString(qs)
fetchLogs(fileByPath, { pdfDownloadDomain })
} else if (response.status === 'timedout') {
$scope.pdf.view = 'errors'
@ -411,7 +435,7 @@ App.controller('PdfController', function(
['validation-fail', 'validation-pass'].includes(response.status)
) {
$scope.pdf.view = 'pdf'
$scope.pdf.url = lastPdfUrl
$scope.pdf.url = buildPdfDownloadUrl(pdfDownloadDomain, lastPdfUrl)
$scope.shouldShowLogs = true
if (response.status === 'validation-fail') {
$scope.pdf.failedCheck = true
@ -421,7 +445,7 @@ App.controller('PdfController', function(
} else if (response.status === 'exited') {
$scope.pdf.view = 'pdf'
$scope.pdf.compileExited = true
$scope.pdf.url = lastPdfUrl
$scope.pdf.url = buildPdfDownloadUrl(pdfDownloadDomain, lastPdfUrl)
$scope.shouldShowLogs = true
fetchLogs(fileByPath, { pdfDownloadDomain })
} else if (response.status === 'autocompile-backoff') {
@ -514,7 +538,9 @@ App.controller('PdfController', function(
name: isOutputFile
? `${file.path.replace(/^output\./, '')} file`
: file.path,
url: file.url + createQueryString(qs),
url:
`/project/${$scope.project_id}/output/${file.path}` +
createQueryString(qs),
main: !!isOutputFile,
fileName: file.path,
type: file.type
@ -542,12 +568,24 @@ App.controller('PdfController', function(
function getFile(name, file) {
const opts = {
method: 'GET',
url: buildPdfDownloadUrl(options.pdfDownloadDomain, file.url),
params: {
compileGroup: ide.compileGroup,
clsiserverid: ide.clsiServerId
}
}
if (file && file.url) {
// FIXME clean this up when we have file.urls out consistently
opts.url = file.url
} else if (file && file.build) {
opts.url = `/project/${$scope.project_id}/build/${file.build}/output/${name}`
} else {
opts.url = `/project/${$scope.project_id}/output/${name}`
}
// check if we need to bust cache (build id is unique so don't need it in that case)
if (!(file && file.build)) {
opts.params.cache_bust = `${Date.now()}`
}
opts.url = buildPdfDownloadUrl(options.pdfDownloadDomain, opts.url)
return $http(opts)
}