feat: port parsePush into ParseRequestFilter to get commit details

Author: coopernetes

src/main/java/org/finos/gitproxy/config/GitProxyProperties.java

@@ -2,7 +2,6 @@
 
 import java.net.URI;
 import java.util.*;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -34,7 +33,7 @@ public class GitProxyProperties {
      */
     private String basePath = "";
 
-    //TODO: Find a way to force properties to be instantiated as a bean but early on in the lifecycle while still
+    // TODO: Find a way to force properties to be instantiated as a bean but early on in the lifecycle while still
     // delegating to Spring Boot to bind the properties. This is an open problem with the use of Environment + Binder
     // in the BeanFactoryPostProcessor where the properties bean is still not bound at the time the factories execute
     // _if_ no "git-proxy.*" properties are defined at all. Use of that factory for creating beans dynamically

src/main/java/org/finos/gitproxy/git/Commit.java

@@ -1,13 +1,17 @@
 package org.finos.gitproxy.git;
 
+import java.time.Instant;
+import lombok.Builder;
 import lombok.Data;
 
 /** Represents a single commit. */
 @Data
+@Builder
 public class Commit {
     private String id;
     private Contributor author;
     private Contributor committer;
     private String message;
-    private String date;
+    private Instant date;
+    private String signature;
 }

src/main/java/org/finos/gitproxy/git/Contributor.java

@@ -1,9 +1,13 @@
 package org.finos.gitproxy.git;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /** A generic class that represents a contributor to a git repository. It can either be an author or a committer. */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Contributor {
     private String name;
     private String email;

src/main/java/org/finos/gitproxy/provider/AbstractGitProxyProvider.java

@@ -16,8 +16,9 @@ public abstract class AbstractGitProxyProvider implements GitProxyProvider {
 
     /**
      * Returns the path that the servlet will be mapped to. This is based on the host of the target URL or a custom path
-     * if set along with an optional application-wide base path. To configure a {@link org.finos.gitproxy.servlet.GitProxyProviderServlet}
-     * for proxying, use {@link #servletMapping()} instead.
+     * if set along with an optional application-wide base path. To configure a
+     * {@link org.finos.gitproxy.servlet.GitProxyProviderServlet} for proxying, use {@link #servletMapping()} instead.
+     *
      * @return The base path that this provider will be mapped to.
      */
     @Override
@@ -27,8 +28,8 @@ public String servletPath() {
 
     /**
      * Returns the servlet mapping for the provider. This is used to map the servlet to a specific path in the
-     * application. Since this mapping is always used for setting up underlying proxying servlet, the
-     * mapping will always append a wildcard end of the path to ensure that all matching requests are proxied.
+     * application. Since this mapping is always used for setting up underlying proxying servlet, the mapping will
+     * always append a wildcard end of the path to ensure that all matching requests are proxied.
      *
      * <p>Matcher functions should use {@link #servletPath()} instead.
      *

src/main/java/org/finos/gitproxy/servlet/RequestBodyWrapper.java

@@ -0,0 +1,79 @@
+package org.finos.gitproxy.servlet;
+
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+import lombok.Getter;
+
+@Getter
+public class RequestBodyWrapper extends HttpServletRequestWrapper {
+
+    private final byte[] body;
+
+    /**
+     * Constructs a request object wrapping the given request.
+     *
+     * @param request The request to wrap
+     * @throws IllegalArgumentException if the request is null
+     */
+    public RequestBodyWrapper(HttpServletRequest request) throws IOException {
+        super(request);
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        BufferedInputStream bufferedInputStream = null;
+        try {
+            InputStream inputStream = request.getInputStream();
+            if (inputStream != null) {
+                bufferedInputStream = new BufferedInputStream(inputStream);
+                byte[] byteBuffer = new byte[128];
+                int bytesRead = -1;
+                while ((bytesRead = bufferedInputStream.read(byteBuffer)) > 0) {
+                    byteArrayOutputStream.write(byteBuffer, 0, bytesRead);
+                }
+            }
+        } catch (IOException ex) {
+            throw ex;
+        } finally {
+            if (bufferedInputStream != null) {
+                try {
+                    bufferedInputStream.close();
+                } catch (IOException ex) {
+                    throw ex;
+                }
+            }
+        }
+        body = byteArrayOutputStream.toByteArray();
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+            @Override
+            public int read() throws IOException {
+                return byteArrayInputStream.read();
+            }
+
+            @Override
+            public boolean isFinished() {
+                return byteArrayInputStream.available() == 0;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+                // No implementation needed
+            }
+        };
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(this.getInputStream()));
+    }
+}

src/main/java/org/finos/gitproxy/servlet/filter/AuditLogFilter.java

@@ -7,7 +7,9 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.finos.gitproxy.git.HttpOperation;
 import org.springframework.core.Ordered;
@@ -20,8 +22,6 @@ public class AuditLogFilter extends AbstractGitProxyFilter implements AuditFilte
 
     /**
      * Apply audit logging to all operations by default and after all other filters.
-     *
-     * @param provider the provider this filter applies to
      */
     public AuditLogFilter() {
         super(Ordered.LOWEST_PRECEDENCE, DEFAULT_OPERATIONS);
@@ -36,6 +36,13 @@ public void audit(String message) {
     public void doHttpFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws IOException, ServletException {
         audit("" + request.getAttribute(GIT_REQUEST_ATTRIBUTE));
+        var headers = Collections.list(request.getHeaderNames()).stream()
+                .collect(Collectors.toMap(
+                        name -> name,
+                        name -> "authorization".equalsIgnoreCase(name)
+                                ? "REDACTED"
+                                : Collections.list(request.getHeaders(name))));
+        audit("headers" + headers);
         chain.doFilter(request, response);
     }
 }

src/main/java/org/finos/gitproxy/servlet/filter/FilterConfiguration.java

@@ -72,12 +72,16 @@ public static BeanFactoryPostProcessor providerFilterFactory(
                             whitelistFilters.size(),
                             provider.getName());
 
-                    int order = whitelistFilters.stream().mapToInt(WhitelistByUrlFilter::getOrder).min()
+                    int order = whitelistFilters.stream()
+                            .mapToInt(WhitelistByUrlFilter::getOrder)
+                            .min()
                             .orElse(0);
-                    var ops = whitelistFilters.stream().flatMap(f -> f.applicableOperations.stream()).collect(Collectors.toSet());
-                    var whitelistAggregateBean =
-                            createWhitelistAggregateBean(provider, order, ops, whitelistFilters);
-                    beanFactory.registerSingleton(whitelistAggregateBean.getFilter().beanName(), whitelistAggregateBean);
+                    var ops = whitelistFilters.stream()
+                            .flatMap(f -> f.applicableOperations.stream())
+                            .collect(Collectors.toSet());
+                    var whitelistAggregateBean = createWhitelistAggregateBean(provider, order, ops, whitelistFilters);
+                    beanFactory.registerSingleton(
+                            whitelistAggregateBean.getFilter().beanName(), whitelistAggregateBean);
                 }
                 // TODO: Generalize this logic
                 if (provider instanceof GitHubProvider gitHubProvider
@@ -113,9 +117,7 @@ private static FilterRegistrationBean<WhitelistAggregateFilter> createWhitelistA
             int order,
             Set<HttpOperation> operations,
             List<WhitelistByUrlFilter> whitelistFilters) {
-        var filter = new WhitelistAggregateFilter(
-                order,
-                operations, provider, whitelistFilters);
+        var filter = new WhitelistAggregateFilter(order, operations, provider, whitelistFilters);
         log.info("Creating {} with {} whitelists", filter, whitelistFilters.size());
         var filterBean = new FilterRegistrationBean<WhitelistAggregateFilter>();
         filterBean.setName(filter.beanName());
@@ -177,9 +179,13 @@ private static FilterRegistrationBean<GitHubUserAuthenticatedFilter> createGithu
         if (filterProperties.getOperations() != null
                 && !filterProperties.getOperations().isEmpty()) {
             filter = new GitHubUserAuthenticatedFilter(
-                    filterProperties.getOrder(), filterProperties.getOperations(), gitHubProvider, filterProperties.getRequiredAuthSchemes());
+                    filterProperties.getOrder(),
+                    filterProperties.getOperations(),
+                    gitHubProvider,
+                    filterProperties.getRequiredAuthSchemes());
         } else {
-            filter = new GitHubUserAuthenticatedFilter(filterProperties.getOrder(), gitHubProvider, filterProperties.getRequiredAuthSchemes());
+            filter = new GitHubUserAuthenticatedFilter(
+                    filterProperties.getOrder(), gitHubProvider, filterProperties.getRequiredAuthSchemes());
         }
         log.info("Creating {}", filter);
         var filterBean = new FilterRegistrationBean<GitHubUserAuthenticatedFilter>();

src/main/java/org/finos/gitproxy/servlet/filter/ForceGitClientFilter.java

@@ -8,7 +8,6 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.function.Predicate;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jgit.http.server.GitSmartHttpTools;
 import org.springframework.core.Ordered;
 

src/main/java/org/finos/gitproxy/servlet/filter/GitHubUserAuthenticatedFilter.java

@@ -34,7 +34,11 @@ public GitHubUserAuthenticatedFilter(int order, GitHubProvider provider, Set<Htt
         this.requiredAuthSchemes = requiredAuthSchemes;
     }
 
-    public GitHubUserAuthenticatedFilter(int order, Set<HttpOperation> appliedOperations, GitHubProvider provider, Set<HttpAuthScheme> requiredAuthSchemes) {
+    public GitHubUserAuthenticatedFilter(
+            int order,
+            Set<HttpOperation> appliedOperations,
+            GitHubProvider provider,
+            Set<HttpAuthScheme> requiredAuthSchemes) {
         super(order, appliedOperations, provider);
         this.requiredAuthSchemes = requiredAuthSchemes;
     }