From 8ef9c9ed0b770444c755851a114bd83cc0dfcab5 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Fri, 21 Jun 2013 17:45:24 -0400 Subject: [PATCH] Added Callback checkbox and Host Config Key field to Job Template. Also added button to generate a config key value using md5 hash. Added button to select-all on key so user can ctrl-c copy to clipboard. --- ansibleworks/ui/static/js/app.js | 3 +- .../ui/static/js/controllers/JobTemplates.js | 31 +- ansibleworks/ui/static/js/controllers/Jobs.js | 15 +- .../ui/static/js/forms/JobTemplates.js | 18 ++ ansibleworks/ui/static/js/forms/Jobs.js | 18 ++ ansibleworks/ui/static/js/helpers/md5.js | 40 +++ .../ui/static/lib/ansible/form-generator.js | 10 +- ansibleworks/ui/static/lib/md5/jquery.md5.js | 269 ++++++++++++++++++ ansibleworks/ui/templates/ui/index.html | 2 + 9 files changed, 397 insertions(+), 9 deletions(-) create mode 100644 ansibleworks/ui/static/js/helpers/md5.js create mode 100644 ansibleworks/ui/static/lib/md5/jquery.md5.js diff --git a/ansibleworks/ui/static/js/app.js b/ansibleworks/ui/static/js/app.js index f4d1a1078a..fd4ee13e85 100644 --- a/ansibleworks/ui/static/js/app.js +++ b/ansibleworks/ui/static/js/app.js @@ -55,7 +55,8 @@ angular.module('ansible', [ 'ParseHelper', 'ChildrenHelper', 'EventsHelper', - 'ProjectPathHelper' + 'ProjectPathHelper', + 'md5Helper' ]) .config(['$routeProvider', function($routeProvider) { $routeProvider. diff --git a/ansibleworks/ui/static/js/controllers/JobTemplates.js b/ansibleworks/ui/static/js/controllers/JobTemplates.js index 2ad7dca81f..7586041d7e 100644 --- a/ansibleworks/ui/static/js/controllers/JobTemplates.js +++ b/ansibleworks/ui/static/js/controllers/JobTemplates.js @@ -158,7 +158,7 @@ JobTemplatesList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$rout function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, JobTemplateForm, GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, - GetBasePath, InventoryList, CredentialList, ProjectList, LookUpInit) + GetBasePath, InventoryList, CredentialList, ProjectList, LookUpInit, md5Setup) { ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior //scope. @@ -168,17 +168,26 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP var form = JobTemplateForm; var generator = GenerateForm; var scope = generator.inject(form, {mode: 'add', related: false}); - + var master = {}; + scope.job_type_options = [{ value: 'run', label: 'Run' }, { value: 'check', label: 'Check' }]; scope.verbosity_options = [ { value: '0', label: 'Default' }, { value: '1', label: 'Verbose' }, { value: '3', label: 'Debug' }]; scope.playbook_options = []; + scope.allow_callbacks = 'false'; generator.reset(); LoadBreadCrumbs(); + md5Setup({ + scope: scope, + master: master, + check_field: 'allow_callbacks', + default_val: false + }); + LookUpInit({ scope: scope, form: form, @@ -259,18 +268,21 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP // Defaults generator.reset(); $('#forks-slider').slider("option", "value", scope.forks); + for (var fld in master) { + scope[fld] = master[fld]; + } }; } JobTemplatesAdd.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', - 'GetBasePath', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit' ]; + 'GetBasePath', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit', 'md5Setup' ]; function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, JobTemplateForm, GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList, CredentialList, - ProjectList, LookUpInit, PromptPasswords, GetBasePath) + ProjectList, LookUpInit, PromptPasswords, GetBasePath, md5Setup) { ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior //scope. @@ -335,6 +347,15 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route } getPlaybooks(scope.project); $('#forks-slider').slider('value',scope.forks); // align slider handle with value. + + var dft = (scope['host_config_key']) ? 'true' : 'false'; + md5Setup({ + scope: scope, + master: master, + check_field: 'allow_callbacks', + default_val: dft + }); + }); // Retrieve detail record and prepopulate the form @@ -484,5 +505,5 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route JobTemplatesEdit.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', - 'ProjectList', 'LookUpInit', 'PromptPasswords', 'GetBasePath' + 'ProjectList', 'LookUpInit', 'PromptPasswords', 'GetBasePath', 'md5Setup' ]; diff --git a/ansibleworks/ui/static/js/controllers/Jobs.js b/ansibleworks/ui/static/js/controllers/Jobs.js index 38adc05ff3..7da9a3ba8e 100644 --- a/ansibleworks/ui/static/js/controllers/Jobs.js +++ b/ansibleworks/ui/static/js/controllers/Jobs.js @@ -129,7 +129,7 @@ JobsListCtrl.$inject = [ '$scope', '$rootScope', '$location', '$log', '$routePar function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, JobForm, GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList, CredentialList, - ProjectList, LookUpInit, PromptPasswords, GetBasePath) + ProjectList, LookUpInit, PromptPasswords, GetBasePath, md5Setup) { ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior //scope. @@ -190,8 +190,19 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, } // Set the playbook lookup getPlaybooks(scope.project); + + // display/hide host callback fields + var dft = (scope['host_config_key']) ? 'true' : 'false'; + md5Setup({ + scope: scope, + master: master, + check_field: 'allow_callbacks', + default_val: dft + }); + $('#forks-slider').slider("option", "value", scope.forks); $('#forks-slider').slider("disable"); + $('input[type="checkbox"]').attr('disabled','disabled'); }); // Our job type options @@ -387,5 +398,5 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams, JobsEdit.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'JobForm', 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', - 'ProjectList', 'LookUpInit', 'PromptPasswords', 'GetBasePath' + 'ProjectList', 'LookUpInit', 'PromptPasswords', 'GetBasePath', 'md5Setup' ]; diff --git a/ansibleworks/ui/static/js/forms/JobTemplates.js b/ansibleworks/ui/static/js/forms/JobTemplates.js index e41a6c6cd7..3eb1f2b05d 100644 --- a/ansibleworks/ui/static/js/forms/JobTemplates.js +++ b/ansibleworks/ui/static/js/forms/JobTemplates.js @@ -141,6 +141,24 @@ angular.module('JobTemplateFormDefinition', []) "#passing-variables-on-the-command-line\" target=\"_blank\">Click here to view documentation and examples.

", dataTitle: 'Extra Variables', dataPlacement: 'left' + }, + allow_callbacks: { + label: 'Allow Callbacks', + type: 'checkbox', + addRequired: false, + editRequird: false, + trueValue: 'true', + falseValue: 'false', + ngChange: "toggleCallback('host_config_key')", + "class": "span12", + column: 2 + }, + host_config_key: { + label: 'Host Config Key', + type: 'text', + ngShow: "allow_callbacks", + genMD5: true, + column: 2 } }, diff --git a/ansibleworks/ui/static/js/forms/Jobs.js b/ansibleworks/ui/static/js/forms/Jobs.js index 26d23bfe02..e5ea1009a1 100644 --- a/ansibleworks/ui/static/js/forms/Jobs.js +++ b/ansibleworks/ui/static/js/forms/Jobs.js @@ -133,6 +133,24 @@ angular.module('JobFormDefinition', []) "for ansible-playbook. Provide key=value pairs or JSON.

Click here to view documentation and examples.

", column: 2 + }, + allow_callbacks: { + label: 'Allow Callbacks', + type: 'checkbox', + addRequired: false, + editRequird: false, + trueValue: 'true', + falseValue: 'false', + ngChange: "toggleCallback('host_config_key')", + "class": "span12", + column: 2 + }, + host_config_key: { + label: 'Host Config Key', + type: 'text', + ngShow: "allow_callbacks", + genMD5: true, + column: 2 } }, diff --git a/ansibleworks/ui/static/js/helpers/md5.js b/ansibleworks/ui/static/js/helpers/md5.js new file mode 100644 index 0000000000..57915352b4 --- /dev/null +++ b/ansibleworks/ui/static/js/helpers/md5.js @@ -0,0 +1,40 @@ +/********************************************* + * Copyright (c) 2013 AnsibleWorks, Inc. + * + * md5helper + * + * Run md5Setup({ scope: , master:, check_field:, default_val: }) + * to initialize md5 fields (checkbox and text field). + * + */ + +angular.module('md5Helper', ['RestServices', 'Utilities']) + .factory('md5Setup', ['Alert', 'Rest', 'GetBasePath','ProcessErrors', + function(Alert, Rest, GetBasePath, ProcessErrors) { + return function(params) { + + var scope = params.scope; + var master = params.master; + var check_field = params.check_field; + var default_val = params.default_val; //default(true/false) for the checkbox + + scope[check_field] = default_val; + master[check_field] = default_val; + + scope.genMD5 = function(fld) { + var now = new Date(); + scope[fld] = $.md5('AnsibleWorks' + now.getTime()); + } + + scope.toggleCallback = function(fld) { + if (scope.allow_callbacks == 'false') { + scope[fld] = null; + } + } + + scope.selectAll = function(fld) { + $('input[name="' + fld +'"]').focus().select(); + } + + } + }]); \ No newline at end of file diff --git a/ansibleworks/ui/static/lib/ansible/form-generator.js b/ansibleworks/ui/static/lib/ansible/form-generator.js index a61acaa616..2ff38b2821 100644 --- a/ansibleworks/ui/static/lib/ansible/form-generator.js +++ b/ansibleworks/ui/static/lib/ansible/form-generator.js @@ -140,6 +140,7 @@ angular.module('FormGenerator', ['GeneratorHelpers']) if ( (! field.readonly) || (field.readonly && options.mode == 'edit') ) { html += "
' + "\n"; html += "
\n"; - html += (field.clear) ? "
\n" : ""; + html += (field.clear || field.genMD5) ? "
\n" : ""; if (field.control === null || field.control === undefined || field.control) { html += "\n"; html += "
\n"; } + if (field.genMD5) { + html += " \n\n"; + html += " \n\n"; + html += "
\n"; + } if (field.ask) { html += " \n"; diff --git a/ansibleworks/ui/static/lib/md5/jquery.md5.js b/ansibleworks/ui/static/lib/md5/jquery.md5.js new file mode 100644 index 0000000000..626b39adf7 --- /dev/null +++ b/ansibleworks/ui/static/lib/md5/jquery.md5.js @@ -0,0 +1,269 @@ +/* +* jQuery MD5 Plugin 1.2.1 +* https://github.com/blueimp/jQuery-MD5 +* +* Copyright 2010, Sebastian Tschan +* https://blueimp.net +* +* Licensed under the MIT license: +* http://creativecommons.org/licenses/MIT/ +* +* Based on +* A JavaScript implementation of the RSA Data Security, Inc. MD5 Message +* Digest Algorithm, as defined in RFC 1321. +* Version 2.2 Copyright (C) Paul Johnston 1999 - 2009 +* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet +* Distributed under the BSD License +* See http://pajhome.org.uk/crypt/md5 for more info. +*/ + +/*jslint bitwise: true */ +/*global unescape, jQuery */ + +(function ($) { + 'use strict'; + + /* +* Add integers, wrapping at 2^32. This uses 16-bit operations internally +* to work around bugs in some JS interpreters. +*/ + function safe_add(x, y) { + var lsw = (x & 0xFFFF) + (y & 0xFFFF), + msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); + } + + /* +* Bitwise rotate a 32-bit number to the left. +*/ + function bit_rol(num, cnt) { + return (num << cnt) | (num >>> (32 - cnt)); + } + + /* +* These functions implement the four basic operations the algorithm uses. +*/ + function md5_cmn(q, a, b, x, s, t) { + return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b); + } + function md5_ff(a, b, c, d, x, s, t) { + return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); + } + function md5_gg(a, b, c, d, x, s, t) { + return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); + } + function md5_hh(a, b, c, d, x, s, t) { + return md5_cmn(b ^ c ^ d, a, b, x, s, t); + } + function md5_ii(a, b, c, d, x, s, t) { + return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); + } + + /* +* Calculate the MD5 of an array of little-endian words, and a bit length. +*/ + function binl_md5(x, len) { + /* append padding */ + x[len >> 5] |= 0x80 << ((len) % 32); + x[(((len + 64) >>> 9) << 4) + 14] = len; + + var i, olda, oldb, oldc, oldd, + a = 1732584193, + b = -271733879, + c = -1732584194, + d = 271733878; + + for (i = 0; i < x.length; i += 16) { + olda = a; + oldb = b; + oldc = c; + oldd = d; + + a = md5_ff(a, b, c, d, x[i], 7, -680876936); + d = md5_ff(d, a, b, c, x[i + 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i + 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i + 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i + 4], 7, -176418897); + d = md5_ff(d, a, b, c, x[i + 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i + 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i + 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i + 8], 7, 1770035416); + d = md5_ff(d, a, b, c, x[i + 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i + 10], 17, -42063); + b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i + 12], 7, 1804603682); + d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i + 15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i + 1], 5, -165796510); + d = md5_gg(d, a, b, c, x[i + 6], 9, -1069501632); + c = md5_gg(c, d, a, b, x[i + 11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i], 20, -373897302); + a = md5_gg(a, b, c, d, x[i + 5], 5, -701558691); + d = md5_gg(d, a, b, c, x[i + 10], 9, 38016083); + c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i + 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i + 9], 5, 568446438); + d = md5_gg(d, a, b, c, x[i + 14], 9, -1019803690); + c = md5_gg(c, d, a, b, x[i + 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i + 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i + 13], 5, -1444681467); + d = md5_gg(d, a, b, c, x[i + 2], 9, -51403784); + c = md5_gg(c, d, a, b, x[i + 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i + 5], 4, -378558); + d = md5_hh(d, a, b, c, x[i + 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i + 11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i + 1], 4, -1530992060); + d = md5_hh(d, a, b, c, x[i + 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i + 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i + 13], 4, 681279174); + d = md5_hh(d, a, b, c, x[i], 11, -358537222); + c = md5_hh(c, d, a, b, x[i + 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i + 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i + 9], 4, -640364487); + d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i + 15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i + 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i], 6, -198630844); + d = md5_ii(d, a, b, c, x[i + 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i + 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i + 12], 6, 1700485571); + d = md5_ii(d, a, b, c, x[i + 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i + 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i + 8], 6, 1873313359); + d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i + 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i + 13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i + 4], 6, -145523070); + d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i + 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i + 9], 21, -343485551); + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + } + return [a, b, c, d]; + } + + /* +* Convert an array of little-endian words to a string +*/ + function binl2rstr(input) { + var i, + output = ''; + for (i = 0; i < input.length * 32; i += 8) { + output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xFF); + } + return output; + } + + /* +* Convert a raw string to an array of little-endian words +* Characters >255 have their high-byte silently ignored. +*/ + function rstr2binl(input) { + var i, + output = []; + output[(input.length >> 2) - 1] = undefined; + for (i = 0; i < output.length; i += 1) { + output[i] = 0; + } + for (i = 0; i < input.length * 8; i += 8) { + output[i >> 5] |= (input.charCodeAt(i / 8) & 0xFF) << (i % 32); + } + return output; + } + + /* +* Calculate the MD5 of a raw string +*/ + function rstr_md5(s) { + return binl2rstr(binl_md5(rstr2binl(s), s.length * 8)); + } + + /* +* Calculate the HMAC-MD5, of a key and some data (raw strings) +*/ + function rstr_hmac_md5(key, data) { + var i, + bkey = rstr2binl(key), + ipad = [], + opad = [], + hash; + ipad[15] = opad[15] = undefined; + if (bkey.length > 16) { + bkey = binl_md5(bkey, key.length * 8); + } + for (i = 0; i < 16; i += 1) { + ipad[i] = bkey[i] ^ 0x36363636; + opad[i] = bkey[i] ^ 0x5C5C5C5C; + } + hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8); + return binl2rstr(binl_md5(opad.concat(hash), 512 + 128)); + } + + /* +* Convert a raw string to a hex string +*/ + function rstr2hex(input) { + var hex_tab = '0123456789abcdef', + output = '', + x, + i; + for (i = 0; i < input.length; i += 1) { + x = input.charCodeAt(i); + output += hex_tab.charAt((x >>> 4) & 0x0F) + + hex_tab.charAt(x & 0x0F); + } + return output; + } + + /* +* Encode a string as utf-8 +*/ + function str2rstr_utf8(input) { + return unescape(encodeURIComponent(input)); + } + + /* +* Take string arguments and return either raw or hex encoded strings +*/ + function raw_md5(s) { + return rstr_md5(str2rstr_utf8(s)); + } + function hex_md5(s) { + return rstr2hex(raw_md5(s)); + } + function raw_hmac_md5(k, d) { + return rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)); + } + function hex_hmac_md5(k, d) { + return rstr2hex(raw_hmac_md5(k, d)); + } + + $.md5 = function (string, key, raw) { + if (!key) { + if (!raw) { + return hex_md5(string); + } else { + return raw_md5(string); + } + } + if (!raw) { + return hex_hmac_md5(key, string); + } else { + return raw_hmac_md5(key, string); + } + }; + +}(typeof jQuery === 'function' ? jQuery : this)); diff --git a/ansibleworks/ui/templates/ui/index.html b/ansibleworks/ui/templates/ui/index.html index 8ab8f02188..3011c93b85 100644 --- a/ansibleworks/ui/templates/ui/index.html +++ b/ansibleworks/ui/templates/ui/index.html @@ -77,6 +77,7 @@ + @@ -223,6 +224,7 @@ +