You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/25 23:18:41 UTC
[1/3] git commit: STORM-223 safe yaml parsing.
Repository: incubator-storm
Updated Branches:
refs/heads/master aeb1bce0c -> dc4de425e
STORM-223 safe yaml parsing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c5e7c5b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c5e7c5b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c5e7c5b9
Branch: refs/heads/master
Commit: c5e7c5b92b55e5f9854e411b663944f171384b4d
Parents: 22b8327
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Feb 7 22:59:22 2014 +0000
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Feb 7 22:59:22 2014 +0000
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/Utils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c5e7c5b9/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 8a05fe4..d817c08 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -50,6 +50,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.thrift.TException;
import org.json.simple.JSONValue;
import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
public class Utils {
public static final String DEFAULT_STREAM_ID = "default";
@@ -134,7 +135,7 @@ public class Utils {
+ resources);
}
URL resource = resources.iterator().next();
- Yaml yaml = new Yaml();
+ Yaml yaml = new Yaml(new SafeConstructor());
Map ret = (Map) yaml.load(new InputStreamReader(resource.openStream()));
if(ret==null) ret = new HashMap();
[3/3] git commit: STORM-223: update changelog
Posted by pt...@apache.org.
STORM-223: update changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/dc4de425
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/dc4de425
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/dc4de425
Branch: refs/heads/master
Commit: dc4de425eef5701ccafe0805f08eeb011baae0fb
Parents: b0f6e00
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 17:18:28 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 17:18:28 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/dc4de425/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c63b82..940d1c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-223: use safe parsing for reading YAML
* STORM-238: LICENSE and NOTICE files are duplicated in storm-core jar
* STORM-276: Add support for logviewer in storm.cmd.
* STORM-286: Use URLEncoder#encode with the encoding specified.
[2/3] git commit: Merge branch 'storm-223-safe-yaml' of
github.com:revans2/incubator-storm
Posted by pt...@apache.org.
Merge branch 'storm-223-safe-yaml' of github.com:revans2/incubator-storm
Conflicts:
storm-core/src/jvm/backtype/storm/utils/Utils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b0f6e00e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b0f6e00e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b0f6e00e
Branch: refs/heads/master
Commit: b0f6e00e859d36f6c259345a1da8a205e6475c4f
Parents: aeb1bce c5e7c5b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 17:16:20 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 17:16:20 2014 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/Utils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b0f6e00e/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/utils/Utils.java
index ef5f53a,d817c08..a1fed96
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@@ -47,14 -50,8 +47,15 @@@ import org.apache.commons.lang.StringUt
import org.apache.thrift.TException;
import org.json.simple.JSONValue;
import org.yaml.snakeyaml.Yaml;
+ import org.yaml.snakeyaml.constructor.SafeConstructor;
+import backtype.storm.Config;
+import backtype.storm.generated.ComponentCommon;
+import backtype.storm.generated.ComponentObject;
+import backtype.storm.generated.StormTopology;
+import clojure.lang.IFn;
+import clojure.lang.RT;
+
public class Utils {
public static final String DEFAULT_STREAM_ID = "default";
@@@ -138,14 -135,8 +139,14 @@@
+ resources);
}
URL resource = resources.iterator().next();
- Yaml yaml = new Yaml();
+ Yaml yaml = new Yaml(new SafeConstructor());
- Map ret = (Map) yaml.load(new InputStreamReader(resource.openStream()));
+ Map ret = null;
+ InputStream input = resource.openStream();
+ try {
+ ret = (Map) yaml.load(new InputStreamReader(input));
+ } finally {
+ input.close();
+ }
if(ret==null) ret = new HashMap();