Skip to content

O
Openfire
Commit fdeb2b38 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

[GATE-114] Returned to having persistent roster items for transports. 

[GATE-115] If a special flag is sent during registration, we don't put the transport in the user's roster.
[GATE-116] If you are registered with the transport, disco info now indicates as such.
[GATE-117] Presence for the transport is always sent on to the client (if a session is active)
Legacy mode and non-persistent transport items are now extinct.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@6013 b35dd754-fafc-0310-a699-88a17e54d16e
parent fbf9ebfe
Hide whitespace changes
Inline Side-by-side
Showing with 351 additions and 370 deletions
src/java/org/jivesoftware/wildfire/gateway/BaseTransport.java
View file @ fdeb2b38
...@@ -15,7 +15,6 @@ import org.dom4j.Element; ...@@ -15,7 +15,6 @@ import org.dom4j.Element;
import org.dom4j.QName; import org.dom4j.QName;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.wildfire.ClientSession; import org.jivesoftware.wildfire.ClientSession;
import org.jivesoftware.wildfire.SessionManager; import org.jivesoftware.wildfire.SessionManager;
import org.jivesoftware.wildfire.XMPPServer; import org.jivesoftware.wildfire.XMPPServer;
...@@ -25,7 +24,6 @@ import org.jivesoftware.wildfire.roster.*; ...@@ -25,7 +24,6 @@ import org.jivesoftware.wildfire.roster.*;
import org.jivesoftware.wildfire.user.PresenceEventListener; import org.jivesoftware.wildfire.user.PresenceEventListener;
import org.jivesoftware.wildfire.user.UserAlreadyExistsException; import org.jivesoftware.wildfire.user.UserAlreadyExistsException;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.wildfire.user.UserNotFoundException;
import org.jivesoftware.wildfire.user.PresenceEventDispatcher;
import org.xmpp.component.Component; import org.xmpp.component.Component;
import org.xmpp.component.ComponentManager; import org.xmpp.component.ComponentManager;
import org.xmpp.forms.DataForm; import org.xmpp.forms.DataForm;
...@@ -72,23 +70,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -72,23 +70,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
this.jid = jid; this.jid = jid;
this.componentManager = componentManager; this.componentManager = componentManager;
sessionManager.startThreadManager(jid); sessionManager.startThreadManager(jid);
legacyMode = JiveGlobals.getBooleanProperty("plugin.gateway.legacymode", true);
}
/**
* Sets legacy roster mode for the transport.
* @param mode new legacy mode status
*/
public void setLegacyMode(boolean mode) {
this.legacyMode = mode;
}
/**
* Retrieves the current legacy roster mode for the transport.
* @return legacy mode status setting
*/
public boolean getLegacyMode() {
return this.legacyMode;
} }
/** /**
...@@ -129,15 +110,12 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -129,15 +110,12 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
*/ */
public TransportType transportType = null; public TransportType transportType = null;
/**
* Legacy roster mode enabled or disabled.
*/
public boolean legacyMode = false;
private final String DISCO_INFO = "http://jabber.org/protocol/disco#info"; private final String DISCO_INFO = "http://jabber.org/protocol/disco#info";
private final String DISCO_ITEMS = "http://jabber.org/protocol/disco#items"; private final String DISCO_ITEMS = "http://jabber.org/protocol/disco#items";
private final String IQ_GATEWAY = "jabber:iq:gateway"; private final String IQ_GATEWAY = "jabber:iq:gateway";
private final String IQ_GATEWAY_REGISTER = "jabber:iq:gateway:register";
private final String IQ_REGISTER = "jabber:iq:register"; private final String IQ_REGISTER = "jabber:iq:register";
private final String IQ_REGISTERED = "jabber:iq:registered";
private final String IQ_VERSION = "jabber:iq:version"; private final String IQ_VERSION = "jabber:iq:version";
/** /**
...@@ -245,9 +223,91 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -245,9 +223,91 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
Log.debug("Unable to find registration."); Log.debug("Unable to find registration.");
return reply; return reply;
} }
Registration registration = registrations.iterator().next();
// This packet is to the transport itself. // This packet is to the transport itself.
if (packet.getType() == Presence.Type.probe) { if (packet.getType() == null) {
// A user's resource has come online.
TransportSession session;
try {
session = sessionManager.getSession(from);
if (session.hasResource(from.getResource())) {
Log.debug("An existing resource has changed status: " + from);
if (session.getPriority(from.getResource()) != packet.getPriority()) {
session.updatePriority(from.getResource(), packet.getPriority());
}
if (session.isHighestPriority(from.getResource())) {
// Well, this could represent a status change.
session.updateStatus(getPresenceType(packet), packet.getStatus());
}
}
else {
Log.debug("A new resource has come online: " + from);
// This is a new resource, lets send them what we know.
session.addResource(from.getResource(), packet.getPriority());
// Tell the new resource what the state of their buddy list is.
session.resendContactStatuses(from);
// If this priority is the highest, treat it's status as golden
if (session.isHighestPriority(from.getResource())) {
session.updateStatus(getPresenceType(packet), packet.getStatus());
}
}
}
catch (NotFoundException e) {
Log.debug("A new session has come online: " + from);
session = this.registrationLoggedIn(registration, from, getPresenceType(packet), packet.getStatus(), packet.getPriority());
sessionManager.storeSession(from, session);
}
}
else if (packet.getType() == Presence.Type.unavailable) {
// A user's resource has gone offline.
TransportSession session;
try {
session = sessionManager.getSession(from);
if (session.getResourceCount() > 1) {
String resource = from.getResource();
// Just one of the resources, lets adjust accordingly.
if (session.isHighestPriority(resource)) {
Log.debug("A high priority resource (of multiple) has gone offline: " + from);
// Ooh, the highest resource went offline, drop to next highest.
session.removeResource(resource);
// Lets ask the next highest resource what it's presence is.
Presence p = new Presence(Presence.Type.probe);
p.setTo(session.getJIDWithHighestPriority());
p.setFrom(this.getJID());
sendPacket(p);
}
else {
Log.debug("A low priority resource (of multiple) has gone offline: " + from);
// Meh, lower priority, big whoop.
session.removeResource(resource);
}
}
else {
Log.debug("A final resource has gone offline: " + from);
// No more resources, byebye.
if (session.isLoggedIn()) {
this.registrationLoggedOut(session);
}
sessionManager.removeSession(from);
}
}
catch (NotFoundException e) {
Log.debug("Ignoring unavailable presence for inactive seession.");
}
}
else if (packet.getType() == Presence.Type.probe) {
// Client is asking for presence status. // Client is asking for presence status.
TransportSession session; TransportSession session;
try { try {
...@@ -356,6 +416,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -356,6 +416,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
*/ */
private List<Packet> handleDiscoInfo(IQ packet) { private List<Packet> handleDiscoInfo(IQ packet) {
List<Packet> reply = new ArrayList<Packet>(); List<Packet> reply = new ArrayList<Packet>();
JID from = packet.getFrom();
if (packet.getTo().getNode() == null) { if (packet.getTo().getNode() == null) {
// Requested info from transport itself. // Requested info from transport itself.
...@@ -371,6 +432,11 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -371,6 +432,11 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
.addAttribute("var", IQ_REGISTER); .addAttribute("var", IQ_REGISTER);
response.addElement("feature") response.addElement("feature")
.addAttribute("var", IQ_VERSION); .addAttribute("var", IQ_VERSION);
Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType);
if (!registrations.isEmpty()) {
response.addElement("feature")
.addAttribute("var", IQ_REGISTERED);
}
result.setChildElement(response); result.setChildElement(response);
reply.add(result); reply.add(result);
} }
...@@ -451,12 +517,10 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -451,12 +517,10 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
IQ result = IQ.createResultIQ(packet); IQ result = IQ.createResultIQ(packet);
// Tell the end user the transport went byebye. // Tell the end user the transport went byebye.
if (legacyMode) { Presence unavailable = new Presence(Presence.Type.unavailable);
Presence unavailable = new Presence(Presence.Type.unavailable); unavailable.setTo(from);
unavailable.setTo(from); unavailable.setFrom(to);
unavailable.setFrom(to); reply.add(unavailable);
reply.add(unavailable);
}
try { try {
this.deleteRegistration(from); this.deleteRegistration(from);
...@@ -525,23 +589,23 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -525,23 +589,23 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
reply.add(result); reply.add(result);
} }
else { else {
Log.info("Registered " + packet.getFrom() + " as " + username); boolean rosterlessMode = false;
Element x = packet.getChildElement().element("x");
if (x.getNamespaceURI().equals(IQ_GATEWAY_REGISTER)) {
rosterlessMode = true;
Log.info("Registered " + packet.getFrom() + " as " + username + " in rosterless mode.");
}
else {
Log.info("Registered " + packet.getFrom() + " as " + username);
}
IQ result = IQ.createResultIQ(packet); IQ result = IQ.createResultIQ(packet);
Element response = DocumentHelper.createElement(QName.get("query", IQ_REGISTER)); Element response = DocumentHelper.createElement(QName.get("query", IQ_REGISTER));
result.setChildElement(response); result.setChildElement(response);
reply.add(result); reply.add(result);
try { try {
this.addNewRegistration(from, username, password, nickname); this.addNewRegistration(from, username, password, nickname, rosterlessMode);
// Lets check what their presence is, maybe log them in immediately.
SessionManager sessionManager = SessionManager.getInstance();
String user = from.getNode();
if (sessionManager.getSessionCount(user) > 0) {
for (ClientSession session : sessionManager.getSessions(user)) {
availableSession(session, session.getPresence());
}
}
} }
catch (UserNotFoundException e) { catch (UserNotFoundException e) {
Log.error("Someone attempted to register with the gateway who is not registered with the server: " + from); Log.error("Someone attempted to register with the gateway who is not registered with the server: " + from);
...@@ -639,6 +703,9 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -639,6 +703,9 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
} }
} }
// Add special indicator for rosterless gateway handling.
response.addElement("x").addNamespace("", IQ_GATEWAY_REGISTER);
result.setChildElement(response); result.setChildElement(response);
reply.add(result); reply.add(result);
...@@ -728,15 +795,14 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -728,15 +795,14 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
*/ */
public void start() { public void start() {
RosterEventDispatcher.addListener(this); RosterEventDispatcher.addListener(this);
PresenceEventDispatcher.addListener(this); // PresenceEventDispatcher.addListener(this);
SessionManager sessionManager = SessionManager.getInstance(); // Probe all registered users [if they are logged in] to auto-log them in
// Check all registered users to auto-log them in
for (Registration registration : registrationManager.getRegistrations()) { for (Registration registration : registrationManager.getRegistrations()) {
String user = registration.getJID().getNode(); if (SessionManager.getInstance().getSessionCount(registration.getJID().getNode()) > 0) {
if (sessionManager.getSessionCount(user) > 0) { Presence p = new Presence(Presence.Type.probe);
for (ClientSession session : sessionManager.getSessions(user)) { p.setFrom(this.getJID());
availableSession(session, session.getPresence()); p.setTo(registration.getJID());
} sendPacket(p);
} }
} }
} }
...@@ -748,7 +814,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -748,7 +814,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
*/ */
public void shutdown() { public void shutdown() {
RosterEventDispatcher.removeListener(this); RosterEventDispatcher.removeListener(this);
PresenceEventDispatcher.removeListener(this); // PresenceEventDispatcher.removeListener(this);
// Disconnect everyone's session // Disconnect everyone's session
for (TransportSession session : sessionManager.getSessions()) { for (TransportSession session : sessionManager.getSessions()) {
registrationLoggedOut(session); registrationLoggedOut(session);
...@@ -889,7 +955,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -889,7 +955,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
// roster items related to the gateway service will be persistent. Roster // roster items related to the gateway service will be persistent. Roster
// items of legacy users are never persisted in the DB. // items of legacy users are never persisted in the DB.
RosterItem gwitem = RosterItem gwitem =
roster.createRosterItem(contactjid, true, false); roster.createRosterItem(contactjid, true, contactjid.getNode() == null);
gwitem.setSubStatus(RosterItem.SUB_BOTH); gwitem.setSubStatus(RosterItem.SUB_BOTH);
gwitem.setAskStatus(RosterItem.ASK_NONE); gwitem.setAskStatus(RosterItem.ASK_NONE);
gwitem.setNickname(nickname); gwitem.setNickname(nickname);
...@@ -1016,7 +1082,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1016,7 +1082,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
public void syncLegacyRoster(JID userjid, List<TransportBuddy> legacyitems) throws UserNotFoundException { public void syncLegacyRoster(JID userjid, List<TransportBuddy> legacyitems) throws UserNotFoundException {
try { try {
Roster roster = rosterManager.getRoster(userjid.getNode()); Roster roster = rosterManager.getRoster(userjid.getNode());
boolean hasTransport = false;
// Lets lock down the roster from update notifications if there's an active session. // Lets lock down the roster from update notifications if there's an active session.
try { try {
...@@ -1042,13 +1107,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1042,13 +1107,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
} }
if (ri.getJid().getNode() == null) { if (ri.getJid().getNode() == null) {
// This is a transport instance, lets leave it alone. // This is a transport instance, lets leave it alone.
if (ri.getID() == 0) {
hasTransport = true;
}
else {
// This is a persistent roster item for the transport, remove.
this.removeFromRoster(userjid, ri.getJid());
}
continue; continue;
} }
JID jid = new JID(ri.getJid().toBareJID()); JID jid = new JID(ri.getJid().toBareJID());
...@@ -1077,18 +1135,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1077,18 +1135,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
} }
} }
if (!hasTransport && legacyMode) {
// This person doesn't have the transport in their roster, lets put it there.
// We only do this if we are in legacy mode. Otherwise, no transports in roster.
this.addOrUpdateRosterItem(userjid, this.getJID(), this.getDescription(), "Transports");
}
if (hasTransport && !legacyMode) {
// We are not in legacy mode but this person has the transport in their roster.
// Ditch it.
this.removeFromRoster(userjid, this.getJID());
}
// Ok, we should now have only new items from the legacy roster // Ok, we should now have only new items from the legacy roster
for (TransportBuddy buddy : legacymap.values()) { for (TransportBuddy buddy : legacymap.values()) {
//Log.debug("ROSTERSYNC: We have new, adding " + buddy.getName()); //Log.debug("ROSTERSYNC: We have new, adding " + buddy.getName());
...@@ -1121,11 +1167,12 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1121,11 +1167,12 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @param username Legacy username of registration. * @param username Legacy username of registration.
* @param password Legacy password of registration. * @param password Legacy password of registration.
* @param nickname Legacy nickname of registration. * @param nickname Legacy nickname of registration.
* @param noRosterItem True if the transport is not to show up in the user's roster.
* @throws UserNotFoundException if registration or roster not found. * @throws UserNotFoundException if registration or roster not found.
* @throws IllegalAccessException if jid is not from this server. * @throws IllegalAccessException if jid is not from this server.
* @throws IllegalArgumentException if username is not valid for this transport type. * @throws IllegalArgumentException if username is not valid for this transport type.
*/ */
public void addNewRegistration(JID jid, String username, String password, String nickname) throws UserNotFoundException, IllegalAccessException { public void addNewRegistration(JID jid, String username, String password, String nickname, Boolean noRosterItem) throws UserNotFoundException, IllegalAccessException {
if (!XMPPServer.getInstance().getServerInfo().getName().equals(jid.getDomain())) { if (!XMPPServer.getInstance().getServerInfo().getName().equals(jid.getDomain())) {
throw new IllegalAccessException("Domain of jid registering does not match domain of server."); throw new IllegalAccessException("Domain of jid registering does not match domain of server.");
} }
...@@ -1152,21 +1199,27 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1152,21 +1199,27 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
// Clean up any leftover roster items from other transports. // Clean up any leftover roster items from other transports.
try { try {
cleanUpRoster(jid, false); cleanUpRoster(jid, !noRosterItem);
} }
catch (UserNotFoundException ee) { catch (UserNotFoundException ee) {
throw new UserNotFoundException("Unable to find roster."); throw new UserNotFoundException("Unable to find roster.");
} }
// Check if the user is logged in to auto-log them in if (!noRosterItem) {
SessionManager sessionManager = SessionManager.getInstance(); try {
String user = jid.getNode(); addOrUpdateRosterItem(jid, this.getJID(), this.getDescription(), "Transports");
if (sessionManager.getSessionCount(user) > 0) { }
for (ClientSession cSession : sessionManager.getSessions(user)) { catch (UserNotFoundException e) {
presenceChanged(cSession, cSession.getPresence()); throw new UserNotFoundException("User not registered with server.");
} }
} }
// Lets ask them what their presence is, maybe log them in immediately.
Presence p = new Presence(Presence.Type.probe);
p.setTo(jid);
p.setFrom(getJID());
sendPacket(p);
} }
/** /**
...@@ -1299,7 +1352,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1299,7 +1352,7 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @see org.jivesoftware.wildfire.roster.RosterEventListener#addingContact(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem, boolean) * @see org.jivesoftware.wildfire.roster.RosterEventListener#addingContact(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem, boolean)
*/ */
public boolean addingContact(Roster roster, RosterItem item, boolean persistent) { public boolean addingContact(Roster roster, RosterItem item, boolean persistent) {
if (item.getJid().getDomain().equals(this.getJID().toString())) { if (item.getJid().getDomain().equals(this.getJID().toString()) && item.getJid().getNode() != null) {
return false; return false;
} }
return persistent; return persistent;
...@@ -1399,52 +1452,52 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1399,52 +1452,52 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @see org.jivesoftware.wildfire.user.PresenceEventListener#availableSession(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence) * @see org.jivesoftware.wildfire.user.PresenceEventListener#availableSession(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence)
*/ */
public void availableSession(ClientSession clSession, Presence packet) { public void availableSession(ClientSession clSession, Presence packet) {
Log.debug(getType().toString()+": availableSession "+clSession+":"+packet); // Log.debug(getType().toString()+": availableSession "+clSession+":"+packet);
JID from = packet.getFrom(); // JID from = packet.getFrom();
//
Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType); // Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType);
if (registrations.isEmpty()) { // if (registrations.isEmpty()) {
// User is not registered with us. // // User is not registered with us.
return; // return;
} // }
Registration registration = registrations.iterator().next(); // Registration registration = registrations.iterator().next();
//
// A user's resource has come online. // // A user's resource has come online.
TransportSession session; // TransportSession session;
try { // try {
session = sessionManager.getSession(from); // session = sessionManager.getSession(from);
//
if (session.hasResource(from.getResource())) { // if (session.hasResource(from.getResource())) {
Log.debug("An existing resource has changed status: " + from); // Log.debug("An existing resource has changed status: " + from);
//
if (session.getPriority(from.getResource()) != packet.getPriority()) { // if (session.getPriority(from.getResource()) != packet.getPriority()) {
session.updatePriority(from.getResource(), packet.getPriority()); // session.updatePriority(from.getResource(), packet.getPriority());
} // }
if (session.isHighestPriority(from.getResource())) { // if (session.isHighestPriority(from.getResource())) {
// Well, this could represent a status change. // // Well, this could represent a status change.
session.updateStatus(getPresenceType(packet), packet.getStatus()); // session.updateStatus(getPresenceType(packet), packet.getStatus());
} // }
} // }
else { // else {
Log.debug("A new resource has come online: " + from); // Log.debug("A new resource has come online: " + from);
//
// This is a new resource, lets send them what we know. // // This is a new resource, lets send them what we know.
session.addResource(from.getResource(), packet.getPriority()); // session.addResource(from.getResource(), packet.getPriority());
// Tell the new resource what the state of their buddy list is. // // Tell the new resource what the state of their buddy list is.
session.resendContactStatuses(from); // session.resendContactStatuses(from);
// If this priority is the highest, treat it's status as golden // // If this priority is the highest, treat it's status as golden
if (session.isHighestPriority(from.getResource())) { // if (session.isHighestPriority(from.getResource())) {
session.updateStatus(getPresenceType(packet), packet.getStatus()); // session.updateStatus(getPresenceType(packet), packet.getStatus());
} // }
} // }
} // }
catch (NotFoundException e) { // catch (NotFoundException e) {
Log.debug("A new session has come online: " + from); // Log.debug("A new session has come online: " + from);
//
session = this.registrationLoggedIn(registration, from, getPresenceType(packet), packet.getStatus(), packet.getPriority()); // session = this.registrationLoggedIn(registration, from, getPresenceType(packet), packet.getStatus(), packet.getPriority());
sessionManager.storeSession(from, session); // sessionManager.storeSession(from, session);
//
} // }
} }
/** /**
...@@ -1453,63 +1506,63 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1453,63 +1506,63 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @see org.jivesoftware.wildfire.user.PresenceEventListener#unavailableSession(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence) * @see org.jivesoftware.wildfire.user.PresenceEventListener#unavailableSession(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence)
*/ */
public void unavailableSession(ClientSession clSession, Presence packet) { public void unavailableSession(ClientSession clSession, Presence packet) {
Log.debug(getType().toString()+": unavailableSession "+clSession+":"+packet); // Log.debug(getType().toString()+": unavailableSession "+clSession+":"+packet);
JID from = packet.getFrom(); // JID from = packet.getFrom();
//
Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType); // Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType);
if (registrations.isEmpty()) { // if (registrations.isEmpty()) {
// User is not registered with us. // // User is not registered with us.
return; // return;
} // }
//
// A user's resource has gone offline. // // A user's resource has gone offline.
TransportSession session; // TransportSession session;
try { // try {
session = sessionManager.getSession(from); // session = sessionManager.getSession(from);
if (session.getResourceCount() > 1) { // if (session.getResourceCount() > 1) {
String resource = from.getResource(); // String resource = from.getResource();
//
// Just one of the resources, lets adjust accordingly. // // Just one of the resources, lets adjust accordingly.
if (session.isHighestPriority(resource)) { // if (session.isHighestPriority(resource)) {
Log.debug("A high priority resource (of multiple) has gone offline: " + from); // Log.debug("A high priority resource (of multiple) has gone offline: " + from);
//
// Ooh, the highest resource went offline, drop to next highest. // // Ooh, the highest resource went offline, drop to next highest.
session.removeResource(resource); // session.removeResource(resource);
//
// Lets check the next highest resource for what it's presence is. // // Lets check the next highest resource for what it's presence is.
SessionManager sessionManager = SessionManager.getInstance(); // SessionManager sessionManager = SessionManager.getInstance();
String user = from.getNode(); // String user = from.getNode();
String nextResource = session.getJIDWithHighestPriority().getResource(); // String nextResource = session.getJIDWithHighestPriority().getResource();
if (sessionManager.getSessionCount(user) > 0) { // if (sessionManager.getSessionCount(user) > 0) {
for (ClientSession cSession : sessionManager.getSessions(user)) { // for (ClientSession cSession : sessionManager.getSessions(user)) {
Presence p = cSession.getPresence(); // Presence p = cSession.getPresence();
if (p.getFrom().getResource().equals(nextResource)) { // if (p.getFrom().getResource().equals(nextResource)) {
presenceChanged(cSession, cSession.getPresence()); // presenceChanged(cSession, cSession.getPresence());
} // }
} // }
} // }
} // }
else { // else {
Log.debug("A low priority resource (of multiple) has gone offline: " + from); // Log.debug("A low priority resource (of multiple) has gone offline: " + from);
//
// Meh, lower priority, big whoop. // // Meh, lower priority, big whoop.
session.removeResource(resource); // session.removeResource(resource);
} // }
} // }
else { // else {
Log.debug("A final resource has gone offline: " + from); // Log.debug("A final resource has gone offline: " + from);
//
// No more resources, byebye. // // No more resources, byebye.
if (session.isLoggedIn()) { // if (session.isLoggedIn()) {
this.registrationLoggedOut(session); // this.registrationLoggedOut(session);
} // }
//
sessionManager.removeSession(from); // sessionManager.removeSession(from);
} // }
} // }
catch (NotFoundException e) { // catch (NotFoundException e) {
Log.debug("Ignoring unavailable presence for inactive seession."); // Log.debug("Ignoring unavailable presence for inactive seession.");
} // }
} }
/** /**
...@@ -1518,34 +1571,34 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1518,34 +1571,34 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @see org.jivesoftware.wildfire.user.PresenceEventListener#presencePriorityChanged(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence) * @see org.jivesoftware.wildfire.user.PresenceEventListener#presencePriorityChanged(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence)
*/ */
public void presencePriorityChanged(ClientSession clSession, Presence packet) { public void presencePriorityChanged(ClientSession clSession, Presence packet) {
Log.debug(getType().toString()+": presencePriorityChanged "+clSession+":"+packet); // Log.debug(getType().toString()+": presencePriorityChanged "+clSession+":"+packet);
JID from = packet.getFrom(); // JID from = packet.getFrom();
//
Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType); // Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType);
if (registrations.isEmpty()) { // if (registrations.isEmpty()) {
// User is not registered with us. // // User is not registered with us.
return; // return;
} // }
//
TransportSession session; // TransportSession session;
try { // try {
session = sessionManager.getSession(from); // session = sessionManager.getSession(from);
//
if (session.hasResource(from.getResource())) { // if (session.hasResource(from.getResource())) {
Log.debug("An existing resource has changed status: " + from); // Log.debug("An existing resource has changed status: " + from);
//
if (session.getPriority(from.getResource()) != packet.getPriority()) { // if (session.getPriority(from.getResource()) != packet.getPriority()) {
session.updatePriority(from.getResource(), packet.getPriority()); // session.updatePriority(from.getResource(), packet.getPriority());
} // }
if (session.isHighestPriority(from.getResource())) { // if (session.isHighestPriority(from.getResource())) {
// Well, this could represent a status change. // // Well, this could represent a status change.
session.updateStatus(getPresenceType(packet), packet.getStatus()); // session.updateStatus(getPresenceType(packet), packet.getStatus());
} // }
} // }
} // }
catch (NotFoundException e) { // catch (NotFoundException e) {
// Not actually logged in. // // Not actually logged in.
} // }
} }
/** /**
...@@ -1554,31 +1607,31 @@ public abstract class BaseTransport implements Component, RosterEventListener, P ...@@ -1554,31 +1607,31 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
* @see org.jivesoftware.wildfire.user.PresenceEventListener#presenceChanged(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence) * @see org.jivesoftware.wildfire.user.PresenceEventListener#presenceChanged(org.jivesoftware.wildfire.ClientSession, org.xmpp.packet.Presence)
*/ */
public void presenceChanged(ClientSession clSession, Presence packet) { public void presenceChanged(ClientSession clSession, Presence packet) {
Log.debug(getType().toString()+": presenceChanged "+clSession+":"+packet); // Log.debug(getType().toString()+": presenceChanged "+clSession+":"+packet);
JID from = packet.getFrom(); // JID from = packet.getFrom();
//
Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType); // Collection<Registration> registrations = registrationManager.getRegistrations(from, this.transportType);
if (registrations.isEmpty()) { // if (registrations.isEmpty()) {
// User is not registered with us. // // User is not registered with us.
return; // return;
} // }
//
TransportSession session; // TransportSession session;
try { // try {
session = sessionManager.getSession(from); // session = sessionManager.getSession(from);
//
if (session.hasResource(from.getResource())) { // if (session.hasResource(from.getResource())) {
Log.debug("An existing resource has changed status: " + from); // Log.debug("An existing resource has changed status: " + from);
//
if (session.isHighestPriority(from.getResource())) { // if (session.isHighestPriority(from.getResource())) {
// Well, this could represent a status change. // // Well, this could represent a status change.
session.updateStatus(getPresenceType(packet), packet.getStatus()); // session.updateStatus(getPresenceType(packet), packet.getStatus());
} // }
} // }
} // }
catch (NotFoundException e) { // catch (NotFoundException e) {
// Not actually logged in. // // Not actually logged in.
} // }
} }
/** /**
......
src/java/org/jivesoftware/wildfire/gateway/TransportInstance.java
View file @ fdeb2b38
...@@ -161,32 +161,6 @@ public class TransportInstance implements PropertyEventListener { ...@@ -161,32 +161,6 @@ public class TransportInstance implements PropertyEventListener {
running = false; running = false;
} }
/**
* Enables legacy roster mode on the transport.
*/
public void enableLegacyMode() {
if (!running || transport == null) {
return;
}
Log.info("Enabling legacy mode: "+type.toString());
transport.setLegacyMode(true);
}
/**
* Disables legacy roster mode on the transport.
*/
public void disableLegacyMode() {
if (!running || transport == null) {
return;
}
Log.info("Disabling legacy mode: "+type.toString());
transport.setLegacyMode(false);
}
/** /**
* Retrieves actual transport associated with this instance. * Retrieves actual transport associated with this instance.
* *
...@@ -221,19 +195,6 @@ public class TransportInstance implements PropertyEventListener { ...@@ -221,19 +195,6 @@ public class TransportInstance implements PropertyEventListener {
} }
} }
} }
else if (property.equals("plugin.gateway.legacymode")) {
enabled = Boolean.parseBoolean((String)params.get("value"));
if (enabled) {
if (!running) {
enableLegacyMode();
}
}
else {
if (running) {
disableLegacyMode();
}
}
}
} }
} }
...@@ -254,11 +215,6 @@ public class TransportInstance implements PropertyEventListener { ...@@ -254,11 +215,6 @@ public class TransportInstance implements PropertyEventListener {
} }
} }
} }
else if (property.equals("plugin.gateway.legacymode")) {
if (running) {
disableLegacyMode();
}
}
} }
} }
......
src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCListener.java
View file @ fdeb2b38
...@@ -71,12 +71,10 @@ public class IRCListener implements IRCEventListener { ...@@ -71,12 +71,10 @@ public class IRCListener implements IRCEventListener {
public void onRegistered() { public void onRegistered() {
Log.debug("IRC registered"); Log.debug("IRC registered");
getSession().getRegistration().setLastLogin(new Date()); getSession().getRegistration().setLastLogin(new Date());
if (getSession().getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setFrom(getSession().getTransport().getJID());
p.setFrom(getSession().getTransport().getJID()); p.setTo(getSession().getJID());
p.setTo(getSession().getJID()); getSession().getTransport().sendPacket(p);
getSession().getTransport().sendPacket(p);
}
statusCheck = new StatusCheck(); statusCheck = new StatusCheck();
timer.schedule(statusCheck, timerInterval, timerInterval); timer.schedule(statusCheck, timerInterval, timerInterval);
getSession().setLoginStatus(TransportLoginStatus.LOGGED_IN); getSession().setLoginStatus(TransportLoginStatus.LOGGED_IN);
...@@ -84,12 +82,10 @@ public class IRCListener implements IRCEventListener { ...@@ -84,12 +82,10 @@ public class IRCListener implements IRCEventListener {
public void onDisconnected() { public void onDisconnected() {
Log.debug("IRC disconnected"); Log.debug("IRC disconnected");
if (getSession().getTransport().getLegacyMode()) { Presence p = new Presence(Presence.Type.unavailable);
Presence p = new Presence(Presence.Type.unavailable); p.setTo(getSession().getJID());
p.setTo(getSession().getJID()); p.setFrom(getSession().getTransport().getJID());
p.setFrom(getSession().getTransport().getJID()); getSession().getTransport().sendPacket(p);
getSession().getTransport().sendPacket(p);
}
getSession().getConnection().close(); getSession().getConnection().close();
timer.cancel(); timer.cancel();
getSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT); getSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT);
...@@ -188,12 +184,10 @@ public class IRCListener implements IRCEventListener { ...@@ -188,12 +184,10 @@ public class IRCListener implements IRCEventListener {
public void onQuit(IRCUser ircUser, String string) { public void onQuit(IRCUser ircUser, String string) {
Log.debug("IRC quit: "+ircUser+", "+string); Log.debug("IRC quit: "+ircUser+", "+string);
if (getSession().getTransport().getLegacyMode()) { Presence p = new Presence(Presence.Type.unavailable);
Presence p = new Presence(Presence.Type.unavailable); p.setTo(getSession().getJID());
p.setTo(getSession().getJID()); p.setFrom(getSession().getTransport().getJID());
p.setFrom(getSession().getTransport().getJID()); getSession().getTransport().sendPacket(p);
getSession().getTransport().sendPacket(p);
}
getSession().getConnection().close(); getSession().getConnection().close();
getSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT); getSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT);
} }
......
src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCSession.java
View file @ fdeb2b38
...@@ -166,22 +166,18 @@ public class IRCSession extends TransportSession { ...@@ -166,22 +166,18 @@ public class IRCSession extends TransportSession {
String awayMsg = ((IRCTransport)getTransport()).convertJabStatusToIRC(presenceType, verboseStatus); String awayMsg = ((IRCTransport)getTransport()).convertJabStatusToIRC(presenceType, verboseStatus);
if (awayMsg == null) { if (awayMsg == null) {
conn.doAway(); conn.doAway();
if (getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
} }
else { else {
conn.doAway(awayMsg); conn.doAway(awayMsg);
if (getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setShow(Presence.Show.away);
p.setShow(Presence.Show.away); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
} }
} }
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNListener.java
View file @ fdeb2b38
...@@ -170,13 +170,11 @@ public class MSNListener extends MsnAdapter { ...@@ -170,13 +170,11 @@ public class MSNListener extends MsnAdapter {
* Owner status has changed. * Owner status has changed.
*/ */
public void ownerStatusChanged(MsnMessenger messenger) { public void ownerStatusChanged(MsnMessenger messenger) {
if (msnSession.getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(msnSession.getJID());
p.setTo(msnSession.getJID()); p.setFrom(msnSession.getTransport().getJID());
p.setFrom(msnSession.getTransport().getJID()); ((MSNTransport)msnSession.getTransport()).setUpPresencePacket(p, messenger.getOwner().getStatus());
((MSNTransport)msnSession.getTransport()).setUpPresencePacket(p, messenger.getOwner().getStatus()); msnSession.getTransport().sendPacket(p);
msnSession.getTransport().sendPacket(p);
}
} }
/** /**
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNSession.java
View file @ fdeb2b38
...@@ -101,12 +101,10 @@ public class MSNSession extends TransportSession { ...@@ -101,12 +101,10 @@ public class MSNSession extends TransportSession {
setLoginStatus(TransportLoginStatus.LOGGING_OUT); setLoginStatus(TransportLoginStatus.LOGGING_OUT);
msnMessenger.logout(); msnMessenger.logout();
} }
if (getTransport().getLegacyMode()) { Presence p = new Presence(Presence.Type.unavailable);
Presence p = new Presence(Presence.Type.unavailable); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
setLoginStatus(TransportLoginStatus.LOGGED_OUT); setLoginStatus(TransportLoginStatus.LOGGED_OUT);
} }
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/BOSConnection.java
View file @ fdeb2b38
...@@ -123,12 +123,10 @@ public class BOSConnection extends BasicFlapConnection { ...@@ -123,12 +123,10 @@ public class BOSConnection extends BasicFlapConnection {
request(new ActivateSsiCmd()); request(new ActivateSsiCmd());
clientReady(); clientReady();
if (oscarSession.getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(oscarSession.getJID());
p.setTo(oscarSession.getJID()); p.setFrom(oscarSession.getTransport().getJID());
p.setFrom(oscarSession.getTransport().getJID()); oscarSession.getTransport().sendPacket(p);
oscarSession.getTransport().sendPacket(p);
}
oscarSession.setLoginStatus(TransportLoginStatus.LOGGED_IN); oscarSession.setLoginStatus(TransportLoginStatus.LOGGED_IN);
oscarSession.gotCompleteSSI(); oscarSession.gotCompleteSSI();
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/LoginConnection.java
View file @ fdeb2b38
...@@ -165,13 +165,11 @@ public class LoginConnection extends BaseFlapConnection { ...@@ -165,13 +165,11 @@ public class LoginConnection extends BaseFlapConnection {
m.setBody(errormsg); m.setBody(errormsg);
getMainSession().getTransport().sendPacket(m); getMainSession().getTransport().sendPacket(m);
if (getMainSession().getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(getMainSession().getJID());
p.setTo(getMainSession().getJID()); p.setFrom(getMainSession().getTransport().getJID());
p.setFrom(getMainSession().getTransport().getJID()); p.setType(Presence.Type.unavailable);
p.setType(Presence.Type.unavailable); getMainSession().getTransport().sendPacket(p);
getMainSession().getTransport().sendPacket(p);
}
getMainSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT); getMainSession().setLoginStatus(TransportLoginStatus.LOGGED_OUT);
} }
else { else {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARSession.java
View file @ fdeb2b38
...@@ -127,12 +127,10 @@ public class OSCARSession extends TransportSession { ...@@ -127,12 +127,10 @@ public class OSCARSession extends TransportSession {
// Ignore. // Ignore.
} }
} }
if (getTransport().getLegacyMode()) { Presence p = new Presence(Presence.Type.unavailable);
Presence p = new Presence(Presence.Type.unavailable); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
setLoginStatus(TransportLoginStatus.LOGGED_OUT); setLoginStatus(TransportLoginStatus.LOGGED_OUT);
} }
} }
...@@ -475,22 +473,18 @@ public class OSCARSession extends TransportSession { ...@@ -475,22 +473,18 @@ public class OSCARSession extends TransportSession {
awayMsg = verboseStatus; awayMsg = verboseStatus;
} }
request(new SetInfoCmd(new InfoData(awayMsg, null, MY_CAPS, null))); request(new SetInfoCmd(new InfoData(awayMsg, null, MY_CAPS, null)));
if (getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setShow(Presence.Show.away);
p.setShow(Presence.Show.away); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
} }
else { else {
request(new SetInfoCmd(new InfoData(InfoData.NOT_AWAY, null, MY_CAPS, null))); request(new SetInfoCmd(new InfoData(InfoData.NOT_AWAY, null, MY_CAPS, null)));
if (getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
} }
this.presenceType = presenceType; this.presenceType = presenceType;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooSession.java
View file @ fdeb2b38
...@@ -104,12 +104,10 @@ public class YahooSession extends TransportSession { ...@@ -104,12 +104,10 @@ public class YahooSession extends TransportSession {
yahooSession.login(registration.getUsername(), registration.getPassword()); yahooSession.login(registration.getUsername(), registration.getPassword());
setLoginStatus(TransportLoginStatus.LOGGED_IN); setLoginStatus(TransportLoginStatus.LOGGED_IN);
if (getTransport().getLegacyMode()) { Presence p = new Presence();
Presence p = new Presence(); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
yahooSession.setStatus(((YahooTransport)getTransport()).convertJabStatusToYahoo(pType)); yahooSession.setStatus(((YahooTransport)getTransport()).convertJabStatusToYahoo(pType));
...@@ -158,12 +156,10 @@ public class YahooSession extends TransportSession { ...@@ -158,12 +156,10 @@ public class YahooSession extends TransportSession {
Log.debug("Failed to log out from Yahoo."); Log.debug("Failed to log out from Yahoo.");
} }
yahooSession.reset(); yahooSession.reset();
if (getTransport().getLegacyMode()) { Presence p = new Presence(Presence.Type.unavailable);
Presence p = new Presence(Presence.Type.unavailable); p.setTo(getJID());
p.setTo(getJID()); p.setFrom(getTransport().getJID());
p.setFrom(getTransport().getJID()); getTransport().sendPacket(p);
getTransport().sendPacket(p);
}
} }
/** /**
......
src/web/gateway-registrations.jsp
View file @ fdeb2b38
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
return; return;
} }
try { try {
plugin.getTransportInstance(typeStr).getTransport().addNewRegistration(jid, username, password, nickname); plugin.getTransportInstance(typeStr).getTransport().addNewRegistration(jid, username, password, nickname, false);
response.sendRedirect("gateway-registrations.jsp?success=true"); response.sendRedirect("gateway-registrations.jsp?success=true");
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023