Commit graph

611 commits

Author SHA1 Message Date
Shane Kilkelly
8c0048b302 Merge pull request #92 from overleaf/sk-configure-aws-region
Allow configuration of AWS region
2021-02-02 13:31:11 +00:00
Shane Kilkelly
c520ecd70d Allow configuration of AWS region 2021-01-27 10:41:32 +00:00
Shane Kilkelly
6d44851869 Merge pull request #88 from overleaf/jpa-docker-image
[misc] docker image
2020-12-15 09:54:33 +00:00
Jakob Ackermann
4644faf212 [misc] integrate git-bridge with overleaf dev-env and prod setup
- Add `base` target for dev-env
- Add `node` user for dev-env and prod
- Use `make` all the way
2020-12-10 17:37:09 +00:00
Jakob Ackermann
3e7cf07c8e Merge branch 'master' into jpa-docker-image
# Conflicts:
#	README.md
2020-12-10 14:28:03 +00:00
Eric Mc Sween
8a5027255a Merge pull request #86 from overleaf/em-handle-history-error
Handle errors from the history service
2020-12-09 09:05:24 -05:00
Eric Mc Sween
614f57f778 Merge pull request #87 from overleaf/em-strip-jwt
Strip token from blob URLs when using cache
2020-12-09 09:03:23 -05:00
Eric Mc Sween
8bbeee0f8d Strip token from blob URLs when using cache
Blob URLs coming from web may now contain a token for authentication
with history v1. This token will change every request, which makes the
URL not suitable as a cache key. Removing the token fixes that.
2020-12-04 15:15:10 -05:00
Eric Mc Sween
2430d5fe1d Handle errors from the history service
If the history service returns a non-success status code when we request
a blob, chances are the payload is not the expected blob contents. We
throw an exception in that case, which will abort the git operation.
2020-12-04 11:27:00 -05:00
Shane Kilkelly
5ce755c7c0 Merge pull request #84 from overleaf/sk-upgrade-jgit-5.9.0
Upgrade to JGit 5.9.0
2020-10-20 10:33:32 +01:00
Shane Kilkelly
f89fab5abb Upgrade to JGit 5.9.0 2020-10-20 10:23:06 +01:00
Shane Kilkelly
aae73d5c99 Merge pull request #83 from overleaf/sk-reset-on-pull
Reset repository state before pull
2020-10-07 09:43:17 +01:00
Shane Kilkelly
de23035e80 Add test for pulling ignored file 2020-09-29 13:00:36 +01:00
Shane Kilkelly
c6cfd51fb4 Use the NoGitignoreIterator recursively 2020-09-29 12:44:33 +01:00
Shane Kilkelly
03af20113f Force add the test file, sigh. 2020-09-24 13:29:39 +01:00
Shane Kilkelly
935770e2ab Add test for reset before pull 2020-09-24 11:24:47 +01:00
Shane Kilkelly
d07ecd2a1b During pull: reset repo before writing data 2020-09-23 11:38:22 +01:00
Shane Kilkelly
d284caf1db Merge pull request #82 from overleaf/sk-add-error-to-log
When logging IOException for put, include error
2020-09-02 09:30:36 +01:00
Shane Kilkelly
bb7831012b When logging IOException for put, include error 2020-09-01 13:28:35 +01:00
Shane Kilkelly
1041b8d332 Merge pull request #81 from overleaf/sk-lfs-error-message
Handle Git LFS requests, with error message
2020-08-06 09:43:42 +01:00
Shane Kilkelly
2b8f3f4de8 Use 422 status when rejecting Git LFS request 2020-08-05 13:00:20 +01:00
Shane Kilkelly
f7125b9159 Handle Git LFS requests, with error message
We don't support Git LFS. This change adds a handler for
POST requests to "<project>.git/info/lfs/objects/batch",
and sends back a 406 response, with json data that the
client can use to print a nice error message.
2020-08-05 10:08:40 +01:00
Shane Kilkelly
395c558d77 Merge pull request #80 from overleaf/sk-health-check-trailing-slash
Handle HEAD method, and trailing slash on status and health-check calls
2020-06-26 14:52:22 +01:00
Shane Kilkelly
e7b19ea4a0 Update src/main/java/uk/ac/ic/wlgitbridge/server/StatusHandler.java
Co-authored-by: John Lees-Miller <jdleesmiller@gmail.com>
2020-06-26 13:37:18 +01:00
Shane Kilkelly
4161416659 Update src/main/java/uk/ac/ic/wlgitbridge/server/HealthCheckHandler.java
Co-authored-by: John Lees-Miller <jdleesmiller@gmail.com>
2020-06-26 13:37:09 +01:00
Shane Kilkelly
5e31a11938 Respond to HEAD request in /status, /health_check 2020-06-26 11:54:18 +01:00
Shane Kilkelly
a9a7f54a96 Handle trailing slash on status and health_check 2020-06-25 16:43:57 +01:00
Shane Kilkelly
0830102cec Merge pull request #79 from overleaf/sk-add-health-check
Add `/api/status` and `/api/health_check` endpoints
2020-06-23 11:14:29 +01:00
Shane Kilkelly
6ff3877dd1 Fix status and healthcheck tests 2020-06-19 15:50:51 +01:00
Shane Kilkelly
ec278ffe0a Fix log lines 2020-06-19 15:50:42 +01:00
Shane Kilkelly
ed778639a8 Move the status and healthcheck to root level 2020-06-19 15:50:27 +01:00
Shane Kilkelly
8def058d85 Fix log level 2020-06-19 15:50:16 +01:00
Shane Kilkelly
3c6ef38036 Fix alignment of function 2020-06-18 15:00:17 +01:00
Shane Kilkelly
40a171d44a Also check we can touch the filesystem in healthcheck 2020-06-18 14:56:50 +01:00
Shane Kilkelly
973a18b1b8 Clean up new healthcheck test 2020-06-18 14:56:38 +01:00
Shane Kilkelly
badeea3e0b Add test for status and health-check endpoints 2020-06-18 13:54:10 +01:00
Shane Kilkelly
689362b24f Use the bridge.healthCheck method 2020-06-18 11:45:21 +01:00
Shane Kilkelly
86769eedea Add a healthCheck method to the Bridge, check db 2020-06-18 11:45:04 +01:00
Shane Kilkelly
1befc3582b wip: add skeleton health-check handler 2020-06-17 16:15:40 +01:00
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