You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/20 16:47:33 UTC
[8/8] incubator-taverna-engine git commit: package names changed to
org.apache.taverna.*
package names changed to org.apache.taverna.*
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/55900be9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/55900be9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/55900be9
Branch: refs/heads/master
Commit: 55900be9677c6cbf63a3ff06309a2210988c300f
Parents: d5b1c81
Author: redmitry <re...@84.88.50.62>
Authored: Fri Mar 20 16:46:28 2015 +0100
Committer: redmitry <re...@84.88.50.62>
Committed: Fri Mar 20 16:46:54 2015 +0100
----------------------------------------------------------------------
.../impl/CredentialManagerAuthenticator.java | 112 -
.../impl/CredentialManagerImpl.java | 2657 ------------------
.../impl/DefaultMasterPasswordProvider.java | 51 -
.../impl/DistinguishedNameParserImpl.java | 177 --
.../impl/ParsedDistinguishedNameImpl.java | 265 --
.../impl/CredentialManagerAuthenticator.java | 131 +
.../impl/CredentialManagerImpl.java | 2656 +++++++++++++++++
.../impl/DefaultMasterPasswordProvider.java | 70 +
.../impl/DistinguishedNameParserImpl.java | 196 ++
.../impl/ParsedDistinguishedNameImpl.java | 263 ++
.../credential-manager-impl-context-osgi.xml | 14 +-
.../spring/credential-manager-impl-context.xml | 6 +-
.../impl/CredentialManagerImplIT.java | 339 ---
.../impl/CredentialManagerImplTest.java | 872 ------
.../DummyJavaTruststorePasswordProvider.java | 39 -
.../impl/DummyMasterPasswordProvider.java | 50 -
...DummyServiceUsernameAndPasswordProvider.java | 50 -
.../impl/HTTPAuthenticatorIT.java | 535 ----
...catorServiceUsernameAndPasswordProvider.java | 73 -
.../HTTPSConnectionAndTrustConfirmationIT.java | 336 ---
.../impl/PossibleURILookupsTest.java | 254 --
.../TrustAlwaysTrustConfirmationProvider.java | 36 -
.../TrustNeverTrustConfimationProvider.java | 36 -
.../impl/CredentialManagerImplIT.java | 338 +++
.../impl/CredentialManagerImplTest.java | 871 ++++++
.../DummyJavaTruststorePasswordProvider.java | 38 +
.../impl/DummyMasterPasswordProvider.java | 49 +
...DummyServiceUsernameAndPasswordProvider.java | 49 +
.../impl/HTTPAuthenticatorIT.java | 534 ++++
...catorServiceUsernameAndPasswordProvider.java | 72 +
.../HTTPSConnectionAndTrustConfirmationIT.java | 335 +++
.../impl/PossibleURILookupsTest.java | 253 ++
.../TrustAlwaysTrustConfirmationProvider.java | 35 +
.../TrustNeverTrustConfimationProvider.java | 35 +
.../security/credentialmanager/CMException.java | 39 +-
.../CMNotInitialisedException.java | 39 +-
.../credentialmanager/CredentialManager.java | 39 +-
.../DistinguishedNameParser.java | 39 +-
.../JavaTruststorePasswordProvider.java | 39 +-
.../credentialmanager/KeystoreChangedEvent.java | 39 +-
.../MasterPasswordProvider.java | 39 +-
.../ParsedDistinguishedName.java | 39 +-
.../ServiceUsernameAndPasswordProvider.java | 39 +-
.../TrustConfirmationProvider.java | 19 +
.../credentialmanager/UsernamePassword.java | 39 +-
45 files changed, 6144 insertions(+), 6092 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/55900be9/taverna-credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerAuthenticator.java
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerAuthenticator.java b/taverna-credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerAuthenticator.java
deleted file mode 100644
index 3a0193e..0000000
--- a/taverna-credential-manager-impl/src/main/java/net/sf/taverna/t2/security/credentialmanager/impl/CredentialManagerAuthenticator.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package net.sf.taverna.t2.security.credentialmanager.impl;
-
-import static java.net.Authenticator.RequestorType.PROXY;
-
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-import java.net.URI;
-import java.net.URISyntaxException;
-import net.sf.taverna.t2.security.credentialmanager.CMException;
-import net.sf.taverna.t2.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.security.credentialmanager.UsernamePassword;
-
-import org.apache.log4j.Logger;
-
-/**
- * Credential Manager backed {@link Authenticator}.
- * <p>
- * Initialize by using: <code>
- * Authenticator.setDefault(new CredentialManagerAuthenticator());
- * </code>
- * <p>
- * Special case included for proxy authentication.
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class CredentialManagerAuthenticator extends Authenticator {
- private Logger logger;
- private CredentialManager credManager;
-
- public CredentialManagerAuthenticator(CredentialManager credManager) {
- logger = Logger.getLogger(CredentialManagerAuthenticator.class);
- setCredentialManager(credManager);
- }
-
- public void setCredentialManager(CredentialManager credManager) {
- this.credManager = credManager;
- }
-
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- if (getRequestorType().equals(PROXY)) {
- String password = System.getProperty("http.proxyPassword");
- String username = System.getProperty("http.proxyUser");
- if (username == null || password == null)
- // No proxy authentication set
- return null;
-
- return new PasswordAuthentication(username, password.toCharArray());
- }
-
- URI uri;
- if (getRequestingURL() != null) {
- try {
- uri = getRequestingURL().toURI();
- } catch (URISyntaxException e) {
- logger.warn("Unsupported request (invalid URL) for "
- + getRequestingURL());
- return null;
- }
- } else {
- // Construct an URI of socket://hostname:port
- String host = getRequestingHost();
- if (host == null)
- // Use IP address
- host = getRequestingSite().getHostAddress();
- int port = getRequestingPort();
- if (host == null || port < 0) {
- logger.warn("Unsupported request for " + getRequestingScheme()
- + " " + getRequestingSite());
- return null;
- }
- uri = URI.create("socket://" + host + ":" + port);
- }
-
- if (credManager == null) {
- logger.warn("No Credential Manager");
- return null;
- }
- boolean usePathRecursion = false;
- String realm = getRequestingPrompt();
- if (getRequestingScheme().equals("basic")
- || getRequestingScheme().equals("digest")) {
- usePathRecursion = true;
- if (realm != null && realm.length() > 0)
- try {
- uri = DistinguishedNameParserImpl.resolveUriFragment(uri, realm);
- } catch (URISyntaxException e) {
- logger.warn("Could not URI-encode fragment for realm: "
- + realm);
- }
- }
-
- UsernamePassword usernameAndPassword;
- try {
- usernameAndPassword = credManager.getUsernameAndPasswordForService(uri,
- usePathRecursion, realm);
- } catch (CMException e) {
- logger.warn("Could not get username and password for " + uri, e);
- return null;
- }
- if (usernameAndPassword == null) {
- logger.warn("No username/password found for " + uri);
- return null;
- }
- PasswordAuthentication pwAuth = new PasswordAuthentication(
- usernameAndPassword.getUsername(), usernameAndPassword
- .getPassword());
- usernameAndPassword.resetPassword();
- return pwAuth;
- }
-}