diff --git a/tycho-its/projects/issue2331/bundle/platform.target b/tycho-its/projects/issue2331/bundle/platform.target new file mode 100644 index 0000000000..b5ff4e45cb --- /dev/null +++ b/tycho-its/projects/issue2331/bundle/platform.target @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/tycho-its/projects/issue2331/pom.xml b/tycho-its/projects/issue2331/pom.xml index c1998db7a5..41566dbd6e 100644 --- a/tycho-its/projects/issue2331/pom.xml +++ b/tycho-its/projects/issue2331/pom.xml @@ -14,11 +14,6 @@ 0.0.1-SNAPSHOT pom - - bundle - product - - @@ -41,6 +36,10 @@ repository + + bundle + product + test-server @@ -52,6 +51,9 @@ target-definition + + bundle + diff --git a/tycho-its/projects/issue2331/settings-auth-mirror.xml b/tycho-its/projects/issue2331/settings-auth-mirror.xml new file mode 100644 index 0000000000..9c47af0398 --- /dev/null +++ b/tycho-its/projects/issue2331/settings-auth-mirror.xml @@ -0,0 +1,18 @@ + + + + test-auth-mirror + mirror-user + mirror-password + + + + + test-auth-mirror + ${p2.authMirror} + test-server + p2 + p2 + + + diff --git a/tycho-its/projects/issue2331/settings-encrypted.xml b/tycho-its/projects/issue2331/settings-encrypted.xml new file mode 100644 index 0000000000..894c3f4ea0 --- /dev/null +++ b/tycho-its/projects/issue2331/settings-encrypted.xml @@ -0,0 +1,9 @@ + + + + test-server + test-user + {Gnn5SYwzVmUHEaxkXS/F3PJlVeqCXstNJ61EtCTqNEU=} + + + diff --git a/tycho-its/projects/issue2331/settings-mirror.xml b/tycho-its/projects/issue2331/settings-mirror.xml new file mode 100644 index 0000000000..170f31c7f5 --- /dev/null +++ b/tycho-its/projects/issue2331/settings-mirror.xml @@ -0,0 +1,11 @@ + + + + test-mirror + ${p2.mirror} + test-server + p2 + p2 + + + diff --git a/tycho-its/projects/issue2331/settings-security.xml b/tycho-its/projects/issue2331/settings-security.xml new file mode 100644 index 0000000000..9d2e13b1b9 --- /dev/null +++ b/tycho-its/projects/issue2331/settings-security.xml @@ -0,0 +1,3 @@ + + {d0cIDW8DS4wHiBuKkPDps5v0kZ/OAX1REXQFCZRmS2g=} + \ No newline at end of file diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedCompositeP2RepositoryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedCompositeP2RepositoryTest.java index 0a70447e4c..0b52c87019 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedCompositeP2RepositoryTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedCompositeP2RepositoryTest.java @@ -19,6 +19,7 @@ import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.HttpServer; import org.eclipse.tycho.test.util.ResourceUtil; +import org.eclipse.tycho.test.util.TargetDefinitionUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -28,18 +29,69 @@ public class PasswordProtectedCompositeP2RepositoryTest extends AbstractTychoInt private HttpServer server; private String p2RepoUrl; + private HttpServer mirror; + private String p2MirrorUrl; + + private HttpServer authMirror; + private String p2AuthMirrorUrl; + @Before public void startServer() throws Exception { server = HttpServer.startServer("test-user", "test-password"); p2RepoUrl = server.addServer("foo", ResourceUtil.resolveTestResource("repositories/issue_2331_reproducer")) + "/bundles"; + + mirror = HttpServer.startServer(); + p2MirrorUrl = mirror.addServer("bar", ResourceUtil.resolveTestResource("repositories/issue_2331_reproducer")) + + "/bundles"; + + authMirror = HttpServer.startServer("mirror-user", "mirror-password"); + p2AuthMirrorUrl = authMirror.addServer("bar", + ResourceUtil.resolveTestResource("repositories/issue_2331_reproducer")) + "/bundles"; } @After public void stopServer() throws Exception { + authMirror.stop(); + mirror.stop(); server.stop(); } + /** + * Tries to access a composite p2 repository over an authenticated composite + * mirror. + * + * @throws Exception + */ + @Test + public void testAuthMirror() throws Exception { + Verifier verifier = createVerifier("settings-auth-mirror.xml"); + verifier.setSystemProperty("p2.authMirror", p2AuthMirrorUrl); + verifier.addCliOption("-P=repository"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to access a composite p2 repository over a composite mirror with no + * authentication. + * + * @throws Exception + */ + @Test + public void testMirror() throws Exception { + Verifier verifier = createVerifier("settings-mirror.xml"); + verifier.setSystemProperty("p2.mirror", p2MirrorUrl); + verifier.addCliOption("-P=repository"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to access a composite p2 repository. + * + * @throws Exception + */ @Test public void testRepository() throws Exception { Verifier verifier = createVerifier("settings.xml"); @@ -48,6 +100,85 @@ public void testRepository() throws Exception { verifier.verifyErrorFreeLog(); } + /** + * Tries to access an authenticated composite p2 repository whose password is + * encrypted. + * + * @throws Exception + */ + @Test + public void testRepositoryEncrypted() throws Exception { + Verifier verifier = createVerifier("settings-encrypted.xml", "settings-security.xml"); + verifier.addCliOption("-P=repository"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to resolve a target platform from a composite p2 repository. + * + * @throws Exception + */ + @Test + public void testTargetDefinition() throws Exception { + Verifier verifier = createVerifier("settings.xml"); + File platformFile = new File(verifier.getBasedir(), "bundle/platform.target"); + TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); + verifier.addCliOption("-P=target-definition"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to resolve a target definition from a composite p2 repository accessed + * over a composite mirror with no authentication. + * + * @throws Exception + */ + @Test + public void testTargetDefinitionMirror() throws Exception { + Verifier verifier = createVerifier("settings-mirror.xml"); + File platformFile = new File(verifier.getBasedir(), "bundle/platform.target"); + TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); + verifier.setSystemProperty("p2.mirror", p2MirrorUrl); + verifier.addCliOption("-P=target-definition"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to resolve a target definition from a composite p2 repository accessed + * over an authenticated composite mirror. + * + * @throws Exception + */ + @Test + public void testTargetDefinitionAuthMirror() throws Exception { + Verifier verifier = createVerifier("settings-auth-mirror.xml"); + File platformFile = new File(verifier.getBasedir(), "bundle/platform.target"); + TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); + verifier.setSystemProperty("p2.authMirror", p2AuthMirrorUrl); + verifier.addCliOption("-P=target-definition"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + + /** + * Tries to resolve a target definition from an authenticated composite p2 + * repository whose password is encrypted. + * + * @throws Exception + */ + @Test + public void testTargetDefinitionEncrypted() throws Exception { + Verifier verifier = createVerifier("settings-encrypted.xml", "settings-security.xml"); + File platformFile = new File(verifier.getBasedir(), "bundle/platform.target"); + TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); + verifier.addCliOption("-P=target-definition"); + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } + private Verifier createVerifier(String settingsFile) throws Exception { return createVerifier(settingsFile, null); } @@ -60,7 +191,7 @@ private Verifier createVerifier(String settingsFile, String settingsSecurityFile // see // org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher#SYSTEM_PROPERTY_SEC_LOCATION systemProperties.setProperty("settings.security", - new File("projects/target.httpAuthentication/" + settingsSecurityFile).getAbsolutePath()); + new File("projects/issue2331/" + settingsSecurityFile).getAbsolutePath()); } return verifier; }