[MNG-7034] StackOverflowError thrown if a cycle exists in BOM imports

This closes #399
This commit is contained in:
Guillaume Nodet 2020-11-25 20:12:04 +01:00 committed by Michael Osipov
parent 95ee890837
commit be8ced6be3
2 changed files with 156 additions and 3 deletions

View File

@ -256,10 +256,16 @@ public DefaultModelBuilder setReportingConverter( ReportingConverter reportingCo
return this; return this;
} }
@SuppressWarnings( "checkstyle:methodlength" )
@Override @Override
public ModelBuildingResult build( ModelBuildingRequest request ) public ModelBuildingResult build( ModelBuildingRequest request )
throws ModelBuildingException throws ModelBuildingException
{
return build( request, new LinkedHashSet<>() );
}
@SuppressWarnings( "checkstyle:methodlength" )
protected ModelBuildingResult build( ModelBuildingRequest request, Collection<String> importIds )
throws ModelBuildingException
{ {
// phase 1 // phase 1
DefaultModelBuildingResult result = new DefaultModelBuildingResult(); DefaultModelBuildingResult result = new DefaultModelBuildingResult();
@ -449,7 +455,7 @@ else if ( !parentIds.add( parentData.getId() ) )
if ( !request.isTwoPhaseBuilding() ) if ( !request.isTwoPhaseBuilding() )
{ {
build( request, result ); build( request, result, importIds );
} }
return result; return result;
@ -1427,7 +1433,7 @@ private void importDependencyManagement( Model model, ModelBuildingRequest reque
final ModelBuildingResult importResult; final ModelBuildingResult importResult;
try try
{ {
importResult = build( importRequest ); importResult = build( importRequest, importIds );
} }
catch ( ModelBuildingException e ) catch ( ModelBuildingException e )
{ {

View File

@ -0,0 +1,147 @@
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.resolution.InvalidRepositoryException;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
/**
* @author Guillaume Nodet
*/
public class DefaultModelBuilderTest
{
private static final String BASE1_ID = "thegroup:base1:pom";
private static final String BASE1 = "<project>\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <groupId>thegroup</groupId>\n" +
" <artifactId>base1</artifactId>\n" +
" <version>1</version>\n" +
" <packaging>pom</packaging>\n" +
" <dependencyManagement>\n" +
" <dependencies>\n" +
" <dependency>\n" +
" <groupId>thegroup</groupId>\n" +
" <artifactId>base2</artifactId>\n" +
" <version>1</version>\n" +
" <type>pom</type>\n" +
" <scope>import</scope>\n" +
" </dependency>\n" +
" </dependencies>\n" +
" </dependencyManagement>\n" +
"</project>\n";
private static final String BASE2_ID = "thegroup:base2:pom";
private static final String BASE2 = "<project>\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <groupId>thegroup</groupId>\n" +
" <artifactId>base2</artifactId>\n" +
" <version>1</version>\n" +
" <packaging>pom</packaging>\n" +
" <dependencyManagement>\n" +
" <dependencies>\n" +
" <dependency>\n" +
" <groupId>thegroup</groupId>\n" +
" <artifactId>base1</artifactId>\n" +
" <version>1</version>\n" +
" <type>pom</type>\n" +
" <scope>import</scope>\n" +
" </dependency>\n" +
" </dependencies>\n" +
" </dependencyManagement>\n" +
"</project>\n";
@Test
public void testCycleInImports()
throws Exception
{
ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
assertNotNull( builder );
DefaultModelBuildingRequest request = new DefaultModelBuildingRequest();
request.setModelSource( new StringModelSource( BASE1 ) );
request.setModelResolver( new CycleInImportsResolver() );
assertThrows( ModelBuildingException.class, () -> builder.build( request ) );
}
static class CycleInImportsResolver extends BaseModelResolver
{
@Override
public ModelSource resolveModel(Dependency dependency) throws UnresolvableModelException
{
switch ( dependency.getManagementKey() )
{
case BASE1_ID: return new StringModelSource( BASE1 );
case BASE2_ID: return new StringModelSource( BASE2 );
}
return null;
}
}
static class BaseModelResolver implements ModelResolver
{
@Override
public ModelSource resolveModel( String groupId, String artifactId, String version )
throws UnresolvableModelException
{
return null;
}
@Override
public ModelSource resolveModel( Parent parent ) throws UnresolvableModelException
{
return null;
}
@Override
public ModelSource resolveModel( Dependency dependency ) throws UnresolvableModelException
{
return null;
}
@Override
public void addRepository( Repository repository ) throws InvalidRepositoryException
{
}
@Override
public void addRepository(Repository repository, boolean replace) throws InvalidRepositoryException
{
}
@Override
public ModelResolver newCopy()
{
return this;
}
}
}