Skip to content

[ZEPPELIN-1125] Application does not logout user when authcBasic and ./grunt serve is used #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prabhjyotsingh wants to merge 2 commits into from
Closed

[ZEPPELIN-1125] Application does not logout user when authcBasic and ./grunt serve is used #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
986d549
Application does not logout user when authcBasic and running on a dif…
prabhjyotsingh Jul 6, 2016
04a2aff
remove unrequired params from response, revert to post
prabhjyotsingh Jul 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.zeppelin.rest;

import org.apache.shiro.authc.*;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.Subject;
import org.apache.zeppelin.annotation.ZeppelinApi;
import org.apache.zeppelin.server.JsonResponse;
Expand Down Expand Up @@ -112,22 +111,15 @@ public Response postLogin(@FormParam("userName") String userName,
LOG.warn(response.toString());
return response.build();
}

@POST
@Path("logout")
@ZeppelinApi
public Response logout() {
JsonResponse response;

Subject currentUser = org.apache.shiro.SecurityUtils.getSubject();
currentUser.logout();

Map<String, String> data = new HashMap<>();
data.put("principal", "anonymous");
data.put("roles", "");
data.put("ticket", "anonymous");

response = new JsonResponse(Response.Status.OK, "", data);
response = new JsonResponse(Response.Status.UNAUTHORIZED, "", "");
LOG.warn(response.toString());
return response.build();
}
Expand Down
42 changes: 18 additions & 24 deletions zeppelin-web/src/components/navbar/navbar.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,24 @@ angular.module('zeppelinWebApp')

$scope.logout = function() {
var logoutURL = baseUrlSrv.getRestApiBase() + '/login/logout';
var request = new XMLHttpRequest();

//force authcBasic (if configured) to logout by setting credentials as false:false
request.open('post', logoutURL, true, 'false', 'false');
request.onreadystatechange = function() {
if (request.readyState === 4) {
if (request.status === 401 || request.status === 405 || request.status === 500) {
$rootScope.userName = '';
$rootScope.ticket.principal = '';
$rootScope.ticket.ticket = '';
$rootScope.ticket.roles = '';
BootstrapDialog.show({
message: 'Logout Success'
});
setTimeout(function() {
window.location.replace('/');
}, 1000);
} else {
request.open('post', logoutURL, true, 'false', 'false');
request.send();
}
}
};
request.send();

//for firefox and safari
logoutURL = logoutURL.replace('//', '//false:false@');
$http.post(logoutURL).error(function() {
//force authcBasic (if configured) to logout
$http.post(logoutURL).error(function() {
$rootScope.userName = '';
$rootScope.ticket.principal = '';
$rootScope.ticket.ticket = '';
$rootScope.ticket.roles = '';
BootstrapDialog.show({
message: 'Logout Success'
});
setTimeout(function() {
window.location.replace('/');
}, 1000);
});
});
};

$scope.search = function(searchTerm) {
Expand Down