root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r1836664 

Bug 62570 - HTTP(S) Test Script Recorder : Increase validity of Root CA used to capture traffic
Bugzilla Id: 62570


git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1836751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Felix Schumacher 2018-07-26 18:57:56 +00:00
parent b8e901bef1
commit 03c8a7af0a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/jmeter.properties
View File

@ -638,7 +638,7 @@ upgrade_properties=/bin/upgrade.properties
# define this property if you wish to use your own keystore
#proxy.cert.alias=<none>
# The default validity for certificates created by JMeter
#proxy.cert.validity=90
#proxy.cert.validity=7
# Use dynamic key generation (if supported by JMeter/JVM)
# If false, will revert to using a single key with no certificate
#proxy.cert.dynamic_keys=true

2
src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
View File

@ -230,7 +230,7 @@ public class ProxyControl extends GenericController implements NonTestElement {
// The alias to be used if dynamic host names are not possible
static final String JMETER_SERVER_ALIAS = ":jmeter:"; // $NON-NLS-1$
public static final int CERT_VALIDITY = JMeterUtils.getPropDefault("proxy.cert.validity", 90); // $NON-NLS-1$
public static final int CERT_VALIDITY = JMeterUtils.getPropDefault("proxy.cert.validity", 7); // $NON-NLS-1$
// If this is defined, it is assumed to be the alias of a user-supplied certificate; overrides dynamic mode
static final String CERT_ALIAS = JMeterUtils.getProperty("proxy.cert.alias"); // $NON-NLS-1$

2
xdocs/usermanual/component_reference.xml
View File

@ -6382,7 +6382,7 @@ the browser. Effectively JMeter has to pretend to be the target server.
</p>
<p>
JMeter will generate its own certificate(s).
These are generated with a validity period defined by the property <code>proxy.cert.validity</code>, default 90 days, and random passwords.
These are generated with a validity period defined by the property <code>proxy.cert.validity</code>, default 7 days, and random passwords.
If JMeter detects that it is running under Java 8 or later, it will generate certificates for each target server as necessary (dynamic mode)
unless the following property is defined: <code>proxy.cert.dynamic_keys=false</code>.
When using dynamic mode, the certificate will be for the correct host name, and will be signed by a JMeter-generated CA certificate.

2
xdocs/usermanual/properties_reference.xml
View File

@ -833,7 +833,7 @@ JMETER-SERVER</source>
</property>
<property name="proxy.cert.validity">
The default validity (in days) for certificates created by JMeter.<br/>
Defaults to: <code>90</code>
Defaults to: <code>7</code>
</property>
<property name="proxy.cert.dynamic_keys">
Use dynamic key generation (if supported by JMeter/JVM).<br/>