Merge branch 'release/2.0' into release/2.0

himanikh · Nov 21, 2019 · 97411a9 · 97411a9
2 parents 506b46c + dd0d2b1
commit 97411a9
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 41 deletions.
diff --git a/installer/resources/lambda_rule_engine/files/rule_engine_cloudwatch_rules.json b/installer/resources/lambda_rule_engine/files/rule_engine_cloudwatch_rules.json
@@ -2867,7 +2867,7 @@
     "targetType": "virtualmachine",
     "assetGroup": "azure",
     "alexaKeyword": "Install_Monitoring_Agent",
-    "ruleParams": "{\"params\":[{\"encrypt\":false,\"value\":\"check-for-azure-security-rule\",\"key\":\"ruleKey\"},{\"key\":\"policyName\",\"value\":\"Monitoring@agent@should@be@installed@on@your@machines\",\"isValueNew\":true,\"encrypt\":false},{\"encrypt\":false,\"value\":\"high\",\"key\":\"severity\"},{\"encrypt\":false,\"value\":\"governance\",\"key\":\"ruleCategory\"},{\"encrypt\":false,\"value\":\"\",\"key\":\"ruleOwner\"}],\"environmentVariables\":[],\"ruleId\":\"PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine\",\"autofix\":false,\"alexaKeyword\":\"install monitoring agent\",\"ruleRestUrl\":\"\",\"targetType\":\"virtualmachine\",\"pac_ds\":\"azure\",\"policyId\":\"PacMan_Azure_Install_monitoring_agent_version-1\",\"assetGroup\":\"azure\",\"ruleUUID\":\"azure_virtualmachine_install_monitoring_agent\",\"ruleType\":\"ManageRule\"}",
+    "ruleParams": "{\"params\":[{\"encrypt\":false,\"value\":\"check-for-azure-security-rule\",\"key\":\"ruleKey\"},{\"key\":\"policyName\",\"value\":\"Monitoring@agent@should@be@installed@on@your@machines\",\"isValueNew\":true,\"encrypt\":false},{\"encrypt\":false,\"value\":\"high\",\"key\":\"severity\"},{\"encrypt\":false,\"value\":\"security\",\"key\":\"ruleCategory\"},{\"encrypt\":false,\"value\":\"\",\"key\":\"ruleOwner\"}],\"environmentVariables\":[],\"ruleId\":\"PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine\",\"autofix\":false,\"alexaKeyword\":\"install monitoring agent\",\"ruleRestUrl\":\"\",\"targetType\":\"virtualmachine\",\"pac_ds\":\"azure\",\"policyId\":\"PacMan_Azure_Install_monitoring_agent_version-1\",\"assetGroup\":\"azure\",\"ruleUUID\":\"azure_virtualmachine_install_monitoring_agent\",\"ruleType\":\"ManageRule\"}",
     "ruleFrequency": "0 * * * ? *",
     "ruleExecutable": "",
     "ruleRestUrl": "",

