Merge pull request #792 from DataVault/dv5-demo

Merge tested changes in dv5-demo to dv5-main

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/DepositsController.java

@@ -31,6 +31,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Api(name="Deposits", description = "Interact with DataVault Deposits")
 public class DepositsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/FileStoreController.java

@@ -25,6 +25,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 public class FileStoreController {
 
     private static final Logger logger = LoggerFactory.getLogger(FileStoreController.class);

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/FilesController.java

@@ -33,6 +33,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Slf4j
 public class FilesController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/GroupsController.java

@@ -22,6 +22,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 @Api(name="Groups", description = "Interact with DataVault Groups")
 public class GroupsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/IndexController.java

@@ -6,13 +6,15 @@
 import org.jsondoc.core.pojo.ApiVisibility;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @Controller
+//@CrossOrigin
 @Api(name="Index", description = "Show JSONDOC page", visibility = ApiVisibility.PRIVATE)
 public class IndexController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/MetadataController.java

@@ -7,13 +7,10 @@
 import org.datavaultplatform.common.model.Dataset;
 import org.datavaultplatform.broker.services.ExternalMetadataService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
+//@CrossOrigin
 public class MetadataController {
 
     private final ExternalMetadataService externalMetadataService;

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/NotifyController.java

@@ -17,6 +17,7 @@
 import org.datavaultplatform.common.model.Agent;
 
 @RestController
+//@CrossOrigin
 @Api(name="Notify", description = "Inform the broker about an event")
 @Slf4j
 public class NotifyController {

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/RetentionPoliciesController.java

@@ -17,6 +17,7 @@
  */
 
 @RestController
+//@CrossOrigin
 public class RetentionPoliciesController {
 
     private final RetentionPoliciesService retentionPoliciesService;

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/ReviewsController.java

@@ -20,6 +20,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Api(name="Reviews", description = "Review functions")
 public class ReviewsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/RolesAndPermissionsController.java

@@ -23,6 +23,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 @RequestMapping("/permissions")
 @Api(name="Permissions", description = "Interact with DataVault Roles and Permissions")
 public class RolesAndPermissionsController {

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/StatisticsController.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 @Api(name="Statistics", description = "System statistics")
 public class StatisticsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/UsersController.java

@@ -16,6 +16,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 @Api(name="Users", description = "Interact with DataVault Users")
 public class UsersController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/VaultsController.java

@@ -34,6 +34,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Api(name="Vaults", description = "Interact with DataVault Vaults")
 public class VaultsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminArchiveStoreController.java

@@ -13,6 +13,7 @@
 import java.util.List;
 
 @RestController
+//@CrossOrigin
 public class AdminArchiveStoreController {
 
     private final ArchiveStoreService archiveStoreService;

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminController.java

@@ -32,12 +32,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -49,6 +44,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Api(name="Admin", description = "Administrator functions")
 @Slf4j
 public class AdminController {

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminPendingVaultsController.java

@@ -6,12 +6,10 @@
 import org.jsondoc.core.annotation.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
+//@CrossOrigin
 @Api(name="AdminPendingVaults", description = "Administrator pending vault functions.")
 public class AdminPendingVaultsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminRetentionPoliciesController.java

@@ -19,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+//@CrossOrigin
 @Api(name="AdminRetentionPolicies", description = "Administrator RetentionPolicies functions")
 public class AdminRetentionPoliciesController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminReviewsController.java

@@ -24,6 +24,7 @@
 
 
 @RestController
+//@CrossOrigin
 @Api(name="AdminReviews", description = "Administrator Review functions")
 public class AdminReviewsController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/AdminUsersController.java

@@ -22,6 +22,7 @@
  */
 
 @RestController
+//@CrossOrigin
 @Api(name="AdminUsers", description = "Administrator User functions")
 public class AdminUsersController {
 

datavault-broker/src/main/java/org/datavaultplatform/broker/controllers/admin/BillingController.java

@@ -9,9 +9,11 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.datavaultplatform.broker.services.BillingService;
 import org.datavaultplatform.broker.services.ExternalMetadataService;
+import org.datavaultplatform.broker.services.RolesAndPermissionsService;
 import org.datavaultplatform.broker.services.VaultsService;
 import org.datavaultplatform.common.model.BillingInfo;
 import org.datavaultplatform.common.model.PendingVault;
+import org.datavaultplatform.common.model.User;
 import org.datavaultplatform.common.model.Vault;
 import org.datavaultplatform.common.response.BillingInformation;
 import org.datavaultplatform.common.response.VaultInfo;
@@ -20,29 +22,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
+//@CrossOrigin
 public class BillingController {
 	private final ExternalMetadataService externalMetadataService;
 	private final VaultsService vaultsService;
 	private final BillingService billingService;
+	private final RolesAndPermissionsService permissionsService;
 	private static final Logger LOGGER = LoggerFactory.getLogger(BillingController.class);
 
 	@Autowired
 	public BillingController(ExternalMetadataService externalMetadataService,
-			VaultsService vaultsService, BillingService billingService) {
+							 VaultsService vaultsService, BillingService billingService,
+							 RolesAndPermissionsService permissionsService) {
 		this.externalMetadataService = externalMetadataService;
 		this.vaultsService = vaultsService;
 		this.billingService = billingService;
+		this.permissionsService = permissionsService;
 	}
 
 	@GetMapping("/admin/billing/search")
@@ -68,6 +67,13 @@ public VaultsData searchAllBillingVaults(@RequestHeader(HEADER_USER_ID) String u
 	        Map<String, Long> projectSizeMap = vaultsService.getAllProjectsSize();
 	        //update project Size in the response
 	        for(VaultInfo vault: billingResponses) {
+
+				User owner = permissionsService.getVaultOwner(vault.getID());
+				if(owner != null) {
+					vault.setOwnerId(owner.getID());
+					vault.setOwnerName(owner.getFirstname() + " " + owner.getLastname());
+				}
+
 	        	if(vault.getProjectId() != null) {
 	        		vault.setProjectSize(projectSizeMap.get(vault.getProjectId()));
 	        	}

datavault-broker/src/main/java/org/datavaultplatform/broker/services/FilesService.java

@@ -30,7 +30,7 @@ public FilesService(StorageClassNameResolver resolver) {
 
     //TODO - DHAY this does not seem thread safe
     private UserStore userStore;
-    private final long TIMEOUT_SECONDS = 40;
+    private final long TIMEOUT_SECONDS = 300;
 
     private boolean connect(FileStore fileStore) {
         try {

datavault-broker/src/main/resources/application.properties

@@ -50,4 +50,5 @@ broker.actuator.password=bactorpass
 rabbitmq.define.queue.worker=false
 rabbitmq.define.queue.broker=false
 
-sftp.driver.use.apache.sshd=false
+sftp.driver.use.apache.sshd=false
+#spring.mvc.cors.allowed-methods=GET,POST,PUT,DELETE,OPTIONS

datavault-common/src/main/java/org/datavaultplatform/common/storage/impl/TivoliStorageManager.java

@@ -63,8 +63,8 @@ public TivoliStorageManager(String name, Map<String,String> config) {
 			}
 		}
         locations = new ArrayList<>();
-        locations.add(TivoliStorageManager.TSM_SERVER_NODE1_OPT);
         locations.add(TivoliStorageManager.TSM_SERVER_NODE2_OPT);
+        locations.add(TivoliStorageManager.TSM_SERVER_NODE1_OPT);
         super.multipleCopies = true;
         super.depositIdStorageKey = true;
         for (String key : config.keySet()) {

datavault-webapp/src/main/java/org/datavaultplatform/webapp/config/shib/ShibWebSecurityConfig.java

@@ -16,6 +16,7 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.Http403ForbiddenEntryPoint;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 
@@ -52,7 +53,6 @@ public void configure(WebSecurity web) throws Exception {
   protected void configure(HttpSecurity http) throws Exception {
 
     // no form login for 'shib'
-
     HttpSecurityUtils.authorizeRequests(http);
 
     HttpSecurityUtils.sessionManagement(http, sessionRegistry);
@@ -87,4 +87,14 @@ ShibAuthenticationFilter shibFilter() throws Exception {
     return filter;
   }
 
+  /*@Bean
+  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    http.authorizeRequests()
+            .anyRequest()
+            .authenticated()
+            .and()
+            .httpBasic();
+    http.cors();
+    return http.build();
+  }*/
 }

datavault-webapp/src/main/java/org/datavaultplatform/webapp/controllers/admin/AdminBillingController.java

@@ -102,7 +102,7 @@ public void exportBillingVaults(HttpServletResponse response,
 
         String[] header = { "Vault name", "Vault Size","Project Id","Project Size","Amount To Be Billed","Amount Billed", "User Name", "Review Date","Creation Time" };
 
-        String[] fieldMapping = { "name",  "sizeStr","projectId","projectSize","amountToBeBilled","amountBilled",  "userName","reviewDate", "CreationTime" };
+        String[] fieldMapping = { "name",  "sizeStr","projectId","projectSize","amountToBeBilled","amountBilled",  "ownerName","reviewDate", "CreationTime" };
 
         try {
             // uses the Super CSV API to generate CSV data from the model data

datavault-webapp/src/main/webapp/WEB-INF/freemarker/admin/billing/index.ftl

@@ -72,7 +72,7 @@
                             <td> <#if vault.getAmountBilled()??>${vault.getAmountBilled()}<#else> </#if></td>
 
                              <td>
-                                 <#if vault.getUserName()??>${vault.getUserName()}</#if>
+                                 <#if vault.getOwnerName()??>${vault.getOwnerName()}</#if>
                             </td>
                             <td>
                              <a href="${springMacroRequestContext.getContextPath()}/admin/billing/${vault.getID()}">Billing Details</a></td>

datavault-webapp/src/main/webapp/resources/application/js/new-create-prototype.js

@@ -278,7 +278,7 @@ $(document).ready(function(){
 
 	// Initially, disable next on doc initialisation
 	$("input[name=\"billingType\"]").parents("fieldset").children(".next").prop( "disabled", true );
-	$('#vaultOwner').prop('disabled', true);
+	//$('#vaultOwner').prop('disabled', true);
 
 	$("#billing-choice-na").change(function(){
 		clearBillingOptions();