// authorization = (Authorization)
// request.getSession().getAttribute(HttpContext.AUTHORIZATION);
// if (authorization == null) {
- Collection<ServiceReference<WebCmsSession>> sr;
+ Collection<ServiceReference<CmsSession>> sr;
try {
- sr = bc.getServiceReferences(WebCmsSession.class,
- "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")");
+ sr = bc.getServiceReferences(CmsSession.class,
+ "(" + CmsSession.SESSION_LOCAL_ID + "=" + httpSessionId + ")");
} catch (InvalidSyntaxException e) {
throw new CmsException("Cannot get CMS session for id " + httpSessionId, e);
}
if (sr.size() == 1) {
- WebCmsSession cmsSession = bc.getService(sr.iterator().next());
+ CmsSession cmsSession = bc.getService(sr.iterator().next());
authorization = cmsSession.getAuthorization();
if (log.isTraceEnabled())
log.trace("Retrieved authorization from " + cmsSession);
@Override
public boolean commit() throws LoginException {
- // TODO create CmsSession in another module
- Authorization authorizationToRegister;
- if (authorization == null) {
- authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
- } else { // this login module did the authorization
- CmsAuthUtils.addAuthentication(subject, authorization);
- authorizationToRegister = authorization;
- }
- if (authorizationToRegister == null) {
- return false;
+ if(authorization!=null){
+ CmsAuthUtils.addAuthorization(subject, authorization,request);
+// CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorization);
}
- if (request == null)
- return false;
- CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
+
+ // TODO create CmsSession in another module
+// Authorization authorizationToRegister;
+// if (authorization == null) {
+// authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
+// }
+// else { // this login module did the authorization
+// CmsAuthUtils.addAuthentication(subject, authorization);
+// authorizationToRegister = authorization;
+// }
+// if (authorizationToRegister == null) {
+// return false;
+// }
+// if (request == null)
+// return false;
+// CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN);
if (outToken != null) {