Repository: cassandra Updated Branches: refs/heads/trunk 5790b4a44 -> 7a6c3272e
Disable UDFs again patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9402 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a6c3272 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a6c3272 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a6c3272 Branch: refs/heads/trunk Commit: 7a6c3272e3bb6b69ec55bb362ddad5978b4fb35f Parents: 5790b4a Author: Robert Stupp <[email protected]> Authored: Fri Jul 24 14:22:21 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Jul 24 14:22:21 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 3 ++- conf/cassandra.yaml | 6 +++--- src/java/org/apache/cassandra/config/Config.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a6c3272/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 3f1d2ae..ba81d6e 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -18,7 +18,8 @@ using the provided 'sstableupgrade' tool. Upgrading --------- - - User defined functions are now by default enabled. + - User defined functions are now executed in a sandbox. + To use UDFs and UDAs, you have to enable them in cassandra.yaml. - New SSTable version 'la' with improved bloom-filter false-positive handling compared to previous version 'ka' used in 2.2 and 2.1. Running sstableupgrade is not necessary but recommended. http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a6c3272/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ce191d5..5fe3d87 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -872,9 +872,9 @@ inter_dc_tcp_nodelay: false tracetype_query_ttl: 86400 tracetype_repair_ttl: 604800 -# UDFs (user defined functions) are enabled by default. -# As of Cassandra 3.0 there is a sandbox in place that prevents execution of evil code. -enable_user_defined_functions: true +# UDFs (user defined functions) are disabled by default. +# As of Cassandra 3.0 there is a sandbox in place that should prevent execution of evil code. +enable_user_defined_functions: false # The default Windows kernel timer and scheduling resolution is 15.6ms for power conservation. # Lowering this value on Windows can provide much tighter latency and better throughput, however http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a6c3272/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 225f1ab..2a2062e 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -256,7 +256,7 @@ public class Config public int windows_timer_interval = 0; - public boolean enable_user_defined_functions = true; + public boolean enable_user_defined_functions = false; /** * Optionally disable asynchronous UDF execution. * Disabling asynchronous UDF execution also implicitly disables the security-manager!
