Skip to content

Commit

Permalink
clientCertProvider is only used by AJP
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1709548 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
markt-asf committed Oct 20, 2015
1 parent 619f096 commit cb95667
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 34 deletions.
12 changes: 0 additions & 12 deletions java/org/apache/coyote/AbstractProcessor.java
Expand Up @@ -45,7 +45,6 @@ public abstract class AbstractProcessor extends AbstractProcessorLight implement
protected final Response response; protected final Response response;
protected volatile SocketWrapperBase<?> socketWrapper = null; protected volatile SocketWrapperBase<?> socketWrapper = null;
protected volatile SSLSupport sslSupport; protected volatile SSLSupport sslSupport;
private String clientCertProvider = null;


/** /**
* Error state for the request/response currently being processed. * Error state for the request/response currently being processed.
Expand Down Expand Up @@ -141,17 +140,6 @@ public Adapter getAdapter() {
} }




@Override
public String getClientCertProvider() {
return clientCertProvider;
}


public void setClientCertProvider(String s) {
this.clientCertProvider = s;
}


/** /**
* Set the socket wrapper being used. * Set the socket wrapper being used.
*/ */
Expand Down
14 changes: 0 additions & 14 deletions java/org/apache/coyote/Processor.java
Expand Up @@ -69,20 +69,6 @@ public interface Processor {
*/ */
void recycle(); void recycle();


/**
* When client certificate information is presented in a form other than
* instances of {@link java.security.cert.X509Certificate} it needs to be
* converted before it can be used and this property controls which JSSE
* provider is used to perform the conversion. For example it is used with
* the AJP connectors, the HTTP APR connector and with the
* {@link org.apache.catalina.valves.SSLValve}. If not specified, the
* default provider will be used.
*
* @return The name of the JSSE provider to use for certificate
* transformation if required
*/
String getClientCertProvider();

void setSslSupport(SSLSupport sslSupport); void setSslSupport(SSLSupport sslSupport);


/** /**
Expand Down
15 changes: 15 additions & 0 deletions java/org/apache/coyote/ajp/AjpProcessor.java
Expand Up @@ -243,6 +243,8 @@ public class AjpProcessor extends AbstractProcessor {
private long bytesWritten = 0; private long bytesWritten = 0;






// ------------------------------------------------------------ Constructor // ------------------------------------------------------------ Constructor


public AjpProcessor(int packetSize, AbstractEndpoint<?> endpoint) { public AjpProcessor(int packetSize, AbstractEndpoint<?> endpoint) {
Expand Down Expand Up @@ -318,6 +320,19 @@ public void setRequiredSecret(String requiredSecret) {
} }




/**
* When client certificate information is presented in a form other than
* instances of {@link java.security.cert.X509Certificate} it needs to be
* converted before it can be used and this property controls which JSSE
* provider is used to perform the conversion.
*/
private String clientCertProvider = null;
public String getClientCertProvider() { return clientCertProvider; }
public void setClientCertProvider(String clientCertProvider) {
this.clientCertProvider = clientCertProvider;
}


// --------------------------------------------------------- Public Methods // --------------------------------------------------------- Public Methods




Expand Down
1 change: 0 additions & 1 deletion java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Expand Up @@ -627,7 +627,6 @@ protected void configureProcessor(Http11Processor processor) {
processor.setRestrictedUserAgents(getRestrictedUserAgents()); processor.setRestrictedUserAgents(getRestrictedUserAgents());
processor.setMaxSavePostSize(getMaxSavePostSize()); processor.setMaxSavePostSize(getMaxSavePostSize());
processor.setServer(getServer()); processor.setServer(getServer());
processor.setClientCertProvider(getClientCertProvider());
} }




Expand Down
Expand Up @@ -99,12 +99,6 @@ public final Request getRequest() {
} }




@Override
public String getClientCertProvider() {
return null;
}


@Override @Override
public ByteBuffer getLeftoverInput() { public ByteBuffer getLeftoverInput() {
return null; return null;
Expand Down
1 change: 0 additions & 1 deletion java/org/apache/coyote/http2/StreamProcessor.java
Expand Up @@ -369,7 +369,6 @@ public void recycle() {
// is reused // is reused
setSocketWrapper(null); setSocketWrapper(null);
setAdapter(null); setAdapter(null);
setClientCertProvider(null);
} }




Expand Down

0 comments on commit cb95667

Please sign in to comment.