Author: kwright
Date: Tue Aug 27 21:23:20 2019
New Revision: 1866010
URL: http://svn.apache.org/viewvc?rev=1866010&view=rev
Log:
More changes
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java?rev=1866010&r1=1866009&r2=1866010&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
Tue Aug 27 21:23:20 2019
@@ -225,20 +225,8 @@ public class CswsAuthority extends org.a
Logging.authorityConnectors.debug("Csws: Csws session created.");
}
- final int connectionTimeout = 15 * 1000;
-
- final javax.net.ssl.SSLSocketFactory mySslFactory;
- if (serverHTTPSKeystore != null)
- {
- mySslFactory = new
InterruptibleSocketFactory(serverHTTPSKeystore.getSecureSocketFactory(),
connectionTimeout);
- }
- else
- {
- mySslFactory = null;
- }
-
// Construct a new csws session object for setting up this session
- cswsSession = new CswsSession(serverUsername, serverPassword,
mySslFactory, 1000L * 60L * 15L,
+ cswsSession = new CswsSession(serverUsername, serverPassword,
serverHTTPSKeystore, 1000L * 60L * 15L,
authenticationServiceURL, null, null, memberServiceServiceURL, null);
}
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1866010&r1=1866009&r2=1866010&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
Tue Aug 27 21:23:20 2019
@@ -525,7 +525,7 @@ public class CswsConnector extends org.a
}
// Construct a new csws session object for setting up this session
- cswsSession = new CswsSession(serverUsername, serverPassword,
mySslFactory, 1000L * 60L * 15L,
+ cswsSession = new CswsSession(serverUsername, serverPassword,
serverHTTPSKeystore, 1000L * 60L * 15L,
authenticationServiceURL, documentManagementServiceURL,
contentServiceServiceURL, memberServiceServiceURL, searchServiceServiceURL);
final GetSessionThread t = new GetSessionThread();
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java?rev=1866010&r1=1866009&r2=1866010&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Tue Aug 27 21:23:20 2019
@@ -130,7 +130,7 @@ public class CswsSession
public CswsSession(final String userName,
final String password,
- final javax.net.ssl.SSLSocketFactory sslSocketFactory,
+ final IKeystoreManager keystore,
final long sessionExpirationInterval,
final String authenticationServiceURL,
final String documentManagementServiceURL,
@@ -145,6 +145,9 @@ public class CswsSession
this.sessionExpirationInterval = sessionExpirationInterval;
// Build TLSClientParameters
final TLSClientParameters tlsConfig = new TLSClientParameters();
+ if (keystore != null) {
+ tlsConfig.setTrustManagers(keystore.getTrustManagers());
+ }
// Build configuration for conduit
final HttpConduitConfig config = new HttpConduitConfig();
config.setTlsClientParameters(tlsConfig);
@@ -175,6 +178,7 @@ public class CswsSession
((BindingProvider)memberServiceHandle).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
memberServiceServiceURL);
((BindingProvider)searchServiceHandle).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
searchServiceServiceURL);
+ /*
// Set SSLSocketFactory's
if (sslSocketFactory != null) {
((BindingProvider)authClientHandle).getRequestContext().put(sslSocketFactoryProperty,
sslSocketFactory);
@@ -183,6 +187,7 @@ public class CswsSession
((BindingProvider)memberServiceHandle).getRequestContext().put(sslSocketFactoryProperty,
sslSocketFactory);
((BindingProvider)searchServiceHandle).getRequestContext().put(sslSocketFactoryProperty,
sslSocketFactory);
}
+ */
}
/**
