Skip to content

Add the ability to add aditional data into sessions #5

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add the ability to add aditional data into sessions #5

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02c0902
Set mod auth manager to save a JsoObject as opposed to simply a usern…
May 8, 2013
3247a65
Merge branch 'master' of git://github.com/vert-x/mod-auth-mgr
May 8, 2013
b712c0d
fix white space
May 8, 2013
dd67fcc
Tidy up and flatten session data
May 8, 2013
08abeb1
remove _id field and make sure to add data to reply
May 8, 2013
207bf70
whitespace
May 8, 2013
d396fac
tidy more whitespace
May 8, 2013
00224af
extract method to form a session object
May 8, 2013
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
42 changes: 28 additions & 14 deletions src/main/java/org/vertx/mods/AuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class AuthManager extends BusModBase {
private Handler<Message<JsonObject>> logoutHandler;
private Handler<Message<JsonObject>> authoriseHandler;

protected final Map<String, String> sessions = new HashMap<>();
protected final Map<String, JsonObject> sessions = new HashMap<>();
protected final Map<String, LoginInfo> logins = new HashMap<>();

private static final long DEFAULT_SESSION_TIMEOUT = 30 * 60 * 1000;
Expand Down Expand Up @@ -113,11 +113,11 @@ private void doLogin(final Message<JsonObject> message) {
findMsg.putObject("matcher", matcher);

eb.send(persistorAddress, findMsg, new Handler<Message<JsonObject>>() {
public void handle(Message<JsonObject> reply) {

public void handle(Message<JsonObject> reply) {
if (reply.body().getString("status").equals("ok")) {
if (reply.body().getObject("result") != null) {

if (reply.body().getObject("result") != null) {
// Check if already logged in, if so logout of the old session
LoginInfo info = logins.get(username);
if (info != null) {
Expand All @@ -132,10 +132,13 @@ public void handle(Long timerID) {
logins.remove(username);
}
});
sessions.put(sessionID, username);

JsonObject sessionData = formSessionData(reply, sessionID);

sessions.put(sessionID, sessionData);
logins.put(username, new LoginInfo(timerID, sessionID));
JsonObject jsonReply = new JsonObject().putString("sessionID", sessionID);
sendOK(message, jsonReply);

sendOK(message, sessionData);
} else {
// Not found
sendStatus("denied", message);
Expand All @@ -148,6 +151,17 @@ public void handle(Long timerID) {
});
}

private JsonObject formSessionData(Message<JsonObject> dbReply, final String sessionID) {
//Put record returned from the db as session data
JsonObject sessionData = dbReply.body().getObject("result");

//remove id and password so that we dont send it back over the wire
sessionData.removeField("_id");
sessionData.removeField("password");
sessionData.putString("sessionID", sessionID);
return sessionData;
}

protected void doLogout(final Message<JsonObject> message) {
final String sessionID = getMandatoryString("sessionID", message);
if (sessionID != null) {
Expand All @@ -160,7 +174,11 @@ protected void doLogout(final Message<JsonObject> message) {
}

protected boolean logout(String sessionID) {
String username = sessions.remove(sessionID);
JsonObject session = sessions.remove(sessionID);
if (session == null)
return false;

String username = session.getString("username");
if (username != null) {
LoginInfo info = logins.remove(username);
vertx.cancelTimer(info.timerID);
Expand All @@ -175,14 +193,10 @@ protected void doAuthorise(Message<JsonObject> message) {
if (sessionID == null) {
return;
}
String username = sessions.get(sessionID);

// In this basic auth manager we don't do any resource specific authorisation
// The user is always authorised if they are logged in
JsonObject authData = sessions.get(sessionID);

if (username != null) {
JsonObject reply = new JsonObject().putString("username", username);
sendOK(message, reply);
if (authData != null) {
sendOK(message, authData);
} else {
sendStatus("denied", message);
}
Expand Down