Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be ready to serve files from per-user containers

Browse Source
This commit is contained in:
Brian Gough
2016-05-19 16:40:12 +01:00
parent 3379577499
commit 0da85d5d03
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app.coffee
View File

@@ -42,6 +42,12 @@ app.param 'project_id', (req, res, next, project_id) ->
else else
next new Error("invalid project id") next new Error("invalid project id")
app.param 'user_id', (req, res, next, project_id) ->
if project_id?.match /^[a-zA-Z0-9_-]+$/
next()
else
next new Error("invalid user id")
app.param 'build_id', (req, res, next, build_id) -> app.param 'build_id', (req, res, next, build_id) ->
if build_id?.match OutputCacheManager.BUILD_REGEX if build_id?.match OutputCacheManager.BUILD_REGEX
next() next()
@@ -72,6 +78,11 @@ staticServer = ForbidSymlinks express.static, Settings.path.compilesDir, setHead
res.set("Etag", etag(path, stat)) res.set("Etag", etag(path, stat))
res.set("Content-Type", ContentTypeMapper.map(path)) res.set("Content-Type", ContentTypeMapper.map(path))
app.get "/project/:project_id/user/:user_id/build/:build_id/output/*", (req, res, next) ->
# for specific build get the path from the OutputCacheManager (e.g. .clsi/buildId)
req.url = "/#{req.params.project_id}-#{req.params.user_id}/" + OutputCacheManager.path(req.params.build_id, "/#{req.params[0]}")
staticServer(req, res, next)
app.get "/project/:project_id/build/:build_id/output/*", (req, res, next) -> app.get "/project/:project_id/build/:build_id/output/*", (req, res, next) ->
# for specific build get the path from the OutputCacheManager (e.g. .clsi/buildId) # for specific build get the path from the OutputCacheManager (e.g. .clsi/buildId)
req.url = "/#{req.params.project_id}/" + OutputCacheManager.path(req.params.build_id, "/#{req.params[0]}") req.url = "/#{req.params.project_id}/" + OutputCacheManager.path(req.params.build_id, "/#{req.params[0]}")