From: <rm...@us...> - 2009-01-30 14:08:34
|
Revision: 4090 http://unicore.svn.sourceforge.net/unicore/?rev=4090&view=rev Author: rmenday Date: 2009-01-30 14:08:05 +0000 (Fri, 30 Jan 2009) Log Message: ----------- towards not having password in the .security props file .. Modified Paths: -------------- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6GeneralStorage.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6JSDLTask.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6SecurityProperties.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Site.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/MegaConfig.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Registry.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/RegistryConfig.java hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Unicore6Config.java Added Paths: ----------- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6ID.java Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6GeneralStorage.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6GeneralStorage.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6GeneralStorage.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -55,7 +55,7 @@ { // Location remains undefined for the time being // must be initialized later - super(null, new StorageClient(epr.getAddress().getStringValue(), epr, (Unicore6SecurityProperties) site.getSecurityProperties().clone())); + super(null, new StorageClient(epr.getAddress().getStringValue(), epr, (Unicore6SecurityProperties) site.getSecurityProperties().getUnicore6SecurityProperties().clone())); this.site = site; this.location = site.getLocation().getChildLocation(Location.STORAGES).getChildLocation(getType().getName()).getChildLocation("/"); } Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -228,7 +228,7 @@ tsfEPR.addNewAddress().setStringValue(tsfEPRString); Site site = null; try { - site = new Unicore6Site(location, tsfEPR, this, (Unicore6SecurityProperties) id); + site = new Unicore6Site(location, tsfEPR, this, (Unicore6ID) id); } catch (Exception e) { log.warn("Site object could not be created."); } Added: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6ID.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6ID.java (rev 0) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6ID.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -0,0 +1,52 @@ +package de.fzj.hila.implementation.unicore6; + +import java.io.ByteArrayOutputStream; +import java.util.Properties; + +import org.springframework.core.io.ByteArrayResource; +import org.springframework.core.io.Resource; + +import de.fzj.hila.ID; + +/** + * @author roger + * + * @org.apache.xbean.XBean element="unicore6id" + */ +public class Unicore6ID implements ID +{ + + private Resource resource; + + private Unicore6SecurityProperties u6sp = null; + + public Unicore6ID(Resource resource) throws Exception + { + this.resource = resource; + } + + public Resource getResource() + { + return this.resource; + } + + public Unicore6SecurityProperties getUnicore6SecurityProperties() throws Exception + { + if (this.u6sp == null) + { + Properties p = new Properties(); + p.load(getResource().getInputStream()); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + p.store(baos, null); + if (!p.containsKey("unicore.wsrflite.ssl.keypass")) + { + baos.write("unicore.wsrflite.ssl.keypass = unicore".getBytes()); + } + System.out.println("--------------------------------------------------"); + System.out.println(baos.toByteArray()); + this.u6sp = new Unicore6SecurityProperties(new ByteArrayResource(baos.toByteArray())); + } + return this.u6sp; + } + +} Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6JSDLTask.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6JSDLTask.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6JSDLTask.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -73,7 +73,7 @@ { SubmitResponseDocument srd = site.getTSSInstance().Submit(submit); EndpointReferenceType jEPR = srd.getSubmitResponse().getJobReference(); - jobClient = new JobClient(jEPR.getAddress().getStringValue(), jEPR, (Unicore6SecurityProperties) site.getSecurityProperties().clone()); + jobClient = new JobClient(jEPR.getAddress().getStringValue(), jEPR, (Unicore6SecurityProperties) site.getSecurityProperties().getUnicore6SecurityProperties().clone()); String eprString = jobClient.getEPR().getAddress().getStringValue(); location = site.getLocation().getChildLocation(Location.TASKS).getChildLocation(eprString.replaceFirst("https://.*?res=", "")); log.debug("Submitted task's location is " + location); Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6SecurityProperties.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6SecurityProperties.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6SecurityProperties.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -47,13 +47,7 @@ import de.fzj.unicore.uas.security.TDOutHandler; import de.fzj.unicore.uas.security.UASSecurityProperties; -/** - * @author bjoernh - * - * @org.apache.xbean.XBean element="unicore6id" - * - */ -public class Unicore6SecurityProperties extends UASSecurityProperties implements ID +public class Unicore6SecurityProperties extends UASSecurityProperties { @SuppressWarnings("unused") Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Site.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Site.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Site.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -93,7 +93,7 @@ private Unicore6Attributes attributes; - private Unicore6SecurityProperties securityProperties; + private Unicore6ID securityid; private List<LocatableCollection> locatableChildren; @@ -107,12 +107,12 @@ private TSSClient tssClient; - public Unicore6Site(Location location, EndpointReferenceType tsfEPR, Unicore6Grid grid, Unicore6SecurityProperties sp) + public Unicore6Site(Location location, EndpointReferenceType tsfEPR, Unicore6Grid grid, Unicore6ID sp) { super(null); this.tsfEPR = tsfEPR; this.grid = grid; - this.securityProperties = sp; + this.securityid = sp; this.location = location; tssClient = getTSSInstance(); @@ -171,7 +171,7 @@ TSFClient tsfClient; try { - tsfClient = new TSFClient(tsfEPR.getAddress().getStringValue(), tsfEPR, (Unicore6SecurityProperties) securityProperties.clone()); + tsfClient = new TSFClient(tsfEPR.getAddress().getStringValue(), tsfEPR, (Unicore6SecurityProperties) securityid.getUnicore6SecurityProperties().clone()); List<EndpointReferenceType> tssEPRs = tsfClient.getAccessibleTargetSystems(); // Try if there are any usable TSS still existing if (tssEPRs != null) @@ -180,7 +180,7 @@ { try { - tssClient = new TSSClient(tssEPR.getAddress().getStringValue(), tssEPR, (Unicore6SecurityProperties) securityProperties.clone()); + tssClient = new TSSClient(tssEPR.getAddress().getStringValue(), tssEPR, (Unicore6SecurityProperties) securityid.getUnicore6SecurityProperties().clone()); tssClient.getResourcePropertyDocument(); return tssClient; } // TODO differentiate Exceptions @@ -386,9 +386,9 @@ return tasksLocatableCollection; } - public Unicore6SecurityProperties getSecurityProperties() + public Unicore6ID getSecurityProperties() { - return securityProperties; + return securityid; } // public Locatable getLocatableChild(String name) throws HiLAException Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -138,7 +138,7 @@ { this(site, location); - jobClient = new JobClient(jEPR.getAddress().getStringValue(), jEPR, (Unicore6SecurityProperties) site.getSecurityProperties().clone()); + jobClient = new JobClient(jEPR.getAddress().getStringValue(), jEPR, (Unicore6SecurityProperties) site.getSecurityProperties().getUnicore6SecurityProperties().clone()); setCurrentStatus(TaskStatus.NEW); Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/MegaConfig.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/MegaConfig.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/MegaConfig.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -24,6 +24,7 @@ */ package de.fzj.hila.implementation.unicore6.config; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileFilter; import java.io.FileNotFoundException; @@ -37,12 +38,15 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.impl.common.IOUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; import org.w3.x2005.x08.addressing.EndpointReferenceType; @@ -56,6 +60,7 @@ import de.fzj.hila.exceptions.HiLAException; import de.fzj.hila.exceptions.HiLAIdentityException; import de.fzj.hila.exceptions.HiLALocationSyntaxException; +import de.fzj.hila.implementation.unicore6.Unicore6ID; import de.fzj.hila.implementation.unicore6.Unicore6SecurityProperties; import de.fzj.unicore.uas.TargetSystemFactory; import de.fzj.unicore.uas.client.RegistryClient; @@ -121,14 +126,13 @@ public void addRegistry(Registry r) throws Exception { log.info("..... LOOKING at registry :: " + r.getRegistryUrl()); - String ru = r.getRegistryUrl(); - Unicore6SecurityProperties[] ids = r.getIds(); - for (Unicore6SecurityProperties id : ids) + Unicore6ID[] ids = r.getIds(); + for (Unicore6ID id : ids) { EndpointReferenceType re = EndpointReferenceType.Factory.newInstance(); re.addNewAddress().setStringValue(ru); - RegistryClient regClient = new RegistryClient(ru, re, id.clone()); + RegistryClient regClient = new RegistryClient(ru, re, id.getUnicore6SecurityProperties().clone()); // List<Site> registrySites = new ArrayList<Site>(); List<EndpointReferenceType> siteEPRs = regClient.listAccessibleServices(TargetSystemFactory.TSF_PORT); @@ -185,11 +189,13 @@ String sn = location.getSiteLocation().getName(); File vx = new File(this.root, sn); - Unicore6SecurityProperties u6sp = null; + Unicore6ID u6id = null; + Unicore6SecurityProperties u6sp; try { File c = (File) XS.fromXML(new FileReader(new File(vx, "1"))); - u6sp = new Unicore6SecurityProperties(new FileSystemResource(c)); + u6id = new Unicore6ID(new FileSystemResource(c)); + u6sp = u6id.getUnicore6SecurityProperties(); } catch (FileNotFoundException e) { @@ -199,7 +205,6 @@ { throw new HiLAIdentityException("Couldn't create primary identity.", e); } - if (!location.isDefaultUser()) { // acting as agent. get saml assertion and add to SecurityProperties. @@ -229,8 +234,7 @@ tdList.add(td); u6sp.setTrustDelegationTokens(tdList); } - return u6sp; - + return u6id; } public Set<Location> getAllSiteLocations() Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Registry.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Registry.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Registry.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -1,5 +1,6 @@ package de.fzj.hila.implementation.unicore6.config; +import de.fzj.hila.implementation.unicore6.Unicore6ID; import de.fzj.hila.implementation.unicore6.Unicore6SecurityProperties; /** @@ -10,18 +11,18 @@ public String registryUrl; - public Unicore6SecurityProperties[] ids; + public Unicore6ID[] ids; public Registry() { } - public Unicore6SecurityProperties[] getIds() + public Unicore6ID[] getIds() { return ids; } - public void setIds(Unicore6SecurityProperties[] ids) + public void setIds(Unicore6ID[] ids) { this.ids = ids; } Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/RegistryConfig.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/RegistryConfig.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/RegistryConfig.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -45,6 +45,7 @@ import de.fzj.hila.common.config.MapBackedConfig; import de.fzj.hila.exceptions.HiLAException; import de.fzj.hila.implementation.unicore6.Unicore6Grid; +import de.fzj.hila.implementation.unicore6.Unicore6ID; import de.fzj.hila.implementation.unicore6.Unicore6SecurityProperties; import de.fzj.hila.implementation.unicore6.Unicore6Site; import de.fzj.unicore.uas.TargetSystemFactory; @@ -115,12 +116,10 @@ private List<Site> getSitesFromRegistry() throws Exception { registrySites = new ArrayList<Site>(); - if (regClient == null) { createRegistryClient(); } - try { log.debug("About to query registry for available TSFs."); @@ -136,7 +135,7 @@ // Chicken or egg? // Can't get site's name w/o credentials // Can't create site w/o site's name - Unicore6Site u6Site = new Unicore6Site(null, siteEPR, this.grid, (Unicore6SecurityProperties) regClient.getSecurityProperties().clone()); + Unicore6Site u6Site = new Unicore6Site(null, siteEPR, this.grid, (Unicore6ID) regClient.getSecurityProperties().clone()); registrySites.add(u6Site); grid.setCachedSite(u6Site.getLocation().getSiteLocation(), u6Site); getConfig().put(u6Site.getLocation().getSiteLocation(), u6Site.getSecurityProperties()); Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Unicore6Config.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Unicore6Config.java 2009-01-30 11:32:08 UTC (rev 4089) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/config/Unicore6Config.java 2009-01-30 14:08:05 UTC (rev 4090) @@ -46,6 +46,7 @@ import de.fzj.hila.Location; import de.fzj.hila.exceptions.HiLALocationSyntaxException; import de.fzj.hila.implementation.unicore6.Unicore6Factory; +import de.fzj.hila.implementation.unicore6.Unicore6ID; import de.fzj.hila.implementation.unicore6.Unicore6Properties; import de.fzj.hila.implementation.unicore6.Unicore6SecurityProperties; @@ -60,14 +61,14 @@ @SuppressWarnings("unused") private static final Logger log = LoggerFactory.getLogger(Unicore6Config.class); - private Map<Location, Unicore6SecurityProperties> loc2id; + private Map<Location, Unicore6ID> loc2id; /** * */ public Unicore6Config(Unicore6Properties u6p) { - loc2id = new HashMap<Location, Unicore6SecurityProperties>(); + loc2id = new HashMap<Location, Unicore6ID>(); List<String> sites = u6p.getSiteNames(); for (String site : sites) { @@ -82,11 +83,11 @@ { e.printStackTrace(); } - Unicore6SecurityProperties siteSec = null; + Unicore6ID siteSec = null; try { log.debug("Instantiating SecurityProperties from file: " + u6p.getSecurityPropertiesFile(site)); - siteSec = new Unicore6SecurityProperties(new FileSystemResource(u6p.getSecurityPropertiesFile(site))); + siteSec = new Unicore6ID(new FileSystemResource(u6p.getSecurityPropertiesFile(site))); } catch (Exception e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |