Commit graph

672 commits

Author SHA1 Message Date
Shane Kilkelly
eba6c907e9 wip: status handler 2020-06-17 16:05:53 +01:00
Jakob Ackermann
cb3508223f Merge pull request #78 from overleaf/jpa-skip-tests
[misc] make: skip tests for the build and package target
2020-03-11 11:55:56 +01:00
Jakob Ackermann
090e58a953 [misc] add documentation on how to run commands from the dev-environment 2020-03-11 11:46:46 +01:00
Jakob Ackermann
f98212e96b [misc] make: skip tests for the build and package target
http://maven.apache.org/plugins-archives/maven-surefire-plugin-2.12.4/examples/skipping-test.html
2020-03-10 15:35:50 +01:00
Ersun Warncke
b4651efc79 Merge pull request #77 from overleaf/ew-revert-logging
revert logging
2019-11-27 10:48:37 -08:00
Ersun Warncke
d89dbb7ff8 Revert "add debug"
This reverts commit 0d28d39563ad5de0db666c9e67493f5c814fe930.
2019-11-27 09:05:18 -04:00
Ersun Warncke
203a690f1c Merge pull request #76 from overleaf/ew-debug-http-headers
debug http headers
2019-11-27 04:46:43 -08:00
Ersun Warncke
b6812462d6 add debug 2019-11-25 10:20:43 -04:00
Ersun Warncke
76359d4ec6 Merge pull request #75 from overleaf/ew-pass-client-ip-as-header
pass client ip as header
2019-11-21 05:40:08 -08:00
Ersun Warncke
b1262ff06e pass client ip as url param 2019-11-19 12:08:35 -04:00
Ersun Warncke
3c28b30680 Merge pull request #74 from overleaf/ew-add-file-number-limit
add file limit error
2019-11-13 05:47:26 -08:00
Ersun Warncke
5188e7c06a add file limit error 2019-11-12 11:16:54 -04:00
Shane Kilkelly
132e8f308d Merge pull request #71 from overleaf/sk-validate-project-names
Reject urls starting with "/project"
2019-08-02 13:36:44 +01:00
Shane Kilkelly
ffcb382f0c Update test to match new setup/teardown pattern 2019-08-02 13:34:43 +01:00
Shane Kilkelly
ac4f4082c8 Use 404 code when rejecting invalid project id 2019-08-02 13:31:27 +01:00
Shane Kilkelly
76b349591c Refactor to use new helper to send error response 2019-08-02 13:31:27 +01:00
Shane Kilkelly
b0ab2e07c5 Reject requests when the project uri begins with '/project' 2019-08-02 13:31:27 +01:00
Shane Kilkelly
abf525f43a Update test to match new setup/teardown pattern 2019-08-01 16:34:49 +01:00
Shane Kilkelly
3fac2cc825 Merge pull request #59 from das7pad/tests/cleanup-resources
[tests] cleanup resources
2019-08-01 16:26:51 +01:00
Shane Kilkelly
bc646829b4 Merge pull request #70 from overleaf/sk-handle-files-with-spaces
Use UUID in file url, not (encoded) file path.
2019-07-08 09:28:41 +01:00
Shane Kilkelly
88adce3a02 Use UUID in file url, not (encoded) file path.
This fixes a bunch of issues where funny characters in the file path
(spaces, unicode, etc) would cause the file server in this process to
respond with a 404 when asked for the file. The 404 would then cause
the push to fail.

