-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #136 from scottslewis/sslcontext
SslcontextFactory introduced to ECF core and used in JRE httpclient
- Loading branch information
Showing
16 changed files
with
791 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...ework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ECFSSLContextFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /**************************************************************************** | ||
| * Copyright (c) 2024 Composent, Inc. and others. | ||
| * | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * Contributors: Composent, Inc. - initial API and implementation | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| *****************************************************************************/ | ||
| package org.eclipse.ecf.core.security; | ||
|
|
||
| import java.security.*; | ||
| import java.util.Optional; | ||
| import javax.net.ssl.SSLContext; | ||
| import org.eclipse.core.runtime.IStatus; | ||
| import org.eclipse.core.runtime.Status; | ||
| import org.eclipse.ecf.internal.core.identity.Activator; | ||
| import org.osgi.framework.BundleContext; | ||
| import org.osgi.util.tracker.ServiceTracker; | ||
|
|
||
| /** | ||
| * @since 3.12 | ||
| */ | ||
| public class ECFSSLContextFactory implements SSLContextFactory { | ||
|
|
||
| private final ServiceTracker<Provider, Provider> providerTracker; | ||
| private final String defaultProtocol; | ||
| private final String defaultProviderName; | ||
|
|
||
| public ECFSSLContextFactory(BundleContext context, String defaultProtocol) { | ||
| this(context, defaultProtocol, null); | ||
| } | ||
|
|
||
| public ECFSSLContextFactory(BundleContext context, String defaultProtocol, String defaultProviderName) { | ||
| this.defaultProtocol = defaultProtocol; | ||
| this.defaultProviderName = defaultProviderName; | ||
| this.providerTracker = new ServiceTracker<Provider, Provider>(context, Provider.class, null); | ||
| this.providerTracker.open(); | ||
| } | ||
|
|
||
| @Override | ||
| public SSLContext getDefault() throws NoSuchAlgorithmException, NoSuchProviderException { | ||
| return getInstance0(this.defaultProtocol, this.defaultProviderName); | ||
| } | ||
|
|
||
| protected SSLContext getInstance0(String protocol, String providerName) throws NoSuchAlgorithmException, NoSuchProviderException { | ||
| if (protocol == null) { | ||
| return SSLContext.getDefault(); | ||
| } | ||
| Provider provider = findProvider(providerName); | ||
| if (provider == null) | ||
| throw new NoSuchProviderException("No provider registered named '" + providerName + "'"); //$NON-NLS-1$ //$NON-NLS-2$ | ||
| return SSLContext.getInstance(protocol, provider); | ||
| } | ||
|
|
||
| @Override | ||
| public SSLContext getInstance(String protocol) throws NoSuchAlgorithmException, NoSuchProviderException { | ||
| return getInstance0(protocol, this.defaultProviderName); | ||
| } | ||
|
|
||
| public void close() { | ||
| this.providerTracker.close(); | ||
| } | ||
|
|
||
| protected Provider findProvider(String providerName) { | ||
| if (providerName == null) { | ||
| return this.providerTracker.getService(); | ||
| } | ||
| Optional<Provider> optResult = this.providerTracker.getTracked().values().stream().filter(p -> | ||
| // test that providerName is equal to Provider.getName() | ||
| providerName.equals(p.getName())).findFirst(); | ||
| // If there are matching Providers, use first (highest priority from sorted map) and use to create SSLContext. | ||
| // If none, then throw | ||
| if (optResult.isPresent()) { | ||
| return optResult.get(); | ||
| } | ||
| // If providerName is same as current default SSLContext then use it | ||
| try { | ||
| SSLContext defaultContext = SSLContext.getDefault(); | ||
| if (providerName.equals(defaultContext.getProvider().getName())) { | ||
| return defaultContext.getProvider(); | ||
| } | ||
| } catch (NoSuchAlgorithmException e) { | ||
| Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Could not get SSLContext.getDefault()", e)); //$NON-NLS-1$ | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public SSLContext getInstance(String protocol, String providerName) throws NoSuchAlgorithmException, NoSuchProviderException { | ||
| return getInstance0(protocol, providerName); | ||
| } | ||
|
|
||
| } |
29 changes: 29 additions & 0 deletions
29
framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/SSLContextFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /**************************************************************************** | ||
| * Copyright (c) 2024 Composent, Inc. and others. | ||
| * | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * Contributors: Composent, Inc. - initial API and implementation | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| *****************************************************************************/ | ||
| package org.eclipse.ecf.core.security; | ||
|
|
||
| import java.security.NoSuchAlgorithmException; | ||
| import java.security.NoSuchProviderException; | ||
| import javax.net.ssl.SSLContext; | ||
|
|
||
| /** | ||
| * @since 3.12 | ||
| */ | ||
| public interface SSLContextFactory { | ||
|
|
||
| SSLContext getDefault() throws NoSuchAlgorithmException, NoSuchProviderException; | ||
|
|
||
| SSLContext getInstance(String protocol) throws NoSuchAlgorithmException, NoSuchProviderException; | ||
|
|
||
| SSLContext getInstance(String protocol, String providerName) throws NoSuchAlgorithmException, NoSuchProviderException; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.