If MavenSettings specify http headers include those headers on HTTP r…

…equests issued by MavenPomDownloader and MavenArtifactDownloader.
openrewrite · Dec 2, 2023 · d0704ac · d0704ac
1 parent 219eda9
commit d0704ac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java
@@ -832,6 +832,15 @@ private MavenRepository applyAuthenticationToRepository(MavenRepository reposito
      * Returns a request builder with Authorization header set if the provided repository specifies credentials
      */
     private HttpSender.Request.Builder applyAuthenticationToRequest(MavenRepository repository, HttpSender.Request.Builder request) {
+        if(ctx.getSettings() != null && ctx.getSettings().getServers() != null) {
+            for (MavenSettings.Server server : ctx.getSettings().getServers().getServers()) {
+                if(server.getId().equals(repository.getId()) && server.getConfiguration() != null && server.getConfiguration().getHttpHeaders() != null) {
+                    for (MavenSettings.HttpHeader header : server.getConfiguration().getHttpHeaders()) {
+                        request.withHeader(header.getName(), header.getValue());
+                    }
+                }
+            }
+        }
         if (hasCredentials(repository)) {
             return request.withBasicAuthentication(repository.getUsername(), repository.getPassword());
         }

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java b/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java
@@ -129,6 +129,11 @@ public Path downloadArtifact(ResolvedDependency dependency) {
     private HttpSender.Request.Builder applyAuthentication(MavenRepository repository, HttpSender.Request.Builder request) {
         MavenSettings.Server authInfo = serverIdToServer.get(repository.getId());
         if (authInfo != null) {
+            if(authInfo.getConfiguration() != null && authInfo.getConfiguration().getHttpHeaders() != null) {
+                for (MavenSettings.HttpHeader header : authInfo.getConfiguration().getHttpHeaders()) {
+                    request.withHeader(header.getName(), header.getValue());
+                }
+            }
             return request.withBasicAuthentication(authInfo.getUsername(), authInfo.getPassword());
         } else if (repository.getUsername() != null && repository.getPassword() != null) {
             return request.withBasicAuthentication(repository.getUsername(), repository.getPassword());