Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add possibility to specify SSL protocol #109

Open
wants to merge 2 commits into
base: branch-0.5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ JavaReceiverInputDStream receiverStream = RabbitMQUtils.createJavaStream[R](java
|---------------------------|------------------------------|--------------------------------------|
| hosts | RabbitMQ hosts | Yes (default: localhost) |
| virtualHosts | RabbitMQ virtual Host | Yes |
| sslProtocol | SSL Protocol | Yes (default: No SSL connection) |
| queueName | Queue name | Yes |
| exchangeName | Exchange name | Yes |
| exchangeType | Exchange type | Yes |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ object ConfigParameters {
val VirtualHostKey = "virtualHost"
val UserNameKey = "userName"
val PasswordKey = "password"
val ConnectionKeys = List(HostsKey, VirtualHostKey, UserNameKey, PasswordKey)
val SslProtocolKey = "sslProtocol"
val ConnectionKeys = List(HostsKey, VirtualHostKey, UserNameKey, PasswordKey, SslProtocolKey)

/**
* Queue Connection properties
Expand All @@ -59,6 +60,7 @@ object ConfigParameters {
val AutoAckType = "auto"
val DefaultHost = "localhost"
val DefaultPrefetchCount = 1
val DefaultSslProtocol = null

/**
* Message Consumed properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ object Consumer extends Logging with ConsumerParamsUtils {

private def getChannel(params: Map[String, String]): Try[Channel] = {
val addresses = getAddresses(params)
if (useSslConnection(params)) {
factory.useSslProtocol(getSslProtocol(params))
}
val addressesKey = addresses.mkString(",")
val connection = connections.getOrElse(addressesKey, addConnection(addressesKey, addresses))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ trait ConsumerParamsUtils {
ExchangeAndRouting(exchangeName, exchangeType, routingKeys)
}

def useSslConnection(params: Map[String, String]): Boolean = {
params.get(SslProtocolKey).orNull != null
}

def getSslProtocol(params: Map[String, String]): String = {
params.getOrElse(SslProtocolKey, DefaultSslProtocol)
}

/**
* Queue Properties
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,30 @@ class RabbitMQConsumerIT extends TemporalDataSuite {

override val exchangeName = s"$configExchangeName-${this.getClass().getName()}-${UUID.randomUUID().toString}"

test("RabbitMQ Receiver should read all the records") {
test("RabbitMQ Receiver should read all the records without SSL") {
testReadRecords(5672, null)
}

test("RabbitMQ Receiver should read all the records with SSL") {
testReadRecords(5671, "tlsv1.2")
}

private def hostsWithPort(port: Int): String = hosts
.split(",")
.map(h => if(h.contains(":")) h.split(":")(0) else h)
.map(_ + ":" + port)
.mkString(",")

private def testReadRecords(port: Int, ssl: String): Unit = {
val receiverStream = RabbitMQUtils.createStream(ssc, Map(
"hosts" -> hosts,
"hosts" -> hostsWithPort(port),
"queueName" -> queueName,
"exchangeName" -> exchangeName,
"exchangeType" -> exchangeType,
"vHost" -> vHost,
"userName" -> userName,
"password" -> password
"password" -> password,
"sslProtocol" -> ssl
))
val totalEvents = ssc.sparkContext.longAccumulator("My Accumulator")

Expand Down