diff --git a/installer/resources/pacbot_app/files/DB.sql b/installer/resources/pacbot_app/files/DB.sql
@@ -1406,7 +1406,7 @@ INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Enable_Adaptive_Application_controls_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_enable_adaptive_application','PacMan_Azure_Enable_Adaptive_Application_controls_version-1','Enable_Adaptive_Application_controls','virtualmachine','azure','Enable_Adaptive_Application_controls','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Adaptive@Application@Controls@should@be@enabled@on@virtual@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Enable_Adaptive_Application_controls_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"enable adaptive controls","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Enable_Adaptive_Application_controls_version-1","assetGroup":"azure","ruleUUID":"PacMan_Azure_Enable_Adaptive_Application_controls_version-1","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_enable_adaptive_application'),'ENABLED','ASGC','Enable Adaptive Application Controls',{d '2019-10-25'},{d '2019-10-25'},null,null);
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Enable_Network_Security_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_enable_network_security','PacMan_Azure_Enable_Network_Security_version-1','Enable_Network_Security','virtualmachine','azure','Enable_Network_Security','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Access@should@be@restricted@for@permissive@Network@Security@Groups@with@Internet-facing@VMs","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Enable_Network_Security_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"enable network security","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Enable_Network_Security_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_enable_network_security","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_enable_network_security'),'ENABLED','ASGC','Enable Network Security Groups on virtual machines',{d '2019-10-25'},{d '2019-10-25'},null,null);
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Install_a_vulnerability_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_install_a_vulnerability','PacMan_Azure_Install_a_vulnerability_version-1','Install_A_Vulnerability','virtualmachine','azure','Install_A_Vulnerability','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Vulnerability@assessment@solution@should@be@installed@on@your@virtual@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Install_a_vulnerability_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"install vulnerability scan tool","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Install_a_vulnerability_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_install_a_vulnerability","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_install_a_vulnerability'),'ENABLED','ASGC','Install a vulnerability assessment solution on your virtual machines',{d '2019-10-25'},{d '2019-10-25'},null,null);
-INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_install_monitoring_agent','PacMan_Azure_Install_monitoring_agent_version-1','Install_Monitoring_Agent','virtualmachine','azure','Install_Monitoring_Agent','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Monitoring@agent@should@be@installed@on@your@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"governance","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"install monitoring agent","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Install_monitoring_agent_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_install_monitoring_agent","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_install_monitoring_agent'),'ENABLED','ASGC','Install monitoring agent on your machines',{d '2019-10-25'},{d '2019-10-25'},null,null);
+INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_install_monitoring_agent','PacMan_Azure_Install_monitoring_agent_version-1','Install_Monitoring_Agent','virtualmachine','azure','Install_Monitoring_Agent','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Monitoring@agent@should@be@installed@on@your@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Install_monitoring_agent_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"install monitoring agent","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Install_monitoring_agent_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_install_monitoring_agent","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_install_monitoring_agent'),'ENABLED','ASGC','Install monitoring agent on your machines',{d '2019-10-25'},{d '2019-10-25'},null,null);
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Just_in_time_network_access_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_just_in_time_network_access','PacMan_Azure_Just_in_time_network_access_version-1','Just_in_time_network_access','virtualmachine','azure','Just_in_time_network_access','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Just-In-Time@network@access@control@should@be@applied@on@virtual@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Just_in_time_network_access_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"enable just in time access","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Just_in_time_network_access_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_just_in_time_network_access","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_just_in_time_network_access'),'ENABLED','ASGC','Apply a Just-In-Time network access control',{d '2019-10-25'},{d '2019-10-25'},null,null);
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Remediate_vulnerabilities_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_remediate_vulnerabilities','PacMan_Azure_Remediate_vulnerabilities_version-1','Remediate_vulnerabilities','virtualmachine','azure','Remediate_vulnerabilities','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Vulnerabilities@should@be@remediated@by@a@Vulnerability@Assessment@solution","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Remediate_vulnerabilities_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"remediate vulnerabilities","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Remediate_vulnerabilities_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_remediate_vulnerabilities","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_remediate_vulnerabilities'),'ENABLED','ASGC','Remediate vulnerabilities - by a Vulnerability Assessment solution',{d '2019-10-25'},{d '2019-10-25'},null,null);
 INSERT IGNORE INTO cf_RuleInstance (ruleId,ruleUUID,policyId,ruleName,targetType,assetGroup,alexaKeyword,ruleParams,ruleFrequency,ruleExecutable,ruleRestUrl,ruleType,ruleArn,status,userId,displayName,createdDate,modifiedDate,severity,category) VALUES ('PacMan_Azure_Resolve_monitoring_agent_version-1_SecurityCenter_virtualmachine','azure_virtualmachine_resolve_monitoring_agent','PacMan_Azure_Resolve_monitoring_agent_version-1','resolve_monitoring_agent','virtualmachine','azure','resolve_monitoring_agent','{"params":[{"encrypt":false,"value":"check-for-azure-security-rule","key":"ruleKey"},{"key":"policyName","value":"Monitoring@agent@health@issues@should@be@resolved@on@your@machines","isValueNew":true,"encrypt":false},{"encrypt":false,"value":"high","key":"severity"},{"encrypt":false,"value":"security","key":"ruleCategory"},{"encrypt":false,"value":"","key":"ruleOwner"}],"environmentVariables":[],"ruleId":"PacMan_Azure_Resolve_monitoring_agent_version-1_SecurityCenter_virtualmachine","autofix":false,"alexaKeyword":"resolve monitoring agent findings","ruleRestUrl":"","targetType":"virtualmachine","pac_ds":"azure","policyId":"PacMan_Azure_Resolve_monitoring_agent_version-1","assetGroup":"azure","ruleUUID":"azure_virtualmachine_resolve_monitoring_agent","ruleType":"ManageRule"}','0 0/12 * * ? *','','','ManageRule',concat('arn:aws:events:',@region,':',@account,':rule/azure_virtualmachine_resolve_monitoring_agent'),'ENABLED','ASGC','Resolve monitoring agent health issues on your machines',{d '2019-10-25'},{d '2019-10-25'},null,null);

