Skip to content

use yaml.safe_load for untrusted yaml input #85

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 23, 2019
Merged

use yaml.safe_load for untrusted yaml input #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/rosdoc_lite/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ def load_rd_config(path, manifest):
exported_config = exported_config.replace('${prefix}', path)
config_path = os.path.join(path, exported_config)
with open(config_path, 'r') as config_file:
rd_config = yaml.load(config_file)
rd_config = yaml.safe_load(config_file)
except Exception as e:
sys.stderr.write("ERROR: unable to load rosdoc config file [%s]: %s\n" % (config_path, str(e)))
#we'll check if a 'rosdoc.yaml' file exists in the directory
elif os.path.isfile(os.path.join(path, 'rosdoc.yaml')):
with open(os.path.join(path, 'rosdoc.yaml'), 'r') as config_file:
rd_config = yaml.load(config_file)
rd_config = yaml.safe_load(config_file)

return rd_config

Expand Down
2 changes: 1 addition & 1 deletion src/rosdoc_lite/doxygenator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def prepare_tagfiles(tagfile_spec, tagfile_dir, output_subfolder):
"""A function that will load a tagfile from either a URL or the filesystem"""
tagfile_list = []
with open(tagfile_spec) as f:
tagfile_list = yaml.load(f)
tagfile_list = yaml.safe_load(f)
tagfile_string = ""
for tag_pair in tagfile_list:
print(tag_pair)
Expand Down