Add egressSites filter for proxySitesCache Save

yma955 · yma955 · commit 653f7b04c572 · 2025-03-31T22:43:46.000+08:00
diff --git a/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java b/cdi-embedder/src/test/java/org/commonjava/maven/galley/embed/TestCDIProvider.java
@@ -126,6 +126,12 @@ public List<String> getAllowHttpJobTypes()
         {
             return new ArrayList<>();
         }
+
+        @Override
+        public List<String> getEgressSites()
+        {
+            return new ArrayList<>();
+        }
     };
 
     @Inject
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
     <partylineVersion>1.16</partylineVersion>
     <pathmappedStorageVersion>2.5</pathmappedStorageVersion>
     <weftVersion>1.24</weftVersion>
-    <jhttpcVersion>1.14</jhttpcVersion>
+    <jhttpcVersion>1.15-SNAPSHOT</jhttpcVersion>
     <infinispanVersion>9.4.7.Final</infinispanVersion>
     <weldVersion>3.1.9.Final</weldVersion>
     <byteman.version>4.0.20</byteman.version>
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/HttpClientTransport.java
@@ -122,7 +122,7 @@ public DownloadJob createDownloadJob( final ConcreteResource resource, final Tra
     {
         return new HttpDownload( getUrl( resource ), getHttpLocation( resource.getLocation(), download ), target,
                                  transferSizes, eventMetadata, http, mapper, metricRegistry, metricConfig,
-                                 proxySitesCache );
+                                 globalProxyConfig.getEgressSites(), proxySitesCache );
     }
 
     @Override
@@ -165,7 +165,8 @@ public ListingJob createListingJob( final ConcreteResource resource, final Trans
     {
         return new HttpListing( getUrl( resource ),
                                 new ConcreteResource( getHttpLocation( resource.getLocation(), listing ),
-                                                      resource.getPath() ), http, proxySitesCache );
+                                                      resource.getPath() ), http, globalProxyConfig.getEgressSites(),
+                                proxySitesCache );
     }
 
     private HttpLocation getHttpLocation( final Location repository, HttpJobType httpJobType )
@@ -189,7 +190,7 @@ public ExistenceJob createExistenceJob( final ConcreteResource resource, final T
         throws TransferException
     {
         return new HttpExistence( getUrl( resource ), getHttpLocation( resource.getLocation(), existence ), target,
-                                  http, mapper, proxySitesCache );
+                                  http, mapper, globalProxyConfig.getEgressSites(), proxySitesCache );
     }
 
     private String getUrl( final ConcreteResource resource )
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/conf/GlobalProxyConfig.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/conf/GlobalProxyConfig.java
@@ -27,4 +27,6 @@ public interface GlobalProxyConfig
     String getUser();
 
     List<String> getAllowHttpJobTypes();
+
+    List<String> getEgressSites();
 }
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/AbstractHttpJob.java
@@ -48,6 +48,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
 
@@ -73,14 +74,18 @@ public abstract class AbstractHttpJob
 
     protected boolean success;
 
