You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2014/06/28 00:13:08 UTC
svn commit: r1606257 - in /uima/sandbox/uima-ducc/trunk:
src/main/config/activemq-ducc.xml
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java
Author: burn
Date: Fri Jun 27 22:13:07 2014
New Revision: 1606257
URL: http://svn.apache.org/r1606257
Log:
UIMA-3892 Let JD connect to broker without security and make its topic accessible
Modified:
uima/sandbox/uima-ducc/trunk/src/main/config/activemq-ducc.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/config/activemq-ducc.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/config/activemq-ducc.xml?rev=1606257&r1=1606256&r2=1606257&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/config/activemq-ducc.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/config/activemq-ducc.xml Fri Jun 27 22:13:07 2014
@@ -88,6 +88,7 @@
<!-- Configure authorization -->
<!-- Creating and writing to Topics is restricted to users in ducc-admin group -->
+ <!-- But access to the topic used by the JDs (user code) must be unrestricted -->
<!-- Everyone can read from, write to, and create queues -->
<authorizationPlugin>
<map>
@@ -96,16 +97,14 @@
<authorizationEntry topic=">" read="anonymous,ducc-admin" write="ducc-admin" admin="ducc-admin" />
<authorizationEntry queue=">" read="anonymous,ducc-admin" write="anonymous,ducc-admin" admin="anonymous,ducc-admin" />
<authorizationEntry topic="ActiveMQ.Advisory.>" read="anonymous,ducc-admin" write="anonymous,ducc-admin" admin="anonymous,ducc-admin"/>
+ <authorizationEntry topic="ducc.jd.state" read="anonymous,ducc-admin" write="anonymous,ducc-admin" admin="anonymous,ducc-admin"/>
</authorizationEntries>
</authorizationMap>
</map>
</authorizationPlugin>
</plugins>
-
-
-
-
+
<transportConnectors>
<transportConnector name="openwire" uri="tcp://0.0.0.0:${DUCC_AMQ_PORT}?${DUCC_AMQ_DECORATION}"/>
</transportConnectors>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java?rev=1606257&r1=1606256&r2=1606257&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/BrokerCredentials.java Fri Jun 27 22:13:07 2014
@@ -18,17 +18,26 @@
*/
package org.apache.uima.ducc.common.authentication;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
+import org.apache.uima.ducc.common.utils.DuccLogger;
+
public class BrokerCredentials {
public static Credentials get(String brokerCredentialsFile) throws FileNotFoundException{
Credentials cr = new Credentials();
Properties properties = new Properties();
if ( brokerCredentialsFile != null ) {
try {
+ if (!(new File(brokerCredentialsFile)).canRead()) {
+ DuccLogger logger = DuccLogger.getLogger(BrokerCredentials.class.getName(), null);
+ // Default of no name & password => anonymous access
+ logger.info("BrokerCredentials.get", null, "Cannot access broker credentials file so will have restricted access");
+ return cr;
+ }
properties.load(new FileInputStream(brokerCredentialsFile));
//Utils.findDuccHome()+File.separator+"activemq"+File.separator+"credentials.properties"));
cr.setUsername(properties.getProperty("ducc.broker.admin.username"));