PLUGINS-228 Adding allowance for using xsync between local projects with whitelist.

Author: ian-xnatworks

src/main/java/org/nrg/xsync/services/local/impl/WhitelistXsyncSiteServiceImpl.java

@@ -4,6 +4,7 @@
 import org.nrg.framework.orm.hibernate.AbstractHibernateEntityService;
 import org.nrg.xapi.exceptions.DataFormatException;
 import org.nrg.xapi.exceptions.NotFoundException;
+import org.nrg.xdat.XDAT;
 import org.nrg.xsync.manifest.whitelist.SiteClassification;
 import org.nrg.xsync.manifest.whitelist.WhitelistSite;
 import org.nrg.xsync.manifest.whitelist.WhitelistSiteRepository;
@@ -24,6 +25,12 @@ public class WhitelistXsyncSiteServiceImpl extends AbstractHibernateEntityServic
     public List<WhitelistSitePojo> getAllWhitelistedSites() {
         List<WhitelistSite> allWhitelistedSites = getDao().findAll();
         List<WhitelistSitePojo> allSitePojos = new ArrayList<>();
+        if (allWhitelistedSites.stream().noneMatch(w -> w.getSiteUrl().equals(XDAT.getSiteUrl()))) {
+            WhitelistSite sourceSiteWhitelist = new WhitelistSite(XDAT.getSiteId(), XDAT.getSiteId(), XDAT.getSiteUrl(),
+                                                           SiteClassification.PUBLIC);
+            getDao().saveOrUpdate(sourceSiteWhitelist);
+            allWhitelistedSites.add(sourceSiteWhitelist);
+        }
         for (WhitelistSite site : allWhitelistedSites) {
             WhitelistSitePojo pojo = new WhitelistSitePojo(site.getSiteId(), site.getSiteName(), site.getSiteUrl(),
                                                            site.getClassification().toString());

src/main/java/org/nrg/xsync/xapi/XsyncSetupController.java

@@ -12,6 +12,7 @@
 import org.nrg.xdat.security.services.RoleHolder;
 import org.nrg.xdat.security.services.UserManagementServiceI;
 import org.nrg.xsync.components.XsyncSitePreferencesBean;
+import org.nrg.xsync.pojo.WhitelistSitePojo;
 import org.nrg.xsync.pojo.configuration.SyncConfigurationPojo;
 import org.nrg.xsync.services.local.WhitelistXsyncSiteService;
 import org.nrg.xsync.services.local.XsyncConfigurationService;
@@ -78,11 +79,11 @@ public String setup(@PathVariable("projectId") String projectId,
 			if (project == null) {
 				throw new DataFormatException(" Project " + projectId + " not found. ");
 			}
-			if (!_xsyncConfigService.checkForWhitelistConformation(_prefs.toPojo().getXsyncWhitelistEnabled(),
-																   _whitelistXsyncSiteService.getAllWhitelistedSites(), configurationPojo.getRemote_url())) {
-				throw new DataFormatException(" Site URL " + configurationPojo.getRemote_url() +
-													" is not an allowed option to receive data. ");
-			}
+			if (_prefs.toPojo().getXsyncWhitelistEnabled() && _whitelistXsyncSiteService.getAllWhitelistedSites()
+					.stream().noneMatch(wl -> wl.getSiteUrl().equals(configurationPojo.getRemote_url()))) {
+                throw new DataFormatException(" Site URL " + configurationPojo.getRemote_url() +
+                                                      " is not an allowed option to receive data. ");
+            }
 
 			XsyncUtils xsyncUtils = new XsyncUtils(_jdbcTemplate, getSessionUser());
 			xsyncUtils.loadConfigurationToDB(configurationPojo);