+    private final List<String> egressSites;
+
     private final ProxySitesCache proxySitesCache;
 
     protected AbstractHttpJob( final String url, final HttpLocation location, final Http http,
-                               ProxySitesCache proxySitesCache, final Integer... successStatuses )
+                               final List<String> egressSites, ProxySitesCache proxySitesCache,
+                               final Integer... successStatuses )
     {
         this.url = url;
         this.location = location;
         this.http = http;
+        this.egressSites = egressSites;
         this.proxySitesCache = proxySitesCache;
 
         if ( successStatuses.length < 1 )
@@ -158,7 +163,7 @@ else if ( !doProxy ) // never do with proxy, retry with proxy
                     {
                         tries = 1;
                         doProxy = true;
-                        if ( proxySitesCache != null )
+                        if ( proxySitesCache != null && ( egressSites == null || !egressSites.contains( site ) ) )
                         {
                             proxySitesCache.saveProxySite( site );
                         }
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpDownload.java
@@ -38,6 +38,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.List;
 import java.util.Map;
 
 import static org.apache.commons.io.IOUtils.closeQuietly;
@@ -68,7 +69,7 @@ public HttpDownload( final String url, final HttpLocation location, final Transf
                          final Map<Transfer, Long> transferSizes, final EventMetadata eventMetadata, final Http http,
                          final ObjectMapper mapper )
     {
-        this( url, location, target, transferSizes, eventMetadata, http, mapper, true, null, null, null );
+        this( url, location, target, transferSizes, eventMetadata, http, mapper, true, null, null, null, null );
     }
 
     public HttpDownload( final String url, final HttpLocation location, final Transfer target,
@@ -77,25 +78,27 @@ public HttpDownload( final String url, final HttpLocation location, final Transf
                          final TransportMetricConfig transportMetricConfig )
     {
         this( url, location, target, transferSizes, eventMetadata, http, mapper, true, metricRegistry,
-              transportMetricConfig, null );
+              transportMetricConfig, null, null );
     }
 
     public HttpDownload( final String url, final HttpLocation location, final Transfer target,
                          final Map<Transfer, Long> transferSizes, final EventMetadata eventMetadata, final Http http,
                          final ObjectMapper mapper, final MetricRegistry metricRegistry,
-                         final TransportMetricConfig transportMetricConfig, ProxySitesCache proxySitesCache )
+                         final TransportMetricConfig transportMetricConfig, final List<String> egressSites,
+                         ProxySitesCache proxySitesCache )
     {
         this( url, location, target, transferSizes, eventMetadata, http, mapper, true, metricRegistry,
-              transportMetricConfig, proxySitesCache );
+              transportMetricConfig, egressSites, proxySitesCache );
     }
 
     public HttpDownload( final String url, final HttpLocation location, final Transfer target,
                          final Map<Transfer, Long> transferSizes, final EventMetadata eventMetadata, final Http http,
                          final ObjectMapper mapper, final boolean deleteFilesOnPath,
                          final MetricRegistry metricRegistry, final TransportMetricConfig transportMetricConfig,
-                         ProxySitesCache proxySitesCache )
+                         final List<String> egressSites, ProxySitesCache proxySitesCache )
     {
-        super( url, location, http, proxySitesCache );
+
+        super( url, location, http, egressSites, proxySitesCache );
         this.request = new HttpGet( url );
         this.target = target;
         this.transferSizes = transferSizes;
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpExistence.java
@@ -24,6 +24,8 @@
 import org.commonjava.maven.galley.transport.htcli.Http;
 import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
 
+import java.util.List;
+
 import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
 
 public final class HttpExistence
@@ -38,13 +40,13 @@ public final class HttpExistence
     public HttpExistence( final String url, final HttpLocation location, final Transfer transfer, final Http http,
                           final ObjectMapper mapper )
     {
-        this( url, location, transfer, http, mapper, null );
+        this( url, location, transfer, http, mapper, null, null );
     }
 
     public HttpExistence( final String url, final HttpLocation location, final Transfer transfer, final Http http,
-                          final ObjectMapper mapper, ProxySitesCache proxySitesCache )
+                          final ObjectMapper mapper, final List<String> egressSites, ProxySitesCache proxySitesCache )
     {
-        super( url, location, http, proxySitesCache );
+        super( url, location, http, egressSites, proxySitesCache );
         this.transfer = transfer;
         this.mapper = mapper;
     }
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpListing.java
@@ -37,6 +37,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import static org.apache.commons.io.IOUtils.closeQuietly;
@@ -60,13 +61,13 @@ public class HttpListing
 
     public HttpListing( final String url, final ConcreteResource resource, final Http http )
     {
-        this( url, resource, http, null );
+        this( url, resource, http, null, null );
     }
 
     public HttpListing( final String url, final ConcreteResource resource, final Http http,
-                        ProxySitesCache proxySitesCache )
+                        final List<String> egressSites, ProxySitesCache proxySitesCache )
     {
-        super( url, (HttpLocation) resource.getLocation(), http, proxySitesCache );
+        super( url, (HttpLocation) resource.getLocation(), http, egressSites, proxySitesCache );
         this.resource = resource;
     }
 
diff --git a/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java b/transports/httpclient/src/main/java/org/commonjava/maven/galley/transport/htcli/internal/HttpPublish.java
@@ -20,13 +20,13 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.InputStreamEntity;
 import org.commonjava.maven.galley.TransferException;
-import org.commonjava.maven.galley.spi.proxy.ProxySitesCache;
 import org.commonjava.maven.galley.spi.transport.PublishJob;
 import org.commonjava.maven.galley.transport.htcli.Http;
 import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;
 import org.commonjava.maven.galley.util.ContentTypeUtils;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 
 import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;
 
