Author: mgoulish
Date: Wed Jul 6 19:28:45 2011
New Revision: 1143536
URL: http://svn.apache.org/viewvc?rev=1143536&view=rev
Log:
JIRA 3337
no more defaulting to guest/guest username/password
qpidd.sasldb is no longer created -- users who want usernames and passwords in
there must create it.
but a local qpidd.sasldb is (before this change) being created for 'make check'
testing.
The etc/sasl2/qpidd.conf file now has an explicit mech list -- so we will no
longer default to the system-list.
Modified:
qpid/trunk/qpid/cpp/etc/Makefile.am
qpid/trunk/qpid/cpp/etc/qpidd.conf
qpid/trunk/qpid/cpp/etc/sasl2/qpidd.conf
qpid/trunk/qpid/cpp/examples/qmf-console/ping.cpp
qpid/trunk/qpid/cpp/examples/qmf-console/printevents.cpp
qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h
qpid/trunk/qpid/cpp/include/qpid/client/Connection.h
qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Wed Jul 6 19:28:45 2011
@@ -30,30 +30,7 @@ nobase_sysconf_DATA = \
qpidd.conf
if HAVE_SASL
-SASL_DB = qpidd.sasldb
-
nobase_sysconf_DATA += \
$(SASL_CONF)
-sasldbdir = $(localstatedir)/lib/qpidd
-sasldb_DATA = $(SASL_DB)
-
-# Setup the default sasldb file with a single user, guest, with an
-# obvious password. This user and password are the default for many
-# clients.
-#
-# The realm specified by -u is very important, and QPID is the default
-# for the broker so we use it here. The realm is important because it
-# defaults to the local hostname of the machine running the
-# broker. This may not seem to bad at first glance, but it means that
-# the sasldb has to be tailored to each machine that would be running
-# a broker, and if the machine ever changed its name the
-# authentication would stop working until the sasldb was updated. For
-# these reasons we always want the broker to specify a realm where its
-# users live, and we want the users to exist in that realm as well.
-$(SASL_DB):
- echo guest | $(SASL_PASSWD) -c -p -f $(SASL_DB) -u QPID guest
-
-CLEANFILES=$(SASL_DB)
-
endif
Modified: qpid/trunk/qpid/cpp/etc/qpidd.conf
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd.conf?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd.conf (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd.conf Wed Jul 6 19:28:45 2011
@@ -21,4 +21,4 @@
#
# (Note: no spaces on either side of '='). Using default settings:
# "qpidd --help" or "man qpidd" for more details.
-cluster-mechanism=ANONYMOUS
+cluster-mechanism=DIGEST-MD5 ANONYMOUS
Modified: qpid/trunk/qpid/cpp/etc/sasl2/qpidd.conf
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/sasl2/qpidd.conf?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/sasl2/qpidd.conf (original)
+++ qpid/trunk/qpid/cpp/etc/sasl2/qpidd.conf Wed Jul 6 19:28:45 2011
@@ -17,8 +17,8 @@
# under the License.
#
#
-# This configuation allows for either SASL PLAIN or ANONYMOUS
-# authentication. The PLAIN authentication is done on a
+# This configuation allows for either SASL ANONYMOUS or DIGEST-MD5
+# authentication. The DIGEST-MD5 authentication is done on a
# username+password, which is stored in the sasldb_path
# file. Usernames and passwords can be added to the file using the
# command:
@@ -39,6 +39,7 @@
pwcheck_method: auxprop
auxprop_plugin: sasldb
sasldb_path: /var/lib/qpidd/qpidd.sasldb
+mech_list: DIGEST-MD5 ANONYMOUS
#following line stops spurious 'sql_select option missing' errors when
#cyrus-sql-sasl plugin is installed
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/ping.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/ping.cpp?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/ping.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/ping.cpp Wed Jul 6 19:28:45 2011
@@ -31,9 +31,7 @@ using namespace qpid::console;
int main_int(int /*argc*/, char** /*argv*/)
{
//
- // Declare connection settings for the messaging broker. The settings
default to
- // localhost:5672 with user guest (password guest). Refer to the header
file
- // <qpid/client/ConnectionSettings.h> for full details.
+ // Declare connection settings for the messaging broker.
//
qpid::client::ConnectionSettings connSettings;
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/printevents.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/printevents.cpp?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/printevents.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/printevents.cpp Wed Jul 6
19:28:45 2011
@@ -64,9 +64,7 @@ struct Main {
Listener listener;
//
- // Declare connection settings for the messaging broker. The settings
default to
- // localhost:5672 with user guest (password guest). Refer to the
header file
- // <qpid/client/ConnectionSettings.h> for full details.
+ // Declare connection settings for the messaging broker.
//
qpid::client::ConnectionSettings connSettings;
Modified: qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h Wed Jul 6
19:28:45 2011
@@ -110,8 +110,8 @@ class ManagementAgent
uint16_t intervalSeconds = 10,
bool useExternalThread = false,
const std::string& storeFile = "",
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& mech = "PLAIN",
const std::string& proto = "tcp") = 0;
Modified: qpid/trunk/qpid/cpp/include/qpid/client/Connection.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/client/Connection.h?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/client/Connection.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/client/Connection.h Wed Jul 6 19:28:45
2011
@@ -102,8 +102,8 @@ class QPID_CLIENT_CLASS_EXTERN Connectio
* within a single broker).
*/
QPID_CLIENT_EXTERN void open(const std::string& host, int port = 5672,
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& virtualhost = "/", uint16_t
maxFrameSize=65535);
/**
@@ -124,8 +124,8 @@ class QPID_CLIENT_CLASS_EXTERN Connectio
* within a single broker).
*/
QPID_CLIENT_EXTERN void open(const Url& url,
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& virtualhost = "/", uint16_t
maxFrameSize=65535);
/**
Modified: qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h Wed Jul 6
19:28:45 2011
@@ -62,8 +62,8 @@ class ManagementAgentImpl : public Manag
uint16_t intervalSeconds = 10,
bool useExternalThread = false,
const std::string& storeFile = "",
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& mech = "PLAIN",
const std::string& proto = "tcp");
void init(const management::ConnectionSettings& settings,
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py?rev=1143536&r1=1143535&r2=1143536&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_tests.py Wed Jul 6 19:28:45 2011
@@ -829,8 +829,8 @@ class LongTests(BrokerTest):
"--base-name", str(qpid.datatypes.uuid4()), "--port",
broker.port()],
["qpid-txtest", "--queue-base-name",
"tx-%s"%str(qpid.datatypes.uuid4()),
"--port", broker.port()],
- ["qpid-queue-stats", "-a", "localhost:%s" %(broker.port())],
- ["testagent", "localhost", str(broker.port())] ]
+ ["qpid-queue-stats", "-a", "localhost:%s" %(broker.port())]
+ ]
clients.append([ClientLoop(broker, cmd) for cmd in cmds])
def start_mclients(broker):
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
