Skip to content

Commit 7406315

Browse files
authored
Merge pull request lightbody#603 from jekh/update-docs
Documentation updates for the selenium 3/firefox issue
2 parents 3352e50 + 4485feb commit 7406315

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

README.md

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,6 @@ Then create a proxy server instance:
4848
The "port" is the port of the newly-created proxy instance, so configure your HTTP client or web browser to use a proxy on the returned port.
4949
For more information on the features available in the REST API, see [the REST API documentation](#rest-api).
5050

51-
## Changes since the 2.1-beta series
52-
53-
**The `browsermob-core-littleproxy` module is now `browsermob-core`**
54-
55-
After six beta releases, the LittleProxy implementation now supports more features and is more stable than the legacy implementation. To reflect that level of maturity and long-term support, the `browsermob-core` module now uses LittleProxy by default.
56-
57-
**Note about Legacy support**: In the 2.1-betas, if you were using the `ProxyServer` or `LegacyProxyServer` classes, use the `browsermob-core-legacy` module in 2.1.0 and higher.
58-
59-
*LittleProxy support for `LegacyProxyServer` has moved to `BrowserMobProxyServerLegacyAdapter`*. Using the LittleProxy implementation with the `LegacyProxyServer` interface is still fully supported as a means to help you transition from 2.0.0. Unlike the 2.1-beta series, the `BrowserMobProxyServer` class
60-
no longer implements `LegacyProxyServer`; however, the `BrowserMobProxyServerLegacyAdapter` can be used to integrate legacy code with the new LittleProxy interface. You must still use the `browsermob-core-legacy` module when using the LegacyAdapter.
61-
62-
```java
63-
LegacyProxyServer proxy = new BrowserMobProxyServerLegacyAdapter();
64-
proxy.setPort(8081); // method only supported by the legacy interface
65-
proxy.start();
66-
```
67-
6851
## Changes since 2.0.0
6952

7053
The new [BrowserMobProxyServer class](browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java) has replaced the legacy ProxyServer implementation. The legacy implementation is no longer actively supported; all new code should use `BrowserMobProxyServer`. We highly recommend that existing code migrate to the new implementation.
@@ -118,7 +101,7 @@ The proxy is programmatically controlled via a REST interface or by being embedd
118101

119102
### REST API
120103

121-
**New in 2.1:** The REST API now supports LittleProxy. As of 2.1.0-beta-3, LittleProxy is the default implementation. (You may specify `--use-littleproxy false` to disable LittleProxy in favor of the legacy Jetty 5-based implementation.)
104+
**New in 2.1:** LittleProxy is the default implementation of the REST API. You may specify `--use-littleproxy false` to disable LittleProxy in favor of the legacy Jetty 5-based implementation.
122105

123106
To get started, first start the proxy by running `browsermob-proxy` or `browsermob-proxy.bat` in the bin directory:
124107

@@ -239,6 +222,8 @@ Consult the Javadocs on the `net.lightbody.bmp.BrowserMobProxy` class for the fu
239222

240223
### Using With Selenium
241224

225+
**Selenium 3 users**: Due to a [geckodriver issue](https://github.com/mozilla/geckodriver/issues/97), Firefox 51 and lower do not properly support proxies with WebDriver's DesiredCapabilities. See [this answer](http://stackoverflow.com/a/41373808/4256475) for a suitable work-around.
226+
242227
BrowserMob Proxy makes it easy to use a proxy in Selenium tests:
243228
```java
244229
// start the proxy

mitm/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ The MITM module uses "sensible" default settings that should work for the vast m
77
### LittleProxy (without BrowserMob Proxy)
88
**Note:** The MITM module requires Java 7
99

10-
**Compatibility note:** The current version of the MITM module is compatible with LittleProxy 1.1.0. If you are using LittleProxy 1.1.0-beta2 or earlier, use MITM 2.1.0-beta-5.
11-
1210
To use MITM with standalone LittleProxy, add a dependency to the mitm module in your pom:
1311

1412
```xml
1513
<!-- existing LittleProxy dependency -->
1614
<dependency>
1715
<groupId>org.littleshoot</groupId>
1816
<artifactId>littleproxy</artifactId>
19-
<version>1.1.0</version>
17+
<version>1.1.1</version>
2018
</dependency>
2119

2220
<-- new dependency on the MITM module -->
@@ -102,7 +100,7 @@ Whether you are using the MITM module with LittleProxy or BrowserMob Proxy, you
102100
You can also load the root certificate and private key from separate PEM-encoded files using the `PemFileCertificateSource` class, or create an implementation of `CertificateAndKeySource` that loads the certificate and private key from another source.
103101

104102
## Trusted Root Certificates
105-
As of 2.1.0-beta-6, the MITM module explicitly trusts the Certificate Authorities in the JVM's default trust store, as well as a default list of trusted CAs derived from NSS/Firefox's list of trusted CAs (courtesy of the cURL team: https://curl.haxx.se/ca/cacert.pem).
103+
The MITM module trusts the Certificate Authorities in the JVM's default trust store, as well as a default list of trusted CAs derived from NSS/Firefox's list of trusted CAs (courtesy of the cURL team: https://curl.haxx.se/ca/cacert.pem).
106104

107105
To add your own CA to the list of root CAs trusted by the MITM module, use the `add()` methods in the `net.lightbody.bmp.mitm.TrustSource` class. Alternatively, it is possible to disable upstream server validation, but this is only recommended when testing. Examples:
108106
```java

0 commit comments

Comments
 (0)