diff --git a/jobs/pacman-data-shipper/pom.xml b/jobs/pacman-data-shipper/pom.xml
@@ -144,7 +144,7 @@
 	<dependency>
     	<groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.9.10.1</version>
+        <version>2.10.1</version>
     </dependency>
     <dependency>
 	   <groupId>mysql</groupId>

diff --git a/webapp/package.json b/webapp/package.json
@@ -72,10 +72,10 @@
     "karma": "^4.2.0",
     "karma-chrome-launcher": "^2.1.1",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.4.3",
+    "karma-coverage-istanbul-reporter": "^2.1.0",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "^6.0.0",
+    "protractor": "^5.4.2",
     "protractor-jasmine2-html-reporter": "0.0.7",
     "replace-in-file": "^3.4.2",
     "source-map-explorer": "^1.6.0",

diff --git a/webapp/src/app/post-login-app/asset-groups/asset-groups.component.css b/webapp/src/app/post-login-app/asset-groups/asset-groups.component.css
@@ -265,4 +265,4 @@ img.delete-icon {
     .asset-tile-container {
         overflow: auto;
     }
-}
+}
diff --git a/webapp/src/app/post-login-app/asset-groups/asset-groups.component.html b/webapp/src/app/post-login-app/asset-groups/asset-groups.component.html
@@ -51,7 +51,7 @@
                             </div>
                         </div>
                     </section>
-                    <section class="asset-details-content" *ngIf='thisAssetTile && loaded && !showError'>
+                    <section class="asset-details-content flex flex-col flex-between" *ngIf='thisAssetTile && loaded && !showError'>
                         <div class="transformState" [class.transformBack]="thisAssetTile">
                             <app-asset-group-details [assetDetailsState]='assetDetailsState' [detailsVal]='assetDetailTiles' (navigatePage)="navigatePage($event,thisAssetTile)"></app-asset-group-details>
                         </div>

diff --git a/webapp/src/app/post-login-app/common/post-login-header/post-login-header.component.css b/webapp/src/app/post-login-app/common/post-login-header/post-login-header.component.css
@@ -385,4 +385,7 @@ nav .nav-icon:last-child {
 
 .user-profile-wrapper:hover > .profile {
     transform: scale(1.2);
+}
+.cloud-icon-wrapper {
+    padding-right: .6em;
 }
diff --git a/webapp/src/app/post-login-app/common/post-login-header/post-login-header.component.html b/webapp/src/app/post-login-app/common/post-login-header/post-login-header.component.html
@@ -78,7 +78,7 @@ <h4 class="recently-viewed-txt">Recently Viewed</h4>
                     <div class="menu-underline"></div>
                 </div>
                 <div [class.hide]='row.cloudSpecific && ((provider.length == 1 && provider[0] == "azure") || (agAndDomain["ag"] && agAndDomain["ag"].includes("azure")))' class="menu-content-item" *ngFor="let row of data.rows">
-                    <span routerLinkActive="active" routerLink={{row.route}} [queryParams]=agAndDomain (click)='clearPageLevel()'>{{row.name}}</span>
+                    <span routerLinkActive="active" [routerLink]="row.overlay ? [  {outlets: { modalBGMenu : [row.route] } } ] : [row.route] " [queryParams]=agAndDomain (click)='clearPageLevel()'>{{row.name}}</span>
                 </div>
             </div>
         </ng-container>