Skip to content

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

Various work. Presence was not working right at all before. Working better... 

Various work.  Presence was not working right at all before.  Working better now but not completely.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@4501 b35dd754-fafc-0310-a699-88a17e54d16e
parent 87be85bc
Show whitespace changes
Inline Side-by-side
Showing with 284 additions and 163 deletions
src/java/org/jivesoftware/wildfire/gateway/BaseGateway.java
View file @ 5144b608
......@@ -21,9 +21,13 @@ import org.dom4j.QName;
import org.jivesoftware.wildfire.gateway.roster.ForeignContact;
import org.jivesoftware.wildfire.gateway.roster.NormalizedJID;
import org.jivesoftware.wildfire.gateway.roster.PersistenceManager;
import org.jivesoftware.wildfire.gateway.roster.Roster;
import org.jivesoftware.wildfire.gateway.roster.Status;
import org.jivesoftware.wildfire.gateway.util.BackgroundThreadFactory;
import org.jivesoftware.wildfire.roster.RosterManager;
import org.jivesoftware.wildfire.roster.RosterItem;
import org.jivesoftware.wildfire.roster.Roster;
import org.jivesoftware.wildfire.user.UserNotFoundException;
import org.jivesoftware.wildfire.user.UserAlreadyExistsException;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.xmpp.component.Component;
......@@ -101,7 +105,12 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
/**
* Handles registration for this gateway.
*/
public final PersistenceManager rosterManager = PersistenceManager.Factory.get(this);
public final PersistenceManager persistenceManager = PersistenceManager.Factory.get(this);
/**
* Handles server side roster for this gateway.
*/
public final RosterManager rosterManager = new RosterManager();
/** The threadPool. @see java.util.concurrent.ScheduledExecutorService */
protected static final ScheduledExecutorService threadPool = Executors.newSingleThreadScheduledExecutor(new BackgroundThreadFactory());
......@@ -141,9 +150,6 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
if ("http://jabber.org/protocol/disco#info".equals(namespace)) {
response.add(handleServiceDiscovery(iq));
}
else if ("jabber:iq:agents".equals(namespace)) {
response.add(handleLegacyServiceDiscovery(iq));
}
else if ("http://jabber.org/protocol/disco#items".equals(namespace)) {
response.add(handleDiscoveryItems(iq));
}
......@@ -153,40 +159,9 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
else if ("jabber:iq:version".equals(namespace)) {
response.add(handleVersion(iq));
}
else if ("jabber:iq:browse".equals(namespace)) {
response.add(handleBrowse(iq));
}
return response;
}
/**
* Process a browse request.
*
* @param iq The client IQ packet.
* @return iq The response IQ packet.
*/
private IQ handleBrowse(IQ iq) {
IQ reply = IQ.createResultIQ(iq);
Element responseElement = DocumentHelper.createElement(QName.get(
"query", "jabber:iq:browse"));
try {
for (ForeignContact fc : PersistenceManager.Factory.get(this).getRegistrar().getGatewaySession(iq.getFrom()).getContacts()) {
Element item = DocumentHelper.createElement("item");
item.addAttribute("category", "user");
item.addAttribute("jid", fc + "@" + this.getName() + "." + this.getDomain());
item.addAttribute("type", "client");
responseElement.add(item);
}
reply.setChildElement(responseElement);
}
catch (Exception e) {
Log.warn(LocaleUtils.getLocalizedString("basegateway.notfound", "gateway", Arrays.asList(iq.getFrom().toBareJID())));
}
return reply;
}
/**
* Process a version request.
*
......@@ -323,21 +298,60 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
}
else {
Log.info(LocaleUtils.getLocalizedString("basegateway.register", "gateway", Arrays.asList(username.trim())));
SubscriptionInfo info = new SubscriptionInfo(username.trim(), password);
SubscriptionInfo info = new SubscriptionInfo(username.trim(), password, iq.getFrom());
PersistenceManager.Factory.get(this).getRegistrar().add(iq.getFrom(), info);
reply.setChildElement(responseElement);
response.add( reply );
Presence subscribe = new Presence(Presence.Type.subscribe);
subscribe.setTo(iq.getFrom());
subscribe.setFrom(iq.getTo());
response.add(subscribe);
//Presence subscribe = new Presence(Presence.Type.subscribe);
//subscribe.setTo(iq.getFrom());
//subscribe.setFrom(iq.getTo());
//response.add(subscribe);
try {
Roster roster = rosterManager.getRoster(iq.getFrom().getNode());
try {
RosterItem gwitem = roster.getRosterItem(iq.getTo());
if (gwitem.getSubStatus() != RosterItem.SUB_BOTH) {
gwitem.setSubStatus(RosterItem.SUB_BOTH);
}
if (gwitem.getAskStatus() != RosterItem.ASK_NONE) {
gwitem.setAskStatus(RosterItem.ASK_NONE);
}
roster.updateRosterItem(gwitem);
}
catch (UserNotFoundException e) {
try {
RosterItem gwitem = roster.createRosterItem(iq.getTo(), true);
gwitem.setSubStatus(RosterItem.SUB_BOTH);
gwitem.setAskStatus(RosterItem.ASK_NONE);
roster.updateRosterItem(gwitem);
}
catch (UserAlreadyExistsException ee) {
Log.error("getRosterItem claims user exists, but couldn't find via getRosterItem?");
IQ result = IQ.createResultIQ(iq);
result.setError(Condition.bad_request);
response.add(result);
}
catch (Exception ee) {
Log.error("createRosterItem caused exception: " + ee.getMessage());
IQ result = IQ.createResultIQ(iq);
result.setError(Condition.bad_request);
response.add(result);
}
}
}
catch (UserNotFoundException e) {
Log.error("Someone attempted to register with the gateway who is not registered with the server: " + iq.getFrom());
IQ result = IQ.createResultIQ(iq);
result.setError(Condition.bad_request);
response.add(result);
}
}
}
else if (iq.getType().equals(IQ.Type.get)) {
DataForm form = new DataForm(DataForm.Type.form);
// This needs to ask the specific gateway what to say.
form.addInstruction("Please enter your AIM Screenname and Password");
form.addInstruction("Please enter your legacy account username and password");
FormField usernameField = form.addField();
usernameField.setLabel("Username");
usernameField.setVariable("username");
......@@ -351,7 +365,7 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
* Add standard elements to request.
*/
// This needs to ask the specific gateway what to say.
responseElement.addElement("instruction").addText("Please enter your AIM screenname and password");
responseElement.addElement("instruction").addText("Please enter your legacy account username and password");
responseElement.addElement("username");
responseElement.addElement("password");
......@@ -378,29 +392,18 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
Element responseElement = DocumentHelper.createElement(QName.get(
"query", "http://jabber.org/protocol/disco#info"));
Roster roster = this.rosterManager.getContactManager().getRoster(iq.getFrom());
for (ForeignContact entry : roster.getAll()) {
Element item = responseElement.addElement("item");
item.addAttribute("jid", entry.getJid().toBareJID());
item.addAttribute("name", entry.getName());
responseElement.add(item);
}
//Roster roster = this.persistenceManager.getContactManager().getRoster(iq.getFrom());
//for (ForeignContact entry : roster.getAll()) {
// Element item = responseElement.addElement("item");
// item.addAttribute("jid", entry.getJid().toBareJID());
// item.addAttribute("name", entry.getName());
// responseElement.add(item);
//}
reply.setChildElement(responseElement);
Log.debug(reply.toString());
return reply;
}
/**
* TODO: handle a legacy service discovery request.
*
* @param iq
* @return response
*/
private IQ handleLegacyServiceDiscovery(IQ iq) {
return IQ.createResultIQ(iq);
// TODO: Implement Legacy Service Discovery.
}
/**
* Handle service discovery.
*
......@@ -494,7 +497,7 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
/*
* Unknown entity is trying to access the gateway.
*/
if (!rosterManager.getRegistrar().isRegistered(NormalizedJID.wrap(from))) {
if (!persistenceManager.getRegistrar().isRegistered(NormalizedJID.wrap(from))) {
Log.info(LocaleUtils.getLocalizedString("basegateway.unabletofind", "gateway", Arrays.asList(from)));
// silently ignore a delete request
if (!Presence.Type.unavailable.equals(presence.getType())) {
......@@ -510,60 +513,124 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
/*
* Get the underlying session for this JID and handle accordingly.
*/
GatewaySession sessionInfo = rosterManager.getRegistrar().getGatewaySession(from);
GatewaySession sessionInfo = persistenceManager.getRegistrar().getGatewaySession(from);
if (sessionInfo == null) {
Log.warn(LocaleUtils.getLocalizedString("basegateway.unabletolocatesession" , "gateway", Arrays.asList(from)));
return p;
}
if (Presence.Type.subscribe.equals(presence.getType())) {
if (presence.getTo().equals(this.jid)) {
sessionInfo.getSubscriptionInfo().serverRegistered = true;
if (presence.getTo().getNode() == null) { // this is a request to the gateway itself.
if (presence.getType() == null && persistenceManager.getRegistrar().isRegistered(NormalizedJID.wrap(from))) {
GatewaySession session = persistenceManager.getRegistrar().getGatewaySession(presence.getFrom());
Presence result = new Presence();
result.setTo(presence.getFrom());
result.setFrom(this.jid);
p.add(result);
Log.debug(LocaleUtils.getLocalizedString("basegateway.gatewaypresence", "gateway"));
}
else if (Presence.Type.unavailable.equals(presence.getType())) {
/**
* If an unavailable presence stanza is received then logout the
* current user and send back and unavailable stanza.
*/
if (sessionInfo.isConnected()) {
sessionInfo.logout();
}
Presence reply = new Presence(Presence.Type.unavailable);
reply.setTo(presence.getFrom());
reply.setFrom(presence.getTo());
p.add(reply);
}
}
else {
Presence subscribe = new Presence(Presence.Type.subscribe);
subscribe.setTo(presence.getFrom());
subscribe.setFrom(presence.getTo());
p.add(subscribe);
if (Presence.Type.subscribe.equals(presence.getType())) {
GatewaySession session = persistenceManager.getRegistrar().getGatewaySession(presence.getFrom());
try {
session.addContact(presence.getTo());
}
catch (Exception e) {
Log.error("Failed to add: " + presence.getTo());
}
try {
Roster roster = rosterManager.getRoster(presence.getFrom().getNode());
try {
RosterItem gwitem = roster.getRosterItem(presence.getTo());
if (gwitem.getSubStatus() != RosterItem.SUB_BOTH) {
gwitem.setSubStatus(RosterItem.SUB_BOTH);
}
if (gwitem.getAskStatus() != RosterItem.ASK_NONE) {
gwitem.setAskStatus(RosterItem.ASK_NONE);
}
roster.updateRosterItem(gwitem);
}
catch (UserNotFoundException e) {
try {
RosterItem gwitem = roster.createRosterItem(presence.getTo(), true);
gwitem.setSubStatus(RosterItem.SUB_BOTH);
gwitem.setAskStatus(RosterItem.ASK_NONE);
roster.updateRosterItem(gwitem);
}
catch (UserAlreadyExistsException ee) {
Log.error("getRosterItem claims user exists, but couldn't find via getRosterItem?");
}
catch (Exception ee) {
Log.error("createRosterItem caused exception: " + ee.getMessage());
}
}
}
catch (UserNotFoundException e) {
Log.error("Someone attempted to register with the gateway who is not registered with the server: " + presence.getFrom());
}
//Presence subscribe = new Presence(Presence.Type.subscribe);
//subscribe.setTo(presence.getFrom());
//subscribe.setFrom(presence.getTo());
//p.add(subscribe);
Presence reply = new Presence(Presence.Type.subscribed);
reply.setTo(presence.getFrom());
reply.setFrom(presence.getTo());
p.add(reply);
}
else if (Presence.Type.subscribed.equals(presence.getType())) {
if (presence.getTo().equals(this.jid)) { // subscribed to server
sessionInfo.getSubscriptionInfo().clientRegistered = true;
else if (Presence.Type.unsubscribe.equals(presence.getType())) {
GatewaySession session = persistenceManager.getRegistrar().getGatewaySession(presence.getFrom());
try {
session.removeContact(presence.getTo());
}
else { // subscribe to legacy user
Log.debug(LocaleUtils.getLocalizedString("basegateway.subscribed", "gateway"));
catch (Exception e) {
Log.error("Failed to remove: " + presence.getTo());
}
try {
Roster roster = rosterManager.getRoster(presence.getFrom().getNode());
try {
roster.deleteRosterItem(presence.getTo(), false);
}
catch (Exception e) {
Log.error("deleteRosterItem caused exception: " + e.getMessage());
}
else if (Presence.Type.unavailable.equals(presence.getType())){
/**
* If an unavailable presence stanza is received then logout the
* current user and send back and unavailable stanza.
*/
if (sessionInfo.isConnected()) {
sessionInfo.logout();
}
catch (UserNotFoundException e) {
Log.error("Someone attempted to register with the gateway who is not registered with the server: " + presence.getFrom());
}
//Presence unsubscribe = new Presence(Presence.Type.subscribe);
//unsubscribe.setTo(presence.getFrom());
//unsubscribe.setFrom(presence.getTo());
//p.add(subscribe);
Presence reply = new Presence(Presence.Type.unavailable);
Presence reply = new Presence(Presence.Type.unsubscribed);
reply.setTo(presence.getFrom());
reply.setFrom(presence.getTo());
p.add(reply);
}
else if (presence.getTo().getNode() == null) { // this is a request to the gateway only.
Presence result = new Presence();
result.setTo(presence.getFrom());
result.setFrom(this.jid);
p.add(result);
Log.debug(LocaleUtils.getLocalizedString("basegateway.gatewaypresence", "gateway"));
else if (Presence.Type.subscribed.equals(presence.getType())) {
Log.debug(LocaleUtils.getLocalizedString("basegateway.subscribed", "gateway"));
}
else {
GatewaySession session = rosterManager.getRegistrar().getGatewaySession(presence.getFrom());
GatewaySession session = persistenceManager.getRegistrar().getGatewaySession(presence.getFrom());
try {
ForeignContact fc = session.getContact(presence.getTo());
Status status = fc.getStatus();
......@@ -582,6 +649,7 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
Log.warn(LocaleUtils.getLocalizedString("basegateway.statusexception", "gateway", Arrays.asList(new Object[]{presence.getTo(), presence.getFrom(), e.getLocalizedMessage()})));
}
}
}
return p;
}
......@@ -654,22 +722,69 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
public void run() {
//Log.debug(LocaleUtils.getLocalizedString("basegateway.maintenancestart", "gateway"));
for (SubscriptionInfo si : rosterManager.getRegistrar().getAllGatewaySessions()) {
if (!si.clientRegistered) {
Presence p = new Presence();
p.setType(Presence.Type.subscribe);
p.setTo(si.jid);
p.setFrom(this.jid);
for (SubscriptionInfo si : persistenceManager.getRegistrar().getAllGatewaySessions()) {
try {
componentManager.sendPacket(this, p);
GatewaySession session = persistenceManager.getRegistrar().getGatewaySession(si.jid);
if (!session.isConnected()) {
continue;
}
catch (ComponentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
for (ForeignContact fc : session.getContacts()) {
try {
Roster roster = rosterManager.getRoster(si.jid.getNode());
try {
RosterItem gwitem = roster.getRosterItem(fc.getJid());
if (gwitem.getSubStatus() != RosterItem.SUB_BOTH) {
gwitem.setSubStatus(RosterItem.SUB_BOTH);
}
if (gwitem.getAskStatus() != RosterItem.ASK_NONE) {
gwitem.setAskStatus(RosterItem.ASK_NONE);
}
roster.updateRosterItem(gwitem);
}
catch (UserNotFoundException e) {
try {
RosterItem gwitem = roster.createRosterItem(fc.getJid(), true);
gwitem.setSubStatus(RosterItem.SUB_BOTH);
gwitem.setAskStatus(RosterItem.ASK_NONE);
roster.updateRosterItem(gwitem);
}
catch (UserAlreadyExistsException ee) {
Log.error("getRosterItem claims user exists, but couldn't find via getRosterItem?");
}
catch (Exception ee) {
Log.error("createRosterItem caused exception: " + ee.getMessage());
}
}
}
catch (UserNotFoundException e) {
Log.error("Someone attempted to register with the gateway who is not registered with the server: " + si.jid);
}
}
}
catch (Exception e) {
// ignore
}
}
//for (SubscriptionInfo si : persistenceManager.getRegistrar().getAllGatewaySessions()) {
// if (!si.clientRegistered) {
// Presence p = new Presence();
// p.setType(Presence.Type.subscribe);
// p.setTo(si.jid);
// p.setFrom(this.jid);
// Log.debug("Run Packet: " + p.toString());
// Log.debug("Run si.user: " + si.username);
// Log.debug("Run si.pass: " + si.password);
// try {
// componentManager.sendPacket(this, p);
// }
// catch (ComponentException e) {
// TODO Auto-generated catch block
// Log.error(e.getMessage());
// }
// }
// for(ForeignContact fc : rosterManager.getContactManager().getRoster(si.jid).getAll()) {
// for(ForeignContact fc : persistenceManager.getContactManager().getRoster(si.jid).getAll()) {
// Presence p = new Presence();
// p.setFrom(fc.getJid());
// p.setTo(si.jid);
......@@ -680,9 +795,9 @@ public abstract class BaseGateway implements Gateway, Component, Runnable {
// Log.warn(LocaleUtils.getLocalizedString("basegateway.unabletosendpresence", "gateway"), e);
// }
// }
}
//}
// for(ForeignContact contact : rosterManager.getContactManager().getAllForeignContacts()) {
// for(ForeignContact contact : persistenceManager.getContactManager().getAllForeignContacts()) {
// if(!contact.isConnected())
// continue;
// Presence p = new Presence();
......
src/java/org/jivesoftware/wildfire/gateway/SubscriptionInfo.java
View file @ 5144b608
......@@ -31,9 +31,10 @@ public class SubscriptionInfo implements Serializable {
* @param username The username
* @param password The password
*/
public SubscriptionInfo(String username, String password) {
public SubscriptionInfo(String username, String password, JID jid) {
this.username = username;
this.password = password;
this.jid = jid;
}
/**
......@@ -61,6 +62,7 @@ public class SubscriptionInfo implements Serializable {
*
* @see org.xmpp.packet.JID
*/
public transient JID jid;
//public transient JID jid;
public JID jid;
}
src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooGatewaySession.java
View file @ 5144b608
......@@ -304,6 +304,7 @@ public class YahooGatewaySession extends AbstractGatewaySession implements Endpo
String node = to.getNode();
if (node == null || node.length() == 0) throw new UnknownForeignContactException("invalidnode", node.toString());
YahooUser user = session.getUser(node);
Log.debug("getUser on node " + node);
if (user == null) throw new UnknownForeignContactException("invaliduser");
return new YahooForeignContact(session.getUser(to.getNode()), this.gateway);
}
......
src/java/org/jivesoftware/wildfire/gateway/roster/PersistenceManager.java
View file @ 5144b608
......@@ -16,6 +16,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.Byte;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executors;
......@@ -147,20 +148,21 @@ public class PersistenceManager implements Serializable {
* The key is stored in the registry so the key is as secure as the
* registry is secure.
*/
byte[] rawKey = Preferences.systemNodeForPackage(this.getClass()).getByteArray(".key", null);
//byte[] rawKey = Preferences.systemNodeForPackage(this.getClass()).getByteArray(".key", null);
if (rawKey == null) {
Log.error(LocaleUtils.getLocalizedString("persistencemanager.nokey", "gateway"));
return;
}
//if (rawKey == null) {
// Log.error(LocaleUtils.getLocalizedString("persistencemanager.nokey", "gateway"));
// return;
//}
SecretKeySpec key = new SecretKeySpec(rawKey, "AES");
Cipher c = Cipher.getInstance("AES");
c.init(Cipher.DECRYPT_MODE, key);
//SecretKeySpec key = new SecretKeySpec(rawKey, "AES");
//Cipher c = Cipher.getInstance("AES");
//c.init(Cipher.DECRYPT_MODE, key);
CipherInputStream cis = new CipherInputStream(new FileInputStream(db), c);
//CipherInputStream cis = new CipherInputStream(new FileInputStream(db), c);
ObjectInputStream is = new ObjectInputStream(cis);
//ObjectInputStream is = new ObjectInputStream(cis);
ObjectInputStream is = new ObjectInputStream(new FileInputStream(db));
contactManager = (ContactManager)is.readObject() ;
registrar = (Registrar) is.readObject() ;
is.close();
......@@ -206,22 +208,23 @@ public class PersistenceManager implements Serializable {
* @throws Exception
*/
public synchronized void store() throws Exception {
Preferences prefs = Preferences.systemNodeForPackage(this.getClass());
byte[] rawKey = prefs.getByteArray(".key", null);
if (rawKey == null) {
Log.error(LocaleUtils.getLocalizedString("persistencemanager.gennewkey", "gateway"));
KeyGenerator kg = KeyGenerator.getInstance("AES");
SecretKey key = kg.generateKey();
rawKey = key.getEncoded();
prefs.putByteArray(".key", rawKey);
}
SecretKeySpec key = new SecretKeySpec(rawKey, "AES");
Cipher c = Cipher.getInstance("AES");
c.init(Cipher.ENCRYPT_MODE, key);
CipherOutputStream os = new CipherOutputStream(new FileOutputStream(db), c);
ObjectOutputStream oos = new ObjectOutputStream(os);
//Preferences prefs = Preferences.systemNodeForPackage(this.getClass());
//byte[] rawKey = prefs.getByteArray(".key", null);
//if (rawKey == null) {
// Log.error(LocaleUtils.getLocalizedString("persistencemanager.gennewkey", "gateway"));
// KeyGenerator kg = KeyGenerator.getInstance("AES");
// SecretKey key = kg.generateKey();
// rawKey = key.getEncoded();
// prefs.putByteArray(".key", rawKey);
//}
//SecretKeySpec key = new SecretKeySpec(rawKey, "AES");
//Cipher c = Cipher.getInstance("AES");
//c.init(Cipher.ENCRYPT_MODE, key);
//CipherOutputStream os = new CipherOutputStream(new FileOutputStream(db), c);
//ObjectOutputStream oos = new ObjectOutputStream(os);
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(db));
oos.writeObject(contactManager);
oos.writeObject(registrar);
oos.flush();
......
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