Merge pull request #2499 from yma96/master

Add egress.sites for Indy Config

Author: yma955

addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java

@@ -34,6 +34,7 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -155,7 +156,7 @@ private Transfer getTestHttpTransfer(final String path, final String content) th
         assertThat( transfer.exists(), equalTo( false ) );
 
         HttpDownload dl = new HttpDownload( url, location, transfer, new HashMap<>(), new EventMetadata(),
-                                            fixture.getHttp().getHttp(), new ObjectMapper(), true, metricRegistry, metricConfig, new NoOpProxySitesCache() );
+                                            fixture.getHttp().getHttp(), new ObjectMapper(), true, metricRegistry, metricConfig, new ArrayList<>(), new NoOpProxySitesCache() );
 
         return dl.call().getTransfer();
     }

pom.xml

@@ -94,14 +94,14 @@
     <indyModelVersion>1.5</indyModelVersion>
     <indyClientVersion>3.4.0</indyClientVersion>
     <atlasVersion>1.1.4</atlasVersion>
-    <galleyVersion>1.19</galleyVersion>
+    <galleyVersion>1.20-SNAPSHOT</galleyVersion>
     <weftVersion>1.24</weftVersion>
     <webdavVersion>3.2.1</webdavVersion>
     <!-- TODO: partyline is still needed for standalone mode, may be removed in future -->
     <partylineVersion>1.16</partylineVersion>
     <kojijiVersion>2.13</kojijiVersion>
     <rwxVersion>2.3</rwxVersion>
-    <jhttpcVersion>1.14</jhttpcVersion>
+    <jhttpcVersion>1.15-SNAPSHOT</jhttpcVersion>
     <httpTestserverVersion>1.5.1</httpTestserverVersion>
     <propulsorVersion>1.5</propulsorVersion>
     <auditQueryVersion>0.13.1</auditQueryVersion>

subsys/http/src/main/java/org/commonjava/indy/subsys/http/IndyGlobalProxyConfigProducer.java

@@ -56,20 +56,6 @@ public GlobalProxyConfig getGlobalProxyConfig()
     private void setupGlobalProxyConfig()
     {
         logger.debug( "Setup global proxy config, host: {}", defaultSiteConfig.getProxyHost() );
-        final String allowTypes = defaultSiteConfig.getProxyAllowHttpJobTypes();
-        final List<String> list = new ArrayList<>();
-        if ( isNotBlank( allowTypes ) )
-        {
-            String[] toks = allowTypes.split( "," );
-            for ( String s : toks )
-            {
-                s = s.trim();
-                if ( isNotBlank( s ) )
-                {
-                    list.add( s );
-                }
-            }
-        }
         globalProxyConfig = new GlobalProxyConfig()
         {
             @Override
@@ -93,16 +79,40 @@ public String getUser()
             @Override
             public List<String> getAllowHttpJobTypes()
             {
-                return list;
+                return getList( defaultSiteConfig.getProxyAllowHttpJobTypes() );
+            }
+
+            @Override
+            public List<String> getEgressSites()
+            {
+                return getList( defaultSiteConfig.getEgressSites() );
             }
 
             @Override
             public String toString()
             {
                 return String.format( "GlobalProxyConfig [host=%s, port=%s, allowHttpJobTypes=%s]", getHost(),
-                                      getPort(), allowTypes );
+                                      getPort(), defaultSiteConfig.getProxyAllowHttpJobTypes() );
             }
         };
         logger.debug( "Global proxy config produced: {}", globalProxyConfig );
     }
+
+    private List<String> getList( String value )
+    {
+        final List<String> list = new ArrayList<>();
+        if ( isNotBlank( value ) )
+        {
+            String[] toks = value.split( "," );
+            for ( String s : toks )
+            {
+                s = s.trim();
+                if ( isNotBlank( s ) )
+                {
+                    list.add( s );
+                }
+            }
+        }
+        return list;
+    }
 }

subsys/http/src/main/java/org/commonjava/indy/subsys/http/conf/IndyHttpConfig.java

@@ -60,6 +60,8 @@ public class IndyHttpConfig
 
     public static final String PROXY_ALLOW_HTTP_JOB_TYPES = "proxy.allow.http.job.types";
 
+    public static final String EGRESS_SITES = "egress.sites";
+
     public static final String TRUST_TYPE = "trust.type";
 
     public static final String KEY_CERT_PEM = "key.cert.pem";
@@ -105,6 +107,7 @@ public void sectionComplete( String name ) throws ConfigurationException
                 case PROXY_PORT:
                 case PROXY_USER:
                 case PROXY_ALLOW_HTTP_JOB_TYPES:
+                case EGRESS_SITES:
                 case TRUST_TYPE:
                 case KEY_CERT_PEM:
                 case KEY_CERT_PEM_PATH:
@@ -227,6 +230,9 @@ private void withEntry( SiteConfigBuilder siteConfigBuilder, String realKey, Str
             case PROXY_ALLOW_HTTP_JOB_TYPES:
                 siteConfigBuilder.withProxyAllowHttpJobTypes( value );
                 break;
+            case EGRESS_SITES:
+                siteConfigBuilder.withEgressSites( value );
+                break;
             case TRUST_TYPE:
                 siteConfigBuilder.withTrustType( SiteTrustType.getType( value ) );
                 break;