agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-23 17:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33665 from overleaf/copilot/fix-error-logging-in-git-bridge

Browse Source 
git-bridge: Log WrongBranchException and ForcedPushException at WARN instead of ERROR
GitOrigin-RevId: 7aaa934a0df614e336ce3c20b892af1af0cd070f
This commit is contained in:
Eric Mc Sween
2026-05-15 08:54:13 -04:00
committed by Copybot
parent a3682af6e4
commit 2913e462ec
2 changed files with 131 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
View File

@@ -70,6 +70,9 @@ public class WriteLatexPutHook implements PreReceiveHook {
} catch (OutOfDateException e) {
Log.error("OutOfDateException on pre receive", e);
receiveCommand.setResult(Result.REJECTED_NONFASTFORWARD);
} catch (WrongBranchException | ForcedPushException e) {
Log.warn("User push rejected on pre receive: {}", e.getMessage());
handleSnapshotPostException(receivePack, receiveCommand, e);
} catch (GitUserException e) {
Log.error("GitUserException on pre receive", e);
handleSnapshotPostException(receivePack, receiveCommand, e);

128
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHookTest.java Normal file
View File

@@ -0,0 +1,128 @@
package uk.ac.ic.wlgitbridge.git.handler.hook;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.transport.ReceiveCommand.Result;
import org.eclipse.jgit.transport.ReceivePack;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.LoggerFactory;
import uk.ac.ic.wlgitbridge.application.GitBridgeApp;
import uk.ac.ic.wlgitbridge.bridge.Bridge;
import uk.ac.ic.wlgitbridge.bridge.repo.RepoStore;
public class WriteLatexPutHookTest {
private WriteLatexPutHook hook;
private ReceivePack receivePack;
private ReceiveCommand receiveCommand;
private Bridge bridge;
private RepoStore repoStore;
private ListAppender<ILoggingEvent> listAppender;
private Logger logger;
@Before
public void setup() {
bridge = mock(Bridge.class);
repoStore = mock(RepoStore.class);
hook = new WriteLatexPutHook(repoStore, bridge, "localhost", Optional.empty());
receivePack = mock(ReceivePack.class);
receiveCommand = mock(ReceiveCommand.class);
Repository repository = mock(Repository.class);
when(receivePack.getRepository()).thenReturn(repository);
when(repository.getDirectory()).thenReturn(new File("/tmp/test-repo/.git"));
logger = (Logger) LoggerFactory.getLogger(GitBridgeApp.class);
listAppender = new ListAppender<>();
listAppender.start();
logger.addAppender(listAppender);
}
@After
public void teardown() {
logger.detachAppender(listAppender);
}
@Test
public void wrongBranchIsRejected() {
when(receiveCommand.getRefName()).thenReturn("refs/heads/feature-branch");
hook.onPreReceive(receivePack, Collections.singletonList(receiveCommand));
verify(receiveCommand).setResult(eq(Result.REJECTED_OTHER_REASON), anyString());
}
@Test
public void wrongBranchIsLoggedAtWarnNotError() {
when(receiveCommand.getRefName()).thenReturn("refs/heads/feature-branch");
hook.onPreReceive(receivePack, Collections.singletonList(receiveCommand));
List<ILoggingEvent> events = listAppender.list;
boolean hasWarnLog =
events.stream()
.anyMatch(
e ->
e.getLevel() == Level.WARN && e.getFormattedMessage().contains("wrong branch"));
boolean hasErrorLog =
events.stream()
.anyMatch(
e ->
e.getLevel() == Level.ERROR
&& e.getFormattedMessage().contains("GitUserException"));
assertTrue("Expected a WARN log for WrongBranchException", hasWarnLog);
assertFalse("Expected no ERROR log for WrongBranchException", hasErrorLog);
}
@Test
public void forcedPushIsRejected() {
when(receiveCommand.getRefName()).thenReturn("refs/heads/master");
when(receiveCommand.getType()).thenReturn(ReceiveCommand.Type.UPDATE_NONFASTFORWARD);
hook.onPreReceive(receivePack, Collections.singletonList(receiveCommand));
verify(receiveCommand).setResult(eq(Result.REJECTED_OTHER_REASON), anyString());
}
@Test
public void forcedPushIsLoggedAtWarnNotError() {
when(receiveCommand.getRefName()).thenReturn("refs/heads/master");
when(receiveCommand.getType()).thenReturn(ReceiveCommand.Type.UPDATE_NONFASTFORWARD);
hook.onPreReceive(receivePack, Collections.singletonList(receiveCommand));
List<ILoggingEvent> events = listAppender.list;
boolean hasWarnLog =
events.stream()
.anyMatch(
e ->
e.getLevel() == Level.WARN
&& e.getFormattedMessage().contains("forced push prohibited"));
boolean hasErrorLog =
events.stream()
.anyMatch(
e ->
e.getLevel() == Level.ERROR
&& e.getFormattedMessage().contains("GitUserException"));
assertTrue("Expected a WARN log for ForcedPushException", hasWarnLog);
assertFalse("Expected no ERROR log for ForcedPushException", hasErrorLog);
}
}