Skip to content

Commit 05d7c29

Browse files
author
Matthew Sackman
committed
Merging bug 21238 into default
2 parents a6bead0 + 5d58237 commit 05d7c29

File tree

3 files changed

+188
-4
lines changed

3 files changed

+188
-4
lines changed

‎projects/client/RabbitMQ.Client/src/client/exceptions/PossibleAuthenticationFailureException.cs

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// This source code is dual-licensed under the Apache License, version
2+
// 2.0, and the Mozilla Public License, version 1.1.
3+
//
4+
// The APL v2.0:
5+
//
6+
//---------------------------------------------------------------------------
7+
// Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial
8+
// Technologies LLC., and Rabbit Technologies Ltd.
9+
//
10+
// Licensed under the Apache License, Version 2.0 (the "License");
11+
// you may not use this file except in compliance with the License.
12+
// You may obtain a copy of the License at
13+
//
14+
// http://www.apache.org/licenses/LICENSE-2.0
15+
//
16+
// Unless required by applicable law or agreed to in writing, software
17+
// distributed under the License is distributed on an "AS IS" BASIS,
18+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19+
// See the License for the specific language governing permissions and
20+
// limitations under the License.
21+
//---------------------------------------------------------------------------
22+
//
23+
// The MPL v1.1:
24+
//
25+
//---------------------------------------------------------------------------
26+
// The contents of this file are subject to the Mozilla Public License
27+
// Version 1.1 (the "License"); you may not use this file except in
28+
// compliance with the License. You may obtain a copy of the License at
29+
// http://www.rabbitmq.com/mpl.html
30+
//
31+
// Software distributed under the License is distributed on an "AS IS"
32+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
33+
// License for the specific language governing rights and limitations
34+
// under the License.
35+
//
36+
// The Original Code is The RabbitMQ .NET Client.
37+
//
38+
// The Initial Developers of the Original Code are LShift Ltd,
39+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
40+
//
41+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
42+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
43+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
44+
// Technologies LLC, and Rabbit Technologies Ltd.
45+
//
46+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
47+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
48+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
49+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
50+
// (C) 2007-2010 Rabbit Technologies Ltd.
51+
//
52+
// All Rights Reserved.
53+
//
54+
// Contributor(s): ______________________________________.
55+
//
56+
//---------------------------------------------------------------------------
57+
using System;
58+
59+
namespace RabbitMQ.Client.Exceptions
60+
{
61+
/// <summary> Thrown when the likely cause is an
62+
/// authentication failure. </summary>
63+
public class PossibleAuthenticationFailureException : Exception
64+
{
65+
public PossibleAuthenticationFailureException(String msg, Exception inner)
66+
: base(msg, inner)
67+
{
68+
}
69+
}
70+
}

‎projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,13 +986,23 @@ public void Open(bool insist)
986986
m_clientProperties = new Hashtable(m_factory.ClientProperties);
987987

988988
// FIXME: check that PLAIN is supported.
989-
// FIXME: parse out locales properly!
990-
ConnectionTuneDetails connectionTune =
989+
// FIXME: parse out locales properly!
990+
ConnectionTuneDetails connectionTune = default(ConnectionTuneDetails);
991+
try
992+
{
993+
connectionTune =
991994
m_model0.ConnectionStartOk(m_clientProperties,
992995
"PLAIN",
993-
Encoding.UTF8.GetBytes("\0" + m_factory.UserName +
994-
"\0" + m_factory.Password),
996+
Encoding.UTF8.GetBytes(
997+
"\0" + m_factory.UserName +
998+
"\0" + m_factory.Password),
995999
"en_US");
1000+
}
1001+
catch (OperationInterruptedException e)
1002+
{
1003+
throw new PossibleAuthenticationFailureException(
1004+
"Possibly caused by authentication failure", e);
1005+
}
9961006

9971007
ushort channelMax = (ushort) NegotiatedMaxValue(m_factory.RequestedChannelMax,
9981008
connectionTune.m_channelMax);

‎projects/client/Unit/src/unit/TestAuth.cs

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
// This source code is dual-licensed under the Apache License, version
2+
// 2.0, and the Mozilla Public License, version 1.1.
3+
//
4+
// The APL v2.0:
5+
//
6+
//---------------------------------------------------------------------------
7+
// Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial
8+
// Technologies LLC., and Rabbit Technologies Ltd.
9+
//
10+
// Licensed under the Apache License, Version 2.0 (the "License");
11+
// you may not use this file except in compliance with the License.
12+
// You may obtain a copy of the License at
13+
//
14+
// http://www.apache.org/licenses/LICENSE-2.0
15+
//
16+
// Unless required by applicable law or agreed to in writing, software
17+
// distributed under the License is distributed on an "AS IS" BASIS,
18+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19+
// See the License for the specific language governing permissions and
20+
// limitations under the License.
21+
//---------------------------------------------------------------------------
22+
//
23+
// The MPL v1.1:
24+
//
25+
//---------------------------------------------------------------------------
26+
// The contents of this file are subject to the Mozilla Public License
27+
// Version 1.1 (the "License"); you may not use this file except in
28+
// compliance with the License. You may obtain a copy of the License at
29+
// http://www.rabbitmq.com/mpl.html
30+
//
31+
// Software distributed under the License is distributed on an "AS IS"
32+
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
33+
// License for the specific language governing rights and limitations
34+
// under the License.
35+
//
36+
// The Original Code is The RabbitMQ .NET Client.
37+
//
38+
// The Initial Developers of the Original Code are LShift Ltd,
39+
// Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
40+
//
41+
// Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
42+
// Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
43+
// are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
44+
// Technologies LLC, and Rabbit Technologies Ltd.
45+
//
46+
// Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
47+
// Ltd. Portions created by Cohesive Financial Technologies LLC are
48+
// Copyright (C) 2007-2010 Cohesive Financial Technologies
49+
// LLC. Portions created by Rabbit Technologies Ltd are Copyright
50+
// (C) 2007-2010 Rabbit Technologies Ltd.
51+
//
52+
// All Rights Reserved.
53+
//
54+
// Contributor(s): ______________________________________.
55+
//
56+
//---------------------------------------------------------------------------
57+
using NUnit.Framework;
58+
59+
using System;
60+
using System.IO;
61+
using System.Text;
62+
using System.Collections;
63+
64+
using RabbitMQ.Client;
65+
using RabbitMQ.Client.Impl;
66+
using RabbitMQ.Client.Exceptions;
67+
using RabbitMQ.Util;
68+
69+
namespace RabbitMQ.Client.Unit
70+
{
71+
[TestFixture]
72+
public class TestAuth
73+
{
74+
75+
[Test]
76+
public void TestAuthFailure()
77+
{
78+
ConnectionFactory connFactory = new ConnectionFactory();
79+
connFactory.UserName = "guest";
80+
connFactory.Password = "incorrect-password";
81+
82+
try
83+
{
84+
connFactory.CreateConnection();
85+
Assert.Fail("Exception caused by authentication failure expected");
86+
}
87+
catch (BrokerUnreachableException bue)
88+
{
89+
foreach (Object failureReason in bue.ConnectionErrors.Values)
90+
{
91+
Assert.IsInstanceOfType(
92+
typeof(PossibleAuthenticationFailureException),
93+
failureReason);
94+
Assert.That(
95+
((PossibleAuthenticationFailureException)failureReason)
96+
.Message
97+
.ToLower()
98+
.Contains("auth"));
99+
}
100+
}
101+
}
102+
}
103+
}
104+

0 commit comments

Comments
 (0)