Michael Mazour
2da15f2eb3
Amend - improve documentation of settings
2018-07-06 10:28:02 +01:00
Michael Mazour
7feafccf31
Amend: safely navigate to bucket credentials
2018-07-06 09:28:09 +01:00
Michael Mazour
03033409c6
Amend: remove unused params
2018-07-06 09:12:59 +01:00
Michael Mazour
336a38ec1e
Amend: scrub secrets from logs
...
Calls to `getFile` can now include S3 credentials in `opts`, so sanitize before writing to opts to log.
2018-07-04 16:41:31 +01:00
Michael Mazour
600ab3ce67
Amend: remove problematic ampersand
2018-07-04 16:39:41 +01:00
Michael Mazour
cfbf0d81ba
Amend: fix params retrieval
2018-07-04 12:11:09 +01:00
Michael Mazour
ece650741a
Amend per several review comments
...
- Removed unused vars
- Label the metric with the bucket name
2018-07-04 12:02:09 +01:00
Michael Mazour
feca8933f1
Add endpoint for arbitrary bucket fetch
...
Add `/bucket/:bucket/key/*`, which fetches the file from the given bucket at the given path. Uses auth stored at `settings.filestore.s3.{{bucketName}}` if present, and otherwise default auth.
2018-07-04 11:22:36 +01:00
Christopher Hoskin
f0cf8e6622
Fix typo in buildscript
2018-06-14 11:37:18 +01:00
Christopher Hoskin
46c61aa78c
Update build scripts to 1.1.7, add csh-staging GCR
2018-06-13 16:21:32 +01:00
Henry Oswald
1763715004
remove black package-lock.json
2018-05-22 13:45:32 +01:00
Henry Oswald
ba8a5cf3e1
bump to 1.1.3 scripts
2018-05-22 13:45:01 +01:00
Henry Oswald
58ab4c72dc
update build scripts to 1.1.1
2018-05-21 15:14:24 +01:00
Henry Oswald
ee81a6af00
updated mocha and added --exit back in
2018-05-21 15:00:32 +01:00
Henry Oswald
8efd562eb3
fix broken acceptence tests, bad quotes in file path
2018-05-21 13:40:03 +01:00
Henry Oswald
6657b6c1dc
make all needed directories in install deps
2018-05-21 11:31:14 +01:00
Henry Oswald
e3514e84cd
fix up mocha migration tests
2018-05-21 11:02:53 +01:00
Henry Oswald
768a4cc1ad
remove console.log from settings
2018-05-21 10:34:16 +01:00
Henry Oswald
09527d804e
ignore js acceptence tests
2018-05-21 10:21:13 +01:00
Henry Oswald
3cf2e1d7c3
add null checks and new body parser
2018-05-21 10:11:47 +01:00
Henry Oswald
ac990f2aba
remove app.configure
2018-05-21 09:49:32 +01:00
Henry Oswald
d9eac8dd8b
upgrade mocha
2018-05-21 09:41:14 +01:00
Henry Oswald
fda6cb0084
fix acceptence tests, add them back into jenkins, upgrade express
2018-05-21 09:37:54 +01:00
Henry Oswald
df6b5203a1
point ci to gcr.io/csh-gcdm-test/
2018-05-18 17:18:39 +01:00
Henry Oswald
28fc39d6c9
don't use quay.io in image name
2018-05-18 17:08:18 +01:00
Henry Oswald
bfb98050e3
don't push to quay.io
2018-05-18 16:57:53 +01:00
Henry Oswald
088d8850ba
don't run acceptence tests yet
2018-05-18 16:48:59 +01:00
Henry Oswald
fcb2d18f8b
don't set command in make test acceptence
2018-05-18 16:15:44 +01:00
Christopher Hoskin
b32c63e16c
Remove --exit option to support older mocha
2018-05-18 14:59:34 +01:00
Christopher Hoskin
7fc7252c35
Remove touch package-lock.json
2018-05-18 14:29:20 +01:00
Christopher Hoskin
8db861258a
Add files generated by bin/update_build_scripts
2018-05-18 14:27:46 +01:00
Christopher Hoskin
5d5cbbef7e
Create fake package-lock.json during build tagret
2018-05-18 14:15:02 +01:00
Christopher Hoskin
a2165d85a0
Update build script to use build-target docker
2018-05-18 13:55:33 +01:00
Christopher Hoskin
de74ec5094
Change build and publish to use the GCR of one of my projects (hard code for now)
2018-05-18 13:47:06 +01:00
Henry Oswald
46f2ff051c
cd into tmp
2018-03-23 17:29:21 +00:00
Henry Oswald
b45e2a922c
install gs correctly
2018-03-23 17:21:15 +00:00
Henry Oswald
8c782ba6b2
debuging
2018-03-23 17:12:37 +00:00
Henry Oswald
801adf8e9e
install gs manually
2018-03-23 17:06:31 +00:00
Henry Oswald
092a151d51
Use new build system
2018-03-23 16:36:41 +00:00
Henry Oswald
837a8ff35f
change uploads permission after creation of user
2018-03-23 16:26:42 +00:00
Henry Oswald
1af209cd24
chown uploads
2018-03-23 16:23:04 +00:00
Henry Oswald
2f0cc4e64a
chown uploads
2018-03-23 16:19:52 +00:00
Henry Oswald
73f77b5667
copy everything into docker container
2018-03-23 16:14:30 +00:00
Henry Oswald
9e321658ed
make s3 configurable via env vars
2018-03-23 15:29:24 +00:00
Henry Oswald
77e34d33df
hello james
2018-01-16 17:00:27 +00:00
Henry Oswald
08c734e850
another bump
...
git log
2018-01-16 14:48:21 +00:00
Henry Oswald
dbfebc0d1c
bump
2018-01-16 14:36:09 +00:00
Henry Oswald
e235651e9c
bump version
2018-01-16 12:44:26 +00:00
Henry Oswald
c23b700927
wip
2018-01-16 12:27:36 +00:00
James Allen
b834e53e13
Provide hosts as environment settings and add npm run start script
2017-12-29 08:14:23 +00:00
Joe Green
a70a216c52
Update Jenkinsfile
2017-10-16 14:10:06 +01:00
Joe Green
6dcef9fdea
alert only on master
2017-10-12 17:07:06 +01:00
Henry Oswald
0e2de1e5ad
added shrinkwrap file
2017-09-15 14:57:01 +01:00
Joe Green
bfef9a9d67
added build.txt
2017-09-04 14:49:14 +01:00
Joe Green
706dc917dd
Create Jenkinsfile
2017-08-11 11:12:32 +01:00
Shane Kilkelly
e162c779d3
Merge pull request #24 from sharelatex/sk-ignore-png-optimiser-timeout
...
If optipng is sigkilled by timeout, then ignore that error
2017-08-03 09:22:43 +01:00
Shane Kilkelly
eaa72d0747
upgrade to node 6
2017-06-27 14:53:20 +01:00
Shane Kilkelly
23fe93ccfd
Prevent double-logging
2017-06-22 15:28:08 +01:00
Shane Kilkelly
ba9477cdb3
Re-work error checking
2017-06-22 09:41:36 +01:00
Shane Kilkelly
d0bbe8beae
If optipng is sigkilled by timeout, then ignore that error
2017-06-21 15:18:36 +01:00
Shane Kilkelly
2f8c693be3
Add a .nvmrc file
2017-03-27 14:49:25 +01:00
Shane Kilkelly
b12f69722f
Begin fixing health-check
2017-03-08 14:59:34 +00:00
Henry Oswald
e0f39da616
null check fsPath on unlink file
2016-12-19 14:48:09 +00:00
Henry Oswald
9e8c27f46b
don’t shutdown filestore on uncaught exception
2016-12-19 14:47:54 +00:00
Henry Oswald
bf93fc3f50
run health check max 1 a at a time
2016-12-19 13:26:21 +00:00
Henry Oswald
fd99887753
running check in background
2016-12-19 12:29:08 +00:00
Henry Oswald
6c81d18627
bumped up rlimit-nproc to 600
2016-12-14 18:15:09 +00:00
Henry Oswald
d41bf2e974
result path not in final cb
2016-12-14 18:11:28 +00:00
Henry Oswald
4bba56ed28
added missing files
2016-12-14 17:14:15 +00:00
Henry Oswald
27139bc433
increased rlimit-nproc and added health check for converting image
2016-12-14 16:47:53 +00:00
Henry Oswald
b166c86197
added missing originalFsPath
2016-12-13 14:29:04 +00:00
Henry Oswald
b38e7d3078
* delete both file and converted file if there is an error
...
* increase timeout of optpng
2016-12-13 12:43:57 +00:00
Shane Kilkelly
4064956cea
working minimal profile
2016-09-28 10:05:27 +01:00
Shane Kilkelly
edb5987c3d
A working profile, tested.
2016-09-27 15:54:41 +01:00
Shane Kilkelly
ff39a9da22
sort the list of syscalls
2016-09-26 15:35:53 +01:00
Shane Kilkelly
21be88482b
Change the seccomp whitelist to match that of docker default list
2016-09-26 15:33:22 +01:00
Brian Gough
fd95599609
remove old firejail includes
2016-08-11 11:52:58 +01:00
James Allen
a95aae16e6
Tweak convert profile to work on api-2
2016-05-10 17:50:46 +01:00
James Allen
a41a307b58
Update firejail profile to allow pdf previews for templates to work
2016-05-10 14:34:48 +01:00
James Allen
92f5234580
Add convert firejail profile
2016-05-09 14:44:49 +01:00
James Allen
be43330208
Allow convert command to be prefixed by security commands
2016-05-09 11:37:35 +01:00
Henrique Santos
ffaac4c81b
add unit tests
2016-03-13 20:45:48 -03:00
Henrique Santos
0bb12f32fa
remove project controller / handler
...
add unit test scaffolding
2016-03-13 16:22:14 -03:00
Henrique Santos
1f20744a68
add size function for each persitor
2016-03-12 11:08:07 -03:00
Henrique Santos
5d2fc89137
scaffolding project methods
2016-03-12 04:35:49 -03:00
Henrique Santos
099d0fef2f
scaffolding project size
2016-03-11 22:31:46 -03:00
James Allen
8ddfbb99de
Only parse body when we need to for copyFile request
2015-11-25 17:01:19 +00:00
James Allen
bc6c8d6afc
Don't send multiple status codes on insertFile error
2015-11-25 16:07:51 +00:00
Xavier Trochu
81a7203315
Fix the checkIfFileExists API.
2015-11-25 15:40:35 +01:00
Xavier Trochu
3b6270236c
Replace indentation from 2 space to tabs.
2015-11-20 14:38:23 +01:00
Xavier Trochu
b6486cb825
Cleanup the dependencies
2015-11-20 14:05:54 +01:00
Xavier Trochu
0219900933
Forward the options argument to getFileStream
2015-11-20 12:07:04 +01:00
Xavier Trochu
bfd41fdaf9
Add aws-sdk unit test.
...
Fix Aws-Sdk persistor to return a correct error on file not found.
Fix FileHandler after some change were lost on a previous merge
2015-11-20 12:02:22 +01:00
Xavier Trochu
476db58c3f
Add the opts parameter to getFileStream and implement Range requests
2015-11-17 12:52:25 +01:00
Xavier Trochu
26523b011a
small fixes
2015-11-16 09:59:27 +01:00
Xavier Trochu
63aef6b832
Fix postmerge issue
2015-11-05 12:11:02 +01:00
Xavier Trochu
a367190a21
Merge remote-tracking branch 'sharelatex/master'
2015-11-04 15:20:15 +01:00
James Allen
f723b1699b
Mongo/redis no longer needed without acceptance tests
2015-10-07 18:39:47 +01:00
James Allen
9b40d34b2a
Acceptance tests no longer run on Travis
2015-10-07 18:39:24 +01:00
Henry Oswald
cf28ee4f9b
locked down packages
2015-09-17 10:34:27 +01:00
Shane Kilkelly
0d450b4e33
Tighten up error handling.
2015-09-10 11:10:30 +01:00
Shane Kilkelly
fcfc595c35
Handle potential error before calling LocalFileWriter.writeStream
.
2015-09-10 09:12:49 +01:00
Shane Kilkelly
a6fff2d4e4
Check for a large response body, rather than exact match on the first few bytes.
2015-09-08 11:50:43 +01:00
Shane Kilkelly
c6a81c94eb
Test the cacheWarm
option for preview.
2015-09-08 11:47:43 +01:00
Shane Kilkelly
b8042ae771
Add an acceptance test that uses a pdf file.
2015-09-08 11:43:19 +01:00
Shane Kilkelly
297ad78b1e
Add an acceptance test to check the preview endpoint doesn't time out.
...
This endpoint needs a lot more testing.
2015-09-08 10:32:41 +01:00
Shane Kilkelly
da5a538095
Fix calls to PersistorManager.getFileStream
which were missed in initial refactor.
...
This should fix a breakage in the template publishing workflow.
Ref: b70b837b7ba29b0631f3105ec1dd5f6cdebbd195
2015-09-08 09:23:08 +01:00
Shane Kilkelly
9b8f11f517
Fix the check for a success response from S3.
...
We need to handle both a 200 and 206 (partial content) response.
2015-09-01 12:25:10 +01:00
Shane Kilkelly
82af1be756
Improve testing of error conditions in the FSPersistorManager.
2015-09-01 12:10:30 +01:00
Shane Kilkelly
edc06c82e5
Correct usage of '==' rather than '=' when checking err.code.
2015-09-01 12:10:05 +01:00
Shane Kilkelly
8bbf81f4bc
If the S3 service produces an error, handle it.
2015-09-01 11:36:28 +01:00
Shane Kilkelly
47fdf3c5c9
Ensure that Filestore responds with 404 when a file does not exist.
2015-08-31 16:47:16 +01:00
Shane Kilkelly
4d60872782
Merge branch 'master' of github.com:sharelatex/filestore-sharelatex
2015-08-28 14:48:25 +01:00
Shane Kilkelly
959191ae50
Add an acceptance test for using range header when getting a file.
2015-08-28 14:20:14 +01:00
Shane Kilkelly
ed980a21e1
Test the FileHandler layer.
2015-08-28 13:50:40 +01:00
Shane Kilkelly
64f70eddbd
Add cluster.js to .gitignore.
2015-08-28 13:38:54 +01:00
Shane Kilkelly
8a631e70f7
Refactor, and log when we have a 'range' header.
2015-08-28 12:16:41 +01:00
Shane Kilkelly
387e96ab67
Refactor to make _get_range testable.
2015-08-28 12:02:50 +01:00
Shane Kilkelly
97cdc243d3
Parse out the range header and set start
and end
properties on options.
2015-08-28 11:45:16 +01:00
Shane Kilkelly
b905d9fba1
Add range-parser
dependency.
2015-08-28 11:44:47 +01:00
Shane Kilkelly
76506ed91e
Pass start/end options down to the S3PersistorManager.
...
Test that those options cause a 'Range' header to be attached to the
request sent to S3.
2015-08-28 10:09:41 +01:00
Shane Kilkelly
d88736e3b5
Pass the start
and end
options down to fs.createReadStream
, and test for same.
2015-08-27 16:12:11 +01:00
Shane Kilkelly
57aedefdd3
Begin work towards obeying 'Range' headers, thread the opts
down to persistence layer.
2015-08-27 15:21:33 +01:00
Brian Gough
bea9ee6b19
add gc to filestore
2015-08-18 15:36:07 +01:00
Brian Gough
2e08281b88
replace the /gc endpoint with a automatic gc every 3 minutes
2015-08-05 16:52:01 +01:00
Brian Gough
e1683b8e1c
added a /gc endpoint to debug filestore memory usage
2015-08-04 11:26:51 +01:00
Xavier Trochu
f417b9b171
Fix the AWS-SDK Persistor
2015-07-24 15:48:46 +02:00
Xavier Trochu
7ef46a79a0
Fix aws-sdk persistor.
...
Also fix some typos.
2015-07-24 09:06:52 +02:00
Xavier Trochu
41397821b1
Add a manager using the aws-sdk library
...
The knox library does not support the AWS Instance Role.
So use the official AWS SDK to connect to S3
2015-07-22 16:42:45 +02:00
Xavier Trochu
3289451ece
Revert "Make S3 Key/Secret pair optional."
...
This reverts commit 65122e603099a4f9ef5c5186b7eb8832340a993f.
knox requires the key and secret arguments.
2015-07-22 16:41:45 +02:00
Xavier Trochu
566e69c6cc
Make S3 Key/Secret pair optional.
...
When using Instance Role in AWS, the credentials are unneeded. So
make them optional to use.
2015-07-21 10:00:59 +02:00
Xavier Trochu
c9b5bb028d
Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex
2015-07-21 09:02:16 +02:00
Brian Gough
9b84422092
added event loop monitor
2015-06-23 13:41:14 +01:00
Brian Gough
8ebbacee5a
move pipe after error handler setup
2015-05-08 15:19:45 +01:00
Brian Gough
7e9f8b885b
add support for public files
2015-05-08 15:15:48 +01:00
Henry Oswald
d5f98c9800
make startup message consistent
2015-04-30 15:04:55 +01:00
Henry Oswald
33e654accf
get the logging locally to work with bunyan
2015-04-22 18:27:34 +01:00
Henry Oswald
7c2e4b00ed
no file subtype can be an issue, added a check on it in the keybuilder
2015-04-13 12:01:49 +01:00
Henry Oswald
158b640b59
Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex
2015-04-09 17:16:23 +01:00
Henry Oswald
b3432f016c
allow proxying of template images though filestore
2015-04-09 17:14:47 +01:00
Brian Gough
07e53bbb2f
handle error when listing bucket
2015-03-31 10:35:33 +01:00
Xavier Trochu
da1b7b9e82
Merge remote-tracking branch 'origin/master'
2015-03-23 16:25:18 +01:00
James Allen
801b5653e4
Fix unit test when false is not at /bin/false
2015-03-20 14:27:25 +00:00
James Allen
a370739722
Release version 0.1.4
2015-03-20 14:20:13 +00:00
Brian Gough
a5e63f7261
Merge pull request #18 from sharelatex/terminate-processes
...
Use process group to terminate processes
2015-03-13 11:32:57 +00:00
Brian Gough
143d44e54b
add tests for SafeExec module
2015-03-13 10:15:53 +00:00
Brian Gough
a7b9376919
use SIGTERM instead of SIGKILL to allow process to shut down cleanly
2015-03-13 10:15:37 +00:00
Brian Gough
9aaef729ad
cleanup and comments
2015-03-13 10:10:51 +00:00
Brian Gough
63ee4d1e7d
use close event instead of exit to capture stdout/stderr correctly
2015-03-13 10:10:21 +00:00
Brian Gough
0e5abe1ff8
update tests to use safe_exec
2015-03-13 09:31:43 +00:00