From db051a1a73684708d47ede1acefdaeff0cf99120 Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Mon, 26 Jul 2004 22:02:03 +0000 Subject: Removed obsolete logout method load_from_dump. Upgraded some residual calls to login_new & logout_new. Updated Java binding. Java unit test works (and C too, but Python still doesn't). --- java/src/c/com_entrouvert_lasso_LassoLogin.c | 11 ++------- java/src/c/com_entrouvert_lasso_LassoLogout.c | 26 ++-------------------- .../c/com_entrouvert_lasso_LassoProfileContext.c | 13 +++++++++++ java/src/java/com/entrouvert/lasso/LassoLogin.java | 9 ++++---- .../src/java/com/entrouvert/lasso/LassoLogout.java | 9 +++----- .../com/entrouvert/lasso/LassoProfileContext.java | 2 ++ java/tests/LoginTest.java | 15 ++++++------- 7 files changed, 33 insertions(+), 52 deletions(-) (limited to 'java') diff --git a/java/src/c/com_entrouvert_lasso_LassoLogin.c b/java/src/c/com_entrouvert_lasso_LassoLogin.c index 7824cd5d..e720de79 100644 --- a/java/src/c/com_entrouvert_lasso_LassoLogin.c +++ b/java/src/c/com_entrouvert_lasso_LassoLogin.c @@ -27,19 +27,12 @@ #include JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoLogin_init -(JNIEnv * env, jobject this, jobject _server, - jobject _user){ +(JNIEnv * env, jobject this, jobject _server){ LassoLogin *login; LassoServer* server; - LassoUser* user = NULL; server = (LassoServer*)getCObject(env, _server); - if(_user != NULL){ - user = (LassoUser*)getCObject(env, _user); - } - - login = LASSO_LOGIN(lasso_login_new(server, user)); - + login = LASSO_LOGIN(lasso_login_new(server)); storeCObject(env, this, login); } diff --git a/java/src/c/com_entrouvert_lasso_LassoLogout.c b/java/src/c/com_entrouvert_lasso_LassoLogout.c index 58e74c29..7d4326ce 100644 --- a/java/src/c/com_entrouvert_lasso_LassoLogout.c +++ b/java/src/c/com_entrouvert_lasso_LassoLogout.c @@ -28,16 +28,12 @@ #include JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoLogout_init -(JNIEnv * env, jobject this, jint _providerType, jobject _server, jobject _user){ +(JNIEnv * env, jobject this, jobject _server, jint _providerType){ LassoLogout *logout; LassoServer* server; - LassoUser* user = NULL; server = (LassoServer*)getCObject(env, _server); - if (_user != NULL) - user = (LassoUser*)getCObject(env, _user); - - logout = lasso_logout_new(_providerType, server, user); + logout = lasso_logout_new(server, _providerType); storeCObject(env, this, logout); } @@ -123,22 +119,6 @@ JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoLogout_loadRequestMsg return result; } -JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoLogout_loadUserDump -(JNIEnv * env, jobject this, jstring _userDump){ - int result; - LassoLogout* logout; - char *userDump; - - userDump = (char*)(*env)->GetStringUTFChars(env, _userDump, NULL); - - logout = getCObject(env, this); - result = lasso_logout_load_user_dump(logout, userDump); - - (*env)->ReleaseStringUTFChars(env, _userDump, userDump); - - return result; -} - JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoLogout_processRequest (JNIEnv * env, jobject this){ LassoLogout* logout; @@ -162,5 +142,3 @@ JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoLogout_processResponseMsg return result; } - - diff --git a/java/src/c/com_entrouvert_lasso_LassoProfileContext.c b/java/src/c/com_entrouvert_lasso_LassoProfileContext.c index 932c167c..0315e135 100644 --- a/java/src/c/com_entrouvert_lasso_LassoProfileContext.c +++ b/java/src/c/com_entrouvert_lasso_LassoProfileContext.c @@ -178,3 +178,16 @@ JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoProfileContext_initUserFie checkAndSetField(env, this, fieldName, fieldType, javaObjectClassName, cObject); } +JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoProfileContext_setUserFromDump +(JNIEnv * env, jobject this, jstring _dump) { + int result; + LassoProfileContext *profileContext; + char *dump; + + profileContext = getCObject(env, this); + dump = (char*)(*env)->GetStringUTFChars(env, _dump, NULL); + result = lasso_profile_context_set_user_from_dump(profileContext, dump); + (*env)->ReleaseStringUTFChars(env, _dump, dump); + return result; +} + diff --git a/java/src/java/com/entrouvert/lasso/LassoLogin.java b/java/src/java/com/entrouvert/lasso/LassoLogin.java index f8e1655c..3df32bd1 100644 --- a/java/src/java/com/entrouvert/lasso/LassoLogin.java +++ b/java/src/java/com/entrouvert/lasso/LassoLogin.java @@ -26,19 +26,18 @@ package com.entrouvert.lasso; public class LassoLogin extends LassoProfileContext { // LassoLogin - public LassoLogin(LassoServer server, LassoUser user){ + public LassoLogin(LassoServer server){ this.server = server; - this.user = user; - init(server, user); + init(server); } public LassoLogin(LassoServer server, LassoUser user, String dump){ this.server = server; - this.user = user; + this.user = user; initFromDump(server, user, dump); } - native protected void init(LassoServer server, LassoUser user); + native protected void init(LassoServer server); native protected void initFromDump(LassoServer server, LassoUser user, diff --git a/java/src/java/com/entrouvert/lasso/LassoLogout.java b/java/src/java/com/entrouvert/lasso/LassoLogout.java index 4c9fddca..0b37cef5 100644 --- a/java/src/java/com/entrouvert/lasso/LassoLogout.java +++ b/java/src/java/com/entrouvert/lasso/LassoLogout.java @@ -26,13 +26,12 @@ package com.entrouvert.lasso; public class LassoLogout extends LassoProfileContext { // LassoLogout - public LassoLogout(int providerType, LassoServer server, LassoUser user){ + public LassoLogout(LassoServer server, int providerType){ this.server = server; - this.user = user; - init(providerType, server, user); + init(server, providerType); } - native protected void init(int providerType, LassoServer server, LassoUser user); + native protected void init(LassoServer server, int providerType); native public int buildRequestMsg(); @@ -46,8 +45,6 @@ public class LassoLogout extends LassoProfileContext { // LassoLogout native public int loadRequestMsg(String requestMsg, int requestMethod); - native public int loadUserDump(String userDump); - native public int processRequest(); native public int processResponseMsg(String responseMsg, int responseMethod); diff --git a/java/src/java/com/entrouvert/lasso/LassoProfileContext.java b/java/src/java/com/entrouvert/lasso/LassoProfileContext.java index db32c355..6fff87ae 100644 --- a/java/src/java/com/entrouvert/lasso/LassoProfileContext.java +++ b/java/src/java/com/entrouvert/lasso/LassoProfileContext.java @@ -72,4 +72,6 @@ public abstract class LassoProfileContext extends LassoObject { // LassoProfileC return user; } + native public int setUserFromDump(String userDump); + } // LassoProfileContext diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java index 95ebd8b0..7c7f8b22 100644 --- a/java/tests/LoginTest.java +++ b/java/tests/LoginTest.java @@ -93,7 +93,7 @@ public class LoginTest extends TestCase { spContextDump = generateServiceProviderContextDump(); assertNotNull(spContextDump); spContext = new LassoServer(spContextDump); - spLoginContext = new LassoLogin(spContext, null); + spLoginContext = new LassoLogin(spContext); assertEquals(0, spLoginContext.initAuthnRequest( "https://identity-provider:1998/liberty-alliance/metadata")); assertEquals(Lasso.messageTypeAuthnRequest, spLoginContext.getRequestType()); @@ -112,7 +112,7 @@ public class LoginTest extends TestCase { idpContextDump = generateIdentityProviderContextDump(); assertNotNull(idpContextDump); idpContext = new LassoServer(idpContextDump); - idpLoginContext = new LassoLogin(idpContext, null); + idpLoginContext = new LassoLogin(idpContext); assertEquals(0, idpLoginContext.initFromAuthnRequestMsg(authnRequestQuery, method)); assertTrue(idpLoginContext.mustAuthenticate()); @@ -135,7 +135,7 @@ public class LoginTest extends TestCase { spContextDump = generateServiceProviderContextDump(); assertNotNull(spContextDump); spContext = new LassoServer(spContextDump); - spLoginContext = new LassoLogin(spContext, null); + spLoginContext = new LassoLogin(spContext); assertEquals(0, spLoginContext.initRequest(responseQuery, method)); assertEquals(0, spLoginContext.buildRequestMsg()); soapEndpoint = spLoginContext.getMsgUrl(); @@ -162,10 +162,9 @@ public class LoginTest extends TestCase { assertNotNull(spContextDump); spContext = new LassoServer(spContextDump); assertNotNull(spContext); + spLogoutContext = new LassoLogout(spContext, Lasso.providerTypeSp); assertNotNull(spUserContextDump); - spUserContext = new LassoUser(spUserContextDump); - assertNotNull(spUserContext); - spLogoutContext = new LassoLogout(Lasso.providerTypeSp, spContext, spUserContext); + spLogoutContext.setUserFromDump(spUserContextDump); assertEquals(0, spLogoutContext.initRequest(null)); assertEquals(0, spLogoutContext.buildRequestMsg()); soapEndpoint = spLogoutContext.getMsgUrl(); @@ -178,11 +177,11 @@ public class LoginTest extends TestCase { assertNotNull(idpContextDump); idpContext = new LassoServer(idpContextDump); assertNotNull(idpContext); - idpLogoutContext = new LassoLogout(Lasso.providerTypeIdp, idpContext, null); + idpLogoutContext = new LassoLogout(idpContext, Lasso.providerTypeIdp); assertEquals(0, idpLogoutContext.loadRequestMsg(soapRequestMsg, Lasso.httpMethodSoap)); assertEquals(nameIdentifier, idpLogoutContext.getNameIdentifier()); assertNotNull(idpUserContextDump); - assertEquals(0, idpLogoutContext.loadUserDump(idpUserContextDump)); + assertEquals(0, idpLogoutContext.setUserFromDump(idpUserContextDump)); assertEquals(0, idpLogoutContext.processRequest()); idpUserContext = idpLogoutContext.getUser(); assertNotNull(idpUserContext); -- cgit