Added username and password information to the review results page

Author: jorgestiga

scb-scanprocesses/ncrack-process/src/main/resources/forms/ncrack/approve-results.html

@@ -30,14 +30,13 @@
 
         camForm.on('variables-restored', function () {
             $scope.context = camForm.variableManager.variableValue('PROCESS_CONTEXT');
-
             $scope.scannerId = camForm.variableManager.variableValue('PROCESS_SCANNER_ID');
             $scope.scannerResult = JSON.parse(camForm.variableManager.variableValue('PROCESS_FINDINGS'));
             $scope.scannerTargets = JSON.parse(camForm.variableManager.variableValue('PROCESS_TARGETS'));
         });
     </script>
     <div ng-repeat="target in scannerTargets">
-        <h2>scan results for "{{ target.name }}"</h2>
+        <h2>Ncrack Scan Results for "{{ target.name }}"</h2>
 
         <div class="row">
             <div class="col-xs-2"><label>Scanner Id:</label></div>
@@ -59,15 +58,16 @@ <h2>scan results for "{{ target.name }}"</h2>
                     <table class="table table-striped">
                         <tr>
                             <th>Host:</th>
+                            <th>Service:</th>
                             <th>Name:</th>
-                            <th>Category:</th>
                             <th>Severity:</th>
-                            <th>Reference:</th>
+                            <th>Username:</th>
+                            <th>Password:</th>
                         </tr>
                         <tr class="danger" ng-repeat="result in scannerResult">
                             <td>{{ result.location }}</td>
+                            <td>{{ result.attributes.service }}</td>
                             <td>{{ result.name }}</td>
-                            <td>{{ result.category }}</td>
                             <td>
                                 <div ng-switch on="result.severity">
                                   <span class="label label-danger" ng-switch-when="HIGH">
@@ -96,8 +96,8 @@ <h2>scan results for "{{ target.name }}"</h2>
                                 </div>
 
                             </td>
-                            <td> {{ result.reference.id }}
-                            </td>
+                            <td> {{ result.attributes.username }}</td>
+                            <td> {{ result.attributes.password }}</td>
                         </tr>
                     </table>
                 </div>

scb-scanprocesses/ncrack-process/src/main/resources/forms/ncrack/configure-target.html

@@ -63,11 +63,7 @@ <h3>Ncrack Target</h3>
             <!-- Target Hosts -->
             <div class="form-group">
                 <div class="controls row form-group">
-<<<<<<< HEAD
                     <div class="col-xs-6">
-=======
-                    <div class="col-xs-5">
->>>>>>> 881d595c22d3a47af05f3b9be7a01a86f4eef76e
                         <label>Target Name</label>
                         <input required class="form-control"
                                type="text"
@@ -97,7 +93,7 @@ <h3>Ncrack Target</h3>
                         />
                     </div>
                 </div>
-                <code class="">{{ target }}</code>
+                <code class="hidden">{{ target }}</code>
             </div>
 
             <!-- Context (Project/Team/System...) -->