You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/10/16 03:55:16 UTC
svn commit: r1532624 - in /juddi/trunk:
juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/
juddi-gui/src/main/java/org/apache/juddi/webconsole/
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/main/resources/META-INF/ juddi-g...
Author: alexoree
Date: Wed Oct 16 01:55:15 2013
New Revision: 1532624
URL: http://svn.apache.org/r1532624
Log:
JUDDI-661 done, reverted gui session encryption key to 128bit aes for users without the jce installed. digital signature app has additional debugging information.
Modified:
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
Modified: juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java (original)
+++ juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java Wed Oct 16 01:55:15 2013
@@ -185,6 +185,7 @@ public class XmlSignatureApplet extends
keyStore = KeyStore.getInstance("Windows-MY");
keyStore.load(null, null);
} catch (Exception ex) {
+ ex.printStackTrace();
//JOptionPane.showMessageDialog(this, ex.getMessage());
}
//firefox keystore
@@ -200,6 +201,7 @@ public class XmlSignatureApplet extends
keyStore.load(null, "password".toCharArray());
} catch (Exception ex) {
//JOptionPane.showMessageDialog(this, ex.getMessage());
+ ex.printStackTrace();
}
}
//MacOS with Safari possibly others
@@ -210,6 +212,7 @@ public class XmlSignatureApplet extends
} catch (Exception ex) {
//JOptionPane.showMessageDialog(this, ex.getMessage());
+ ex.printStackTrace();
}
}
try {
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java Wed Oct 16 01:55:15 2013
@@ -82,8 +82,9 @@ public class AES {
return raw;
}
//default key
- private final static String something2 = "dde284c781d60ca0b56c4b23eec85217951dc99869402abd42c7dcc9080d60aa";
+ private final static String something128 = "dde284c781d60ca0b56c4b23eec85217951dc99869402abd42c7dcc9080d60aa";
+ private final static String something256 ="72d93747ba0162f2f2985f5cb3e24b30";
/**
* generates an AES based off of the selected key size
* @param keysize
@@ -209,7 +210,7 @@ public class AES {
return key;
} else {
log.debug( "default encryption key loaded.");
- return something2;
+ return something128;
}
}
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Wed Oct 16 01:55:15 2013
@@ -47,6 +47,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.UDDIConstants;
+import org.apache.juddi.v3.client.config.ClientConfig;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.webconsole.AES;
@@ -174,6 +175,8 @@ public class UddiHub {
public Properties GetRawConfiguration() {
return properties;
}
+
+
private UddiHub(ServletContext application, HttpSession _session) throws Exception {
URL prop = application.getResource("/META-INF/config.properties");
@@ -187,7 +190,12 @@ public class UddiHub {
p.load(in);
in.close();
properties = p;
- style = (AuthStyle) AuthStyle.valueOf((String) p.get("authtype"));
+ try {
+ style = AuthStyle.valueOf((String) p.get("authtype"));
+ } catch (Exception ex) {
+ log.info("UDDI_AUTH is not defined in the config");
+ style = AuthStyle.UDDI_AUTH;
+ }
try {
String clazz = UDDIClientContainer.getUDDIClient(null).
@@ -202,33 +210,7 @@ public class UddiHub {
subscription = transport.getUDDISubscriptionService();
publish = transport.getUDDIPublishService();
custody = transport.getUDDICustodyTransferService();
- // juddi = transport.getJUDDIApiService();
- BindingProvider bp = null;
- Map<String, Object> context = null;
- bp = (BindingProvider) inquiry;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("inquiryurl"));
- bp = (BindingProvider) publish;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("publishurl"));
- bp = (BindingProvider) custody;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("custodyurl"));
-
-
- bp = (BindingProvider) security;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("securityurl"));
-
- bp = (BindingProvider) subscription;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("subscriptionurl"));
-
-
- /*bp = (BindingProvider) juddi;
- context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("juddipapi"));*/
}
} catch (Exception ex) {
HandleException(ex);
@@ -236,6 +218,19 @@ public class UddiHub {
}
private HttpSession session;
+
+ public Properties GetDigitalSignatureConfig()
+ {
+ try{
+ return UDDIClientContainer.getUDDIClient(null).getClientConfig().getDigitalSignatureConfiguration();
+ }
+ catch (Exception ex){
+ log.error("error fetching uddi.xml", ex);
+ }
+ return new Properties();
+ }
+
+
private String GetToken() {
if (style != AuthStyle.UDDI_AUTH) {
BindingProvider bp = null;
@@ -1367,9 +1362,9 @@ public class UddiHub {
fb.setAuthInfo(GetToken());
if (fq != null) {
fb.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
- for (int i = 0; i < fq.length; i++) {
- fb.getFindQualifiers().getFindQualifier().add(fq[i]);
- }
+ for (int i = 0; i < fq.length; i++) {
+ fb.getFindQualifiers().getFindQualifier().add(fq[i]);
+ }
}
BindingDetail findBusiness = null;
switch (criteria) {
Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Wed Oct 16 01:55:15 2013
@@ -29,7 +29,7 @@
</node>
</nodes>
<signature>
- <!-- signing stuff -->
+ <!-- signing stuff, not used by juddi-gui -->
<signingKeyStorePath>keystore.jks</signingKeyStorePath>
<signingKeyStoreType>JKS</signingKeyStoreType>
<signingKeyStoreFilePassword
@@ -39,10 +39,14 @@
isPasswordEncrypted="false"
cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
<signingKeyAlias>my special key</signingKeyAlias>
+
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
<signatureMethod>RSA_SHA1</signatureMethod>
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
- <!-- validation stuff -->
+
+ <!-- validation stuff
+ This part is used by juddi-gui whenever someone views an entity that is signed
+ -->
<trustStorePath>truststore.jks</trustStorePath>
<trustStoreType>JKS</trustStoreType>
<trustStorePassword
@@ -53,6 +57,7 @@
<checkTrust>true</checkTrust>
<checkRevocationCRL>true</checkRevocationCRL>
</signature>
+ <!-- not used by juddi-gui-->
<subscriptionCallbacks>
<keyDomain>uddi:somebusiness</keyDomain>
<listenUrl>http://MyHostname:4444/callback</listenUrl>
@@ -61,8 +66,10 @@
<signatureBehavior>DoNothing</signatureBehavior>
<!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
</subscriptionCallbacks>
+ <!-- juddi-gui, used in the Create, Import from Wadl/Wsdl -->
<XtoWsdl>
<IgnoreSSLErrors>false</IgnoreSSLErrors>
</XtoWsdl>
+
</client>
</uddi>
Modified: juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties Wed Oct 16 01:55:15 2013
@@ -1,41 +1,7 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-inquiryurl=http://localhost:8080/juddiv3/services/inquiry?wsdl
-publishurl=http://localhost:8080/juddiv3/services/publish?wsdl
-securityurl=http://localhost:8080/juddiv3/services/security?wsdl
-
-custodyurl=http://localhost:8080/juddiv3/services/custody-transfer?wsdl
-juddipapi=http://localhost:8080/juddiv3/services/juddi-api?wsdl
-subscriptionurl=http://localhost:8080/juddiv3/services/subscription?wsdl
-# note used subscriptionlistenerurl=http://localhost:8080/juddiv3/services/subscription-listener?wsdl
+#required. if this uddi client is connected to uddi services that use the auth token, then set to UDDI_AUTH
+#if not, set authtype to
authtype=UDDI_AUTH
-registryType=juddi
#future use
-
-
-#javax.net.ssl.keyStore
-#javax.net.ssl.keyStorePassword
-#javax.net.ssl.trustStore
-#javax.net.ssl.trustStorePassword
-
-
-#
-# The type of file, such as JKS for most Java applications, or WINDOWS-MY
-# to use the Windows certificate store of the current user or KeychainStore
-# for MacOS
-
-#TRUSTSTORE_FILE = keyStorePath
-#TRUSTSTORE_FILETYPE = keyStoreType
-#TRUSTSTORE_FILE_PASSWORD = filePassword
-
-
-# uncomment to override
-#XML_DIGSIG_NS = http://www.w3.org/2000/09/xmldsig#
-
-CHECK_TIMESTAMPS = anyvalue
-#CHECK_REVOCATION_STATUS_OCSP = anyvalue
-#CHECK_REVOCATION_STATUS_CRL = anyvalue
-#CHECK_TRUST_CHAIN = anyvalue
+#registryType=juddi
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp Wed Oct 16 01:55:15 2013
@@ -8,7 +8,7 @@
<%@page import="java.util.Set"%>
<%@page import="java.util.Properties"%>
<%@page import="java.util.concurrent.atomic.AtomicReference"%>
-<%@page import="org.apache.juddi.v3.client.crypto.DigSigUtil"%>
+<%@page import="org.apache.juddi.v3.client.cryptor.DigSigUtil"%>
<%@page import="org.apache.juddi.jaxb.JAXBMarshaller"%>
<%@page import="org.apache.juddi.jaxb.EntityCreator"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
@@ -32,17 +32,9 @@
j = x.GettModelDetailsAsObject(id);
}
if (j != null) {
- org.apache.juddi.v3.client.crypto.DigSigUtil dsig = new DigSigUtil();
UddiHub hub = UddiHub.getInstance(application, session);
- Properties config2 = hub.GetRawConfiguration();
- Set<Entry<Object, Object>> it = config2.entrySet();
- Iterator it2 = it.iterator();
- while (it2.hasNext()) {
- Object j2 = it2.next();
- Entry<Object, Object> item = (Entry<Object, Object>) j2;
- dsig.put((String) item.getKey(), (String) item.getValue());
- }
-
+
+ org.apache.juddi.v3.client.cryptor.DigSigUtil dsig = new DigSigUtil(hub.GetDigitalSignatureConfig());
AtomicReference<String> msg = new AtomicReference<String>();
// dsig.put(DigSigUtil., value);
Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1532624&r1=1532623&r2=1532624&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Wed Oct 16 01:55:15 2013
@@ -71,8 +71,7 @@
if (newitem) {
out.write(StringEscapeUtils.escapeHtml(bd.getBusinessKey()));
}
- if (bd.getContacts()
- == null) {
+ if (bd.getContacts() == null) {
bd.setContacts(new Contacts());
}
if (bd.getCategoryBag() == null) {
@@ -197,8 +196,7 @@
<b><%=ResourceLoader.GetResource(session, "items.discoveryurl")%></b>- <%=ResourceLoader.GetResource(session, "items.discoveryurl.description")%>
<div id="discoContainer" style="border-width: 2px; border-style: solid;" >
<%
- if (bd.getDiscoveryURLs()
- != null) {
+ if (bd.getDiscoveryURLs() != null) {
for (int i = 0; i < bd.getDiscoveryURLs().getDiscoveryURL().size(); i++) {
out.write("<div id=\"disco" + i + "\" style=\"border-width:1px; border-style:solid\">");
@@ -469,6 +467,7 @@
out.write(Integer.toString(bd.getBusinessServices().getBusinessService().size()));
} else {
out.write("0");
+ }
%> <%=ResourceLoader.GetResource(session, "pages.businesseditor.businesslist2")%>
<%if (!newitem) {
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org