Some progress in first non regression test.

8 files changed, 67 insertions, 36 deletions

diff --git a/java/Makefile b/java/Makefile
index 29ebe1dc..36aac173 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,19 +1,24 @@
 TARGET=target
 
+#JAVAC=/usr/bin/javac
+#JAVAH=/usr/bin/javah
+#JAVAH_CLASSPATH_PREFIX=
+#JAR=/usr/bin/jar
+
 #JAVAC=/opt/jdk/bin/javac
 #JAVAH=/opt/jdk/bin/javah
 #JAVAH_CLASSPATH_PREFIX=
 #JAR=/opt/jdk/bin/jar
 
-#JAVAC=/usr/lib/kaffe/bin/javac
-#JAVAH=/usr/lib/kaffe/bin/javah
-#JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
-#JAR=/usr/lib/kaffe/bin/jar
-
-JAVAC=/usr/bin/gcj -C
-JAVAH=/usr/bin/gcjh -jni
+JAVAC=/usr/lib/kaffe/bin/javac
+JAVAH=/usr/lib/kaffe/bin/javah
 JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
-JAR=/usr/bin/fastjar
+JAR=/usr/lib/kaffe/bin/jar
+
+#JAVAC=/usr/bin/gcj -C
+#JAVAH=/usr/bin/gcjh -jni
+#JAVAH_CLASSPATH_PREFIX=
+#JAR=/usr/bin/fastjar
 
 JAVA_BUILD_DIR=${TARGET}/classes
 JAVA_SOURCE_DIR=src/java
diff --git a/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c b/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
index a2d4f243..a71af821 100644
--- a/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
+++ b/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
@@ -67,7 +67,7 @@ JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setassertionC
     (*env)->ReleaseStringUTFChars(env, _value, value);
 }
 
-JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setContent
+JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setConsent
 (JNIEnv * env, jobject this, jstring _value){
     LassoAuthnRequest * request;
     char * value;
diff --git a/java/src/c/helper.c b/java/src/c/helper.c
index 6f19ca70..a4ee15d9 100644
--- a/java/src/c/helper.c
+++ b/java/src/c/helper.c
@@ -1,11 +1,11 @@
-/* $Id$
- *
+/*
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
+ *          Emmanuel Raviart <eraviart@entrouvert.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/java/src/c/helper.h b/java/src/c/helper.h
index ba8304eb..f9b4d167 100644
--- a/java/src/c/helper.h
+++ b/java/src/c/helper.h
@@ -1,11 +1,11 @@
-/* $Id$
- *
+/*
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
+ *          Emmanuel Raviart <eraviart@entrouvert.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/java/src/java/com/entrouvert/lasso/Lasso.java b/java/src/java/com/entrouvert/lasso/Lasso.java
index e2618921..a1d5700d 100644
--- a/java/src/java/com/entrouvert/lasso/Lasso.java
+++ b/java/src/java/com/entrouvert/lasso/Lasso.java
@@ -30,6 +30,15 @@ public class Lasso { // Lasso
         System.loadLibrary("jlasso");
     }
 
+    /* NameIDPolicyType */
+    static final public String libNameIdPolicyTypeNone = "none";
+    static final public String libNameIdPolicyTypeOneTime = "onetime";
+    static final public String libNameIdPolicyTypeFederated = "federated";
+    static final public String libNameIdPolicyTypeAny = "any";
+
+    static final public int signatureMethodRsaSha1 = 1;
+    static final public int signatureMethodDsaSha1 = 2;
+
     native static public int init();
     native static public int shutdown();
 
diff --git a/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java b/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
index 9c623932..bde492ed 100644
--- a/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
+++ b/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
@@ -36,7 +36,7 @@ public class LassoAuthnRequest extends LassoNode { // LassoAuthnRequest
 
     native public void setAffiliationID(String affiliationId);
     native public void setassertionConsumerServiceID(String assertionConsumerServiceID);
-    native public void setContent(String content);
+    native public void setConsent(String consent);
     native public void setForceAuthn(boolean val);
     native public void setPassive(boolean val);
     native public void setNameIdPolicy(String val);
diff --git a/java/src/java/com/entrouvert/lasso/LassoObject.java b/java/src/java/com/entrouvert/lasso/LassoObject.java
index fc87287e..98856d34 100644
--- a/java/src/java/com/entrouvert/lasso/LassoObject.java
+++ b/java/src/java/com/entrouvert/lasso/LassoObject.java
@@ -1,9 +1,8 @@
 /*
- *
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
  *          Emmanuel Raviart <eraviart@entrouvert.com>
diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java
index cac7bff0..d4455f34 100644
--- a/java/tests/LoginTest.java
+++ b/java/tests/LoginTest.java
@@ -2,7 +2,7 @@
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.org
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
  *          Emmanuel Raviart <eraviart@entrouvert.com>
@@ -24,29 +24,32 @@
 
 // To run it:
 // $ export LD_LIBRARY_PATH=../target/
-// $ javac -classpath /usr/share/java/junit.jar:../target/lasso.jar:.:/ LoginTest.java
-// $ java -classpath /usr/share/java/junit.jar:../target/lasso.jar:.:/ LoginTest
+// $ javac -classpath /usr/share/java/junit.jar:../target/lasso.jar:. LoginTest.java
+// $ java -classpath /usr/share/java/junit.jar:../target/lasso.jar:. LoginTest
+// or for gcj:
+// $ export LD_LIBRARY_PATH=../target/
+// $ gcj -C -classpath /usr/share/java/junit.jar:../target/lasso.jar:. LoginTest.java
+// $ gij -classpath /usr/share/java/junit.jar:../target/lasso.jar:. LoginTest
 
 import junit.framework.TestCase;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import com.entrouvert.lasso.Lasso;
-import com.entrouvert.lasso.LassoServer;
+import com.entrouvert.lasso.*;
 
 
 public class LoginTest extends TestCase {
     public String generateIdentityProviderContextDump() {
 	LassoServer serverContext = new LassoServer(
             "../../examples/data/idp-metadata.xml",
-            "../../examples/idp-public-key.pem",
-            "../../examples/idp-private-key.pem",
-            "../../examples/idp-crt.pem",
-            1); // FIXME: Replace with lasso.signatureMethodRsaSha1
+            "../../examples/data/idp-public-key.pem",
+            "../../examples/data/idp-private-key.pem",
+            "../../examples/data/idp-crt.pem",
+           Lasso.signatureMethodRsaSha1);
         serverContext.addProvider(
             "../../examples/data/sp-metadata.xml",
-            "../../examples/sp-public-key.pem",
-            "../../examples/ca-crt.pem");
+            "../../examples/data/sp-public-key.pem",
+            "../../examples/data/ca-crt.pem");
 	String serverContextDump = serverContext.dump();
         return serverContextDump;
     }
@@ -54,25 +57,40 @@ public class LoginTest extends TestCase {
     public String generateServiceProviderContextDump() {
         LassoServer serverContext = new LassoServer(
             "../../examples/data/sp-metadata.xml",
-            "../../examples/sp-public-key.pem",
-            "../../examples/sp-private-key.pem",
-            "../../examples/sp-crt.pem",
-            1); // FIXME: Replace with lasso.signatureMethodRsaSha1
+            "../../examples/data/sp-public-key.pem",
+            "../../examples/data/sp-private-key.pem",
+            "../../examples/data/sp-crt.pem",
+            Lasso.signatureMethodRsaSha1);
         serverContext.addProvider(
             "../../examples/data/idp-metadata.xml",
-            "../../examples/idp-public-key.pem",
-            "../../examples/ca-crt.pem");
+            "../../examples/data/idp-public-key.pem",
+            "../../examples/data/ca-crt.pem");
         String serverContextDump = serverContext.dump();
         return serverContextDump;
     }
 
-    public void testSimpleAdd() {
+    public void test01_generateServersContextDumps() {
         String identityProviderContextDump = generateIdentityProviderContextDump();
         assertNotNull(identityProviderContextDump);
         String serviceProviderContextDump = generateServiceProviderContextDump();
         assertNotNull(serviceProviderContextDump);
     }
 
+    public void test02_serviceProviderLogin() {
+        String spContextDump = generateServiceProviderContextDump();
+	assertNotNull(spContextDump);
+        LassoServer spContext = new LassoServer(spContextDump);
+        LassoLogin spLoginContext = new LassoLogin(spContext, null);
+        assertEquals(spLoginContext.initAuthnRequest(
+	    "https://identity-provider:1998/liberty-alliance/metadata"), 0);
+	LassoAuthnRequest authnRequest = (LassoAuthnRequest) spLoginContext.getRequest();
+        authnRequest.setPassive(false);
+        authnRequest.setNameIdPolicy(Lasso.libNameIdPolicyTypeFederated);
+        // FIXME authnRequest.setConsent(Lasso.libConsentObtained);
+        authnRequest.setRelayState("fake");
+        assertEquals(spLoginContext.buildAuthnRequestMsg(), 0);
+    }
+
     public static Test suite() { 
 	return new TestSuite(LoginTest.class); 
     }