ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add account plugin, and support for acquiring a session with the account webservice

Browse Source
This commit is contained in:
Adam
2017-05-14 19:23:44 -04:00
parent aebeba06ad
commit cf4e9fab1d
19 changed files with 1144 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
http-service/src/main/java/net/runelite/http/service/account/AccountService.java
View File

@@ -39,7 +39,11 @@ import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import net.runelite.http.api.RuneliteAPI;
import net.runelite.http.api.account.LoginResponse;
import net.runelite.http.api.account.OAuthResponse;
import net.runelite.http.api.ws.messages.LoginResponse;
import net.runelite.http.service.ws.SessionManager;
import net.runelite.http.service.ws.WSService;
import net.runelite.http.service.ws.WSSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sql2o.Connection;
@@ -117,7 +121,7 @@ public class AccountService
}
}
public LoginResponse login(Request request, Response response)
public OAuthResponse login(Request request, Response response)
{
UUID uuid = UUID.randomUUID();
@@ -135,7 +139,7 @@ public class AccountService
String authorizationUrl = service.getAuthorizationUrl();
LoginResponse lr = new LoginResponse();
OAuthResponse lr = new OAuthResponse();
lr.setOauthUrl(authorizationUrl);
lr.setUid(uuid);
@@ -205,13 +209,33 @@ public class AccountService
.addParameter("uuid", state.getUuid().toString())
.executeUpdate();
logger.info("Created session for user {}", user.getUsername());
logger.info("Created session for user {}", userInfo.getEmail());
}
response.redirect(RL_REDIR);
notifySession(state.getUuid(), userInfo.getEmail());
return "";
}
private void notifySession(UUID uuid, String username)
{
WSSession session = SessionManager.findSession(uuid);
if (session == null)
{
logger.info("Session {} logged in - but no websocket session", uuid);
return;
}
WSService service = session.getServlet();
LoginResponse response = new LoginResponse();
response.setUsername(username);
service.send(response);
}
public Object logout(Request request, Response response)
{
SessionEntry session = request.session().attribute("session");

72
http-service/src/main/java/net/runelite/http/service/ws/SessionManager.java Normal file
View File

@@ -0,0 +1,72 @@
/*
* Copyright (c) 2017, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.ws;
import com.google.common.base.Objects;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import javax.websocket.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SessionManager
{
private static final Logger logger = LoggerFactory.getLogger(SessionManager.class);
private static final Set<WSSession> sessions = Collections.synchronizedSet(new HashSet<>());
public static void add(WSService service, Session session)
{
WSSession wssession = new WSSession(service, session);
logger.info("Adding service {} session {}", service, session);
sessions.add(wssession);
}
public static void remove(Session session)
{
WSSession wssession = new WSSession(null, session);
sessions.remove(wssession);
}
public static WSSession findSession(UUID uuid)
{
synchronized (sessions)
{
for (WSSession session : sessions)
{
if (Objects.equal(session.getServlet().getUuid(), uuid))
{
return session;
}
}
}
return null;
}
}

37
http-service/src/main/java/net/runelite/http/service/WSService.java → http-service/src/main/java/net/runelite/http/service/ws/WSService.java
View File

@@ -22,8 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service;
package net.runelite.http.service.ws;
import com.google.gson.Gson;
import java.util.UUID;
import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig;
import javax.websocket.OnClose;
@@ -32,6 +34,9 @@ import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
import net.runelite.http.api.ws.messages.Handshake;
import net.runelite.http.api.ws.WebsocketGsonFactory;
import net.runelite.http.api.ws.WebsocketMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,9 +45,30 @@ public class WSService
{
private static final Logger logger = LoggerFactory.getLogger(WSService.class);
private static final Gson gson = WebsocketGsonFactory.build();
private Session session;
private UUID uuid;
public UUID getUuid()
{
return uuid;
}
public void send(WebsocketMessage message)
{
String json = gson.toJson(message, WebsocketMessage.class);
logger.debug("Sending {}", json);
session.getAsyncRemote().sendText(json);
}
@OnOpen
public void onOpen(Session session, EndpointConfig config)
{
this.session = session;
SessionManager.add(this, session);
logger.info("New session {}", session);
}
@@ -59,8 +85,15 @@ public class WSService
}
@OnMessage
public void onMessage(Session session, String message)
public void onMessage(Session session, String text)
{
WebsocketMessage message = gson.fromJson(text, WebsocketMessage.class);
logger.info("Got message: {}", message);
if (message instanceof Handshake)
{
Handshake hs = (Handshake) message;
uuid = hs.getSession();
}
}
}

81
http-service/src/main/java/net/runelite/http/service/ws/WSSession.java Normal file
View File

@@ -0,0 +1,81 @@
/*
* Copyright (c) 2017, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.ws;
import java.util.Objects;
import javax.websocket.Session;
public class WSSession
{
private final WSService servlet;
private final Session session;
public WSSession(WSService servlet, Session session)
{
this.servlet = servlet;
this.session = session;
}
public WSService getServlet()
{
return servlet;
}
public Session getSession()
{
return session;
}
@Override
public int hashCode()
{
int hash = 3;
hash = 29 * hash + Objects.hashCode(this.session);
return hash;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
{
return true;
}
if (obj == null)
{
return false;
}
if (getClass() != obj.getClass())
{
return false;
}
final WSSession other = (WSSession) obj;
if (!Objects.equals(this.session, other.session))
{
return false;
}
return true;
}
}