Commit graph

667 commits

Author SHA1 Message Date
Dr. Sasha Göbbels
c7465bc23e Merge pull request #14196 from overleaf/sg-guava-version-bump
Removal of guava, version bumps for jetty servlet, jetty server and sqlite-jdbc (#13519)

GitOrigin-RevId: 1ec77529c4b2d010bfebf41d59e6713554c4c53c
2023-08-14 08:05:18 +00:00
Eric Mc Sween
e33bf3e450 Merge pull request #13711 from overleaf/em-fix-git-bridge-dev-env
Fix git-bridge client secret in dev env

GitOrigin-RevId: 385ccfacd3d41ad855f1d41e483bf0b762e5665b
2023-07-17 10:54:14 +00:00
Miguel Serrano
afeeb9be68 Merge pull request #13498 from overleaf/msm-git-logback-configurable
[git-bridge] Configurable `LOG_LEVEL`

GitOrigin-RevId: 5dc34a3c980d9fd83898b4f96a30f60a8f9201ad
2023-07-17 10:42:12 +00:00
Eric Mc Sween
4535364ee2 Merge pull request #13387 from overleaf/em-git-bridge-remove-v1-to-v2-conversions
Remove automatic conversion of v1 projects to v2 in git-bridge

GitOrigin-RevId: af0285d98c77f4c9014da5c1d20d7def4b866cde
2023-07-17 10:32:24 +00:00
Eric Mc Sween
a5834a0f8c Merge pull request #13107 from overleaf/em-reenable-swap-job-test
Reenable swap job test in git bridge

GitOrigin-RevId: 4fcef9d1b9a6ef169b14ec490b785daeb80ab418
2023-05-17 12:05:20 +00:00
Eric Mc Sween
effccf2d3a Merge pull request #12997 from overleaf/em-git-bridge-pat-messaging
Adapt git bridge messaging to personal access tokens

GitOrigin-RevId: 0b5d5ecbd97814c8b18827fe11e77513c11bab3a
2023-05-16 08:04:36 +00:00
Eric Mc Sween
27cc7db733 Merge pull request #13026 from overleaf/em-git-bridge-password-mode-default
Default password auth support in git-bridge to false

GitOrigin-RevId: c8b783082e519e7b5ccdee27e45c37dee955796b
2023-05-12 08:04:24 +00:00
Eric Mc Sween
cc604376c5 Merge pull request #12882 from overleaf/em-git-bridge-swap-job-config
Disable swap job when swap store is unsafe

GitOrigin-RevId: 104b03e378e7802f9ba6ff96b5a626a2fa7960fb
2023-05-02 19:45:48 +00:00
Miguel Serrano
0564532f92 [git-bridge] Add support for Oauth2 Personal Access Tokens (#12795)
* [git-bridge] Add support for Oauth2 Personal Access Tokens

Adds support for Personal Access Tokens by sending a Bearer
token authentication when the username is `git`.
The feature is controlled by `GIT_BRIDGE_ACCESS_TOKEN_ENABLED`

---------

Co-authored-by: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
GitOrigin-RevId: 5553b0b68574158ede86ceec6c618cf4c4b09c92
2023-05-02 19:43:59 +00:00
Eric Mc Sween
c539e960e7 Merge pull request #12671 from overleaf/em-git-bridge-delete-project
Add endpoint to delete project data in git bridge

GitOrigin-RevId: bdc9701284255166bf4a122dad5fd89ced0c0ca2
2023-04-25 08:06:30 +00:00
Miguel Serrano
7aa68ebcec Merge pull request #12551 from overleaf/msm-git-bridge-vulnerabilites
[git-bridge] Update `httpclient` and `commons-compress`

GitOrigin-RevId: cb4f6cca09d991114bd784af6d2a79d887de256d
2023-04-12 08:03:57 +00:00
Eric Mc Sween
ea7d633117 Merge pull request #12371 from overleaf/em-git-bridge-data-directory
Server Pro entrypoint for git bridge

GitOrigin-RevId: 278e3fa912fe015ef131d2c3f6673d154a1cdfb7
2023-03-30 08:03:54 +00:00
June Kelly
7c1e91573c Merge pull request #10784 from overleaf/jk-gitbridge-add-rate-limits
[git-bridge] Add rate-limits on GitBridgeRouter

GitOrigin-RevId: ec935fae39cc061cefe3c932304de8cde2fdd185
2022-12-14 09:02:57 +00:00
Miguel Serrano
e93a4336bc Merge pull request #9309 from overleaf/msm-error-git-bridge-link
[git-bridge] replace error link with troubleshooting age

GitOrigin-RevId: 51853e6d65d7227685cb16f96fdf84678b01b710
2022-08-31 08:03:52 +00:00
Jakob Ackermann
da3d4fd4f5 Merge pull request #9081 from overleaf/jpa-bring-back-build
[git-bridge] bring back "build" make target

GitOrigin-RevId: 14b57aa437142d05db8b96218426a3e9385c2254
2022-08-03 08:04:45 +00:00
June Kelly
a2010bf901 Merge pull request #9059 from overleaf/jk-gitbridge-upgrade-jetty-9
[git-bridge] Upgrade jetty-server and jetty-servlet to 9.4.48

GitOrigin-RevId: 7bf3f72b7bf5a0677a3c7f217a08c07524db6e2e
2022-08-03 08:04:03 +00:00
June Kelly
7f09c6cf0c Merge pull request #9014 from overleaf/jlm-avoid-git-bridge-compile
Avoid always compiling the git bridge on start

GitOrigin-RevId: 2b8d4cf29c243d5de5f4cd026c63e1c8406771da
2022-07-27 12:18:00 +00:00
June Kelly
8043485572 Merge pull request #8824 from overleaf/jk-git-bridge-upgrade-google-oauth-134
Bump google-oauth-client from 1.23.0 to 1.34.1 in /services/git-bridge

GitOrigin-RevId: 8d473023a6ba0ae524f8e27f715a72fbe0138fc2
2022-07-18 08:04:32 +00:00
June Kelly
7c809432db Merge pull request #8409 from overleaf/jk-git-bridge-operation-in-progress
[git-bridge] Operation-in-progress message

GitOrigin-RevId: 2836c3917303f06c7ff2e0b91a36f88237276507
2022-07-13 08:04:46 +00:00
June Kelly
767a671a38 Merge pull request #8221 from overleaf/dependabot-maven-services-git-bridge-com.google.code.gson-gson-2.9.0
Bump gson from 2.8.2 to 2.9.0 in /services/git-bridge

GitOrigin-RevId: 9cdb8c44dee06da880f03848bb7a4c99df458440
2022-06-10 08:03:44 +00:00
John Lees-Miller
96a8f7ffa1 Merge pull request #8220 from overleaf/jlm-dependabot-tidy
Update and tidy dependabot configs

GitOrigin-RevId: dc3c37f7fca5c632a520d74dbbe0194c31ac9746
2022-05-31 08:04:15 +00:00
Miguel Serrano
d23874f04c Merge pull request #6969 from overleaf/msm-fix-log-debug
[git-bridge] Fix `Log.debug()` sending `INFO` logs

GitOrigin-RevId: ef87b35ee3c6fa7659671a0a65545fa34f04dcd4
2022-03-08 09:03:17 +00:00
Miguel Serrano
cdf88358d4 [git-bridge] delete newrelic.yml (#6850)
Deleting unused New Relic configuration from git-bridge.

* Delete `newrelic.yml`
* Delete `newrelic.jar`

GitOrigin-RevId: 60fc512d8b60d6905b5a660e44239dd8b5310347
2022-03-02 09:02:42 +00:00
Miguel Serrano
fe35372d27 Merge pull request #6849 from overleaf/msm-git-bridge-log-level
[git-bridge] review logging levels

GitOrigin-RevId: beb6ce89ccdee7c60c4439d7a5252d7858956a9a
2022-03-02 09:02:40 +00:00
Miguel Serrano
de20b5b443 Merge pull request #6744 from overleaf/msm-update-async-http-client-vuln
[git-bridge] Bump `async-http-client` and `mockserver-netty`

GitOrigin-RevId: bcea12a01f3bbae6567b9f54567a1187e5a763f3
2022-02-16 11:39:21 +00:00
Christopher Hoskin
cf4269d4ee Merge pull request #6221 from overleaf/ae-web-port
Change web port to 3000 in dev environment

GitOrigin-RevId: 8e9af8fa5e1a35c2c9089d4e9cbf744634cc4e85
2022-01-12 09:03:47 +00:00
June Kelly
57613ba547 Merge pull request #6063 from overleaf/jk-gitbridge-rate-limit-429
[git-bridge] Pass 429 and message to client

GitOrigin-RevId: f751b27efdbad9d775dead2a209fd7468c253ad2
2021-12-15 09:03:03 +00:00
June Kelly
231ba305ed Merge pull request #5477 from overleaf/jk-git-bridge-put-log-upgrade
[git-bridge] raise log level to error in put hook

GitOrigin-RevId: 45a4a77200f8e8490c4b70922614253c984c9d36
2021-10-15 08:03:12 +00:00
Simon Detheridge
1a8c5c9498 Set global logging limit to INFO 2021-07-27 09:55:04 +01:00
Simon Detheridge
545de52a12 Load Debian's version of jemalloc 2021-07-19 11:05:57 +01:00
Simon Detheridge
4318dea5a0 Restore debug level to INFO 2021-07-19 10:54:59 +01:00
Simon Detheridge
0bf2aeeec0 Revert "Merge pull request #132 from overleaf/spd-binutils"
This reverts commit 96530cc00a752953678e91d2dee25046912db20c, reversing
changes made to 693163c5417fe0d13dde2d6dfe0876c77939eb96.
2021-07-19 10:52:14 +01:00
Simon Detheridge
d830224e29 Revert "Merge pull request #137 from overleaf/spd-memprof-again"
This reverts commit 1764b7e9c0a3891955b97136c2fa0d5821b8f40b, reversing
changes made to f1dc05fc8defebf341c320638998947537998192.
2021-07-19 10:50:25 +01:00
Simon Detheridge
6905ddf5f8 Revert "Merge pull request #138 from overleaf/spd-gdb"
This reverts commit 4267b11fa17282f6eecde62c984baef1f63b21a0, reversing
changes made to 1764b7e9c0a3891955b97136c2fa0d5821b8f40b.
2021-07-19 10:50:12 +01:00
Simon Detheridge
17435e6cee Add GDB to the Docker image 2021-07-16 14:07:27 +01:00
Simon Detheridge
e9232929c4 Add all dev/dbg packages to Docker image 2021-07-15 18:08:30 +01:00
Simon Detheridge
e30d116980 re-add jemalloc profiling again
Revert "Merge pull request #131 from overleaf/spd-revert-jemalloc"

This reverts commit 5a80ecc0fed0fe8c653cabe36b0e379da729d5cc, reversing
changes made to 6196386a61be1f38b1fbd5a651044b503ba0823c.
2021-07-15 16:54:38 +01:00
Shane Kilkelly
21c1378b4a Drop the root log level to "DEGUG"
This allows our dependencies, such as jgit, to log
at the debug level
2021-07-09 11:11:52 +01:00
Simon Detheridge
087c076fcd Enable more verbose logging 2021-07-08 12:32:15 +01:00
Simon Detheridge
c6d20faa34 Add debug logging to push mechanism 2021-07-08 12:32:10 +01:00
Simon Detheridge
5be3616109 Add debug logs to put hook 2021-07-08 12:15:46 +01:00
Simon Detheridge
3b27a2ee6a Add debug logs to project lock mechanism 2021-07-08 12:15:00 +01:00
Simon Detheridge
a3c4f8c4e6 Add format-style Log.debug method 2021-07-08 12:14:29 +01:00
Simon Detheridge
12b8c0a1c0 Merge pull request #131 from overleaf/spd-revert-jemalloc
Revert "Merge pull request #129 from overleaf/spd-jeprof"
2021-07-07 12:09:02 +01:00
Simon Detheridge
5a9e3d68bb Merge pull request #133 from overleaf/sk-add-deprecated-xml-libs
Re-add removed libs, needed by AWS SDK
2021-07-06 14:53:58 +01:00
Shane Kilkelly
8e6fa6c938 Re-add removed libs, needed by AWS SDK 2021-07-06 14:17:37 +01:00
Simon Detheridge
14f459870a Add binutils and graphviz to Docker image 2021-07-05 17:31:17 +01:00
Simon Detheridge
e505ecc8c0 Revert "Merge pull request #129 from overleaf/spd-jeprof"
This reverts commit 4268e58ff36bd591d40e3730446b691440c34409, reversing
changes made to 6c1eaae2eeb4949b7466c36d4a2e722697294c0b.
2021-07-02 17:04:41 +01:00
Simon Detheridge
187dfa82e5 Merge pull request #130 from overleaf/spd-apachecommons
Upgrade apache commons to 3.12
2021-07-02 16:00:15 +01:00
Simon Detheridge
adcd156470 Merge pull request #129 from overleaf/spd-jeprof
Add jemalloc/jeprof profiling
2021-07-02 15:59:57 +01:00