alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-22 01:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/install_input_validation' into 'master'

Browse Source 
fix(idf_tools): Validate input features

Closes IDF-11703

See merge request espressif/esp-idf!37852
This commit is contained in:
Roland Dobai
2025-03-19 21:38:52 +08:00
parent bbca89da53 7102508444
commit cf5989ca06
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/idf_tools.py
View File

@@ -1783,14 +1783,24 @@ def process_and_check_features(idf_env_obj: IDFEnv, features_str: str) -> List[s
"""
new_features = []
remove_features = []
for new_feature_candidate in features_str.split(','):
invalid_features = []
for new_feature_candidate in [feature for feature in features_str.split(',') if feature != '']:
# Feature to be added/removed needs to be checked if valid
sanitized_feat = new_feature_candidate.lstrip('-+')
if not os.path.isfile(feature_to_requirements_path(sanitized_feat)):
invalid_features += [sanitized_feat]
continue
if new_feature_candidate.startswith('-'):
remove_features += [new_feature_candidate.lstrip('-')]
else:
new_feature_candidate = new_feature_candidate.lstrip('+')
# Feature to be added needs to be checked if is valid
if os.path.isfile(feature_to_requirements_path(new_feature_candidate)):
new_features += [new_feature_candidate]
new_features += [new_feature_candidate.lstrip('+')]
if invalid_features:
fatal(f'The following selected features are not valid: {", ".join(invalid_features)}')
raise SystemExit(1)
idf_env_obj.get_active_idf_record().update_features(tuple(new_features), tuple(remove_features))
return idf_env_obj.get_active_idf_record().features