mirror of https://github.com/apache/archiva.git
merge -r1098897 from 1.3.x branch (MRM-1468: Fix XSS vulnerability in Archiva, patch submitted by Marc Jansen Tan Chua)
additional changes: o added a factory for action validator manager since ObjectFactory.setObjectFactory(..) was removed in struts 2.1 so the unit tests for validation would work o fixed conflicts TODO: o fix some failing selenium tests due to error 500 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1099425 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching
parent
d72ee0c68b
commit
8fd13f6d0a
|
|
@ -26,7 +26,7 @@ import org.testng.annotations.Test;
|
|||
public class AppearanceTest
|
||||
extends AbstractArchivaTest
|
||||
{
|
||||
public void testAddAppearanceNullValues()
|
||||
public void testAddAppearanceEmptyValues()
|
||||
{
|
||||
goToAppearancePage();
|
||||
clickLinkWithText( "Edit" );
|
||||
|
|
@ -34,21 +34,51 @@ public class AppearanceTest
|
|||
assertTextPresent( "You must enter a name" );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceNullValues" } )
|
||||
public void testAddAppearanceValidValues()
|
||||
{
|
||||
addEditAppearance( "The Apache Software Foundation", "http://www.apache.org/",
|
||||
"http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "The Apache Software Foundation" );
|
||||
@Test( dependsOnMethods = { "testAddAppearanceEmptyValues" })
|
||||
public void testAddAppearanceInvalidValues()
|
||||
{
|
||||
addEditAppearance( "<>~+[ ]'\"" , "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"" , "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"" );
|
||||
assertTextPresent( "Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "You must enter a URL" );
|
||||
assertXpathCount("//span[@class='errorMessage' and text()='You must enter a URL']", 2);
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceValidValues" } )
|
||||
public void testEditAppearance()
|
||||
{
|
||||
clickLinkWithText( "Edit" );
|
||||
addEditAppearance( "Apache Software Foundation", "http://www.apache.org/",
|
||||
"http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "Apache Software Foundation" );
|
||||
@Test( dependsOnMethods = { "testAddAppearanceInvalidValues" })
|
||||
public void testAddAppearanceInvalidOrganisationName()
|
||||
{
|
||||
addEditAppearance( "<>~+[ ]'\"" , "http://www.apache.org/" , "http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceInvalidOrganisationName" })
|
||||
public void testAddAppearanceInvalidOrganisationUrl()
|
||||
{
|
||||
addEditAppearance( "The Apache Software Foundation" , "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"" , "http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "You must enter a URL" );
|
||||
assertXpathCount("//span[@class='errorMessage' and text()='You must enter a URL']", 1);
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceInvalidOrganisationUrl" })
|
||||
public void testAddAppearanceInvalidOrganisationLogo()
|
||||
{
|
||||
addEditAppearance( "The Apache Software Foundation" , "http://www.apache.org/" , "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"" );
|
||||
assertTextPresent( "You must enter a URL" );
|
||||
assertXpathCount("//span[@class='errorMessage' and text()='You must enter a URL']", 1);
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceInvalidOrganisationLogo" })
|
||||
public void testAddAppearanceValidValues()
|
||||
{
|
||||
addEditAppearance( "The Apache Software Foundation" , "http://www.apache.org/" , "http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "The Apache Software Foundation" );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddAppearanceValidValues" })
|
||||
public void testEditAppearance()
|
||||
{
|
||||
clickLinkWithText( "Edit" );
|
||||
addEditAppearance( "Apache Software Foundation" , "http://www.apache.org/" , "http://www.apache.org/images/asf_logo_wide.gifs" );
|
||||
assertTextPresent( "Apache Software Foundation" );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -165,4 +165,25 @@ public class ArtifactManagementTest
|
|||
deleteArtifact( "delete", "delete", "asdf", "internal" );
|
||||
assertTextPresent( "Invalid version." );
|
||||
}
|
||||
|
||||
// HTML select should have the proper value, else it will cause a selenium error: Option with label 'customValue' not found
|
||||
public void testDeleteArtifactInvalidValues()
|
||||
{
|
||||
deleteArtifact( "<> \\/~+[ ]'\"", "<> \\/~+[ ]'\"", "<>", "internal");
|
||||
assertTextPresent( "Invalid version." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
public void testDeleteArtifactInvalidGroupId()
|
||||
{
|
||||
deleteArtifact( "<> \\/~+[ ]'\"", "delete", "1.0", "internal");
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
public void testDeleteArtifactInvalidArtifactId()
|
||||
{
|
||||
deleteArtifact( "delete", "<> \\/~+[ ]'\"", "1.0", "internal");
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
}
|
||||
|
|
@ -72,4 +72,58 @@ public class LegacySupportTest
|
|||
addLegacyArtifactPath( "test", "test", "test", "1.0-SNAPSHOT", "testing", "" );
|
||||
assertTextPresent( "You must enter a type." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_NullType" })
|
||||
public void testAddLegacyArtifact_InvalidValues()
|
||||
{
|
||||
addLegacyArtifactPath( "<> ~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"");
|
||||
assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidValues" })
|
||||
public void testAddLegacyArtifact_InvalidLegacyPath()
|
||||
{
|
||||
addLegacyArtifactPath( "<> ~+[ ]'\"" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "jar");
|
||||
assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidLegacyPath" })
|
||||
public void testAddLegacyArtifact_InvalidGroupId()
|
||||
{
|
||||
addLegacyArtifactPath( "test" , "<> \\/~+[ ]'\"" , "test" , "1.0-SNAPSHOT" , "testing" , "jar");
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidGroupId" })
|
||||
public void testAddLegacyArtifact_InvalidArtifactId()
|
||||
{
|
||||
addLegacyArtifactPath( "test" , "test" , "<> \\/~+[ ]'\"" , "1.0-SNAPSHOT" , "testing" , "jar");
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidArtifactId" })
|
||||
public void testAddLegacyArtifact_InvalidVersion()
|
||||
{
|
||||
addLegacyArtifactPath( "test" , "test" , "test" , "<> \\/~+[ ]'\"" , "testing" , "jar");
|
||||
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidVersion" })
|
||||
public void testAddLegacyArtifact_InvalidType()
|
||||
{
|
||||
addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "<> \\/~+[ ]'\"");
|
||||
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddLegacyArtifact_InvalidType" })
|
||||
public void testAddLegacyArtifact_InvalidClassifier()
|
||||
{
|
||||
addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "<> \\/~+[ ]'\"" , "jar");
|
||||
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
}
|
||||
|
|
@ -60,7 +60,59 @@ public class NetworkProxiesTest
|
|||
assertTextPresent( "You must enter a host." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddNetworkProxiesNullHostname" } )
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesNullHostname" } )
|
||||
public void testAddNetworkProxiesInvalidValues()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "<> \\/~+[ ]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "0", "<> ~+[ ]'\"", "");
|
||||
assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
|
||||
assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Port needs to be larger than 1" );
|
||||
assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidValues" } )
|
||||
public void testAddNetworkProxiesInvalidIdentifier()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "<> \\/~+[ ]'\"", "http", "localhost", "8080", "", "");
|
||||
assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidIdentifier" } )
|
||||
public void testAddNetworkProxiesInvalidProtocol()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "testing123", "<> ~+[ ]'\"", "localhost", "8080", "", "");
|
||||
assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidProtocol" } )
|
||||
public void testAddNetworkProxiesInvalidHostname()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "testing123", "http", "<> ~+[ ]'\"", "8080", "", "");
|
||||
assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidHostname" } )
|
||||
public void testAddNetworkProxiesInvalidPort()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "testing123", "http", "localhost", "0", "", "");
|
||||
assertTextPresent( "Port needs to be larger than 1" );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidPort" } )
|
||||
public void testAddNetworkProxiesInvalidUsername()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "testing123", "http", "localhost", "8080", "<> ~+[ ]'\"", "");
|
||||
assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidUsername" } )
|
||||
public void testAddNetworkProxiesValidValues()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
|
|
|
|||
|
|
@ -37,19 +37,76 @@ public class RepositoryTest
|
|||
assertRepositoriesPage();
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddManagedRepoValidValues" } )
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
|
||||
public void testAddManagedRepoInvalidValues()
|
||||
{
|
||||
goToRepositoriesPage();
|
||||
getSelenium().open( "/archiva/admin/addRepository.action" );
|
||||
addManagedRepository( "", "", "", "", "Maven 2.x Repository", "", "", "" );
|
||||
assertTextPresent( "You must enter a repository identifier." );
|
||||
assertTextPresent( "You must enter a repository name." );
|
||||
assertTextPresent( "You must enter a directory." );
|
||||
getSelenium().open( "/archiva/admin/addRepository.action" ); ;
|
||||
addManagedRepository( "<> \\/~+[ ]'\"", "<>\\~+[]'\"" , "<> ~+[ ]'\"" , "<> ~+[ ]'\"", "Maven 2.x Repository", "", "-1", "101" );
|
||||
assertTextPresent( "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100.");
|
||||
assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0.");
|
||||
assertTextPresent( "Invalid cron expression." );
|
||||
}
|
||||
|
||||
@Test( dependsOnMethods = { "testAddManagedRepoInvalidValues" } )
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidValues" } )
|
||||
public void testAddManagedRepoInvalidIdentifier()
|
||||
{
|
||||
addManagedRepository( "<> \\/~+[ ]'\"", "name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" );
|
||||
assertTextPresent( "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidIdentifier" } )
|
||||
public void testAddManagedRepoInvalidRepoName()
|
||||
{
|
||||
addManagedRepository( "identifier", "<>\\~+[]'\"" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" );
|
||||
assertTextPresent( "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidRepoName" } )
|
||||
public void testAddManagedRepoInvalidDirectory()
|
||||
{
|
||||
addManagedRepository( "identifier", "name" , "<> ~+[ ]'\"" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" );
|
||||
assertTextPresent( "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidDirectory" } )
|
||||
public void testAddManagedRepoInvalidIndexDir()
|
||||
{
|
||||
addManagedRepository( "identifier", "name" , "/home" , "<> ~+[ ]'\"", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" );
|
||||
assertTextPresent( "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidIndexDir" } )
|
||||
public void testAddManagedRepoInvalidRetentionCount()
|
||||
{
|
||||
addManagedRepository( "identifier", "name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "101" );
|
||||
assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidRetentionCount" } )
|
||||
public void testAddManagedRepoInvalidDaysOlder()
|
||||
{
|
||||
addManagedRepository( "identifier", "name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "-1", "1" );
|
||||
assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoInvalidDaysOlder" } )
|
||||
public void testAddManagedRepoBlankValues()
|
||||
{
|
||||
goToRepositoriesPage();
|
||||
getSelenium().open( "/archiva/admin/addRepository.action" ); ;
|
||||
addManagedRepository( "", "" , "" , "", "Maven 2.x Repository", "", "", "" );
|
||||
assertTextPresent( "You must enter a repository identifier." );
|
||||
assertTextPresent( "You must enter a repository name." );
|
||||
assertTextPresent( "You must enter a directory." );
|
||||
assertTextPresent( "Invalid cron expression." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoBlankValues" } )
|
||||
public void testAddManagedRepoNoIdentifier()
|
||||
{
|
||||
addManagedRepository( "", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
|
||||
|
|
@ -88,8 +145,62 @@ public class RepositoryTest
|
|||
assertTextPresent( "Managed Repository Sample" );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testAddManagedRepoForEdit" } )
|
||||
public void testEditManagedRepoInvalidValues()
|
||||
{
|
||||
editManagedRepository("<>\\~+[]'\"" , "<> ~+[ ]'\"" , "<> ~+[ ]'\"", "Maven 2.x Repository", "", "-1", "101");
|
||||
assertTextPresent( "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100.");
|
||||
assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0.");
|
||||
assertTextPresent( "Invalid cron expression." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidValues" } )
|
||||
public void testEditManagedRepoInvalidRepoName()
|
||||
{
|
||||
editManagedRepository("<>\\~+[]'\"" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1");
|
||||
assertTextPresent( "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidRepoName" } )
|
||||
public void testEditManagedRepoInvalidDirectory()
|
||||
{
|
||||
editManagedRepository("name" , "<> ~+[ ]'\"" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1");
|
||||
assertTextPresent( "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidDirectory" } )
|
||||
public void testEditManagedRepoInvalidIndexDir()
|
||||
{
|
||||
editManagedRepository("name" , "/home" , "<> ~+[ ]'\"", "Maven 2.x Repository", "0 0 * * * ?", "1", "1");
|
||||
assertTextPresent( "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidIndexDir" } )
|
||||
public void testEditManagedRepoInvalidCron()
|
||||
{
|
||||
editManagedRepository("name" , "/home" , "/.index", "Maven 2.x Repository", "", "1", "1");
|
||||
assertTextPresent( "Invalid cron expression." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidCron" } )
|
||||
public void testEditManagedRepoInvalidRetentionCount()
|
||||
{
|
||||
editManagedRepository("name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "101");
|
||||
assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." );
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = { "testEditManagedRepoInvalidRetentionCount" } )
|
||||
public void testEditManagedRepoInvalidDaysOlder()
|
||||
{
|
||||
editManagedRepository("name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "-1", "1");
|
||||
assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." );
|
||||
}
|
||||
|
||||
// TODO
|
||||
@Test( dependsOnMethods = { "testAddManagedRepoForEdit" } )
|
||||
@Test( dependsOnMethods = { "testEditManagedRepoInvalidDaysOlder" } )
|
||||
public void testEditManagedRepo()
|
||||
{
|
||||
editManagedRepository( "repository.name", "Managed Repo" );
|
||||
|
|
|
|||
|
|
@ -0,0 +1,190 @@
|
|||
package org.apache.archiva.web.test;
|
||||
|
||||
/*
|
||||
* 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.testng.annotations.Test;
|
||||
import org.apache.archiva.web.test.parent.AbstractArchivaTest;
|
||||
|
||||
/**
|
||||
* Test all actions affected with XSS security issue.
|
||||
*/
|
||||
@Test( groups = { "xss" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
|
||||
public class XSSSecurityTest
|
||||
extends AbstractArchivaTest
|
||||
{
|
||||
public void testDeleteArtifactImmunityToURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/deleteArtifact!doDelete.action?groupId=\"/>1<script>alert('xss')</script>&artifactId=\"/>1<script>alert('xss')</script>&version=\"/>1<script>alert('xss')</script>&repositoryId=\"/>1<script>alert('xss')</script>");
|
||||
assertDeleteArtifactPage();
|
||||
assertTextPresent( "Invalid version." );
|
||||
assertTextPresent( "User is not authorized to delete artifacts in repository '\"/>1<script>alert('xss')</script>'." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Repository id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertElementValue("//input[@id='deleteArtifact_groupId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='deleteArtifact_artifactId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='deleteArtifact_version']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//select[@id='deleteArtifact_repositoryId']", "internal");
|
||||
}
|
||||
|
||||
public void testDeleteArtifactImmunityToEncodedURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/deleteArtifact!doDelete.action?groupId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&artifactId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&version=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&repositoryId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E");
|
||||
assertDeleteArtifactPage();
|
||||
assertTextPresent( "Invalid version." );
|
||||
assertTextPresent( "User is not authorized to delete artifacts in repository '\"/>1<script>alert('xss')</script>'." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Repository id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertElementValue("//input[@id='deleteArtifact_groupId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='deleteArtifact_artifactId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='deleteArtifact_version']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//select[@id='deleteArtifact_repositoryId']", "internal");
|
||||
}
|
||||
|
||||
public void testEditAppearanceImmunityToURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/configureAppearance.action?organisationName=<script>alert('xss')</script>&organisationUrl=<script>alert('xss')</script>&organisationLogo=<script>alert('xss')</script>");
|
||||
assertAppearancePage();
|
||||
assertXpathCount("//td[text()=\"<script>alert('xss')</script>\"]", 1);
|
||||
assertXpathCount("//code[text()=\"<script>alert('xss')</script>\"]", 2);
|
||||
|
||||
}
|
||||
|
||||
public void testEditAppearanceImmunityToEncodedURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/configureAppearance.action?organisationName=%3Cscript%3Ealert('xss')%3C%2Fscript%3E&organisationUrl=%3Cscript%3Ealert('xss')%3C%2Fscript%3E&organisationLogo=%3Cscript%3Ealert('xss')%3C%2Fscript%3E");
|
||||
assertAppearancePage();
|
||||
assertXpathCount("//td[text()=\"<script>alert('xss')</script>\"]", 1);
|
||||
assertXpathCount("//code[text()=\"<script>alert('xss')</script>\"]", 2);
|
||||
}
|
||||
|
||||
public void testAddLegacyArtifactImmunityToURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/addLegacyArtifactPath!commit.action?legacyArtifactPath.path=\"/>1<script>alert('xss')</script>&groupId=\"/>1<script>alert('xss')</script>&artifactId=\"/>1<script>alert('xss')</script>&version=\"/>1<script>alert('xss')</script>&classifier=\"/>1<script>alert('xss')</script>&type=\"/>1<script>alert('xss')</script>");
|
||||
assertAddLegacyArtifactPathPage();
|
||||
assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_legacyArtifactPath_path']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_artifactId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_version']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_groupId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_classifier']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_type']", "\"/>1<script>alert('xss')</script>");
|
||||
}
|
||||
|
||||
public void testAddLegacyArtifactImmunityToEncodedURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/addLegacyArtifactPath!commit.action?legacyArtifactPath.path=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&groupId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&artifactId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&version=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&classifier=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&type=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E");
|
||||
assertAddLegacyArtifactPathPage();
|
||||
assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_legacyArtifactPath_path']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_artifactId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_version']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_groupId']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_classifier']", "\"/>1<script>alert('xss')</script>");
|
||||
assertElementValue("//input[@id='addLegacyArtifactPath_type']", "\"/>1<script>alert('xss')</script>");
|
||||
}
|
||||
|
||||
public void testDeleteNetworkProxyImmunityToURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/deleteNetworkProxy!confirm.action?proxyid=\"/>1<script>alert('xss')</script>");
|
||||
assertTextPresent( "Security Alert - Invalid Token Found" );
|
||||
assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." );
|
||||
}
|
||||
|
||||
public void testDeleteNetworkProxyImmunityToEncodedURLCrossSiteScripting()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/deleteNetworkProxy!confirm.action?proxyid=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E");
|
||||
assertTextPresent( "Security Alert - Invalid Token Found" );
|
||||
assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." );
|
||||
}
|
||||
|
||||
public void testAddManagedRepositoryImmunityToInputFieldCrossSiteScripting()
|
||||
{
|
||||
goToRepositoriesPage();
|
||||
getSelenium().open( "/archiva/admin/addRepository.action" );
|
||||
addManagedRepository( "test\"><script>alert('xss')</script>", "test\"><script>alert('xss')</script>" , "test\"><script>alert('xss')</script>" , "test\"><script>alert('xss')</script>", "Maven 2.x Repository", "", "-1", "101" );
|
||||
// xss inputs are blocked by validation.
|
||||
assertTextPresent( "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100.");
|
||||
assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0.");
|
||||
assertTextPresent( "Invalid cron expression." );
|
||||
}
|
||||
|
||||
public void testEditAppearanceImmunityToInputFieldCrossSiteScripting()
|
||||
{
|
||||
goToAppearancePage();
|
||||
clickLinkWithText( "Edit" );
|
||||
addEditAppearance( "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" );
|
||||
// xss inputs are blocked by validation.
|
||||
assertTextPresent( "Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "You must enter a URL" );
|
||||
assertXpathCount("//span[@class='errorMessage' and text()='You must enter a URL']", 2);
|
||||
}
|
||||
|
||||
public void testEditAppearanceImmunityToCrossSiteScriptingRendering()
|
||||
{
|
||||
goToAppearancePage();
|
||||
clickLinkWithText( "Edit" );
|
||||
addEditAppearance( "xss" , "http://\">test<script>alert(\"xss\")</script>" , "http://\">test<script>alert(\"xss\")</script>" );
|
||||
// escaped html/url prevents cross-site scripting exploits
|
||||
assertXpathCount("//td[text()=\"xss\"]", 1);
|
||||
assertXpathCount("//code[text()='http://\">test<script>alert(\"xss\")</script>']", 2);
|
||||
}
|
||||
|
||||
public void testAddLegacyArtifactPathImmunityToInputFieldCrossSiteScripting()
|
||||
{
|
||||
goToLegacySupportPage();
|
||||
clickLinkWithText( "Add" );
|
||||
addLegacyArtifactPath( "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>" , "test<script>alert('xss')</script>");
|
||||
// xss inputs are blocked by validation.
|
||||
assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
|
||||
public void testAddNetworkProxyImmunityToInputFieldCrossSiteScripting()
|
||||
{
|
||||
goToNetworkProxiesPage();
|
||||
addNetworkProxy( "test<script>alert('xss')</script>", "test<script>alert('xss')</script>", "test<script>alert('xss')</script>", "test<script>alert('xss')</script>", "test<script>alert('xss')</script>", "");
|
||||
// xss inputs are blocked by validation.
|
||||
assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
|
||||
assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
|
||||
assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
|
||||
assertTextPresent( "Invalid field value for field \"proxy.port\"." );
|
||||
assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
|
||||
}
|
||||
}
|
||||
|
|
@ -562,6 +562,104 @@ public abstract class AbstractArchivaTest
|
|||
clickButtonWithValue( "Add Repository" );
|
||||
}
|
||||
|
||||
// artifact management
|
||||
public void assertDeleteArtifactPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Delete Artifact" );
|
||||
assertTextPresent( "Delete Artifact" );
|
||||
assertTextPresent( "Group Id*:" );
|
||||
assertTextPresent( "Artifact Id*:" );
|
||||
assertTextPresent( "Version*:" );
|
||||
assertTextPresent( "Repository Id:" );
|
||||
assertElementPresent( "groupId" );
|
||||
assertElementPresent( "artifactId" );
|
||||
assertElementPresent( "version" );
|
||||
assertElementPresent( "repositoryId" );
|
||||
assertButtonWithValuePresent( "Submit" );
|
||||
}
|
||||
|
||||
// network proxies
|
||||
public void goToNetworkProxiesPage()
|
||||
{
|
||||
clickLinkWithText( "Network Proxies" );
|
||||
assertNetworkProxiesPage();
|
||||
}
|
||||
|
||||
public void assertNetworkProxiesPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Administration - Network Proxies" );
|
||||
assertTextPresent( "Administration - Network Proxies" );
|
||||
assertTextPresent( "Network Proxies" );
|
||||
assertLinkPresent( "Add Network Proxy" );
|
||||
}
|
||||
|
||||
public void addNetworkProxy( String identifier, String protocol, String hostname, String port, String username, String password )
|
||||
{
|
||||
//goToNetworkProxiesPage();
|
||||
clickLinkWithText( "Add Network Proxy" );
|
||||
assertAddNetworkProxy();
|
||||
setFieldValue( "proxy.id" , identifier );
|
||||
setFieldValue( "proxy.protocol" , protocol );
|
||||
setFieldValue( "proxy.host" , hostname );
|
||||
setFieldValue( "proxy.port" , port );
|
||||
setFieldValue( "proxy.username" , username );
|
||||
setFieldValue( "proxy.password" , password );
|
||||
clickButtonWithValue( "Save Network Proxy" );
|
||||
}
|
||||
|
||||
public void assertAddNetworkProxy()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Admin: Add Network Proxy" );
|
||||
assertTextPresent( "Admin: Add Network Proxy" );
|
||||
assertTextPresent( "Add network proxy:" );
|
||||
assertTextPresent( "Identifier*:" );
|
||||
assertTextPresent( "Protocol*:" );
|
||||
assertTextPresent( "Hostname*:" );
|
||||
assertTextPresent( "Port*:" );
|
||||
assertTextPresent( "Username:" );
|
||||
assertTextPresent( "Password:" );
|
||||
assertButtonWithValuePresent( "Save Network Proxy" );
|
||||
}
|
||||
|
||||
// Legacy Support
|
||||
public void goToLegacySupportPage()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/legacyArtifactPath.action" );
|
||||
assertLegacySupportPage();
|
||||
}
|
||||
|
||||
public void assertLegacySupportPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Administration - Legacy Support" );
|
||||
assertTextPresent( "Administration - Legacy Artifact Path Resolution" );
|
||||
assertTextPresent( "Path Mappings" );
|
||||
assertLinkPresent( "Add" );
|
||||
}
|
||||
|
||||
public void addLegacyArtifactPath( String path, String groupId, String artifactId, String version, String classifier, String type)
|
||||
{
|
||||
assertAddLegacyArtifactPathPage();
|
||||
setFieldValue( "legacyArtifactPath.path" , path );
|
||||
setFieldValue( "groupId" , groupId );
|
||||
setFieldValue( "artifactId" , artifactId );
|
||||
setFieldValue( "version" , version );
|
||||
setFieldValue( "classifier" , classifier );
|
||||
setFieldValue( "type" , type );
|
||||
clickButtonWithValue( "Add Legacy Artifact Path" );
|
||||
}
|
||||
|
||||
public void assertAddLegacyArtifactPathPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Admin: Add Legacy Artifact Path" );
|
||||
assertTextPresent( "Admin: Add Legacy Artifact Path" );
|
||||
assertTextPresent( "Enter the legacy path to map to a particular artifact reference, then adjust the fields as necessary." );
|
||||
String element = "addLegacyArtifactPath_legacyArtifactPath_path,addLegacyArtifactPath_groupId,addLegacyArtifactPath_artifactId,addLegacyArtifactPath_version,addLegacyArtifactPath_classifier,addLegacyArtifactPath_type";
|
||||
String[] arrayElement = element.split( "," );
|
||||
for ( String arrayelement : arrayElement )
|
||||
assertElementPresent( arrayelement );
|
||||
assertButtonWithValuePresent( "Add Legacy Artifact Path" );
|
||||
}
|
||||
|
||||
// add managed repository and its staging repository
|
||||
public void addStagingRepository( String identifier, String name, String directory, String indexDirectory,
|
||||
String type, String cron, String daysOlder, String retentionCount )
|
||||
|
|
|
|||
|
|
@ -74,60 +74,4 @@ public abstract class AbstractArtifactManagementTest
|
|||
selectValue( "repositoryId", repositoryId );
|
||||
clickButtonWithValue( "Submit" );
|
||||
}
|
||||
|
||||
public void assertDeleteArtifactPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Delete Artifact" );
|
||||
assertTextPresent( "Delete Artifact" );
|
||||
assertTextPresent( "Group Id*:" );
|
||||
assertTextPresent( "Artifact Id*:" );
|
||||
assertTextPresent( "Version*:" );
|
||||
assertTextPresent( "Repository Id:" );
|
||||
assertElementPresent( "groupId" );
|
||||
assertElementPresent( "artifactId" );
|
||||
assertElementPresent( "version" );
|
||||
assertElementPresent( "repositoryId" );
|
||||
assertButtonWithValuePresent( "Submit" );
|
||||
}
|
||||
|
||||
// Legacy Support
|
||||
public void goToLegacySupportPage()
|
||||
{
|
||||
getSelenium().open( "/archiva/admin/legacyArtifactPath.action" );
|
||||
assertLegacySupportPage();
|
||||
}
|
||||
|
||||
public void assertLegacySupportPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Administration - Legacy Support" );
|
||||
assertTextPresent( "Administration - Legacy Artifact Path Resolution" );
|
||||
assertTextPresent( "Path Mappings" );
|
||||
assertLinkPresent( "Add" );
|
||||
}
|
||||
|
||||
public void addLegacyArtifactPath( String path, String groupId, String artifactId, String version,
|
||||
String classifier, String type )
|
||||
{
|
||||
assertAddLegacyArtifactPathPage();
|
||||
setFieldValue( "legacyArtifactPath.path", path );
|
||||
setFieldValue( "groupId", groupId );
|
||||
setFieldValue( "artifactId", artifactId );
|
||||
setFieldValue( "version", version );
|
||||
setFieldValue( "classifier", classifier );
|
||||
setFieldValue( "type", type );
|
||||
clickButtonWithValue( "Add Legacy Artifact Path" );
|
||||
}
|
||||
|
||||
public void assertAddLegacyArtifactPathPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Admin: Add Legacy Artifact Path" );
|
||||
assertTextPresent( "Admin: Add Legacy Artifact Path" );
|
||||
assertTextPresent( "Enter the legacy path to map to a particular artifact reference, then adjust the fields as necessary." );
|
||||
String element =
|
||||
"addLegacyArtifactPath_legacyArtifactPath_path,addLegacyArtifactPath_groupId,addLegacyArtifactPath_artifactId,addLegacyArtifactPath_version,addLegacyArtifactPath_classifier,addLegacyArtifactPath_type";
|
||||
String[] arrayElement = element.split( "," );
|
||||
for ( String arrayelement : arrayElement )
|
||||
assertElementPresent( arrayelement );
|
||||
assertButtonWithValuePresent( "Add Legacy Artifact Path" );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,48 +181,6 @@ public abstract class AbstractRepositoryTest
|
|||
// /////////////////////////////
|
||||
// network proxies
|
||||
// /////////////////////////////
|
||||
public void goToNetworkProxiesPage()
|
||||
{
|
||||
clickLinkWithText( "Network Proxies" );
|
||||
assertNetworkProxiesPage();
|
||||
}
|
||||
|
||||
public void assertNetworkProxiesPage()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Administration - Network Proxies" );
|
||||
assertTextPresent( "Administration - Network Proxies" );
|
||||
assertTextPresent( "Network Proxies" );
|
||||
assertLinkPresent( "Add Network Proxy" );
|
||||
}
|
||||
|
||||
public void assertAddNetworkProxy()
|
||||
{
|
||||
assertPage( "Apache Archiva \\ Admin: Add Network Proxy" );
|
||||
assertTextPresent( "Admin: Add Network Proxy" );
|
||||
assertTextPresent( "Add network proxy:" );
|
||||
assertTextPresent( "Identifier*:" );
|
||||
assertTextPresent( "Protocol*:" );
|
||||
assertTextPresent( "Hostname*:" );
|
||||
assertTextPresent( "Port*:" );
|
||||
assertTextPresent( "Username:" );
|
||||
assertTextPresent( "Password:" );
|
||||
assertButtonWithValuePresent( "Save Network Proxy" );
|
||||
}
|
||||
|
||||
public void addNetworkProxy( String identifier, String protocol, String hostname, String port, String username,
|
||||
String password )
|
||||
{
|
||||
// goToNetworkProxiesPage();
|
||||
clickLinkWithText( "Add Network Proxy" );
|
||||
assertAddNetworkProxy();
|
||||
setFieldValue( "proxy.id", identifier );
|
||||
setFieldValue( "proxy.protocol", protocol );
|
||||
setFieldValue( "proxy.host", hostname );
|
||||
setFieldValue( "proxy.port", port );
|
||||
setFieldValue( "proxy.username", username );
|
||||
setFieldValue( "proxy.password", password );
|
||||
clickButtonWithValue( "Save Network Proxy" );
|
||||
}
|
||||
|
||||
public void editNetworkProxies( String fieldName, String value )
|
||||
{
|
||||
|
|
@ -307,6 +265,21 @@ public abstract class AbstractRepositoryTest
|
|||
clickButtonWithValue( "Update Repository" );
|
||||
}
|
||||
|
||||
public void editManagedRepository(String name, String directory, String indexDirectory, String type, String cron, String daysOlder, String retentionCount)
|
||||
{
|
||||
goToRepositoriesPage();
|
||||
clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
|
||||
assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
|
||||
setFieldValue( "repository.name" , name );
|
||||
setFieldValue( "repository.location" , directory );
|
||||
setFieldValue( "repository.indexDir" , indexDirectory );
|
||||
selectValue( "repository.layout", type );
|
||||
setFieldValue( "repository.refreshCronExpression" , cron );
|
||||
setFieldValue( "repository.daysOlder" , daysOlder );
|
||||
setFieldValue( "repository.retentionCount" , retentionCount );
|
||||
clickButtonWithValue( "Update Repository" );
|
||||
}
|
||||
|
||||
public void deleteManagedRepository()
|
||||
{
|
||||
clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[2]" );
|
||||
|
|
|
|||
|
|
@ -403,4 +403,14 @@ public abstract class AbstractSeleniumTest
|
|||
Assert.assertFalse( getSelenium().isChecked( locator ) );
|
||||
}
|
||||
|
||||
public void assertXpathCount(String locator, int expectedCount)
|
||||
{
|
||||
Assert.assertEquals( getSelenium().getXpathCount(locator).intValue(), expectedCount );
|
||||
}
|
||||
|
||||
public void assertElementValue(String locator, String expectedValue)
|
||||
{
|
||||
Assert.assertEquals(getSelenium().getValue(locator), expectedValue);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -31,6 +31,7 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
|
|||
import org.apache.archiva.metadata.repository.MetadataResolutionException;
|
||||
import org.apache.archiva.metadata.repository.RepositorySession;
|
||||
import org.apache.archiva.repository.events.RepositoryListener;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.maven.archiva.common.utils.VersionComparator;
|
||||
import org.apache.maven.archiva.common.utils.VersionUtil;
|
||||
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
|
||||
|
|
@ -390,6 +391,9 @@ public class DeleteArtifactAction
|
|||
{
|
||||
addActionError( e.getMessage() );
|
||||
}
|
||||
|
||||
// trims all request parameter values, since the trailing/leading white-spaces are ignored during validation.
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
private List<String> getManagableRepos()
|
||||
|
|
@ -414,6 +418,29 @@ public class DeleteArtifactAction
|
|||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if( StringUtils.isNotEmpty(groupId))
|
||||
{
|
||||
groupId = groupId.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(artifactId))
|
||||
{
|
||||
artifactId = artifactId.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(version))
|
||||
{
|
||||
version = version.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repositoryId))
|
||||
{
|
||||
repositoryId = repositoryId.trim();
|
||||
}
|
||||
}
|
||||
|
||||
public List<RepositoryListener> getListeners()
|
||||
{
|
||||
return listeners;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ package org.apache.maven.archiva.web.action.admin.appearance;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import com.opensymphony.xwork2.Validateable;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.maven.archiva.configuration.Configuration;
|
||||
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
|
||||
import org.apache.maven.archiva.configuration.OrganisationInformation;
|
||||
|
|
@ -38,7 +40,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
|
|||
*/
|
||||
public class EditOrganisationInfoAction
|
||||
extends AbstractAppearanceAction
|
||||
implements SecureAction
|
||||
implements SecureAction, Validateable
|
||||
{
|
||||
@Override
|
||||
public String execute()
|
||||
|
|
@ -70,4 +72,28 @@ public class EditOrganisationInfoAction
|
|||
bundle.addRequiredAuthorization( ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, Resource.GLOBAL );
|
||||
return bundle;
|
||||
}
|
||||
|
||||
public void validate()
|
||||
{
|
||||
// trim all unecessary trailing/leading white-spaces; always put this statement before the closing braces(after all validation).
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if(StringUtils.isNotEmpty(super.getOrganisationName()))
|
||||
{
|
||||
super.setOrganisationName(super.getOrganisationName().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(super.getOrganisationUrl()))
|
||||
{
|
||||
super.setOrganisationUrl(super.getOrganisationUrl().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(super.getOrganisationLogo()))
|
||||
{
|
||||
super.setOrganisationLogo(super.getOrganisationLogo().trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ import org.apache.maven.archiva.repository.ManagedRepositoryContent;
|
|||
import org.codehaus.plexus.registry.RegistryException;
|
||||
|
||||
import com.opensymphony.xwork2.Preparable;
|
||||
import com.opensymphony.xwork2.Validateable;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.maven.archiva.web.action.PlexusActionSupport;
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +40,7 @@ import org.apache.maven.archiva.web.action.PlexusActionSupport;
|
|||
*/
|
||||
public class AddLegacyArtifactPathAction
|
||||
extends PlexusActionSupport
|
||||
implements Preparable
|
||||
implements Preparable, Validateable
|
||||
{
|
||||
/**
|
||||
* @plexus.requirement
|
||||
|
|
@ -110,6 +112,12 @@ public class AddLegacyArtifactPathAction
|
|||
this.legacyArtifactPath = legacyArtifactPath;
|
||||
}
|
||||
|
||||
public void validate()
|
||||
{
|
||||
// trim all unecessary trailing/leading white-spaces; always put this statement before the closing braces(after all validation).
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
protected String saveConfiguration( Configuration configuration )
|
||||
{
|
||||
try
|
||||
|
|
@ -131,6 +139,39 @@ public class AddLegacyArtifactPathAction
|
|||
return SUCCESS;
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if(StringUtils.isNotEmpty(legacyArtifactPath.getPath()))
|
||||
{
|
||||
legacyArtifactPath.setPath(legacyArtifactPath.getPath().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(groupId))
|
||||
{
|
||||
groupId = groupId.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(artifactId))
|
||||
{
|
||||
artifactId = artifactId.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(version))
|
||||
{
|
||||
version = version.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(classifier))
|
||||
{
|
||||
classifier = classifier.trim();
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(type))
|
||||
{
|
||||
type = type.trim();
|
||||
}
|
||||
}
|
||||
|
||||
public String getGroupId()
|
||||
{
|
||||
return groupId;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ package org.apache.maven.archiva.web.action.admin.networkproxies;
|
|||
*/
|
||||
|
||||
import com.opensymphony.xwork2.Preparable;
|
||||
import com.opensymphony.xwork2.Validateable;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.collections.functors.NotPredicate;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
|
@ -44,7 +45,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionException;
|
|||
*/
|
||||
public class ConfigureNetworkProxyAction
|
||||
extends PlexusActionSupport
|
||||
implements SecureAction, Preparable
|
||||
implements SecureAction, Preparable, Validateable
|
||||
{
|
||||
/**
|
||||
* @plexus.requirement
|
||||
|
|
@ -169,6 +170,12 @@ public class ConfigureNetworkProxyAction
|
|||
return saveConfiguration();
|
||||
}
|
||||
|
||||
public void validate()
|
||||
{
|
||||
// trim all unecessary trailing/leading white-spaces; always put this statement before the closing braces(after all validation).
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
public void setMode( String mode )
|
||||
{
|
||||
this.mode = mode;
|
||||
|
|
@ -225,4 +232,32 @@ public class ConfigureNetworkProxyAction
|
|||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if(StringUtils.isNotEmpty(proxy.getId()))
|
||||
{
|
||||
proxy.setId(proxy.getId().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(proxy.getHost()))
|
||||
{
|
||||
proxy.setHost(proxy.getHost().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(proxy.getPassword()))
|
||||
{
|
||||
proxy.setPassword(proxy.getPassword().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(proxy.getProtocol()))
|
||||
{
|
||||
proxy.setProtocol(proxy.getProtocol().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(proxy.getUsername()))
|
||||
{
|
||||
proxy.setUsername(proxy.getUsername().trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import org.codehaus.plexus.scheduler.CronExpressionValidator;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
||||
/**
|
||||
* AddManagedRepositoryAction
|
||||
|
|
@ -176,6 +177,32 @@ public class AddManagedRepositoryAction
|
|||
{
|
||||
addFieldError( "repository.refreshCronExpression", "Invalid cron expression." );
|
||||
}
|
||||
|
||||
// trim all unecessary trailing/leading white-spaces; always put this statement before the closing braces(after all validation).
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if(StringUtils.isNotEmpty(repository.getId()))
|
||||
{
|
||||
repository.setId(repository.getId().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getName()))
|
||||
{
|
||||
repository.setName(repository.getName().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getLocation()))
|
||||
{
|
||||
repository.setLocation(repository.getLocation().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getIndexDir()))
|
||||
{
|
||||
repository.setIndexDir(repository.getIndexDir().trim());
|
||||
}
|
||||
}
|
||||
|
||||
public ManagedRepositoryConfiguration getRepository()
|
||||
|
|
|
|||
|
|
@ -232,6 +232,31 @@ public class EditManagedRepositoryAction
|
|||
{
|
||||
addFieldError( "repository.refreshCronExpression", "Invalid cron expression." );
|
||||
}
|
||||
|
||||
trimAllRequestParameterValues();
|
||||
}
|
||||
|
||||
private void trimAllRequestParameterValues()
|
||||
{
|
||||
if(StringUtils.isNotEmpty(repository.getId()))
|
||||
{
|
||||
repository.setId(repository.getId().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getName()))
|
||||
{
|
||||
repository.setName(repository.getName().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getLocation()))
|
||||
{
|
||||
repository.setLocation(repository.getLocation().trim());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotEmpty(repository.getIndexDir()))
|
||||
{
|
||||
repository.setIndexDir(repository.getIndexDir().trim());
|
||||
}
|
||||
}
|
||||
|
||||
public String getRepoid()
|
||||
|
|
@ -261,6 +286,7 @@ public class EditManagedRepositoryAction
|
|||
|
||||
public void setStageNeeded( boolean stageNeeded )
|
||||
{
|
||||
|
||||
this.stageNeeded = stageNeeded;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,20 +21,40 @@
|
|||
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
|
||||
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
|
||||
|
||||
<!-- validate temporarily-trimmed inputs, actual values are then carried over to the action class to be trimmed once more. -->
|
||||
<validators>
|
||||
<field name="groupId">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a groupId.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="artifactId">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter an artifactId.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<!-- version's validation is inside the validate() method of the action class -->
|
||||
<field name="version">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a version.</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
</field>
|
||||
<field name="repositoryId">
|
||||
<!-- no requiredstring validation, because there was none before(being consistent). -->
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]*$</param>
|
||||
<message>Repository id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
</validators>
|
||||
|
|
@ -26,6 +26,11 @@
|
|||
<field-validator type="requiredstring">
|
||||
<message>You must enter a name</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^([-a-zA-Z0-9._/~:?!&=\\]|\s)+$</param>
|
||||
<message>Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="organisationUrl">
|
||||
<field-validator type="url">
|
||||
|
|
|
|||
|
|
@ -21,30 +21,64 @@
|
|||
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
|
||||
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
|
||||
|
||||
<!-- validate temporarily-trimmed inputs, actual values are then carried over to the action class to be trimmed once more. -->
|
||||
<validators>
|
||||
<field name="legacyArtifactPath.path">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a legacy path.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/\\]+$</param>
|
||||
<message>Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\), underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="groupId">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a groupId.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="artifactId">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter an artifactId.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="version">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a version.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="classifier">
|
||||
<!-- no requiredstring validation, because there was none before(being consistent). -->
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]*$</param>
|
||||
<message>Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="type">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a type.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
</validators>
|
||||
|
|
@ -35,18 +35,33 @@
|
|||
<param name="trim">true</param>
|
||||
<message>You must enter an identifier of 4 or more than 4 characters.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="proxy.protocol">
|
||||
<field-validator type="requiredstring">
|
||||
<param name="trim">true</param>
|
||||
<message>You must enter a protocol.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9./:\\]+$</param>
|
||||
<message>Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\), dots(.), colons(:), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="proxy.host">
|
||||
<field-validator type="requiredstring">
|
||||
<param name="trim">true</param>
|
||||
<message>You must enter a host.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
|
||||
<message>Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="proxy.port">
|
||||
<field-validator type="required">
|
||||
|
|
@ -60,5 +75,18 @@
|
|||
-->
|
||||
<message>Port needs to be larger than ${min}</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[0-9]+$</param>
|
||||
<message>Port must only contain numeric characters.</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="proxy.username">
|
||||
<!-- no requiredstring validation, because there was none before(being consistent). -->
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9.@/_\\]*$</param>
|
||||
<message>Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\), underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
</validators>
|
||||
|
|
|
|||
|
|
@ -26,16 +26,39 @@
|
|||
<field-validator type="requiredstring">
|
||||
<message>You must enter a repository identifier.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.location">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a directory.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
|
||||
<message>Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.indexDir">
|
||||
<!-- no requiredstring validation, because there was none before(being consistent). -->
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
|
||||
<message>Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.name">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a repository name.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
|
||||
<message>Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.retentionCount">
|
||||
<field-validator type="int">
|
||||
|
|
|
|||
|
|
@ -26,28 +26,51 @@
|
|||
<field-validator type="requiredstring">
|
||||
<message>You must enter a repository identifier.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[a-zA-Z0-9._-]+$</param>
|
||||
<message>Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.location">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a directory.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
|
||||
<message>Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.indexDir">
|
||||
<!-- no requiredstring validation, because there was none before(being consistent). -->
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
|
||||
<message>Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.name">
|
||||
<field-validator type="requiredstring">
|
||||
<message>You must enter a repository name.</message>
|
||||
</field-validator>
|
||||
<field-validator type="regex">
|
||||
<param name="trim">true</param>
|
||||
<param name="expression">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
|
||||
<message>Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).</message>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.retentionCount">
|
||||
<field-validator type="int">
|
||||
<param name="min">1</param>
|
||||
<param name="max">100</param>
|
||||
<message>Repository Purge By Retention Count needs to be between ${min} and ${max}.</message>
|
||||
</field-validator>
|
||||
</field-validator>
|
||||
</field>
|
||||
<field name="repository.daysOlder">
|
||||
<field-validator type="int">
|
||||
<param name="min">0</param>
|
||||
<message>Repository Purge By Days Older Than needs to be larger than ${min}.</message>
|
||||
</field-validator>
|
||||
</field-validator>
|
||||
</field>
|
||||
</validators>
|
||||
|
|
|
|||
|
|
@ -66,8 +66,22 @@
|
|||
}
|
||||
</script>
|
||||
|
||||
<s:actionmessage/>
|
||||
<s:actionerror/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
|
||||
<s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
|
||||
<s:textfield name="groupId" label="GroupId" size="20" required="true"/>
|
||||
|
|
|
|||
|
|
@ -31,8 +31,21 @@
|
|||
<h1>Admin: Add Managed Repository</h1>
|
||||
|
||||
<div id="contentArea">
|
||||
<s:actionerror/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
|
||||
<s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
|
||||
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
|
||||
|
|
|
|||
|
|
@ -40,29 +40,30 @@
|
|||
<a href="<s:url action='editAppearance' />">Change your appearance</a>
|
||||
</p>
|
||||
|
||||
<%-- used c:out in displaying EL's so that they are escaped --%>
|
||||
<h3>Organization Information</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<td>${organisationName}</td>
|
||||
<td><c:out value="${organisationName}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>URL</th>
|
||||
<td><a href="${organisationUrl}">
|
||||
<code>${organisationUrl}</code>
|
||||
<td><a href='<c:out value="${organisationUrl}" />'>
|
||||
<code><c:out value="${organisationUrl}" /></code>
|
||||
</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Logo URL</th>
|
||||
<td>
|
||||
<code>${organisationLogo}</code>
|
||||
<code><c:out value="${organisationLogo}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<c:if test="${!empty (organisationLogo)}">
|
||||
<tr>
|
||||
<th> </th>
|
||||
<td><img src="${organisationLogo}"
|
||||
title="${organisationName}" border="0" alt="" /></td>
|
||||
<td><img src='<c:out value="${organisationLogo}" />'
|
||||
title='<c:out value="${organisationName}" />' border="0" alt="" /></td>
|
||||
</tr>
|
||||
</c:if>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -46,23 +46,24 @@
|
|||
the following managed repository?
|
||||
</p>
|
||||
|
||||
<%-- used c:out in displaying EL's so that they are escaped --%>
|
||||
<div class="infobox">
|
||||
<table class="infotable">
|
||||
<tr>
|
||||
<td>ID:</td>
|
||||
<td><code>${repository.id}</code></td>
|
||||
<td><code><c:out value="${repository.id}" /></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Name:</td>
|
||||
<td>${repository.name}</td>
|
||||
<td><c:out value="${repository.name}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Directory:</td>
|
||||
<td>${repository.location}</td>
|
||||
<td><c:out value="${repository.location}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Index Directory:</td>
|
||||
<td>${repository.indexDir}</td>
|
||||
<td><c:out value="${repository.indexDir}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Type:</td>
|
||||
|
|
@ -80,15 +81,15 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>Cron:</td>
|
||||
<td>${repository.refreshCronExpression}</td>
|
||||
<td><c:out value="${repository.refreshCronExpression}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Repository Purge By Days Older Than:</td>
|
||||
<td>${repository.daysOlder}</td>
|
||||
<td><c:out value="${repository.daysOlder}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Repository Purge By Retention Count:</td>
|
||||
<td>${repository.retentionCount}</td>
|
||||
<td><c:out value="${repository.retentionCount}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Releases Included:</td>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
<%@ page contentType="text/html; charset=UTF-8" %>
|
||||
<%@ taglib prefix="s" uri="/struts-tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
|
|
@ -30,7 +31,14 @@
|
|||
|
||||
<h1>Admin: Delete Network Proxy</h1>
|
||||
|
||||
<s:actionerror/>
|
||||
<%-- changed the structure of displaying errorMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div id="contentArea">
|
||||
|
||||
|
|
@ -39,9 +47,9 @@
|
|||
<blockquote>
|
||||
<strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
|
||||
</blockquote>
|
||||
|
||||
<%-- used c:out in displaying EL's for them to be escaped. --%>
|
||||
<p>
|
||||
Are you sure you want to delete network proxy <code>${proxyid}</code> ?
|
||||
Are you sure you want to delete network proxy <code><c:out value="${proxyid}" /></code> ?
|
||||
</p>
|
||||
|
||||
<s:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
<%@ page contentType="text/html; charset=UTF-8" %>
|
||||
<%@ taglib prefix="s" uri="/struts-tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
|
|
@ -30,7 +31,14 @@
|
|||
|
||||
<h1>Admin: Delete Managed Repository</h1>
|
||||
|
||||
<s:actionerror/>
|
||||
<%-- changed the structure of displaying errorMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div id="contentArea">
|
||||
|
||||
|
|
@ -44,19 +52,20 @@
|
|||
Are you sure you want to delete the following managed repository?
|
||||
</p>
|
||||
|
||||
<%-- used c:out in displaying EL's so that they are escaped --%>
|
||||
<div class="infobox">
|
||||
<table class="infotable">
|
||||
<tr>
|
||||
<td>ID:</td>
|
||||
<td><code>${repository.id}</code></td>
|
||||
<td><code><c:out value="${repository.id}" /></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Name:</td>
|
||||
<td>${repository.name}</td>
|
||||
<td><c:out value="${repository.name}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Directory:</td>
|
||||
<td>${repository.location}</td>
|
||||
<td><c:out value="${repository.location}" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,14 @@
|
|||
</p>
|
||||
|
||||
<s:set name="editOrganisationInfo" value="editOrganisationInfo"/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
|
||||
<s:textfield name="organisationName" value="%{#attr.organisationName}" label="Name" size="50" />
|
||||
<s:textfield name="organisationUrl" value="%{#attr.organisationUrl}" label="URL" size="50"/>
|
||||
|
|
|
|||
|
|
@ -43,10 +43,23 @@
|
|||
|
||||
<div id="contentArea">
|
||||
|
||||
<h2>${addedit} network proxy: ${networkProxyName}</h2>
|
||||
<h2>${addedit} network proxy: <c:out value="${networkProxyName}" /></h2>
|
||||
|
||||
<s:actionerror/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<s:form method="post" action="saveNetworkProxy" namespace="/admin">
|
||||
<s:hidden name="mode"/>
|
||||
|
|
@ -66,7 +79,7 @@
|
|||
</s:form>
|
||||
|
||||
<script type="text/javascript">
|
||||
document.getElementById("saveNetworkProxy_host").focus();
|
||||
document.getElementById("saveNetworkProxy_host").focus();
|
||||
</script>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -30,11 +30,24 @@
|
|||
|
||||
<h1>Admin: Edit Managed Repository</h1>
|
||||
|
||||
<s:actionerror/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div id="contentArea">
|
||||
|
||||
<s:actionmessage/>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
|
||||
<s:hidden name="repository.id"/>
|
||||
<s:label label="ID" name="repository.id" />
|
||||
|
|
|
|||
|
|
@ -35,8 +35,21 @@
|
|||
|
||||
<div id="contentArea">
|
||||
|
||||
<s:actionerror/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div class="admin">
|
||||
<div class="controls">
|
||||
|
|
@ -69,12 +82,12 @@
|
|||
</c:choose>
|
||||
|
||||
<div class="legacyArtifactPath ${rowColor}">
|
||||
|
||||
|
||||
<div class="controls">
|
||||
<%-- TODO: make some icons --%>
|
||||
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
|
||||
<s:token/>
|
||||
<s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
|
||||
<s:url id="deleteLegacyArtifactPath" encode="true" action="deleteLegacyArtifactPath">
|
||||
<s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
|
||||
<s:param name="struts.token.name">struts.token</s:param>
|
||||
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
|
||||
|
|
@ -86,17 +99,18 @@
|
|||
</redback:ifAnyAuthorized>
|
||||
</div>
|
||||
|
||||
<%-- used c:out in displaying EL's so that they would be escaped --%>
|
||||
<table class="infoTable">
|
||||
<tr>
|
||||
<th>Path</th>
|
||||
<td>
|
||||
<code>${legacyArtifactPath.path}</code>
|
||||
<code><c:out value="${legacyArtifactPath.path}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Artifact</th>
|
||||
<td>
|
||||
<code>${legacyArtifactPath.artifact}</code>
|
||||
<code><c:out value="${legacyArtifactPath.artifact}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,21 @@
|
|||
|
||||
<div id="contentArea">
|
||||
|
||||
<s:actionerror /> <s:actionmessage />
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div class="admin">
|
||||
<div class="controls">
|
||||
|
|
@ -72,10 +86,10 @@
|
|||
<redback:ifAnyAuthorized
|
||||
permissions="archiva-manage-configuration">
|
||||
<s:token/>
|
||||
<s:url id="editNetworkProxyUrl" action="editNetworkProxy">
|
||||
<s:url id="editNetworkProxyUrl" encode="true" action="editNetworkProxy">
|
||||
<s:param name="proxyid" value="%{#attr.proxy.id}" />
|
||||
</s:url>
|
||||
<s:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
|
||||
<s:url id="deleteNetworkProxyUrl" encode="true" action="deleteNetworkProxy" method="confirm">
|
||||
<s:param name="proxyid" value="%{#attr.proxy.id}" />
|
||||
<s:param name="struts.token.name">struts.token</s:param>
|
||||
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
|
||||
|
|
@ -88,27 +102,28 @@
|
|||
Delete Network Proxy</s:a>
|
||||
</redback:ifAnyAuthorized></div>
|
||||
|
||||
<%-- used c:out in displaying EL's for them to be escaped. --%>
|
||||
<table class="infoTable">
|
||||
<tr>
|
||||
<th>Identifier</th>
|
||||
<td><code>${proxy.id}</code></td>
|
||||
<td><code><c:out value="${proxy.id}" /></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Protocol</th>
|
||||
<td>${proxy.protocol}</td>
|
||||
<td><c:out value="${proxy.protocol}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Host</th>
|
||||
<td>${proxy.host}</td>
|
||||
<td><c:out value="${proxy.host}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Port</th>
|
||||
<td>${proxy.port}</td>
|
||||
<td><c:out value="${proxy.port}" /></td>
|
||||
</tr>
|
||||
<c:if test="${not empty (proxy.username)}">
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<td>${proxy.username}</td>
|
||||
<td><c:out value="${proxy.username}" /></td>
|
||||
</tr>
|
||||
<c:if test="${not empty (proxy.password)}">
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -48,8 +48,22 @@
|
|||
|
||||
<div id="contentArea">
|
||||
|
||||
<s:actionerror/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:actionmessage />
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div class="admin">
|
||||
<div class="controls">
|
||||
|
|
@ -86,11 +100,11 @@
|
|||
<div class="controls">
|
||||
<%-- TODO: make some icons --%>
|
||||
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
|
||||
<s:url id="editRepositoryUrl" action="editRepository">
|
||||
<s:url id="editRepositoryUrl" encode="true" action="editRepository">
|
||||
<s:param name="repoid" value="%{#attr.repository.id}"/>
|
||||
</s:url>
|
||||
<s:token/>
|
||||
<s:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
|
||||
<s:url id="deleteRepositoryUrl" encode="true" action="confirmDeleteRepository">
|
||||
<s:param name="repoid" value="%{#attr.repository.id}"/>
|
||||
<s:param name="struts.token.name">struts.token</s:param>
|
||||
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
|
||||
|
|
@ -105,43 +119,44 @@
|
|||
</s:a>
|
||||
</redback:ifAnyAuthorized>
|
||||
<c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
|
||||
<a href="/archiva/feeds/${repository.id}">
|
||||
<a href='/archiva/feeds/<c:out value="${repository.id}" />'>
|
||||
<img src="${rssFeedIconUrl}" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<%-- used c:out in displaying EL's for them to be escaped. --%>
|
||||
<div style="float: left">
|
||||
<img src="<c:url value="/images/archiva-splat-32.gif"/>" alt="" width="32" height="32"/>
|
||||
</div>
|
||||
|
||||
<h3 class="repository">${repository.name}</h3>
|
||||
<h3 class="repository"><c:out value="${repository.name}" /></h3>
|
||||
|
||||
<table class="infoTable">
|
||||
<tr>
|
||||
<th>Identifier</th>
|
||||
<td>
|
||||
<code>${repository.id}</code>
|
||||
<code><c:out value="${repository.id}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<td>
|
||||
<code>${repository.name}</code>
|
||||
<code><c:out value="${repository.name}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Directory</th>
|
||||
<td>${repository.location}</td>
|
||||
<td><c:out value="${repository.location}" /></td>
|
||||
</tr>
|
||||
<c:if test="${!empty (repository.indexDir)}">
|
||||
<tr>
|
||||
<th>Index Directory</th>
|
||||
<td>${repository.indexDir}</td>
|
||||
<td><c:out value="${repository.indexDir}" /></td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<tr>
|
||||
<th>WebDAV URL</th>
|
||||
<td><a href="${baseUrl}/${repository.id}/">${baseUrl}/${repository.id}/</a></td>
|
||||
<td><a href='<c:out value="${baseUrl}" />/<c:out value="${repository.id}" />/' ><c:out value="${baseUrl}" />/<c:out value="${repository.id}" />/</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
|
|
@ -162,7 +177,7 @@
|
|||
<th>Groups</th>
|
||||
<td>
|
||||
<c:forEach items="${repositoryToGroupMap[repository.id]}" varStatus="i" var="group">
|
||||
${group}<c:if test="${!i.last}">,</c:if>
|
||||
<c:out value="${group}" /><c:if test="${!i.last}">,</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -182,11 +197,11 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<th>Repository Purge By Days Older Than</th>
|
||||
<td>${repository.daysOlder}</td>
|
||||
<td><c:out value="${repository.daysOlder}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Repository Purge By Retention Count</th>
|
||||
<td>${repository.retentionCount}</td>
|
||||
<td><c:out value="${repository.retentionCount}" /></td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<tr>
|
||||
|
|
@ -196,7 +211,7 @@
|
|||
<c:if test="${repository.scanned}">
|
||||
<tr>
|
||||
<th>Scanning Cron</th>
|
||||
<td>${repository.refreshCronExpression}</td>
|
||||
<td><c:out value="${repository.refreshCronExpression}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
|
|
@ -230,19 +245,19 @@
|
|||
<table>
|
||||
<tr>
|
||||
<th>Last Scanned</th>
|
||||
<td>${stats.scanStartTime}</td>
|
||||
<td><c:out value="${stats.whenGathered}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Duration</th>
|
||||
<td>${stats.duration} ms</td>
|
||||
<td><c:out value="${stats.duration}" /> ms</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Total File Count</th>
|
||||
<td>${stats.totalFileCount}
|
||||
<td><c:out value="${stats.totalFileCount}" />
|
||||
</tr>
|
||||
<tr>
|
||||
<th>New Files Found</th>
|
||||
<td>${stats.newFileCount}
|
||||
<td><c:out value="${stats.newFileCount}" />
|
||||
</tr>
|
||||
</table>
|
||||
</c:otherwise>
|
||||
|
|
@ -337,15 +352,15 @@
|
|||
|
||||
<div class="controls">
|
||||
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
|
||||
<s:url id="editRepositoryUrl" action="editRemoteRepository">
|
||||
<s:param name="repoid" value="%{#attr.repository.id}"/>
|
||||
<s:url id="editRepositoryUrl" encode="true" action="editRemoteRepository">
|
||||
<s:param name="repoid" value="%{#attr.repository.id}"/>
|
||||
</s:url>
|
||||
<s:a href="%{editRepositoryUrl}">
|
||||
<img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
|
||||
Edit
|
||||
</s:a>
|
||||
<s:token/>
|
||||
<s:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
|
||||
<s:url id="deleteRepositoryUrl" encode="true" action="confirmDeleteRemoteRepository">
|
||||
<s:param name="repoid" value="%{#attr.repository.id}"/>
|
||||
<s:param name="struts.token.name">struts.token</s:param>
|
||||
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
|
||||
|
|
@ -361,24 +376,24 @@
|
|||
<img src="<c:url value="/images/archiva-world.png"/>" alt="" width="32" height="32"/>
|
||||
</div>
|
||||
|
||||
<h3 class="repository">${repository.name}</h3>
|
||||
<h3 class="repository"><c:out value="${repository.name}" /></h3>
|
||||
|
||||
<table class="infoTable">
|
||||
<tr>
|
||||
<th>Identifier</th>
|
||||
<td>
|
||||
<code>${repository.id}</code>
|
||||
<code><c:out value="${repository.id}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<td>
|
||||
<code>${repository.name}</code>
|
||||
<code><c:out value="${repository.name}" /></code>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>URL</th>
|
||||
<td>${repository.url}</td>
|
||||
<td><c:out value="${repository.url}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@
|
|||
<s:set name="organisationUrl" value="organisationUrl"/>
|
||||
<c:choose>
|
||||
<c:when test="${!empty (organisationUrl)}">
|
||||
<a href="${organisationUrl}">
|
||||
<img src="${organisationLogo}" title="${organisationName}"/>
|
||||
<a href='<c:out value="${organisationUrl}" />'>
|
||||
<img src='<c:out value="${organisationLogo}" />' title='<c:out value="${organisationName}" />'/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<img src="${organisationLogo}" title="${organisationName}"/>
|
||||
<img src='<c:out value="${organisationLogo}" />' title='<c:out value="${organisationName}" />'/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,21 @@
|
|||
<body>
|
||||
<h1>Delete Artifact</h1>
|
||||
|
||||
<s:actionerror/>
|
||||
<s:actionmessage/>
|
||||
<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
|
||||
<s:if test="hasActionErrors()">
|
||||
<ul>
|
||||
<s:iterator value="actionErrors">
|
||||
<li><span class="errorMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
<s:if test="hasActionMessages()">
|
||||
<ul>
|
||||
<s:iterator value="actionMessages">
|
||||
<li><span class="actionMessage"><s:property escape="true" /></span></li>
|
||||
</s:iterator>
|
||||
</ul>
|
||||
</s:if>
|
||||
|
||||
<div id="contentArea">
|
||||
<s:form action="deleteArtifact!doDelete" namespace="/" method="post" validate="true">
|
||||
|
|
|
|||
|
|
@ -20,12 +20,51 @@ package org.apache.maven.archiva.web.action.admin.appearance;
|
|||
*/
|
||||
|
||||
import com.opensymphony.xwork2.Action;
|
||||
import com.opensymphony.xwork2.ObjectFactory;
|
||||
import com.opensymphony.xwork2.validator.ActionValidatorManager;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
|
||||
import org.apache.maven.archiva.configuration.OrganisationInformation;
|
||||
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
|
||||
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil;
|
||||
|
||||
/**
|
||||
*/
|
||||
public class EditOrganizationInfoActionTest extends AbstractOrganizationInfoActionTest
|
||||
{
|
||||
private static final String EMPTY_STRING = "";
|
||||
|
||||
// valid inputs
|
||||
private static final String ORGANISATION_NAME_VALID_INPUT = "abcXYZ0129. _/\\~ :?!&=-";
|
||||
|
||||
private static final String ORGANISATION_URL_VALID_INPUT = "file://home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"";
|
||||
|
||||
private static final String ORGANISATION_LOGO_VALID_INPUT = "file://home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"";
|
||||
|
||||
// invalid inputs
|
||||
private static final String ORGANISATION_NAME_INVALID_INPUT = "<>~+[ ]'\"";
|
||||
|
||||
private static final String ORGANISATION_URL_INVALID_INPUT = "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"";
|
||||
|
||||
private static final String ORGANISATION_LOGO_INVALID_INPUT = "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"";
|
||||
|
||||
// testing requisite
|
||||
private ActionValidatorManager actionValidatorManager;
|
||||
|
||||
@Override
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
super.setUp();
|
||||
|
||||
DefaultActionValidatorManagerFactory factory = new DefaultActionValidatorManagerFactory();
|
||||
|
||||
actionValidatorManager = factory.createDefaultActionValidatorManager();
|
||||
}
|
||||
|
||||
public void testOrganisationInfoSaves()
|
||||
throws Exception
|
||||
{
|
||||
|
|
@ -56,6 +95,109 @@ public class EditOrganizationInfoActionTest extends AbstractOrganizationInfoActi
|
|||
assertEquals("URL1", orginfo.getUrl());
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
action = getAction();
|
||||
populateOrganisationValues(action, null, null, null);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a name");
|
||||
expectedFieldErrors.put("organisationName", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
action = getAction();
|
||||
populateOrganisationValues(action, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a name");
|
||||
expectedFieldErrors.put("organisationName", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
action = getAction();
|
||||
populateOrganisationValues(action, ORGANISATION_NAME_INVALID_INPUT, ORGANISATION_URL_INVALID_INPUT, ORGANISATION_LOGO_INVALID_INPUT);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("organisationName", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a URL");
|
||||
expectedFieldErrors.put("organisationUrl", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a URL");
|
||||
expectedFieldErrors.put("organisationLogo", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
action = getAction();
|
||||
populateOrganisationValues(action, ORGANISATION_NAME_VALID_INPUT, ORGANISATION_URL_VALID_INPUT, ORGANISATION_LOGO_VALID_INPUT);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertFalse(action.hasFieldErrors());
|
||||
}
|
||||
|
||||
private void populateOrganisationValues(AbstractAppearanceAction abstractAppearanceAction , String name, String url, String logo)
|
||||
{
|
||||
abstractAppearanceAction.setOrganisationName(name);
|
||||
abstractAppearanceAction.setOrganisationUrl(url);
|
||||
abstractAppearanceAction.setOrganisationLogo(logo);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected AbstractAppearanceAction getAction()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,236 @@
|
|||
package org.apache.maven.archiva.web.action.admin.legacy;
|
||||
|
||||
/*
|
||||
* 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 com.opensymphony.xwork2.ObjectFactory;
|
||||
import com.opensymphony.xwork2.validator.ActionValidatorManager;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.maven.archiva.configuration.LegacyArtifactPath;
|
||||
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
|
||||
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil;
|
||||
|
||||
public class AddLegacyArtifactPathActionTest extends TestCase
|
||||
{
|
||||
private static final String EMPTY_STRING = "";
|
||||
|
||||
// valid inputs
|
||||
private static final String LEGACY_ARTIFACT_PATH_PATH_VALID_INPUT = "-abcXYZ0129._/\\";
|
||||
|
||||
private static final String GROUP_ID_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
private static final String ARTIFACT_ID_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
private static final String VERSION_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
private static final String CLASSIFIER_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
private static final String TYPE_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
// invalid inputs
|
||||
private static final String LEGACY_ARTIFACT_PATH_PATH_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
private static final String GROUP_ID_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
private static final String ARTIFACT_ID_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
private static final String VERSION_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
private static final String CLASSIFIER_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
private static final String TYPE_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
// testing requisite
|
||||
private AddLegacyArtifactPathAction addLegacyArtifactPathAction;
|
||||
|
||||
private ActionValidatorManager actionValidatorManager;
|
||||
|
||||
@Override
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
addLegacyArtifactPathAction = new AddLegacyArtifactPathAction();
|
||||
|
||||
DefaultActionValidatorManagerFactory factory = new DefaultActionValidatorManagerFactory();
|
||||
|
||||
actionValidatorManager = factory.createDefaultActionValidatorManager();
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
LegacyArtifactPath legacyArtifactPath = createLegacyArtifactPath(null);
|
||||
populateAddLegacyArtifactPathActionFields(addLegacyArtifactPathAction, legacyArtifactPath, null, null, null, null, null);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(addLegacyArtifactPathAction, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(addLegacyArtifactPathAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = addLegacyArtifactPathAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a legacy path.");
|
||||
expectedFieldErrors.put("legacyArtifactPath.path", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a groupId.");
|
||||
expectedFieldErrors.put("groupId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter an artifactId.");
|
||||
expectedFieldErrors.put("artifactId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a version.");
|
||||
expectedFieldErrors.put("version", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a type.");
|
||||
expectedFieldErrors.put("type", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
LegacyArtifactPath legacyArtifactPath = createLegacyArtifactPath(EMPTY_STRING);
|
||||
populateAddLegacyArtifactPathActionFields(addLegacyArtifactPathAction, legacyArtifactPath, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(addLegacyArtifactPathAction, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(addLegacyArtifactPathAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = addLegacyArtifactPathAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a legacy path.");
|
||||
expectedFieldErrors.put("legacyArtifactPath.path", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a groupId.");
|
||||
expectedFieldErrors.put("groupId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter an artifactId.");
|
||||
expectedFieldErrors.put("artifactId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a version.");
|
||||
expectedFieldErrors.put("version", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a type.");
|
||||
expectedFieldErrors.put("type", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
LegacyArtifactPath legacyArtifactPath = createLegacyArtifactPath(LEGACY_ARTIFACT_PATH_PATH_INVALID_INPUT);
|
||||
populateAddLegacyArtifactPathActionFields(addLegacyArtifactPathAction, legacyArtifactPath, GROUP_ID_INVALID_INPUT, ARTIFACT_ID_INVALID_INPUT, VERSION_INVALID_INPUT, CLASSIFIER_INVALID_INPUT, TYPE_INVALID_INPUT);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(addLegacyArtifactPathAction, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(addLegacyArtifactPathAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = addLegacyArtifactPathAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("legacyArtifactPath.path", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("groupId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("artifactId", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("version", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("classifier", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("type", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
LegacyArtifactPath legacyArtifactPath = createLegacyArtifactPath(LEGACY_ARTIFACT_PATH_PATH_VALID_INPUT);
|
||||
populateAddLegacyArtifactPathActionFields(addLegacyArtifactPathAction, legacyArtifactPath, GROUP_ID_VALID_INPUT, ARTIFACT_ID_VALID_INPUT, VERSION_VALID_INPUT, CLASSIFIER_VALID_INPUT, TYPE_VALID_INPUT);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(addLegacyArtifactPathAction, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertFalse(addLegacyArtifactPathAction.hasFieldErrors());
|
||||
}
|
||||
|
||||
private LegacyArtifactPath createLegacyArtifactPath(String path)
|
||||
{
|
||||
LegacyArtifactPath legacyArtifactPath = new LegacyArtifactPath();
|
||||
legacyArtifactPath.setPath(path);
|
||||
return legacyArtifactPath;
|
||||
}
|
||||
|
||||
private void populateAddLegacyArtifactPathActionFields(AddLegacyArtifactPathAction addLegacyArtifactPathAction, LegacyArtifactPath legacyArtifactPath, String groupId, String artifactId, String version, String classifier, String type)
|
||||
{
|
||||
addLegacyArtifactPathAction.setLegacyArtifactPath(legacyArtifactPath);
|
||||
addLegacyArtifactPathAction.setGroupId(groupId);
|
||||
addLegacyArtifactPathAction.setArtifactId(artifactId);
|
||||
addLegacyArtifactPathAction.setVersion(version);
|
||||
addLegacyArtifactPathAction.setClassifier(classifier);
|
||||
addLegacyArtifactPathAction.setType(type);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,221 @@
|
|||
package org.apache.maven.archiva.web.action.admin.networkproxies;
|
||||
|
||||
/*
|
||||
* 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 com.opensymphony.xwork2.ObjectFactory;
|
||||
import com.opensymphony.xwork2.validator.ActionValidatorManager;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
|
||||
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
|
||||
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil;
|
||||
|
||||
public class ConfigureNetworkProxyActionTest extends TestCase
|
||||
{
|
||||
private static final String EMPTY_STRING = "";
|
||||
|
||||
private static final String VALIDATION_CONTEXT = "saveNetworkProxy";
|
||||
|
||||
// valid inputs
|
||||
private static final String PROXY_ID_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
private static final String PROXY_PROTOCOL_VALID_INPUT = "-abcXYZ0129./:\\";
|
||||
|
||||
private static final String PROXY_HOST_VALID_INPUT = "abcXYZ0129._/\\~:?!&=-";
|
||||
|
||||
private static final int PROXY_PORT_VALID_INPUT = 8080;
|
||||
|
||||
private static final String PROXY_USERNAME_VALID_INPUT = "abcXYZ0129.@/_-\\";
|
||||
|
||||
// invalid inputs
|
||||
private static final String PROXY_ID_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
private static final String PROXY_PROTOCOL_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
private static final String PROXY_HOST_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
private static final int PROXY_PORT_INVALID_INPUT = 0;
|
||||
|
||||
private static final String PROXY_USERNAME_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
// testing requisite
|
||||
private ConfigureNetworkProxyAction configureNetworkProxyAction;
|
||||
|
||||
private ActionValidatorManager actionValidatorManager;
|
||||
|
||||
@Override
|
||||
public void setUp()
|
||||
throws Exception
|
||||
{
|
||||
configureNetworkProxyAction = new ConfigureNetworkProxyAction();
|
||||
|
||||
DefaultActionValidatorManagerFactory factory = new DefaultActionValidatorManagerFactory();
|
||||
|
||||
actionValidatorManager = factory.createDefaultActionValidatorManager();
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
NetworkProxyConfiguration networkProxyConfiguration = createNetworkProxyConfiguration(null, null, null, null);
|
||||
configureNetworkProxyAction.setProxy(networkProxyConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(configureNetworkProxyAction, VALIDATION_CONTEXT);
|
||||
|
||||
// verify
|
||||
assertTrue(configureNetworkProxyAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = configureNetworkProxyAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter an identifier.");
|
||||
expectedFieldErrors.put("proxy.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a protocol.");
|
||||
expectedFieldErrors.put("proxy.protocol", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a host.");
|
||||
expectedFieldErrors.put("proxy.host", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
NetworkProxyConfiguration networkProxyConfiguration = createNetworkProxyConfiguration(EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING);
|
||||
configureNetworkProxyAction.setProxy(networkProxyConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(configureNetworkProxyAction, VALIDATION_CONTEXT);
|
||||
|
||||
// verify
|
||||
assertTrue(configureNetworkProxyAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = configureNetworkProxyAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter an identifier.");
|
||||
expectedFieldErrors.put("proxy.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a protocol.");
|
||||
expectedFieldErrors.put("proxy.protocol", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a host.");
|
||||
expectedFieldErrors.put("proxy.host", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
NetworkProxyConfiguration networkProxyConfiguration = createNetworkProxyConfiguration(PROXY_ID_INVALID_INPUT, PROXY_HOST_INVALID_INPUT, PROXY_PORT_INVALID_INPUT, PROXY_PROTOCOL_INVALID_INPUT, PROXY_USERNAME_INVALID_INPUT);
|
||||
configureNetworkProxyAction.setProxy(networkProxyConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(configureNetworkProxyAction, VALIDATION_CONTEXT);
|
||||
|
||||
// verify
|
||||
assertTrue(configureNetworkProxyAction.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = configureNetworkProxyAction.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("proxy.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-).");
|
||||
expectedFieldErrors.put("proxy.protocol", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("proxy.host", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Port needs to be larger than 1");
|
||||
expectedFieldErrors.put("proxy.port", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("proxy.username", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
NetworkProxyConfiguration networkProxyConfiguration = createNetworkProxyConfiguration(PROXY_ID_VALID_INPUT, PROXY_HOST_VALID_INPUT, PROXY_PORT_VALID_INPUT, PROXY_PROTOCOL_VALID_INPUT, PROXY_USERNAME_VALID_INPUT);
|
||||
configureNetworkProxyAction.setProxy(networkProxyConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(configureNetworkProxyAction, VALIDATION_CONTEXT);
|
||||
|
||||
// verify
|
||||
assertFalse(configureNetworkProxyAction.hasFieldErrors());
|
||||
}
|
||||
|
||||
private NetworkProxyConfiguration createNetworkProxyConfiguration(String id, String host, int port, String protocol, String username)
|
||||
{
|
||||
NetworkProxyConfiguration networkProxyConfiguration = new NetworkProxyConfiguration();
|
||||
networkProxyConfiguration.setId(id);
|
||||
networkProxyConfiguration.setHost(host);
|
||||
networkProxyConfiguration.setPort(port);
|
||||
networkProxyConfiguration.setProtocol(protocol);
|
||||
networkProxyConfiguration.setUsername(username);
|
||||
return networkProxyConfiguration;
|
||||
}
|
||||
|
||||
// over-loaded
|
||||
// for simulating empty/null form purposes; excluding primitive data-typed values
|
||||
private NetworkProxyConfiguration createNetworkProxyConfiguration(String id, String host, String protocol, String username)
|
||||
{
|
||||
NetworkProxyConfiguration networkProxyConfiguration = new NetworkProxyConfiguration();
|
||||
networkProxyConfiguration.setId(id);
|
||||
networkProxyConfiguration.setHost(host);
|
||||
networkProxyConfiguration.setProtocol(protocol);
|
||||
networkProxyConfiguration.setUsername(username);
|
||||
return networkProxyConfiguration;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
package org.apache.maven.archiva.web.action.admin.repositories;
|
||||
|
||||
/*
|
||||
* 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 com.opensymphony.xwork2.validator.ActionValidatorManager;
|
||||
import java.io.File;
|
||||
|
||||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
|
||||
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
|
||||
|
||||
public abstract class AbstractManagedRepositoryActionTest
|
||||
extends PlexusInSpringTestCase
|
||||
{
|
||||
protected static final String EMPTY_STRING = "";
|
||||
|
||||
// valid inputs; validation testing
|
||||
protected static final String REPOSITORY_ID_VALID_INPUT = "abcXYZ0129._-";
|
||||
|
||||
protected static final String REPOSITORY_LOCATION_VALID_INPUT = "abcXYZ0129._/\\~:?!&=-";
|
||||
|
||||
protected static final String REPOSITORY_INDEX_DIR_VALID_INPUT = "abcXYZ0129._/\\~:?!&=-";
|
||||
|
||||
protected static final String REPOSITORY_NAME_VALID_INPUT = "abcXYZ 0129.)/ _(-";
|
||||
|
||||
protected static final int REPOSITORY_RETENTION_COUNT_VALID_INPUT = 1;
|
||||
|
||||
protected static final int REPOSITORY_DAYS_OLDER_VALID_INPUT = 1;
|
||||
|
||||
// invalid inputs; validation testing
|
||||
protected static final String REPOSITORY_ID_INVALID_INPUT = "<> \\/~+[ ]'\"";
|
||||
|
||||
protected static final String REPOSITORY_LOCATION_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
protected static final String REPOSITORY_INDEX_DIR_INVALID_INPUT = "<> ~+[ ]'\"";
|
||||
|
||||
protected static final String REPOSITORY_NAME_INVALID_INPUT = "<>\\~+[]'\"";
|
||||
|
||||
protected static final int REPOSITORY_RETENTION_COUNT_INVALID_INPUT = 101;
|
||||
|
||||
protected static final int REPOSITORY_DAYS_OLDER_INVALID_INPUT = -1;
|
||||
|
||||
// testing requisite; validation testing
|
||||
protected ActionValidatorManager actionValidatorManager;
|
||||
|
||||
protected static final String REPO_ID = "repo-ident";
|
||||
|
||||
protected File location;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception
|
||||
{
|
||||
super.setUp();
|
||||
|
||||
DefaultActionValidatorManagerFactory defaultActionValidatorManagerFactory = new DefaultActionValidatorManagerFactory();
|
||||
|
||||
actionValidatorManager = defaultActionValidatorManagerFactory.createDefaultActionValidatorManager();
|
||||
}
|
||||
|
||||
protected void populateRepository( ManagedRepositoryConfiguration repository )
|
||||
{
|
||||
repository.setId( REPO_ID );
|
||||
repository.setName( "repo name" );
|
||||
repository.setLocation( location.getAbsolutePath() );
|
||||
repository.setLayout( "default" );
|
||||
repository.setRefreshCronExpression( "* 0/5 * * * ?" );
|
||||
repository.setDaysOlder( 31 );
|
||||
repository.setRetentionCount( 20 );
|
||||
repository.setReleases( true );
|
||||
repository.setSnapshots( true );
|
||||
repository.setScanned( false );
|
||||
repository.setDeleteReleasedSnapshots( true );
|
||||
}
|
||||
|
||||
protected ManagedRepositoryConfiguration createManagedRepositoryConfiguration(String id, String name, String location, String indexDir, int daysOlder, int retentionCount)
|
||||
{
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = new ManagedRepositoryConfiguration();
|
||||
|
||||
managedRepositoryConfiguration.setId(id);
|
||||
managedRepositoryConfiguration.setName(name);
|
||||
managedRepositoryConfiguration.setLocation(location);
|
||||
managedRepositoryConfiguration.setIndexDir(indexDir);
|
||||
managedRepositoryConfiguration.setDaysOlder(daysOlder);
|
||||
managedRepositoryConfiguration.setRetentionCount(retentionCount);
|
||||
|
||||
return managedRepositoryConfiguration;
|
||||
}
|
||||
|
||||
// over-loaded
|
||||
// for simulating empty/null form purposes; excluding primitive data-typed values
|
||||
protected ManagedRepositoryConfiguration createManagedRepositoryConfiguration(String id, String name, String location, String indexDir)
|
||||
{
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = new ManagedRepositoryConfiguration();
|
||||
|
||||
managedRepositoryConfiguration.setId(id);
|
||||
managedRepositoryConfiguration.setName(name);
|
||||
managedRepositoryConfiguration.setLocation(location);
|
||||
managedRepositoryConfiguration.setIndexDir(indexDir);
|
||||
|
||||
return managedRepositoryConfiguration;
|
||||
}
|
||||
}
|
||||
|
|
@ -20,18 +20,23 @@ package org.apache.maven.archiva.web.action.admin.repositories;
|
|||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.opensymphony.xwork2.Action;
|
||||
import org.apache.archiva.audit.AuditListener;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
|
||||
import org.apache.maven.archiva.configuration.Configuration;
|
||||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
|
||||
import org.apache.maven.archiva.security.ArchivaRoleConstants;
|
||||
import org.apache.maven.archiva.web.action.AbstractActionTestCase;
|
||||
import org.apache.maven.archiva.web.action.PlexusActionSupport;
|
||||
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil;
|
||||
import org.codehaus.plexus.redback.role.RoleManager;
|
||||
import org.codehaus.plexus.registry.Registry;
|
||||
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
|
||||
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
|
||||
import org.codehaus.redback.integration.interceptor.SecureActionException;
|
||||
import org.easymock.MockControl;
|
||||
|
|
@ -42,7 +47,7 @@ import org.easymock.MockControl;
|
|||
* @version $Id$
|
||||
*/
|
||||
public class AddManagedRepositoryActionTest
|
||||
extends AbstractActionTestCase
|
||||
extends AbstractManagedRepositoryActionTest
|
||||
{
|
||||
private AddManagedRepositoryAction action;
|
||||
|
||||
|
|
@ -57,11 +62,7 @@ public class AddManagedRepositoryActionTest
|
|||
private MockControl registryControl;
|
||||
|
||||
private ArchivaConfiguration archivaConfiguration;
|
||||
|
||||
private static final String REPO_ID = "repo-ident";
|
||||
|
||||
private File location;
|
||||
|
||||
@Override
|
||||
protected void setUp()
|
||||
throws Exception
|
||||
|
|
@ -69,7 +70,7 @@ public class AddManagedRepositoryActionTest
|
|||
super.setUp();
|
||||
|
||||
action = new AddManagedRepositoryAction();
|
||||
|
||||
|
||||
archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
|
||||
archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();
|
||||
action.setArchivaConfiguration( archivaConfiguration );
|
||||
|
|
@ -198,21 +199,133 @@ public class AddManagedRepositoryActionTest
|
|||
assertEquals( location.getCanonicalPath(), new File( repository.getLocation() ).getCanonicalPath() );
|
||||
registryControl.verify();
|
||||
}
|
||||
|
||||
private void populateRepository( ManagedRepositoryConfiguration repository )
|
||||
|
||||
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
|
||||
{
|
||||
repository.setId( REPO_ID );
|
||||
repository.setName( "repo name" );
|
||||
repository.setLocation( "${appserver.base}/location" );
|
||||
repository.setLayout( "default" );
|
||||
repository.setRefreshCronExpression( "* 0/5 * * * ?" );
|
||||
repository.setDaysOlder( 31 );
|
||||
repository.setRetentionCount( 20 );
|
||||
repository.setReleases( true );
|
||||
repository.setSnapshots( true );
|
||||
repository.setScanned( false );
|
||||
repository.setDeleteReleasedSnapshots( true );
|
||||
// prep
|
||||
// 0 is the default value for primitive int; null for objects
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(null, null, null, null);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository identifier.");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a directory.");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository name.");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
// 0 is the default value for primitive int
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository identifier.");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a directory.");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository name.");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_INVALID_INPUT, REPOSITORY_NAME_INVALID_INPUT, REPOSITORY_LOCATION_INVALID_INPUT, REPOSITORY_INDEX_DIR_INVALID_INPUT, REPOSITORY_DAYS_OLDER_INVALID_INPUT, REPOSITORY_RETENTION_COUNT_INVALID_INPUT);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.indexDir", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Purge By Retention Count needs to be between 1 and 100.");
|
||||
expectedFieldErrors.put("repository.retentionCount", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Purge By Days Older Than needs to be larger than 0.");
|
||||
expectedFieldErrors.put("repository.daysOlder", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_VALID_INPUT, REPOSITORY_NAME_VALID_INPUT, REPOSITORY_LOCATION_VALID_INPUT, REPOSITORY_INDEX_DIR_VALID_INPUT, REPOSITORY_DAYS_OLDER_VALID_INPUT, REPOSITORY_RETENTION_COUNT_VALID_INPUT);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertFalse(action.hasFieldErrors());
|
||||
}
|
||||
|
||||
|
||||
// TODO: test errors during add, other actions
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
package org.apache.maven.archiva.web.action.admin.repositories;
|
||||
|
||||
import com.opensymphony.xwork2.ActionContext;
|
||||
import com.opensymphony.xwork2.DefaultTextProvider;
|
||||
import com.opensymphony.xwork2.ObjectFactory;
|
||||
import com.opensymphony.xwork2.TextProvider;
|
||||
import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
|
||||
import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer;
|
||||
import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter;
|
||||
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
|
||||
import com.opensymphony.xwork2.inject.Container;
|
||||
import com.opensymphony.xwork2.inject.ContainerBuilder;
|
||||
import com.opensymphony.xwork2.inject.Scope;
|
||||
import com.opensymphony.xwork2.ognl.OgnlReflectionProvider;
|
||||
import com.opensymphony.xwork2.ognl.OgnlUtil;
|
||||
import com.opensymphony.xwork2.ognl.OgnlValueStackFactory;
|
||||
import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
|
||||
import com.opensymphony.xwork2.util.CompoundRoot;
|
||||
import com.opensymphony.xwork2.util.ValueStack;
|
||||
import com.opensymphony.xwork2.util.ValueStackFactory;
|
||||
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
|
||||
import com.opensymphony.xwork2.validator.ActionValidatorManager;
|
||||
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
|
||||
import com.opensymphony.xwork2.validator.DefaultValidatorFactory;
|
||||
import com.opensymphony.xwork2.validator.DefaultValidatorFileParser;
|
||||
import ognl.PropertyAccessor;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
/**
|
||||
* Factory for creating the DefaultActionValidatorManager to be used for the validation tests.
|
||||
*/
|
||||
public class DefaultActionValidatorManagerFactory
|
||||
{
|
||||
|
||||
// ObjectFactory.setObjectFactory(..) was removed in struts 2.1, so we have to workaround with this
|
||||
// to make the validation tests work
|
||||
public ActionValidatorManager createDefaultActionValidatorManager()
|
||||
throws ClassNotFoundException
|
||||
{
|
||||
Container container = createBootstrapContainer();
|
||||
|
||||
ActionContext context = new ActionContext( new HashMap<String, Object>() );
|
||||
context.setValueStack( createValueStack( container ) );
|
||||
ActionContext.setContext( context );
|
||||
|
||||
OgnlReflectionProvider reflectionProvider = new OgnlReflectionProvider();
|
||||
|
||||
reflectionProvider.setOgnlUtil( container.getInstance( OgnlUtil.class ) );
|
||||
|
||||
ObjectFactory objectFactory = new ObjectFactory();
|
||||
objectFactory.setReflectionProvider( reflectionProvider );
|
||||
|
||||
DefaultValidatorFileParser fileParser = new DefaultValidatorFileParser();
|
||||
fileParser.setObjectFactory( objectFactory );
|
||||
|
||||
DefaultValidatorFactory validatorFactory = new DefaultValidatorFactory( objectFactory, fileParser );
|
||||
|
||||
DefaultActionValidatorManager defaultValidatorManager = new DefaultActionValidatorManager();
|
||||
defaultValidatorManager.setValidatorFactory( validatorFactory );
|
||||
defaultValidatorManager.setValidatorFileParser( fileParser );
|
||||
|
||||
return defaultValidatorManager;
|
||||
}
|
||||
|
||||
private ValueStack createValueStack( Container container )
|
||||
throws ClassNotFoundException
|
||||
{
|
||||
OgnlValueStackFactory stackFactory = new OgnlValueStackFactory();
|
||||
|
||||
stackFactory.setXWorkConverter( container.getInstance( XWorkConverter.class ) );
|
||||
stackFactory.setContainer( container );
|
||||
stackFactory.setTextProvider( container.getInstance( TextProvider.class ) );
|
||||
|
||||
ValueStack stack = stackFactory.createValueStack();
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
private Container createBootstrapContainer()
|
||||
{
|
||||
ContainerBuilder builder = new ContainerBuilder();
|
||||
builder.factory( ObjectFactory.class, Scope.SINGLETON );
|
||||
builder.factory( ReflectionProvider.class, OgnlReflectionProvider.class, Scope.SINGLETON );
|
||||
builder.factory( ValueStackFactory.class, OgnlValueStackFactory.class, Scope.SINGLETON );
|
||||
builder.factory( XWorkConverter.class, Scope.SINGLETON );
|
||||
builder.factory( XWorkBasicConverter.class, Scope.SINGLETON );
|
||||
builder.factory( TextProvider.class, "system", DefaultTextProvider.class, Scope.SINGLETON );
|
||||
builder.factory( ObjectTypeDeterminer.class, DefaultObjectTypeDeterminer.class, Scope.SINGLETON );
|
||||
builder.factory( PropertyAccessor.class, CompoundRoot.class.getName(), CompoundRootAccessor.class, Scope.SINGLETON );
|
||||
builder.factory( OgnlUtil.class, Scope.SINGLETON );
|
||||
builder.constant( "devMode", "false" );
|
||||
|
||||
return builder.create( true );
|
||||
}
|
||||
}
|
||||
|
|
@ -31,6 +31,7 @@ import org.apache.maven.archiva.configuration.Configuration;
|
|||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
|
||||
import org.apache.maven.archiva.security.ArchivaRoleConstants;
|
||||
import org.apache.maven.archiva.web.action.AbstractActionTestCase;
|
||||
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil;
|
||||
import org.codehaus.plexus.redback.role.RoleManager;
|
||||
import org.codehaus.plexus.registry.Registry;
|
||||
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
|
||||
|
|
@ -40,7 +41,11 @@ import org.easymock.MockControl;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
|
@ -51,7 +56,7 @@ import static org.mockito.Mockito.when;
|
|||
* @version $Id$
|
||||
*/
|
||||
public class EditManagedRepositoryActionTest
|
||||
extends AbstractActionTestCase
|
||||
extends AbstractManagedRepositoryActionTest
|
||||
{
|
||||
private EditManagedRepositoryAction action;
|
||||
|
||||
|
|
@ -67,12 +72,9 @@ public class EditManagedRepositoryActionTest
|
|||
|
||||
private MockControl registryControl;
|
||||
|
||||
private static final String REPO_ID = "repo-ident";
|
||||
|
||||
private File location;
|
||||
|
||||
private MetadataRepository metadataRepository;
|
||||
|
||||
@Override
|
||||
protected void setUp()
|
||||
throws Exception
|
||||
{
|
||||
|
|
@ -292,6 +294,132 @@ public class EditManagedRepositoryActionTest
|
|||
registryControl.verify();
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithNullInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
// 0 is the default value for primitive int; null for objects
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(null, null, null, null);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository identifier.");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a directory.");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository name.");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithBlankInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
// 0 is the default value for primitive int
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository identifier.");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a directory.");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("You must enter a repository name.");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithInvalidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_INVALID_INPUT, REPOSITORY_NAME_INVALID_INPUT, REPOSITORY_LOCATION_INVALID_INPUT, REPOSITORY_INDEX_DIR_INVALID_INPUT, REPOSITORY_DAYS_OLDER_INVALID_INPUT, REPOSITORY_RETENTION_COUNT_INVALID_INPUT);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertTrue(action.hasFieldErrors());
|
||||
|
||||
Map<String, List<String>> fieldErrors = action.getFieldErrors();
|
||||
|
||||
// make an expected field error object
|
||||
Map<String, List<String>> expectedFieldErrors = new HashMap<String, List<String>>();
|
||||
|
||||
// populate
|
||||
List<String> expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.id", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.location", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.name", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).");
|
||||
expectedFieldErrors.put("repository.indexDir", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Purge By Retention Count needs to be between 1 and 100.");
|
||||
expectedFieldErrors.put("repository.retentionCount", expectedErrorMessages);
|
||||
|
||||
expectedErrorMessages = new ArrayList<String>();
|
||||
expectedErrorMessages.add("Repository Purge By Days Older Than needs to be larger than 0.");
|
||||
expectedFieldErrors.put("repository.daysOlder", expectedErrorMessages);
|
||||
|
||||
ValidatorUtil.assertFieldErrors(expectedFieldErrors, fieldErrors);
|
||||
}
|
||||
|
||||
public void testStruts2ValidationFrameworkWithValidInputs() throws Exception
|
||||
{
|
||||
// prep
|
||||
ManagedRepositoryConfiguration managedRepositoryConfiguration = createManagedRepositoryConfiguration(REPOSITORY_ID_VALID_INPUT, REPOSITORY_NAME_VALID_INPUT, REPOSITORY_LOCATION_VALID_INPUT, REPOSITORY_INDEX_DIR_VALID_INPUT, REPOSITORY_DAYS_OLDER_VALID_INPUT, REPOSITORY_RETENTION_COUNT_VALID_INPUT);
|
||||
action.setRepository(managedRepositoryConfiguration);
|
||||
|
||||
// test
|
||||
actionValidatorManager.validate(action, EMPTY_STRING);
|
||||
|
||||
// verify
|
||||
assertFalse(action.hasFieldErrors());
|
||||
}
|
||||
|
||||
private void assertRepositoryEquals( ManagedRepositoryConfiguration expectedRepository,
|
||||
ManagedRepositoryConfiguration actualRepository )
|
||||
{
|
||||
|
|
@ -335,22 +463,6 @@ public class EditManagedRepositoryActionTest
|
|||
return r;
|
||||
}
|
||||
|
||||
private void populateRepository( ManagedRepositoryConfiguration repository )
|
||||
throws IOException
|
||||
{
|
||||
repository.setId( REPO_ID );
|
||||
repository.setName( "repo name" );
|
||||
repository.setLocation( "${appserver.base}/location" );
|
||||
repository.setLayout( "default" );
|
||||
repository.setRefreshCronExpression( "* 0/5 * * * ?" );
|
||||
repository.setDaysOlder( 31 );
|
||||
repository.setRetentionCount( 20 );
|
||||
repository.setReleases( true );
|
||||
repository.setSnapshots( true );
|
||||
repository.setScanned( false );
|
||||
repository.setDeleteReleasedSnapshots( true );
|
||||
}
|
||||
|
||||
private void populateStagingRepository( ManagedRepositoryConfiguration repository )
|
||||
throws IOException
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
package org.apache.maven.archiva.web.validator.utils;
|
||||
|
||||
/*
|
||||
* 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 java.util.List;
|
||||
import java.util.Map;
|
||||
import junit.framework.Assert;
|
||||
|
||||
public class ValidatorUtil
|
||||
{
|
||||
public static void assertFieldErrors(Map<String, List<String>> expectedFieldErrors, Map<String, List<String>> actualFieldErrors)
|
||||
{
|
||||
if(expectedFieldErrors != null)
|
||||
{
|
||||
Assert.assertNotNull(actualFieldErrors);
|
||||
// checks the number of field errors
|
||||
Assert.assertEquals(expectedFieldErrors.size(), actualFieldErrors.size());
|
||||
|
||||
// check every content of the field error
|
||||
for(Map.Entry<String, List<String>> expectedEntry : expectedFieldErrors.entrySet())
|
||||
{
|
||||
if(expectedEntry.getValue() != null)
|
||||
{
|
||||
Assert.assertNotNull(actualFieldErrors.get(expectedEntry.getKey()));
|
||||
// checks the error message count per error field
|
||||
Assert.assertEquals(expectedEntry.getValue().size(), actualFieldErrors.get(expectedEntry.getKey()).size());
|
||||
|
||||
// check the contents of error messages per field error
|
||||
for(int i = 0; i < expectedEntry.getValue().size(); i++)
|
||||
{
|
||||
Assert.assertEquals(expectedEntry.getValue().get(i), actualFieldErrors.get(expectedEntry.getKey()).get(i));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.assertNull(actualFieldErrors.get(expectedEntry.getKey()));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.assertNull(actualFieldErrors);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue