Use SafeLoader to load settingsmeta yaml #2133
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
forslund
added
the
CLA: Yes
ChristopherRogers1991
requested changes
May 26, 2019
There was a problem hiding this comment.
From the docs, it looks like we're using the default loader now, which supports creating arbitrary python objects. Doesn't seem like there will be any need for that for settingsmeta, so safe loader seems like a sane choice. Only minor note is I think we should use yaml.safe_load(...) rather than passing in loader to load.
mycroft/skills/settings.py
Outdated
| @@ -268,7 +268,7 @@ def _load_settings_meta(self): | |||
| if json_file: | |||
| data = json.load(f) | |||
| else: | |||
| data = yaml.load(f) | |||
| data = yaml.load(f, Loader=yaml.SafeLoader) | |||
There was a problem hiding this comment.
Minor nit, but I think it would be simpler to use yaml.safe_load, rather than pass in the loader.
There was a problem hiding this comment.
True that, change incoming!
forslund
force-pushed
the
feature/yaml-loader
branch
from
a241404
to
b8577df
Compare
safe_load limits the amount of custom methods that can be supplied with the yaml and supports the basic yaml features.
forslund
force-pushed
the
feature/yaml-loader
branch
from
b8577df
to
21efb0f
Compare
ChristopherRogers1991
approved these changes
May 27, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
SafeLoader limits the amount of custom methods that can be supplied with
the yaml and supports the basic yaml features.
I'm not certain this is 100% correct but after reading @krisgesling's issue on msm and the related docs it seems like the way to go.
How to test
Ensure that settingsmeta.yaml files works.
Contributor license agreement signed?
CLA [ Yes ]