External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 07:26:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1210 from mabashian/1029-passwords-preview

Browse Source 
Scrub passwords from extra vars preview on launch
This commit is contained in:
Jake McDermott
2018-04-03 01:36:17 -04:00
committed by GitHub
parent 654a1b3e09 278a2091c2
commit 652bdf7875
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.controller.js
View File

@@ -37,25 +37,27 @@ export default
scope.promptData.extraVars = ToJSON(scope.parseType, scope.promptData.prompts.variables.value, false); scope.promptData.extraVars = ToJSON(scope.parseType, scope.promptData.prompts.variables.value, false);
if(scope.promptData.launchConf.ask_tags_on_launch) { const surveyPasswords = {};
if (scope.promptData.launchConf.ask_tags_on_launch) {
scope.promptData.prompts.tags.value = consolidateTags(scope.promptData.prompts.tags.value, "#job_launch_job_tags"); scope.promptData.prompts.tags.value = consolidateTags(scope.promptData.prompts.tags.value, "#job_launch_job_tags");
} }
if(scope.promptData.launchConf.ask_skip_tags_on_launch) { if (scope.promptData.launchConf.ask_skip_tags_on_launch) {
scope.promptData.prompts.skipTags.value = consolidateTags(scope.promptData.prompts.skipTags.value, "#job_launch_skip_tags"); scope.promptData.prompts.skipTags.value = consolidateTags(scope.promptData.prompts.skipTags.value, "#job_launch_skip_tags");
} }
if(scope.promptData.launchConf.survey_enabled){ if (scope.promptData.launchConf.survey_enabled){
scope.promptData.surveyQuestions.forEach(surveyQuestion => { scope.promptData.surveyQuestions.forEach(surveyQuestion => {
// grab all survey questions that have answers // grab all survey questions that have answers
if(surveyQuestion.required || (surveyQuestion.required === false && surveyQuestion.model.toString()!=="")) { if (surveyQuestion.required || (surveyQuestion.required === false && surveyQuestion.model.toString()!=="")) {
if(!scope.promptData.extraVars) { if (!scope.promptData.extraVars) {
scope.promptData.extraVars = {}; scope.promptData.extraVars = {};
} }
scope.promptData.extraVars[surveyQuestion.variable] = surveyQuestion.model; scope.promptData.extraVars[surveyQuestion.variable] = surveyQuestion.model;
} }
if(surveyQuestion.required === false && _.isEmpty(surveyQuestion.model)) { if (surveyQuestion.required === false && _.isEmpty(surveyQuestion.model)) {
switch (surveyQuestion.type) { switch (surveyQuestion.type) {
// for optional text and text-areas, submit a blank string if min length is 0 // for optional text and text-areas, submit a blank string if min length is 0
// -- this is confusing, for an explanation see: // -- this is confusing, for an explanation see:
@@ -69,10 +71,20 @@ export default
break; break;
} }
} }
if (surveyQuestion.type === 'password' && surveyQuestion.model.toString()!=="") {
surveyPasswords[surveyQuestion.variable] = '$encrypted$';
}
}); });
} }
scope.promptExtraVars = $.isEmptyObject(scope.promptData.extraVars) ? '---' : '---\n' + jsyaml.safeDump(scope.promptData.extraVars); // We don't want to modify the extra vars when we merge them with the survey
// password $encrypted$ strings so we clone it
const extraVarsClone = _.cloneDeep(scope.promptData.extraVars);
// Replace the survey passwords with $encrypted$ to display to the user
const cleansedExtraVars = Object.assign(extraVarsClone, surveyPasswords);
scope.promptExtraVars = $.isEmptyObject(scope.promptData.extraVars) ? '---' : '---\n' + jsyaml.safeDump(cleansedExtraVars);
ParseTypeChange({ ParseTypeChange({
scope: scope, scope: scope,