@@ -46,7 +46,7 @@ public final class HttpPublish
     public HttpPublish( final String url, final HttpLocation location, final InputStream stream, final long length,
                         final String contentType, final Http http )
     {
-        super( url, location, http, null, HttpStatus.SC_OK, HttpStatus.SC_CREATED );
+        super( url, location, http, null, null, HttpStatus.SC_OK, HttpStatus.SC_CREATED );
         this.stream = stream;
         this.length = length;
         this.contentType = contentType == null ? ContentTypeUtils.detectContent( url ) : contentType;

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,12 @@ public List<String> getAllowHttpJobTypes()`
`126`	`126`	`{`
`127`	`127`	`return new ArrayList<>();`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ @Override`
	`131`	`+ public List<String> getEgressSites()`
	`132`	`+ {`
	`133`	`+ return new ArrayList<>();`
	`134`	`+ }`
`129`	`135`	`};`
`130`	`136`
`131`	`137`	`@Inject`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public DownloadJob createDownloadJob( final ConcreteResource resource, final Tra`
`122`	`122`	`{`
`123`	`123`	`return new HttpDownload( getUrl( resource ), getHttpLocation( resource.getLocation(), download ), target,`
`124`	`124`	`transferSizes, eventMetadata, http, mapper, metricRegistry, metricConfig,`
`125`		`- proxySitesCache );`
	`125`	`+ globalProxyConfig.getEgressSites(), proxySitesCache );`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Override`
`@@ -165,7 +165,8 @@ public ListingJob createListingJob( final ConcreteResource resource, final Trans`
`165`	`165`	`{`
`166`	`166`	`return new HttpListing( getUrl( resource ),`
`167`	`167`	`new ConcreteResource( getHttpLocation( resource.getLocation(), listing ),`
`168`		`- resource.getPath() ), http, proxySitesCache );`
	`168`	`+ resource.getPath() ), http, globalProxyConfig.getEgressSites(),`
	`169`	`+ proxySitesCache );`
`169`	`170`	`}`
`170`	`171`
`171`	`172`	`private HttpLocation getHttpLocation( final Location repository, HttpJobType httpJobType )`
`@@ -189,7 +190,7 @@ public ExistenceJob createExistenceJob( final ConcreteResource resource, final T`
`189`	`190`	`throws TransferException`
`190`	`191`	`{`
`191`	`192`	`return new HttpExistence( getUrl( resource ), getHttpLocation( resource.getLocation(), existence ), target,`
`192`		`- http, mapper, proxySitesCache );`
	`193`	`+ http, mapper, globalProxyConfig.getEgressSites(), proxySitesCache );`
`193`	`194`	`}`
`194`	`195`
`195`	`196`	`private String getUrl( final ConcreteResource resource )`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ public interface GlobalProxyConfig`
`27`	`27`	`String getUser();`
`28`	`28`
`29`	`29`	`List<String> getAllowHttpJobTypes();`
	`30`	`+`
	`31`	`+ List<String> getEgressSites();`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`import org.commonjava.maven.galley.transport.htcli.Http;`
`25`	`25`	`import org.commonjava.maven.galley.transport.htcli.model.HttpLocation;`
`26`	`26`
	`27`	`+import java.util.List;`
	`28`	`+`
`27`	`29`	`import static org.commonjava.o11yphant.trace.TraceManager.addFieldToActiveSpan;`
`28`	`30`
`29`	`31`	`public final class HttpExistence`
`@@ -38,13 +40,13 @@ public final class HttpExistence`
`38`	`40`	`public HttpExistence( final String url, final HttpLocation location, final Transfer transfer, final Http http,`
`39`	`41`	`final ObjectMapper mapper )`
`40`	`42`	`{`
`41`		`- this( url, location, transfer, http, mapper, null );`
	`43`	`+ this( url, location, transfer, http, mapper, null, null );`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`public HttpExistence( final String url, final HttpLocation location, final Transfer transfer, final Http http,`
`45`		`- final ObjectMapper mapper, ProxySitesCache proxySitesCache )`
	`47`	`+ final ObjectMapper mapper, final List<String> egressSites, ProxySitesCache proxySitesCache )`
`46`	`48`	`{`
`47`		`- super( url, location, http, proxySitesCache );`
	`49`	`+ super( url, location, http, egressSites, proxySitesCache );`
`48`	`50`	`this.transfer = transfer;`
`49`	`51`	`this.mapper = mapper;`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`import java.nio.charset.Charset;`
`38`	`38`	`import java.util.ArrayList;`
`39`	`39`	`import java.util.HashSet;`
	`40`	`+import java.util.List;`
`40`	`41`	`import java.util.Set;`
`41`	`42`
`42`	`43`	`import static org.apache.commons.io.IOUtils.closeQuietly;`
`@@ -60,13 +61,13 @@ public class HttpListing`
`60`	`61`
`61`	`62`	`public HttpListing( final String url, final ConcreteResource resource, final Http http )`
`62`	`63`	`{`
`63`		`- this( url, resource, http, null );`
	`64`	`+ this( url, resource, http, null, null );`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`public HttpListing( final String url, final ConcreteResource resource, final Http http,`
`67`		`- ProxySitesCache proxySitesCache )`
	`68`	`+ final List<String> egressSites, ProxySitesCache proxySitesCache )`
`68`	`69`	`{`
`69`		`- super( url, (HttpLocation) resource.getLocation(), http, proxySitesCache );`
	`70`	`+ super( url, (HttpLocation) resource.getLocation(), http, egressSites, proxySitesCache );`
`70`	`71`	`this.resource = resource;`
`71`	`72`	`}`
`72`	`73`