Fix broken path references/tests pointing to /lightbody/ url references

Author: epic-alex-rodionov

README.md

@@ -9,7 +9,7 @@ If you're running BrowserUp Proxy within a Java application or Selenium test, ge
 command line as a standalone proxy, start with [Standalone](#getting-started-standalone).
 
 ### Getting started: Embedded Mode
-To use BrowserUp Proxy in your tests or application, add the `BrowserUp-core` dependency to your pom:
+To use BrowserUp Proxy in your tests or application, add the `browserup-proxy-core` dependency to your pom:
 ```xml
     <dependency>
         <groupId>com.browserup.bup</groupId>
@@ -50,17 +50,17 @@ For more information on the features available in the REST API, see [the REST AP
 
 ## Changes since 2.0.0
 
-The new [BrowserUpProxyServer class](BrowserUp-core/src/main/java/net/lightbody/bup/BrowserUpProxyServer.java) has replaced the legacy ProxyServer implementation. The legacy implementation is no longer actively supported; all new code should use `BrowserUpProxyServer`. We highly recommend that existing code migrate to the new implementation.
+The new [BrowserUpProxyServer class](browserup-proxy-core/src/main/java/com/browserup/bup/BrowserUpProxyServer.java) has replaced the legacy ProxyServer implementation. The legacy implementation is no longer actively supported; all new code should use `BrowserUpProxyServer`. We highly recommend that existing code migrate to the new implementation.
 
 The most important changes from 2.0 are:
 
 - [Separate REST API and Embedded Mode modules](#embedded-mode). Include only the functionality you need.
-- [New BrowserUpProxy interface](BrowserUp-core/src/main/java/net/lightbody/bup/BrowserUpProxy.java). The new interface will completely replace the legacy 2.0 ProxyServer contract in version 3.0 and higher.
+- [New BrowserUpProxy interface](browserup-proxy-core/src/main/java/com/browserup/bup/BrowserUpProxy.java). The new interface will completely replace the legacy 2.0 ProxyServer contract in version 3.0 and higher.
 - [LittleProxy support](#littleproxy-support). More stable and more powerful than the legacy Jetty back-end.
 
 ### New BrowserUpProxy API
 
-BrowserUp Proxy 2.1 includes a [new BrowserUpProxy interface](BrowserUp-core/src/main/java/net/lightbody/bup/BrowserUpProxy.java) to interact with BrowserUp Proxy programmatically. The new interface defines the functionality that BrowserUp Proxy will support in future releases (including 3.0+). To ease migration, both the legacy (Jetty-based) ProxyServer class and the new, LittleProxy-powered BrowserUpProxy class support the new BrowserUpProxy interface.
+BrowserUp Proxy 2.1 includes a [new BrowserUpProxy interface](browserup-proxy-core/src/main/java/com/browserup/bup/BrowserUpProxy.java) to interact with BrowserUp Proxy programmatically. The new interface defines the functionality that BrowserUp Proxy will support in future releases (including 3.0+). To ease migration, both the legacy (Jetty-based) ProxyServer class and the new, LittleProxy-powered BrowserUpProxy class support the new BrowserUpProxy interface.
 
 We _highly_ recommend migrating existing code to the BrowserUpProxy interface using the `BrowserUpProxyServer` class.
 
@@ -86,7 +86,7 @@ The legacy interface, implicitly defined by the ProxyServer class, has been extr
 
 LegacyProxyServer will not be supported after 3.0 is released, so we recommend migrating to the `BrowserUpProxy` interface as soon as possible. The new interface provides additional functionality and is compatible with both the legacy Jetty-based ProxyServer implementation [(with some exceptions)](new-interface-compatibility.md) and the new LittleProxy implementation.
 
-If you must continue using the legacy Jetty-based implementation, include the `BrowserUp-core-legacy` artifact instead of `BrowserUp-core`.
+If you must continue using the legacy Jetty-based implementation, include the `browserup-proxy-core-legacy` artifact instead of `browserup-proxy-core`.
 
 ## Features and Usage
 
@@ -198,13 +198,13 @@ system properties will be used to specify the upstream proxy.
 
 **New in 2.1:** New [BrowserUpProxy interface](#new-BrowserUpproxy-api) for Embedded Mode
 
-BrowserUp Proxy 2.1 separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `BrowserUp-core` artifact as a dependency. The REST API artifact is `BrowserUp-rest`.
+BrowserUp Proxy 2.1 separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `browserup-proxy-core` artifact as a dependency. The REST API artifact is `BrowserUp-rest`.
 
 If you're using Java and Selenium, the easiest way to get started is to embed the project directly in your test. First, you'll need to make sure that all the dependencies are imported in to the project. You can find them in the *lib* directory. Or, if you're using Maven, you can add this to your pom:
 ```xml
     <dependency>
         <groupId>com.browserup.bup</groupId>
-        <artifactId>BrowserUp-core</artifactId>
+        <artifactId>browserup-proxy-core</artifactId>
         <version>2.1.4</version>
         <scope>test</scope>
     </dependency>
@@ -358,7 +358,7 @@ Consult the Java API docs for more info.
 
 ### SSL Support
 
-**BrowserUp Proxy 2.1.0+ now supports full MITM:** For most users, MITM will work out-of-the-box with default settings. Install the [ca-certificate-rsa.cer](/BrowserUp-core/src/main/resources/sslSupport/ca-certificate-rsa.cer) file in your browser or HTTP client to avoid untrusted certificate warnings. Generally, it is safer to generate your own private key, rather than using the .cer files distributed with BrowserUp Proxy. See the [README file in the `mitm` module](/mitm/README.md) for instructions on generating or using your own root certificate and private key with MITM.
+**BrowserUp Proxy 2.1.0+ now supports full MITM:** For most users, MITM will work out-of-the-box with default settings. Install the [ca-certificate-rsa.cer](/browserup-proxy-core/src/main/resources/sslSupport/ca-certificate-rsa.cer) file in your browser or HTTP client to avoid untrusted certificate warnings. Generally, it is safer to generate your own private key, rather than using the .cer files distributed with BrowserUp Proxy. See the [README file in the `mitm` module](/mitm/README.md) for instructions on generating or using your own root certificate and private key with MITM.
 
 **Note: DO NOT** permanently install the .cer files distributed with BrowserUp Proxy in users' browsers. They should be used for testing only and must not be used with general web browsing.
 
@@ -374,7 +374,7 @@ When running in stand-alone mode, the proxy loads the default logging configurat
 
 ### DNS Resolution
 
-The BrowserUpProxyServer implementation uses native DNS resolution by default, but supports custom DNS resolution and advanced DNS manipulation. See the [ClientUtil](BrowserUp-proxy/BrowserUp-core/src/main/java/net/lightbody/bup/client/ClientUtil.java) class for information on DNS manipulation using the dnsjava resolver.
+The BrowserUpProxyServer implementation uses native DNS resolution by default, but supports custom DNS resolution and advanced DNS manipulation. See the [ClientUtil](browserup-proxy-core/src/main/java/com/browserup/bup/client/ClientUtil.java) class for information on DNS manipulation using the dnsjava resolver.
 
 ## Building the latest from source
 

browserup-proxy-core/src/main/java/com/browserup/bup/filters/HarCaptureFilter.java

@@ -784,7 +784,7 @@ public void serverToProxyResponseReceived() {
         long responseReceivedNanos = System.nanoTime();
 
         // like the wait time, the receive time requires that the serverToProxyResponseReceiving() method be called before this method is invoked.
-        // typically that should happen, but it has been reported (https://github.com/lightbody/BrowserUp-proxy/issues/288) that it
+        // typically that should happen, but it has been reported (https://github.com/lightbody/browsermob-proxy/issues/288) that it
         // sometimes does not. therefore, to be safe, make sure responseReceiveStartedNanos is populated before setting the receive time.
         if (responseReceiveStartedNanos > 0L) {
             this.harEntry.getTimings().setReceive(responseReceivedNanos - responseReceiveStartedNanos, NANOSECONDS);

browserup-proxy-mitm/build.gradle

@@ -4,6 +4,7 @@
 
 plugins {
     id 'java-library'
+    id 'groovy'
 }
 
 archivesBaseName = 'browserup-proxy-mitm'
@@ -74,6 +75,7 @@ dependencies {
     testImplementation 'org.apache.logging.log4j:log4j-api:2.8'
     testImplementation 'org.apache.logging.log4j:log4j-core:2.8'
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8'
+    testImplementation 'org.codehaus.groovy:groovy-all:2.4.16'
     testImplementation 'org.hamcrest:hamcrest-library:1.3'
     testImplementation 'org.mockito:mockito-core:2.23.4'
     testImplementation 'org.slf4j:jcl-over-slf4j:1.7.22'

browserup-proxy-mitm/src/test/groovy/com/browserup/bup/mitm/KeyStoreFileCertificateSourceTest.groovy

@@ -13,6 +13,8 @@ import org.junit.rules.TemporaryFolder
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
+import static com.browserup.bup.mitm.test.util.CertificateTestUtil.*
+
 class KeyStoreFileCertificateSourceTest {
 
     @Rule
@@ -26,17 +28,17 @@ class KeyStoreFileCertificateSourceTest {
         pkcs12File = tmpDir.newFile("keystore.p12")
         jksFile = tmpDir.newFile("keystore.jks")
 
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/keystore.p12"), pkcs12File.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/keystore.jks"), jksFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/keystore.p12"), pkcs12File.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/keystore.jks"), jksFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
     }
 
     @Test
     void testPkcs12FileOnClasspath() {
-        KeyStoreFileCertificateSource keyStoreFileCertificateSource = new KeyStoreFileCertificateSource("PKCS12", "/net/lightbody/bup/mitm/keystore.p12", "privateKey", "password")
+        KeyStoreFileCertificateSource keyStoreFileCertificateSource = new KeyStoreFileCertificateSource("PKCS12", "/com/browserup/bup/mitm/keystore.p12", "privateKey", "password")
 
         CertificateAndKey certificateAndKey = keyStoreFileCertificateSource.load()
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 
     @Test
@@ -45,16 +47,16 @@ class KeyStoreFileCertificateSourceTest {
 
         CertificateAndKey certificateAndKey = keyStoreFileCertificateSource.load()
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 
     @Test
     void testJksFileOnClasspath() {
-        KeyStoreFileCertificateSource keyStoreFileCertificateSource = new KeyStoreFileCertificateSource("JKS", "/net/lightbody/bup/mitm/keystore.jks", "privateKey", "password")
+        KeyStoreFileCertificateSource keyStoreFileCertificateSource = new KeyStoreFileCertificateSource("JKS", "/com/browserup/bup/mitm/keystore.jks", "privateKey", "password")
 
         CertificateAndKey certificateAndKey = keyStoreFileCertificateSource.load()
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 
     @Test
@@ -63,6 +65,6 @@ class KeyStoreFileCertificateSourceTest {
 
         CertificateAndKey certificateAndKey = keyStoreFileCertificateSource.load()
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 }

browserup-proxy-mitm/src/test/groovy/com/browserup/bup/mitm/PemFileCertificateSourceTest.groovy

@@ -15,6 +15,7 @@ import org.junit.rules.TemporaryFolder
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
+import static com.browserup.bup.mitm.test.util.CertificateTestUtil.*
 import static org.junit.Assert.assertNotNull
 import static org.junit.Assume.assumeTrue
 
@@ -33,9 +34,9 @@ class PemFileCertificateSourceTest {
         encryptedPrivateKeyFile = tmpDir.newFile("encrypted-private-key.key")
         unencryptedPrivateKeyFile = tmpDir.newFile("unencrypted-private-key.key")
 
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/certificate.crt"), certificateFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/encrypted-private-key.key"), encryptedPrivateKeyFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/unencrypted-private-key.key"), unencryptedPrivateKeyFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/certificate.crt"), certificateFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/encrypted-private-key.key"), encryptedPrivateKeyFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/unencrypted-private-key.key"), unencryptedPrivateKeyFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
     }
 
     @Test
@@ -47,7 +48,7 @@ class PemFileCertificateSourceTest {
         CertificateAndKey certificateAndKey = pemFileCertificateSource.load()
         assertNotNull(certificateAndKey)
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 
     @Test
@@ -57,7 +58,7 @@ class PemFileCertificateSourceTest {
         CertificateAndKey certificateAndKey = pemFileCertificateSource.load()
         assertNotNull(certificateAndKey)
 
-        CertificateTestUtil.verifyTestRSACertWithCNandO(certificateAndKey)
+        verifyTestRSACertWithCNandO(certificateAndKey)
     }
 
     @Test(expected = ImportException)

browserup-proxy-mitm/src/test/groovy/com/browserup/bup/mitm/TrustSourceTest.groovy

@@ -32,7 +32,7 @@ class TrustSourceTest {
     void stageFiles() {
         certificateFile = tmpDir.newFile("certificate.crt")
 
-        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/net/lightbody/bup/mitm/certificate.crt"), certificateFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(KeyStoreFileCertificateSourceTest.getResourceAsStream("/com/browserup/bup/mitm/certificate.crt"), certificateFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
     }
 
     @Test
@@ -95,7 +95,7 @@ class TrustSourceTest {
 
     @Test
     void testCanAddTrustedCertificateInKeyStore() {
-        InputStream keystoreStream = TrustSource.class.getResourceAsStream("/net/lightbody/bup/mitm/trusted-cert.jks")
+        InputStream keystoreStream = TrustSource.class.getResourceAsStream("/com/browserup/bup/mitm/trusted-cert.jks")
         assertNotNull("Unable to load keystore", keystoreStream)
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
         keyStore.load(keystoreStream, null)

browserup-proxy-rest/build.gradle

@@ -75,7 +75,7 @@ dependencies {
     testImplementation 'org.apache.logging.log4j:log4j-api:2.8.2'
     testImplementation 'org.apache.logging.log4j:log4j-core:2.8.2'
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2'
-    testImplementation 'org.codehaus.groovy:groovy-all:2.4.12'
+    testImplementation 'org.codehaus.groovy:groovy-all:2.4.16'
     testImplementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
     testImplementation 'org.hamcrest:hamcrest-library:1.3'
     testImplementation 'org.mock-server:mockserver-netty:3.10.8'

build.gradle

@@ -10,8 +10,8 @@ configurations.all {
         // it uses org.littleshoot.proxy.impl.ProxyToServerConnection.addressFor
         // which calls com.google.common.net.HostAndPort.getHost(),
         // which is not in 19.
-        // https://github.com/lightbody/BrowserUp-proxy/issues/638
-        // https://github.com/lightbody/BrowserUp-proxy/issues/398
+        // https://github.com/lightbody/browsermob-proxy/issues/638
+        // https://github.com/lightbody/browsermob-proxy/issues/398
         // .....
         // UPDATE Jan 21 2019: I'm upgrading to Guava 22, and will sort out upstream Minion
         // conflicts later. BrowserUpDriver _should_ be allowed to use whatever libs it wants.