Merge lp:~newell-jensen/maas/fix-1676882 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Changes Pod passwords from cleartext to hidden characters.

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

=== modified file 'src/maasserver/static/js/angular/directives/maas_obj_form.js'
--- src/maasserver/static/js/angular/directives/maas_obj_form.js	2017-04-10 22:07:32 +0000
+++ src/maasserver/static/js/angular/directives/maas_obj_form.js	2017-04-13 21:46:31 +0000
@@ -608,7 +608,8 @@
                 // Render the input based on the type.
                 var placeholder = attrs.placeholder || label;
                 var inputElement = null;
-                if(attrs.type === "text" || attrs.type === "textarea") {
+                if(attrs.type === "text" || attrs.type === "textarea" ||
+                   attrs.type === "password") {
                     if(attrs.type === "text") {
                         inputElement = $compile(
                             '<input type="text" id="' + attrs.key +
@@ -619,7 +620,12 @@
                             '<textarea id="' + attrs.key +
                             '" placeholder="' + placeholder + '"' +
                             'data-ng-disabled="ngDisabled()">' +
-                            '</textarea>')(scope);
+                                '</textarea>')(scope);
+                    } else if(attrs.type === "password") {
+                        inputElement = $compile(
+                            '<input type="password" id="' + attrs.key +
+                            '" placeholder="' + placeholder + '"' +
+                            'data-ng-disabled="ngDisabled()">')(scope);
                     }
 
                     // Allow enter on blur, by default.

=== modified file 'src/maasserver/static/js/angular/directives/pod_parameters.js'
--- src/maasserver/static/js/angular/directives/pod_parameters.js	2017-03-29 19:08:16 +0000
+++ src/maasserver/static/js/angular/directives/pod_parameters.js	2017-04-13 21:46:31 +0000
@@ -56,10 +56,15 @@
                   var html = '<maas-obj-field-group>';
                   angular.forEach(type.fields, function(field) {
                       if(field.scope === 'bmc') {
-                          html += (
-                            '<maas-obj-field type="text" key="' + field.name +
-                            '" label="' + field.label + '" ' +
-                            'label-width="two" input-width="three">' +
+                          if(field.name === 'power_pass') {
+                              html += (
+                                  '<maas-obj-field type="password" key="');
+                          } else {
+                              html += (
+                                  '<maas-obj-field type="text" key="');
+                          }
+                          html += (field.name + '" label="' + field.label +
+                            '" ' + 'label-width="two" input-width="three">' +
                             '</maas-obj-field>');
                       }
                   });

=== modified file 'src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js'
--- src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js	2017-03-29 15:40:39 +0000
+++ src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js	2017-04-13 21:46:31 +0000
@@ -184,6 +184,73 @@
         });
     });
 
+    describe("input type=password", function() {
+
+        var directive;
+        beforeEach(function() {
+            $scope.obj = {};
+            $scope.manager = {
+                updateItem: jasmine.createSpy().and.returnValue(
+                    $q.defer().promise)
+            };
+            var html = [
+                '<maas-obj-form obj="obj" manager="manager">',
+                    '<maas-obj-field type="password" key="key" label="Key" ',
+                        'placeholder="Placeholder" label-width="two" ',
+                        'input-width="three"></maas-obj-field>',
+                '</maas-obj-form>'
+                ].join('');
+            directive = compileDirective(html);
+        });
+
+        it("creates input with type 'password'", function() {
+            var inputField = angular.element(directive.find("#key"));
+            expect(inputField.prop("nodeName")).toBe("INPUT");
+            expect(inputField.attr("type")).toBe("password");
+        });
+
+        it("sets placeholder", function() {
+            var inputField = angular.element(directive.find("#key"));
+            expect(inputField.attr("placeholder")).toBe("Placeholder");
+        });
+
+        it("adds label with width", function() {
+            var labelField = angular.element(directive.find("label"));
+            expect(labelField.text()).toBe("Key");
+            expect(labelField.hasClass("two-col")).toBe(true);
+        });
+
+        it("adds inputWrapper with width", function() {
+            var labelField = angular.element(directive.find("label "));
+            var inputWrapper = angular.element(labelField.next("div"));
+            expect(inputWrapper.hasClass("three-col")).toBe(true);
+            expect(inputWrapper.hasClass("last-col")).toBe(true);
+        });
+
+        it("reverts value on esc", function() {
+            var inputField = angular.element(directive.find("#key"));
+            inputField.triggerHandler("focus");
+            inputField.val(makeName("newValue"));
+
+            // Send esc.
+            var evt = angular.element.Event("keydown");
+            evt.which = 27;
+            inputField.trigger(evt);
+
+            expect(inputField.val()).toBe("");
+        });
+
+        it("sets $maasForm on obj", function() {
+            expect($scope.obj.$maasForm).toBeDefined();
+        });
+
+        it("hasErrors returns true if has-error class exists", function() {
+            var inputField = angular.element(directive.find("#key"));
+            inputField.addClass('has-error');
+            expect($scope.obj.$maasForm.hasErrors()).toBe(true);
+        });
+    });
+
     describe("select", function() {
 
         var directive, options;