Michael Pasternak has uploaded a new change for review. Change subject: restapi: return SESSIONID header along with cookie ......................................................................
restapi: return SESSIONID header along with cookie Change-Id: I26667239157be04afc6dc446e8c7ad98ec40c778 Signed-off-by: Michael Pasternak <[email protected]> --- M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/SessionUtils.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/9071/1 diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/SessionUtils.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/SessionUtils.java index 47d983f..cec49f2 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/SessionUtils.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/SessionUtils.java @@ -18,6 +18,7 @@ public static String ENGINE_SESSION_ID_KEY = "engineSessionId"; public static String PREFER_HEADER_FIELD = "Prefer"; public static String PERSIST_FIELD_VALUE = "persistent-auth"; + public static String JSESSIONID_HEADER = "JSESSIONID"; private static final Log log = LogFactory.getLog(SessionUtils.class); /* diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java index 7918f37..85bbd80 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java @@ -153,6 +153,7 @@ @Override public void postProcess(ServerResponse response) { + HttpSession httpSession = getCurrentSession(false); if (!current.get(MetaData.class).hasKey("async") || ((Boolean)current.get(MetaData.class).get("async")) != Boolean.TRUE) { VdcUser user = current.get(VdcUser.class); @@ -160,10 +161,12 @@ if (!persistentSession) { backend.Logoff( sessionHelper.sessionize(new LogoutUserParameters(user.getUserId()))); - HttpSession httpSession = getCurrentSession(false); if (httpSession != null) { httpSession.invalidate(); } + } else if (httpSession != null && httpSession.isNew()) { + response.getMetadata().add(SessionUtils.JSESSIONID_HEADER, + httpSession.getId()); } } } -- To view, visit http://gerrit.ovirt.org/9071 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26667239157be04afc6dc446e8c7ad98ec40c778 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
