From 06a7ee6614687a0b0cfb6116b7fb08e30b92f554 Mon Sep 17 00:00:00 2001
From: Winston Li <winston.li12@imperial.ac.uk>
Date: Sun, 16 Nov 2014 21:00:57 +0000
Subject: [PATCH] Corrected remoteAddr to localName.

---
 .../application/SnapshotPushPostbackHandler.java          | 2 +-
 .../uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java | 2 +-
 .../ic/wlgitbridge/git/handler/WLReceivePackFactory.java  | 2 +-
 .../wlgitbridge/git/handler/hook/WriteLatexPutHook.java   | 8 ++++----
 .../wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java   | 4 ++--
 .../uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java    | 4 ++--
 .../ac/ic/wlgitbridge/writelatex/model/WLDataModel.java   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
index ea8a756d65..fff9757011 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
@@ -25,7 +25,7 @@ public class SnapshotPushPostbackHandler extends AbstractHandler {
         }
 
         System.out.println(request.getRemoteAddr());
-        System.out.println(request.getLocalAddr());
+        System.out.println(request.getLocalName());
         System.out.println("method: " + request.getMethod());
         System.out.println("pathInfo: " + request.getPathInfo());
         System.out.println("contextPath: " + request.getContextPath());
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
index 2f636ecb63..4804a8a7e3 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
@@ -15,7 +15,7 @@ public interface WriteLatexDataSource {
     /* Called by request thread. */
     public boolean repositoryExists(String projectName) throws FailedConnectionException;
     public List<WritableRepositoryContents> getWritableRepositories(String projectName) throws FailedConnectionException, InvalidProjectException;
-    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException;
+    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException;
     public void expectPostback(String projectName);
 
     /* Called by postback thread. */
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
index 416324eef6..f5174a8fb4 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
@@ -25,7 +25,7 @@ public class WLReceivePackFactory implements ReceivePackFactory<HttpServletReque
     @Override
     public ReceivePack create(HttpServletRequest httpServletRequest, Repository repository) throws ServiceNotEnabledException, ServiceNotAuthorizedException {
         ReceivePack receivePack = new ReceivePack(repository);
-        receivePack.setPreReceiveHook(new WriteLatexPutHook(writeLatexDataSource, httpServletRequest.getRemoteAddr()));
+        receivePack.setPreReceiveHook(new WriteLatexPutHook(writeLatexDataSource, httpServletRequest.getLocalName()));
         return receivePack;
     }
 
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
index a181792de2..49e1703575 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
@@ -22,11 +22,11 @@ import java.util.Collection;
 public class WriteLatexPutHook implements PreReceiveHook {
 
     private final WriteLatexDataSource writeLatexDataSource;
-    private final String remoteAddr;
+    private final String hostname;
 
-    public WriteLatexPutHook(WriteLatexDataSource writeLatexDataSource, String remoteAddr) {
+    public WriteLatexPutHook(WriteLatexDataSource writeLatexDataSource, String hostname) {
         this.writeLatexDataSource = writeLatexDataSource;
-        this.remoteAddr = remoteAddr;
+        this.hostname = hostname;
     }
 
     @Override
@@ -58,7 +58,7 @@ public class WriteLatexPutHook implements PreReceiveHook {
         writeLatexDataSource.putDirectoryContentsToProjectWithName(repository.getWorkTree().getName(),
                                                                    getPushedDirectoryContents(repository,
                                                                                               receiveCommand),
-                                                                   remoteAddr);
+                                                                   hostname);
     }
 
     private void checkForcedPush(ReceiveCommand receiveCommand) throws ForcedPushException {
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
index e8325de39c..89d02d65c1 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
@@ -20,10 +20,10 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
     private final WLDirectoryNode directoryNode;
     private final CandidateSnapshotCallback callback;
 
-    public WLDirectoryNodeSnapshot(WLProject project, WLDirectoryNode directoryNode, String remoteAddr, CandidateSnapshotCallback callback) {
+    public WLDirectoryNodeSnapshot(WLProject project, WLDirectoryNode directoryNode, String hostname, CandidateSnapshotCallback callback) {
         previousVersionID = project.getLatestSnapshot().getVersionID();
         projectName = project.getName();
-        projectURL = "http://" + remoteAddr + "/" + projectName;
+        projectURL = "http://" + hostname + "/" + projectName;
         this.directoryNode = directoryNode;
         this.callback = callback;
         System.out.println(getJsonRepresentation());
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
index 1e994756ba..2b06165839 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
@@ -43,8 +43,8 @@ public class WriteLatexAPI implements WriteLatexDataSource {
     }
 
     @Override
-    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException {
-        CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents, remoteAddr);
+    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException {
+        CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents, hostname);
         new SnapshotPushRequest(candidate).request();
         throw new SnapshotPostException() {
 
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
index 001aa97391..836b697cf6 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
@@ -43,11 +43,11 @@ public class WLDataModel implements CandidateSnapshotCallback {
         return project;
     }
 
-    public CandidateSnapshot createCandidateSnapshotFromProjectWithContents(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException {
+    public CandidateSnapshot createCandidateSnapshotFromProjectWithContents(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException {
         return new WLDirectoryNodeSnapshot(getProjectWithName(projectName),
                                            fileStore.createNextDirectoryNodeInProjectFromContents(getProjectWithName(projectName),
                                                                                                   directoryContents),
-                                           remoteAddr,
+                                           hostname,
                                            this);
     }