Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[3335] ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src
|
From: <ms...@us...> - 2008-08-22 18:10:40
|
Revision: 3335
http://unicore.svn.sourceforge.net/unicore/?rev=3335&view=rev
Author: msmemon
Date: 2008-08-22 18:10:37 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
remaining commits for compilation
Modified Paths:
--------------
ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/security/TestExtendedClientSecurity.java
ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/test/BaseActivityTest.java
Added Paths:
-----------
ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/main/java/de/fzj/unicore/bes/client/BaseUsernameClient.java
Added: ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/main/java/de/fzj/unicore/bes/client/BaseUsernameClient.java
===================================================================
--- ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/main/java/de/fzj/unicore/bes/client/BaseUsernameClient.java (rev 0)
+++ ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/main/java/de/fzj/unicore/bes/client/BaseUsernameClient.java 2008-08-22 18:10:37 UTC (rev 3335)
@@ -0,0 +1,37 @@
+package de.fzj.unicore.bes.client;
+
+import org.w3.x2005.x08.addressing.EndpointReferenceType;
+
+import de.fzj.unicore.uas.client.BaseUASClient;
+import de.fzj.unicore.uas.security.IUASSecurityProperties;
+
+
+
+/**
+ * This class inherits BaseUASClient to use inherent client side unicore security feature
+ * and updates the type of inherited client factory class.
+ *
+ * @author m.memon
+ *
+ */
+public class BaseUsernameClient extends BaseUASClient{
+
+ private String username, password;
+
+ public BaseUsernameClient(String url, EndpointReferenceType epr, String username, String password, IUASSecurityProperties sec) throws Exception {
+ super(url, epr, sec);
+ // using another client factory for username out handlers
+ this.proxyMaker = new UsernameClientFactory(username, password, sec);
+ this.username = username;
+ this.password = password;
+ }
+
+ public String getUsername(){
+ return username;
+ }
+
+ public String getPassword(){
+ return password;
+ }
+
+}
Modified: ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/security/TestExtendedClientSecurity.java
===================================================================
--- ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/security/TestExtendedClientSecurity.java 2008-08-22 18:06:30 UTC (rev 3334)
+++ ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/security/TestExtendedClientSecurity.java 2008-08-22 18:10:37 UTC (rev 3335)
@@ -11,7 +11,7 @@
import org.w3.x2005.x08.addressing.EndpointReferenceType;
import de.fzj.unicore.bes.BESFactory;
-import de.fzj.unicore.bes.client.BESClientFactory;
+import de.fzj.unicore.bes.client.UsernameClientFactory;
import de.fzj.unicore.uas.security.IUASSecurityProperties;
import de.fzj.unicore.uas.security.UASSecurityProperties;
import de.fzj.unicore.wsrflite.security.ISecurityProperties;
@@ -44,7 +44,7 @@
}
public void run() {
- BESClientFactory client = new BESClientFactory("sc06", "sc06",
+ UsernameClientFactory client = new UsernameClientFactory("sc06", "sc06",
getSecurityProperties());
EndpointReferenceType eprt = EndpointReferenceType.Factory
Modified: ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/test/BaseActivityTest.java
===================================================================
--- ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/test/BaseActivityTest.java 2008-08-22 18:06:30 UTC (rev 3334)
+++ ogsabes/ogsabes-core/tags/ogsabes-core-1.1.2/src/test/java/de/fzj/unicore/bes/test/BaseActivityTest.java 2008-08-22 18:10:37 UTC (rev 3335)
@@ -8,6 +8,7 @@
import de.fzj.unicore.uas.security.IUASSecurityProperties;
import de.fzj.unicore.uas.security.TDOutHandler;
import de.fzj.unicore.uas.security.UASSecurityProperties;
+import de.fzj.unicore.uas.util.AddressingUtil;
import de.fzj.unicore.wsrflite.security.ISecurityProperties;
import junit.framework.TestCase;
@@ -19,12 +20,14 @@
protected static IUASSecurityProperties sp = null;
protected String protocol = "http";
protected String serverUrl = null;
-// protected static final String hostAddress = "://localhost:8080/DEMO-SITE/services/";
- protected static final String hostAddress = "://localhost:7774/services/";
+ protected static final String hostAddress = "://localhost:8080/DEMO-SITE/services/";
+// protected static final String hostAddress = "://localhost:7774/services/";
// protected static final String hostAddress = "://zam461.zam.kfa-juelich.de:9122/DEMO-SITE/services/";
// protected static final String hostAddress = "://omiiei.zam.kfa-juelich.de:6000/Bravo-Site/services/";
// protected static final String hostAddress = "://knowarc1.grid.niif.hu:60000/arex";
+// protected static final String hostAddress = "://seagrass.man.poznan.pl:8080/DEMO-SITE/services/";
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -33,7 +36,9 @@
protected void configureSecurity(){
if(getSecurityFlag()){
protocol = "https";
- sp = makeSecurityProperties();
+// sp = makeSecurityProperties();
+// sp = makeSecurityPropertiesWithProxy();
+ sp = makeSecurityPropertiesWithProxy1();
}
@@ -60,6 +65,12 @@
return null;
}
+ protected EndpointReferenceType getDefaultFactoryEpr(){
+ EndpointReferenceType eprt = EndpointReferenceType.Factory.newInstance();
+ eprt.addNewAddress().setStringValue(serverUrl+"BESFactory?res="+BESOnStartup.INSTANCE_ID);
+ AddressingUtil.addUGSRefparamToEpr(eprt, BESOnStartup.INSTANCE_ID);
+ return eprt;
+ }
protected ActivityClient getActivityClient(EndpointReferenceType epr){
configureSecurity();
@@ -77,45 +88,47 @@
}
- // Programatically setup security
- // security properties for testing with project-ca certificates
- @Deprecated
- protected IUASSecurityProperties makeSecurityProperties1(){
+
+
+
+ //programatically setup security
+ protected IUASSecurityProperties makeSecurityProperties(){
if(sp==null){
UASSecurityProperties p=new UASSecurityProperties();
-// String certs="src/main/certs";
+ String certs="src/main/certs";
p.setProperty(ISecurityProperties.WSRF_SSL,"true");
// p.setProperty(ISecurityProperties.WSRF_WSS,"false");
p.setProperty(ISecurityProperties.WSRF_SSL_CLIENTAUTH,"true");
- p.setProperty(ISecurityProperties.WSRF_SSL_KEYSTORE,"/home/m.memon/projectca-credentials/projectcastore.jks");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYSTORE,certs+"/user-keystore.jks");
p.setProperty(ISecurityProperties.WSRF_SSL_KEYTYPE,"JKS");
- p.setProperty(ISecurityProperties.WSRF_SSL_KEYPASS,"*****");
- p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTPASS,"******");
- p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTSTORE,"/home/m.memon/projectca-credentials/projectcastore.jks");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYPASS,"the!user");
+ p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTPASS,"the!user");
+ p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTSTORE,certs+"/user-keystore.jks");
p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTTYPE,"JKS");
p.setProperty(IUASSecurityProperties.UAS_OUTHANDLER_NAME,TDOutHandler.class.getName()+" "+DSigOutHandler.class.getName());
p.setSignMessage(false);
- p.setAddTrustDelegation(false);
- String dn = "C=DE,ST=none,L=none,O=Unicore,OU=none,CN=NJS Test Certificate,1.2.840.113549.1.9.1=#161c756e69636f72652d737570706f7274406c697374732e73662e6e6574";
- p.setReceiver(new javax.security.auth.x500.X500Principal(dn));
+ p.setAddTrustDelegation(true);
+// String dn = "C=DE,ST=none,L=none,O=Unicore,OU=none,CN=NJS Test Certificate,1.2.840.113549.1.9.1=#161c756e69636f72652d737570706f7274406c697374732e73662e6e6574";
+// p.setReceiver(new javax.security.auth.x500.X500Principal(dn));
+
sp=p;
}
return sp;
}
- //programatically setup security
- protected IUASSecurityProperties makeSecurityProperties(){
+ //programatically setup proxy credentials
+ protected IUASSecurityProperties makeSecurityPropertiesWithProxy(){
if(sp==null){
UASSecurityProperties p=new UASSecurityProperties();
String certs="src/main/certs";
p.setProperty(ISecurityProperties.WSRF_SSL,"true");
// p.setProperty(ISecurityProperties.WSRF_WSS,"false");
p.setProperty(ISecurityProperties.WSRF_SSL_CLIENTAUTH,"true");
- p.setProperty(ISecurityProperties.WSRF_SSL_KEYSTORE,certs+"/user-keystore.jks");
- p.setProperty(ISecurityProperties.WSRF_SSL_KEYTYPE,"JKS");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYSTORE,"/tmp/proxy/user-proxy_aa.p12");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYTYPE,"pkcs12");
p.setProperty(ISecurityProperties.WSRF_SSL_KEYPASS,"the!user");
p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTPASS,"the!user");
p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTSTORE,certs+"/user-keystore.jks");
@@ -132,15 +145,38 @@
}
return sp;
}
-
-
+ //programatically setup proxy credentials
+ protected IUASSecurityProperties makeSecurityPropertiesWithProxy1(){
+ if(sp==null){
+ UASSecurityProperties p=new UASSecurityProperties();
+ String certs="src/main/certs";
+ p.setProperty(ISecurityProperties.WSRF_SSL,"true");
+// p.setProperty(ISecurityProperties.WSRF_WSS,"false");
+ p.setProperty(ISecurityProperties.WSRF_SSL_CLIENTAUTH,"true");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYSTORE,"/home/m.memon/Desktop/dawid_proxy.p12");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYTYPE,"pkcs12");
+ p.setProperty(ISecurityProperties.WSRF_SSL_KEYPASS,"the!user");
+ p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTPASS,"the!njs");
+ p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTSTORE,certs+"/server-truststore.jks");
+ p.setProperty(ISecurityProperties.WSRF_SSL_TRUSTTYPE,"JKS");
+
+ p.setProperty(IUASSecurityProperties.UAS_OUTHANDLER_NAME,TDOutHandler.class.getName()+" "+DSigOutHandler.class.getName());
+ p.setSignMessage(false);
+ p.setAddTrustDelegation(true);
+// String dn = "C=DE,ST=none,L=none,O=Unicore,OU=none,CN=NJS Test Certificate,1.2.840.113549.1.9.1=#161c756e69636f72652d737570706f7274406c697374732e73662e6e6574";
+// p.setReceiver(new javax.security.auth.x500.X500Principal(dn));
+
+
+ sp=p;
+ }
+ return sp;
+ }
-
protected void setSecurityFlag(boolean b){
securityFlag = b;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|