You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/15 03:02:18 UTC
[1/2] git commit: Validate IPv6 wildcard addresses properly
Repository: cassandra
Updated Branches:
refs/heads/trunk 9d05efafe -> 4dd1a15cc
Validate IPv6 wildcard addresses properly
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7680
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a1fc6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a1fc6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a1fc6e
Branch: refs/heads/trunk
Commit: 04a1fc6e10ba6ffd774c3d5a67a650520a0ac896
Parents: ffb919e
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Aug 15 03:59:29 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 15 03:59:29 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/config/DatabaseDescriptor.java | 37 +++++++-------------
2 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 99fb988..ea9e8aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.1
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
* (cqlsh) Error when tracing query (CASSANDRA-7613)
* Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
* SSTableExport uses correct validator to create string representation of partition
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index f624ce5..e8c5372 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -298,8 +298,6 @@ public class DatabaseDescriptor
}
else if (conf.listen_address != null)
{
- if (conf.listen_address.equals("0.0.0.0"))
- throw new ConfigurationException("listen_address cannot be 0.0.0.0!");
try
{
listenAddress = InetAddress.getByName(conf.listen_address);
@@ -308,6 +306,9 @@ public class DatabaseDescriptor
{
throw new ConfigurationException("Unknown listen_address '" + conf.listen_address + "'");
}
+
+ if (listenAddress.isAnyLocalAddress())
+ throw new ConfigurationException("listen_address cannot be a wildcard address (" + conf.listen_address + ")!");
}
else if (conf.listen_interface != null)
{
@@ -328,11 +329,6 @@ public class DatabaseDescriptor
/* Gossip Address to broadcast */
if (conf.broadcast_address != null)
{
- if (conf.broadcast_address.equals("0.0.0.0"))
- {
- throw new ConfigurationException("broadcast_address cannot be 0.0.0.0!");
- }
-
try
{
broadcastAddress = InetAddress.getByName(conf.broadcast_address);
@@ -341,6 +337,9 @@ public class DatabaseDescriptor
{
throw new ConfigurationException("Unknown broadcast_address '" + conf.broadcast_address + "'");
}
+
+ if (broadcastAddress.isAnyLocalAddress())
+ throw new ConfigurationException("broadcast_address cannot be a wildcard address (" + conf.broadcast_address + ")!");
}
/* Local IP, hostname or interface to bind RPC server to */
@@ -381,33 +380,23 @@ public class DatabaseDescriptor
/* RPC address to broadcast */
if (conf.broadcast_rpc_address != null)
{
- if (conf.broadcast_rpc_address.equals("0.0.0.0"))
- throw new ConfigurationException("broadcast_rpc_address cannot be 0.0.0.0");
-
try
{
broadcastRpcAddress = InetAddress.getByName(conf.broadcast_rpc_address);
}
catch (UnknownHostException e)
{
- throw new ConfigurationException("Unkown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'");
+ throw new ConfigurationException("Unknown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'");
}
+
+ if (broadcastRpcAddress.isAnyLocalAddress())
+ throw new ConfigurationException("broadcast_rpc_address cannot be a wildcard address (" + conf.broadcast_rpc_address + ")!");
}
else
{
- InetAddress bindAll;
- try
- {
- bindAll = InetAddress.getByAddress(new byte[4]);
- }
- catch (UnknownHostException e)
- {
- throw new RuntimeException("Host 0.0.0.0 is somehow unknown");
- }
-
- if (rpcAddress.equals(bindAll))
- throw new ConfigurationException("If rpc_address is set to 0.0.0.0, you must set broadcast_rpc_address " +
- "to a value other than 0.0.0.0");
+ if (rpcAddress.isAnyLocalAddress())
+ throw new ConfigurationException("If rpc_address is set to a wildcard address (" + conf.rpc_address + "), then " +
+ "you must set broadcast_rpc_address to a value other than " + conf.rpc_address);
broadcastRpcAddress = rpcAddress;
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dd1a15c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dd1a15c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dd1a15c
Branch: refs/heads/trunk
Commit: 4dd1a15ccc59ebe863c233d88b07dc269aee2cff
Parents: 9d05efa 04a1fc6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 15 04:02:07 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 15 04:02:07 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/config/DatabaseDescriptor.java | 37 +++++++-------------
2 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e2e37d6,ea9e8aa..2b38918
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
+3.0
+ * Support pure user-defined functions (CASSANDRA-7395)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
+
2.1.1
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
* (cqlsh) Error when tracing query (CASSANDRA-7613)
* Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
* SSTableExport uses correct validator to create string representation of partition
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------