github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Handle a 409 response with code=projectHasDotGit

Browse source
This commit is contained in:
Shane Kilkelly 2019-05-24 16:31:52 +01:00
parent 8086a1b2b4
commit 2492c95c0b
3 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
View file

@ -11,6 +11,7 @@ import uk.ac.ic.wlgitbridge.util.Log;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.*;
/**
@ -73,9 +74,30 @@ public abstract class Request<T extends Result> {
if (cause instanceof HttpResponseException) {
HttpResponseException httpCause = (HttpResponseException) cause;
int sc = httpCause.getStatusCode();
if (sc == HttpServletResponse.SC_UNAUTHORIZED || sc == HttpServletResponse.SC_FORBIDDEN) {
if (sc == HttpServletResponse.SC_UNAUTHORIZED || sc == HttpServletResponse.SC_FORBIDDEN) { // 401, 403
throw new ForbiddenException();
} else if (sc == HttpServletResponse.SC_NOT_FOUND) {
} else if (sc == HttpServletResponse.SC_CONFLICT) { // 409
try {
JsonObject json = Instance.gson.fromJson(httpCause.getContent(), JsonObject.class);
String code = json.get("code").getAsString();
if ("projectHasDotGit".equals(code)) {
throw new MissingRepositoryException(Arrays.asList(
"This project contains a '.git' entity at the top level, indicating that it is",
"already a git repository. The Overleaf git-bridge cannot work with this project",
"due to a known problem with handling these '.git' folders.",
"",
"If this is unexpected, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
));
} else {
throw new MissingRepositoryException(Arrays.asList("Conflict: 409"));
}
} catch (IllegalStateException
| ClassCastException
| NullPointerException _e) { // json parse errors
throw new MissingRepositoryException(Arrays.asList("Conflict: 409"));
}
} else if (sc == HttpServletResponse.SC_NOT_FOUND) { // 404
try {
JsonObject json = Instance.gson.fromJson(httpCause.getContent(), JsonObject.class);
String message = json.get("message").getAsString();

21
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
View file

@ -129,6 +129,9 @@ public class WLGitBridgeIntegrationTest {
put("rejectV1Repository", new HashMap<String, SnapshotAPIState>() {{
put("state", new SnapshotAPIStateBuilder(getResourceAsStream("/rejectV1Repository/state/state.json")).build());
}});
put("cannotCloneAHasDotGitProject", new HashMap<String, SnapshotAPIState>() {{
put("state", new SnapshotAPIStateBuilder(getResourceAsStream("/cannotCloneAHasDotGitProject/state/state.json")).build());
}});
}};
@Rule
@ -868,6 +871,24 @@ public class WLGitBridgeIntegrationTest {
assertNotEquals(0, gitProcess.waitFor());
}
@Test
public void cannotCloneAHasDotGitProject() throws IOException, GitAPIException, InterruptedException {
int gitBridgePort = 33885;
int mockServerPort = 3885;
MockSnapshotServer server = new MockSnapshotServer(mockServerPort, getResource("/cannotCloneAHasDotGitProject").toFile());
server.start();
server.setState(states.get("cannotCloneAHasDotGitProject").get("state"));
GitBridgeApp wlgb = new GitBridgeApp(new String[] {
makeConfigFile(gitBridgePort, mockServerPort)
});
wlgb.run();
Process gitProcess = runtime.exec("git clone http://127.0.0.1:" + gitBridgePort + "/conflict.git", null, dir);
assertNotEquals(0, gitProcess.waitFor());
wlgb.stop();
}
private String makeConfigFile(
int port,
int apiPort

19
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/cannotCloneAHasDotGitProject/state/state.json Normal file
View file

@ -0,0 +1,19 @@
[
{
"project": "conflict",
"getDoc": {
"error": 409,
"code": "projectHasDotGit",
"versionID": 1,
"createdAt": "2018-02-05T15:30:00Z",
"email": "michael.walker@overleaf.com",
"name": "msw"
},
"getSavedVers": [],
"getForVers": [],
"push": "success",
"postback": {
"type": "outOfDate"
}
}
]