follow redirects

lucee · Nov 4, 2024 · 8e86ce5 · 8e86ce5
1 parent 34252a0
commit 8e86ce5
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/core/src/main/java/lucee/runtime/mvn/POM.java b/core/src/main/java/lucee/runtime/mvn/POM.java
@@ -16,6 +16,7 @@
 import lucee.commons.io.res.Resource;
 import lucee.commons.lang.ExceptionUtil;
 import lucee.commons.lang.SerializableObject;
+import lucee.commons.lang.StringUtil;
 import lucee.commons.tree.TreeNode;
 import lucee.runtime.mvn.POMReader.Dependency;
 import lucee.runtime.op.Caster;
@@ -83,6 +84,13 @@ public static POM getInstance(Resource localDirectory, String groupId, String ar
 		return getInstance(localDirectory, null, groupId, artifactId, version, null, null, dependencyScope, SCOPE_ALL, log);
 	}
 
+	/*
+	 * public static void main(String[] args) throws IOException { Resource dir =
+	 * ResourcesImpl.getFileResourceProvider().getResource("/Users/mic/tmp9/mvn/"); POM pom =
+	 * getInstance(dir, "org.apache.maven", "maven-core", "3.8.1", SCOPE_COMPILE, null); pom.getJars();
+	 * }
+	 */
+
 	public static POM getInstance(Resource localDirectory, Collection<Repository> repositories, String groupId, String artifactId, String version, int dependencyScope,
 			int dependencyScopeManagement, Log log) {
 		return getInstance(localDirectory, null, groupId, artifactId, version, null, null, dependencyScope, dependencyScopeManagement, log);
@@ -148,13 +156,25 @@ void initXML() throws IOException {
 						throw ioe;
 					}
 					this.packaging = reader.getPackaging();
+					boolean custom = true;
 					this.artifactExtension = this.packaging;
-					if (artifactExtension == null || "bundle".equalsIgnoreCase(artifactExtension)) this.artifactExtension = "jar";
+					if (artifactExtension == null || "bundle".equalsIgnoreCase(artifactExtension)) {
+						custom = false;
+						this.artifactExtension = "jar";
+					}
+
 					this.name = reader.getName();
 					this.description = reader.getDescription();
 					this.url = reader.getURL();
 
-					if (this.artifactExtension != null && !"pom".equalsIgnoreCase(this.artifactExtension)) MavenUtil.download(this, initRepositories, artifactExtension, log);
+					if (this.artifactExtension != null && !"pom".equalsIgnoreCase(this.artifactExtension)) {
+						try {
+							MavenUtil.download(this, initRepositories, artifactExtension, log);
+						}
+						catch (IOException ioe) {
+							if (!custom) throw ioe;
+						}
+					}
 
 					isInitXML = true;
 				}
@@ -384,14 +404,28 @@ public URL getArtifact(String type, Collection<Repository> repositories) throws
 			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 			connection.setRequestMethod("HEAD");
 			int responseCode = connection.getResponseCode();
+
 			if (responseCode == 200) {
 				return url;
 			}
+			// TODO handle having more than one redirect
+			else if (responseCode == 301 || responseCode == 302) {
+				String newUrl = connection.getHeaderField("Location");
+				if (!StringUtil.isEmpty(newUrl, true)) {
+					url = new URL(newUrl);
+					connection = (HttpURLConnection) url.openConnection();
+					connection.setRequestMethod("HEAD");
+					responseCode = connection.getResponseCode();
+					if (responseCode == 200) {
+						return url;
+					}
+				}
+			}
 			if (sb == null) sb = new StringBuilder();
 			else sb.append(", ");
 			sb.append(url.toExternalForm());
 		}
-		throw new IOException("could not find a valid endpoint for [" + this + "], possibles endpoint are [" + sb + "]");
+		throw new IOException("could not find a valid endpoint [" + this + "] for type [" + type + "], possibles endpoint are [" + sb + "]");
 	}
 
 	@Override

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.151-SNAPSHOT"/>
+  <property name="version" value="6.2.0.152-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.151-SNAPSHOT</version>
+  <version>6.2.0.152-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/test/functions/createObject.cfc b/test/functions/createObject.cfc
@@ -131,7 +131,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 				expect(Observable.just("Hello").blockingFirst()).toBe("Hello");
 			});
 
-			/*it( title = "Checking the createObject(..,javasettings:{maven:...}) with maven-core", body = function( currentSpec ) {
+			it( title = "Checking the createObject(..,javasettings:{maven:...}) with maven-core", body = function( currentSpec ) {
 				var MavenCli=createObject("java","org.apache.maven.cli.MavenCli",{
 					"maven":[
 						{
@@ -142,7 +142,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 					]
 				});
 				expect(MavenCli.getClass().getSimpleName()).toEqual("MavenCli");
-			});*/
+			});