Now we just use a UUID as an opaque and unambiguous identifier for each file.
2019-07-05 11:07:47 +01:00
Shane Kilkelly
1e3b973d9a Merge pull request #69 from overleaf/sk-update-local-config-2019-07
Point local OAuth config at v2
2019-07-05 11:06:46 +01:00
Shane Kilkelly
11e42ecb6f Point local config to v2 2019-07-03 09:37:11 +01:00
Shane Kilkelly
a68afc2e28 Merge pull request #67 from overleaf/sk-dont-catch-throwable-swap-impl
Don't catch `Throwable` in swap-job, catch Exception
2019-06-13 12:11:01 +01:00
Shane Kilkelly
591617f996 Merge pull request #68 from overleaf/sk-fix-unicode-file-paths
Encode file path when building url, allows unicode
2019-06-13 12:10:55 +01:00
Shane Kilkelly
71df1b0a31 Encode file path when building url, allows unicode 2019-06-07 14:17:33 +01:00
Shane Kilkelly
28865e2956 Don't catch Throwable in swap-job, catch Exception 2019-06-07 10:26:55 +01:00
Shane Kilkelly
181896f7ec Merge pull request #66 from overleaf/sk-change-409-wording
Tell user to remove .git folder
2019-05-30 09:57:56 +01:00
Shane Kilkelly
552e0955da Tell user to remove .git folder 2019-05-29 11:05:53 +01:00
Shane Kilkelly
545a9240d3 Merge pull request #61 from overleaf/spd-colon-passwords
GitBridge: Allow colons in passwords
2019-05-29 10:33:38 +01:00
Shane Kilkelly
b1d7a0cf63 Merge pull request #65 from overleaf/sk-handle-409-has-dot-git
Handle a 409 response with code=projectHasDotGit
2019-05-29 10:33:22 +01:00
Shane Kilkelly
b6fc48645a Merge pull request #64 from overleaf/sk-skip-failing-projects-in-swap-job
Skip failing projects in swap job, and give up after a certain number
2019-05-29 10:33:06 +01:00
Shane Kilkelly
719f0c3661 Give up on projects that cannot be swapped, rather than spinning the loop forever 2019-05-29 10:20:37 +01:00
Shane Kilkelly
2492c95c0b Handle a 409 response with code=projectHasDotGit 2019-05-29 10:18:49 +01:00
Shane Kilkelly
8086a1b2b4 Merge pull request #63 from overleaf/sk-emergency-log-and-trap-gc-errors
Log and trap/ignore gc errors during swap
2019-05-23 11:26:05 +01:00
Shane Kilkelly
f237efa6d5 Log and trap/ignore gc errors during swap 2019-05-23 11:14:02 +01:00
Shane Kilkelly
980a2ab98f Merge pull request #60 from overleaf/sk-gc-before-swap
Run GC before swap
2019-05-16 11:43:56 +01:00
Shane Kilkelly
c7d8c1c6b5 Run GC on a project at start of swap job.
When there is an exception during swap, add project name to log
2019-05-16 11:42:13 +01:00
Simon Detheridge
d51f2fecfc Allow colons in passwords
bug: overleaf/issues#1393
2019-05-16 10:03:27 +01:00
Jakob Ackermann
f547b6d494 Revert "Add git, make, and curl to docker image"
This reverts commit 02a2c9cd429b26ff44fabb97d3649e791b9edea4

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-05 18:34:01 +02:00
Jakob Ackermann
5907172463 Merge remote-tracking branch 'upstream/master' into misc/docker-build
# Conflicts:
#	Dockerfile
2019-05-05 18:32:35 +02:00
Shane Kilkelly
a2d041ffae Merge pull request #58 from overleaf/sk-docker-maven-base-image
Docker: maven base image
2019-04-29 10:00:15 +01:00
Jakob Ackermann
35ac848f43 [docker] install git in the app image
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:59:59 +02:00
Jakob Ackermann
a333aabfa9 [WLGitBridgeIntegrationTest] adjust the urls for the individual tests
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:54 +02:00
Jakob Ackermann
5040b4d7f0 [WLGitBridgeIntegrationTest] ensure that we stop the started servers
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:47 +02:00
Shane Kilkelly
c3308e565b Add git, make, and curl to docker image 2019-04-26 15:29:44 +01:00
Shane Kilkelly
bf44fe3b29 Merge pull request #56 from das7pad/misc/dry-dockerfile
[docker] use a base image that already contains maven and openjdk
2019-04-26 14:09:23 +01:00
Jakob Ackermann
a517c15053 [docker] include the LICENSE file in the image
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 23:10:08 +02:00
Jakob Ackermann
2ebae69044 [docker] build the git-bridge in docker
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 13:45:21 +02:00
Jakob Ackermann
85a8e377fc [docker] use a base image that already contains maven and openjdk
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 11:21:41 +02:00