[Unicore-cvs-commits] SF.net SVN: unicore:[13656] contributions/unicore-taverna/trunk/ unicore-taverna/src/main/java/fzj/unicore/SecurityManager.java

[<so...@us...>]

Revision: 13656
          http://unicore.svn.sourceforge.net/unicore/?rev=13656&view=rev
Author:   soholl
Date:     2012-06-28 16:27:18 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Solved blocking of Taverna Credential Manager Message and selection of keys
Solved requesting of all p12 AND password entries

Modified Paths:
--------------
    contributions/unicore-taverna/trunk/unicore-taverna/src/main/java/fzj/unicore/SecurityManager.java

Modified: contributions/unicore-taverna/trunk/unicore-taverna/src/main/java/fzj/unicore/SecurityManager.java
===================================================================
--- contributions/unicore-taverna/trunk/unicore-taverna/src/main/java/fzj/unicore/SecurityManager.java	2012-06-28 11:53:47 UTC (rev 13655)
+++ contributions/unicore-taverna/trunk/unicore-taverna/src/main/java/fzj/unicore/SecurityManager.java	2012-06-28 16:27:18 UTC (rev 13656)
@@ -59,6 +59,7 @@
 	private static SecurityManager instance;
 	private boolean checkedCertificates = false;
 	private String tdPath="security_token.out";
+	private String alia="";
 
 	
 
@@ -131,10 +132,13 @@
 			managePath();
 			FileOutputStream f = null;
 
-			
-			
 				ArrayList<String> aliases = credentialManager.getAliases("Keystore");
-				String alia = getSelection(aliases, uri);
+				synchronized(alia){
+				if(alia.equals("")){
+				 alia = getSelection(aliases, uri);
+				}
+				}
+				
 				boolean b= true;//create file
 				
 		
@@ -224,8 +228,13 @@
 	 * if a user has more than one private key he will be asked to select one. 
 	 */
 	private String getSelection(ArrayList<String> aliases,String uri) {
+		//delete the passwort entries as they are also catched
+		ArrayList<String> aliasesClean= new ArrayList<String>();
+		for (String string : aliases) {
+			if (!(string.startsWith("password"))) aliasesClean.add(string);
+		}
 		
-			String[] selection = aliases.toArray(new String[aliases.size()]);
+			String[] selection = aliasesClean.toArray(new String[aliasesClean.size()]);
 
 			if(selection.length==0) return "";
 			else{
@@ -248,6 +257,7 @@
 					      };
 					 
 					final JDialog dialog = optionPane.createDialog(null, "Please choose the key to be used for"+uri+":");
+					dialog.setModal(true);
 					dialog.setVisible(true);
 					int selectedValue = (Integer) optionPane.getValue();
 					if (!(selectedValue== JOptionPane.CANCEL_OPTION)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.