Skip to content

O
Openfire
Commit d1708df9 authored by Nate Putnam's avatar Nate Putnam Committed by nate
Browse files
Options

Performance fixes. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10107 b35dd754-fafc-0310-a699-88a17e54d16e
parent 3327c4e3
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 249 deletions
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/PacketFilter.java
View file @ d1708df9
...@@ -27,17 +27,12 @@ public class PacketFilter { ...@@ -27,17 +27,12 @@ public class PacketFilter {
public Rule findMatch(Packet packet) { public Rule findMatch(Packet packet) {
if (packet.getTo() == null || packet.getFrom() == null) return null; if (packet.getTo() == null || packet.getFrom() == null) return null;
String to = packet.getTo().toBareJID();
String from = packet.getFrom().toBareJID();
//TODO Would it be better to keep a local copy of the rules? //TODO Would it be better to keep a local copy of the rules?
for (Rule rule : ruleManager.getRules()) { for (Rule rule : ruleManager.getRules()) {
if (!rule.isDisabled() && if (!rule.isDisabled() &&
typeMatch(rule.getPackeType().toString(), packet) && typeMatch(rule.getPackeType(), packet) &&
sourceDestMatch(rule.getDestType(), rule.getDestination(), to) && sourceDestMatch(rule.getDestType(), rule.getDestination(), packet.getTo()) &&
sourceDestMatch(rule.getSourceType(), rule.getSource(), from)) { sourceDestMatch(rule.getSourceType(), rule.getSource(), packet.getFrom())) {
return rule; return rule;
} }
...@@ -45,30 +40,30 @@ public class PacketFilter { ...@@ -45,30 +40,30 @@ public class PacketFilter {
return null; return null;
} }
private boolean typeMatch(String rulePacketType, Packet packet) { private boolean typeMatch(Rule.PacketType rulePacketType, Packet packet) {
//Simple case. Any. //Simple case. Any.
if (rulePacketType.equals(Rule.PacketType.Any.toString())) return true; if (rulePacketType == Rule.PacketType.Any) return true;
else if (packet instanceof Message) { else if (packet instanceof Message) {
Message message = (Message) packet; Message message = (Message) packet;
if (rulePacketType.equals(Rule.PacketType.Message.toString())) { if (rulePacketType == Rule.PacketType.Message) {
return true; return true;
} }
//Try some types. //Try some types.
else if (rulePacketType.equals(Rule.PacketType.MessageChat.toString()) else if (rulePacketType == Rule.PacketType.MessageChat
&& message.getType().toString().equals("chat")) { && message.getType() == Message.Type.chat) {
return true; return true;
} else if (rulePacketType.equals(Rule.PacketType.MessageGroupChat.toString()) } else if (rulePacketType == Rule.PacketType.MessageGroupChat
&& message.getType().toString().equals("groupchat")) { && message.getType() == Message.Type.groupchat) {
return true; return true;
} }
return false; return false;
} else if (packet instanceof Presence) { } else if (packet instanceof Presence) {
if (rulePacketType.equals(Rule.PacketType.Presence.toString())) { if (rulePacketType == Rule.PacketType.Presence) {
return true; return true;
} else return false; } else return false;
} else if (packet instanceof IQ) { } else if (packet instanceof IQ) {
if (rulePacketType.equals(Rule.PacketType.Iq.toString())) { if (rulePacketType == Rule.PacketType.Iq) {
return true; return true;
} else return false; } else return false;
} }
...@@ -77,38 +72,36 @@ public class PacketFilter { ...@@ -77,38 +72,36 @@ public class PacketFilter {
} }
private boolean sourceDestMatch(String type, String ruleToFrom, String packetToFrom) { private boolean sourceDestMatch(Rule.SourceDestType type, String ruleToFrom, JID packetToFrom) {
if (type.equals(Rule.SourceDestType.Any.toString())) return true; if (type == Rule.SourceDestType.Any) return true;
if (type.equals(Rule.SourceDestType.User.toString())) { if (type == Rule.SourceDestType.User) {
if (ruleToFrom.equals(packetToFrom)) { if (ruleToFrom.equals(packetToFrom.toBareJID())) {
return true; return true;
} }
} else if (type.equals(Rule.SourceDestType.Group.toString())) { } else if (type == Rule.SourceDestType.Group) {
return packetToFromGroup(ruleToFrom, packetToFrom); return packetToFromGroup(ruleToFrom, packetToFrom);
} else if (type.equals(Rule.SourceDestType.Component.toString())) { } else if (type == Rule.SourceDestType.Component) {
if (ruleToFrom.toLowerCase().equals(PacketFilterUtil.getComponent(packetToFrom).toLowerCase())) { if (ruleToFrom.toLowerCase().equals(packetToFrom.getDomain().toLowerCase())) {
return true; return true;
} }
} else if (type.equals(Rule.SourceDestType.Other.toString())) { } else if (type == Rule.SourceDestType.Other) {
if (matchUser(ruleToFrom, packetToFrom)) { if (matchUser(ruleToFrom, packetToFrom)) {
return true; return true;
} }
} }
return false; return false;
} }
private boolean matchUser(String ruleToFrom, String packetToFrom) { private boolean matchUser(String ruleToFrom, JID packetToFrom) {
boolean match = false; boolean match = false;
//Escape the text so I get a rule to packet match. //Escape the text so I get a rule to packet match.
packetToFrom = JID.unescapeNode(packetToFrom); // String escapedPacketToFrom = JID.unescapeNode(packetToFrom.toBareJID().toString());
if (ruleToFrom.indexOf("*") == 0 && ruleToFrom.indexOf("@") == 1) { if (ruleToFrom.indexOf("*") == 0 && ruleToFrom.indexOf("@") == 1) {
if (PacketFilterUtil.getDomain(ruleToFrom).equals(PacketFilterUtil.getDomain(packetToFrom))) { if (PacketFilterUtil.getDomain(ruleToFrom).equals(packetToFrom.getDomain().toString())) {
match = true; match = true;
} }
} else { } else {
if (ruleToFrom.equals(packetToFrom)) { if (ruleToFrom.equals(packetToFrom.toBareJID())) {
match = true; match = true;
} }
} }
...@@ -116,17 +109,20 @@ public class PacketFilter { ...@@ -116,17 +109,20 @@ public class PacketFilter {
} }
private boolean packetToFromGroup(String rulegroup, String packetToFrom) { private boolean packetToFromGroup(String rulegroup, JID packetToFrom) {
Group group = PacketFilterUtil.getGroup(rulegroup); Group group = null;
try {
group = GroupManager.getInstance().getProvider().getGroup(rulegroup);
} catch (GroupNotFoundException e) {
e.printStackTrace();
}
if (group == null) { if (group == null) {
return false; return false;
} else { } else {
for (JID jid : group.getMembers()) { if (group.isUser(packetToFrom)) {
if (jid.toBareJID().equals(packetToFrom)) {
return true; return true;
} }
} }
}
return false; return false;
} }
} }
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/PacketFilterPlugin.java
View file @ d1708df9
...@@ -20,9 +20,7 @@ public class PacketFilterPlugin implements Plugin, PacketInterceptor { ...@@ -20,9 +20,7 @@ public class PacketFilterPlugin implements Plugin, PacketInterceptor {
private static PluginManager pluginManager; private static PluginManager pluginManager;
public PacketFilterPlugin() { public PacketFilterPlugin() {
XMPPServer server = XMPPServer.getInstance();
interceptorManager = InterceptorManager.getInstance(); interceptorManager = InterceptorManager.getInstance();
} }
//Packet Filter //Packet Filter
...@@ -58,6 +56,10 @@ public class PacketFilterPlugin implements Plugin, PacketInterceptor { ...@@ -58,6 +56,10 @@ public class PacketFilterPlugin implements Plugin, PacketInterceptor {
} }
public void interceptPacket(Packet packet, Session session, boolean incoming, boolean processed) throws PacketRejectedException { public void interceptPacket(Packet packet, Session session, boolean incoming, boolean processed) throws PacketRejectedException {
if (processed) {
return;
}
Rule rule = pf.findMatch(packet); Rule rule = pf.findMatch(packet);
if (rule != null) { if (rule != null) {
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/PacketFilterUtil.java
View file @ d1708df9
...@@ -5,50 +5,19 @@ import org.jivesoftware.openfire.group.Group; ...@@ -5,50 +5,19 @@ import org.jivesoftware.openfire.group.Group;
import org.jivesoftware.openfire.group.GroupManager; import org.jivesoftware.openfire.group.GroupManager;
import org.jivesoftware.openfire.group.GroupNotFoundException; import org.jivesoftware.openfire.group.GroupNotFoundException;
import org.jivesoftware.openfire.user.UserManager; import org.jivesoftware.openfire.user.UserManager;
import org.xmpp.packet.JID;
import java.util.Collection; import java.util.Collection;
/* /*
Static util methods. Static util methods.
*/ */
public class PacketFilterUtil { public class PacketFilterUtil {
static String serverName = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
public static boolean isGroup(String name) {
try {
GroupManager.getInstance().getGroup(name);
return true;
} catch (GroupNotFoundException e) {
return false;
}
}
public static Group getGroup(String name) {
Group group = null;
try {
group = GroupManager.getInstance().getProvider().getGroup(name);
} catch (GroupNotFoundException e) {
e.printStackTrace();
}
return group;
}
//Faster the better. This will break if virtual hosts is ever implemented.
public static boolean isLocalUser(String jid) {
Collection<String> users = UserManager.getUserProvider().getUsernames();
for (String username : users) {
if (jid.equals(username+"@"+serverName)) {
return true;
}
}
return false;
}
/* /*
Method to get the component part from a jid. The packet could Method to get the component part from a jid. The packet could
be from the component itself so just return. be from the component itself so just return.
*/ */
public static String getComponent(String jid) { public static String getDomain(String jid) {
if (jid.contains("@")) { if (jid.contains("@")) {
int atIndex = jid.indexOf("@"); int atIndex = jid.indexOf("@");
return (jid.substring(atIndex+1,jid.length())); return (jid.substring(atIndex+1,jid.length()));
...@@ -57,40 +26,4 @@ public class PacketFilterUtil { ...@@ -57,40 +26,4 @@ public class PacketFilterUtil {
return jid; return jid;
} }
} }
public static String getDomain(String jid) {
return getComponent(jid);
}
/*
Figure out if the packet is going to a component
*/
/* public static boolean isComponent(String jid) {
ComponentList cList = ComponentList.getInstance();
if (cList.getComponentName(jid) == null) {
return false;
}
else {
return true;
}
}
*/
/*
Make reasonably sure that the string is a valid
JID.
*/
/*public static boolean isJID(String jid) {
try {
JID _jid = new JID(jid);
}
catch (IllegalArgumentException e) {
Log.error(e);
return false;
}
return true;
} */
} }
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/component/ComponentList.java
View file @ d1708df9
...@@ -43,7 +43,6 @@ public class ComponentList implements IQResultListener { ...@@ -43,7 +43,6 @@ public class ComponentList implements IQResultListener {
return componentMap.get(jid); return componentMap.get(jid);
} }
public void receivedAnswer(IQ packet) { public void receivedAnswer(IQ packet) {
if (IQ.Type.result == packet.getType()) { if (IQ.Type.result == packet.getType()) {
...@@ -62,7 +61,6 @@ public class ComponentList implements IQResultListener { ...@@ -62,7 +61,6 @@ public class ComponentList implements IQResultListener {
Log.warn("An answer to a previously sent IQ stanza was never received. Packet id: " + packetId); Log.warn("An answer to a previously sent IQ stanza was never received. Packet id: " + packetId);
} }
public Collection<String> getComponentDomains() { public Collection<String> getComponentDomains() {
return routingTable.getComponentsDomains(); return routingTable.getComponentsDomains();
} }
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/rules/AbstractRule.java
View file @ d1708df9
...@@ -17,23 +17,23 @@ public abstract class AbstractRule implements Rule { ...@@ -17,23 +17,23 @@ public abstract class AbstractRule implements Rule {
private String description; private String description;
private String ruleId; private String ruleId;
private String displayName; private String displayName;
private String sourceType; private SourceDestType sourceType;
private String destType; private SourceDestType destType;
public String getDestType() { public SourceDestType getDestType() {
return destType; return destType;
} }
public void setDestType(String destType) { public void setDestType(SourceDestType destType) {
this.destType = destType; this.destType = destType;
} }
public String getSourceType() { public SourceDestType getSourceType() {
return sourceType; return sourceType;
} }
public void setSourceType(String sourceType) { public void setSourceType(SourceDestType sourceType) {
this.sourceType = sourceType; this.sourceType = sourceType;
} }
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/rules/DbRuleManager.java
View file @ d1708df9
...@@ -81,8 +81,7 @@ public class DbRuleManager { ...@@ -81,8 +81,7 @@ public class DbRuleManager {
rule = new Pass(); rule = new Pass();
else if (ruleType.equals(Drop.class.getName())) else if (ruleType.equals(Drop.class.getName()))
rule = new Drop(); rule = new Drop();
else if (ruleType.equals(Redirect.class.getName()))
rule = new Redirect();
rule.setRuleId(rs.getString(2)); rule.setRuleId(rs.getString(2));
rule.setPacketType(Rule.PacketType.valueOf(rs.getString(3))); rule.setPacketType(Rule.PacketType.valueOf(rs.getString(3)));
...@@ -92,8 +91,8 @@ public class DbRuleManager { ...@@ -92,8 +91,8 @@ public class DbRuleManager {
rule.doLog(rs.getBoolean(7)); rule.doLog(rs.getBoolean(7));
rule.setDescription(rs.getString(8)); rule.setDescription(rs.getString(8));
rule.setOrder(rs.getInt(9)); rule.setOrder(rs.getInt(9));
rule.setSourceType(rs.getString(10)); rule.setSourceType(Rule.SourceDestType.valueOf(rs.getString(10)));
rule.setDestType(rs.getString(11)); rule.setDestType(Rule.SourceDestType.valueOf(rs.getString(11)));
rules.add(rule); rules.add(rule);
...@@ -163,13 +162,15 @@ public class DbRuleManager { ...@@ -163,13 +162,15 @@ public class DbRuleManager {
con = DbConnectionManager.getConnection(); con = DbConnectionManager.getConnection();
pstmt = con.prepareStatement(GET_LAST_ORDERID); pstmt = con.prepareStatement(GET_LAST_ORDERID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
rs.next(); if (rs.next()) {
count = rs.getInt(1);
count = rs.getInt(1);
}
else {
count = 0;
}
} catch (SQLException sqle) { } catch (SQLException sqle) {
Log.error(sqle); Log.error(sqle);
//If error dataset is probably empty
return 0;
} }
finally { finally {
DbConnectionManager.closeConnection(pstmt, con); DbConnectionManager.closeConnection(pstmt, con);
...@@ -220,13 +221,7 @@ public class DbRuleManager { ...@@ -220,13 +221,7 @@ public class DbRuleManager {
} }
rule.setOrder(order); rule.setOrder(order);
pstmt.setString(2, rule.getPackeType().toString()); pstmt.setString(2, rule.getPackeType().toString());
if (rule.getDestination().contains(" ")) {
rule.setDestination(rule.getDestination().replace(" ", ""));
}
pstmt.setString(3, rule.getDestination()); pstmt.setString(3, rule.getDestination());
if (rule.getSource().contains(" ")) {
rule.setSource(rule.getSource().replace(" ", ""));
}
pstmt.setString(4, rule.getSource()); pstmt.setString(4, rule.getSource());
pstmt.setString(5, rule.getClass().getName()); pstmt.setString(5, rule.getClass().getName());
if (rule.isDisabled()) { if (rule.isDisabled()) {
...@@ -242,8 +237,8 @@ public class DbRuleManager { ...@@ -242,8 +237,8 @@ public class DbRuleManager {
pstmt.setByte(7, new Byte("0")); pstmt.setByte(7, new Byte("0"));
} }
pstmt.setString(8, rule.getDescription()); pstmt.setString(8, rule.getDescription());
pstmt.setString(9, rule.getSourceType()); pstmt.setString(9, rule.getSourceType().toString());
pstmt.setString(10, rule.getDestType()); pstmt.setString(10, rule.getDestType().toString());
pstmt.execute(); pstmt.execute();
rules.clear(); rules.clear();
...@@ -337,8 +332,8 @@ public class DbRuleManager { ...@@ -337,8 +332,8 @@ public class DbRuleManager {
rule.isDisabled(rs.getBoolean(7)); rule.isDisabled(rs.getBoolean(7));
rule.doLog(rs.getBoolean(8)); rule.doLog(rs.getBoolean(8));
rule.setDescription(rs.getString(9)); rule.setDescription(rs.getString(9));
rule.setSourceType(rs.getString(10)); rule.setSourceType(Rule.SourceDestType.valueOf(rs.getString(10)));
rule.setDestType(rs.getString(11)); rule.setDestType(Rule.SourceDestType.valueOf(rs.getString(11)));
} }
...@@ -393,8 +388,8 @@ public class DbRuleManager { ...@@ -393,8 +388,8 @@ public class DbRuleManager {
pstmt.setString(7, rule.getDescription()); pstmt.setString(7, rule.getDescription());
pstmt.setInt(8, order); pstmt.setInt(8, order);
pstmt.setString(9, rule.getSourceType()); pstmt.setString(9, rule.getSourceType().toString());
pstmt.setString(10, rule.getDestType()); pstmt.setString(10, rule.getDestType().toString());
pstmt.setInt(11, new Integer(rule.getRuleId())); pstmt.setInt(11, new Integer(rule.getRuleId()));
pstmt.executeUpdate(); pstmt.executeUpdate();
......
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/rules/Redirect.java deleted 100644 → 0
View file @ 3327c4e3
package org.jivesoftware.openfire.plugin.rules;
import org.jivesoftware.openfire.SessionManager;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.group.Group;
import org.jivesoftware.openfire.interceptor.PacketRejectedException;
import org.jivesoftware.openfire.plugin.PacketFilterUtil;
import org.jivesoftware.openfire.session.ClientSession;
import org.jivesoftware.util.Log;
import org.xmpp.packet.JID;
import org.xmpp.packet.Message;
import org.xmpp.packet.Packet;
import java.util.Collection;
public class Redirect extends AbstractRule implements Rule {
public String getDisplayName() {
return "Redirect";
}
public Packet doAction(Packet packet) throws PacketRejectedException {
Message newPacket = null;
if (packet instanceof Message) {
if (getDestType().equals(Rule.SourceDestType.Group.toString())) {
Group sendGroup = PacketFilterUtil.getGroup(getDestination());
ClientSession clientSession;
for (JID jid : sendGroup.getMembers()) {
newPacket = (Message) packet.createCopy();
newPacket.setTo(jid);
sendPacket(newPacket);
}
}
else {
JID jid = new JID(getDestination());
newPacket = (Message) packet.createCopy();
newPacket.setFrom("test@machintosh.local");
newPacket.setTo(jid);
sendPacket(newPacket);
}
if (doLog()) {
Log.info("Redirecting from "+packet.getFrom()+" to "+packet.getTo());
}
}
throw new PacketRejectedException();
}
public boolean destMustMatch() {
return false;
}
private static void sendPacket(Packet packet) {
SessionManager sessionManager = XMPPServer.getInstance().getSessionManager();
ClientSession clientSession;
clientSession = sessionManager.getSession(packet.getTo());
Log.info("Sending to "+packet.getTo());
if (clientSession != null) {
Log.info("***** Session Not Null ******");
clientSession.process(packet);
}
}
}
src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/rules/Rule.java
View file @ d1708df9
...@@ -88,13 +88,13 @@ public interface Rule { ...@@ -88,13 +88,13 @@ public interface Rule {
public void setDisplayName(String displayName); public void setDisplayName(String displayName);
public String getSourceType(); public SourceDestType getSourceType();
public void setSourceType(String sourceType); public void setSourceType(SourceDestType sourceType);
public String getDestType(); public SourceDestType getDestType();
public void setDestType(String destType); public void setDestType(SourceDestType destType);
public Packet doAction(Packet packet) throws PacketRejectedException; public Packet doAction(Packet packet) throws PacketRejectedException;
......
src/plugins/packetFilter/src/web/rule-edit-form.jsp
View file @ d1708df9
...@@ -78,33 +78,33 @@ ...@@ -78,33 +78,33 @@
log = rule.doLog().toString(); log = rule.doLog().toString();
description = rule.getDescription(); description = rule.getDescription();
String destType = rule.getDestType(); Rule.SourceDestType destType = rule.getDestType();
String sourceType = rule.getSourceType(); Rule.SourceDestType sourceType = rule.getSourceType();
destJID = destination; destJID = destination;
sourceJID = source; sourceJID = source;
if (destType.equals(Rule.SourceDestType.Any.toString())) { if (destType == Rule.SourceDestType.Any) {
isDestAny = true; isDestAny = true;
} else if (destType.equals(Rule.SourceDestType.Group.toString())) { } else if (destType == Rule.SourceDestType.Group) {
isDestGroup = true; isDestGroup = true;
} else if (destType.equals(Rule.SourceDestType.Component.toString())) { } else if (destType == Rule.SourceDestType.Component) {
isDestComponent = true; isDestComponent = true;
} else if (destType.equals(Rule.SourceDestType.User.toString())) { } else if (destType == Rule.SourceDestType.User) {
isDestUser = true; isDestUser = true;
} else if (destType.equals(Rule.SourceDestType.Other.toString())) { } else if (destType == Rule.SourceDestType.Other) {
isDestOther = true; isDestOther = true;
} }
if (sourceType.equals(Rule.SourceDestType.Any.toString())) { if (sourceType == Rule.SourceDestType.Any) {
isSourceAny = true; isSourceAny = true;
} else if (sourceType.equals(Rule.SourceDestType.Group.toString())) { } else if (sourceType == Rule.SourceDestType.Group) {
isSourceGroup = true; isSourceGroup = true;
} else if (sourceType.equals(Rule.SourceDestType.Component.toString())) { } else if (sourceType == Rule.SourceDestType.Component) {
isSourceComponent = true; isSourceComponent = true;
} else if (sourceType.equals(Rule.SourceDestType.User.toString())) { } else if (sourceType == Rule.SourceDestType.User) {
isSourceUser = true; isSourceUser = true;
} else if (sourceType.equals(Rule.SourceDestType.Other.toString())) { } else if (sourceType == Rule.SourceDestType.Other) {
isSourceOther = true; isSourceOther = true;
} }
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
rule.setPacketType(Rule.PacketType.valueOf(packetType)); rule.setPacketType(Rule.PacketType.valueOf(packetType));
if (source.equals(Rule.SourceDestType.Any.toString())) { if (source.equals(Rule.SourceDestType.Any.toString())) {
rule.setSource(source); rule.setSource(source);
rule.setSourceType(Rule.SourceDestType.Any.toString()); rule.setSourceType(Rule.SourceDestType.Any);
} else if (source.equals(Rule.SourceDestType.Other.toString())) { } else if (source.equals(Rule.SourceDestType.Other.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceOtherJID"); sourceJID = ParamUtils.getParameter(request, "sourceOtherJID");
if (sourceJID == null || !(sourceJID.length() > 0)) { if (sourceJID == null || !(sourceJID.length() > 0)) {
...@@ -147,25 +147,25 @@ ...@@ -147,25 +147,25 @@
errors.put("sourceOther", ""); errors.put("sourceOther", "");
} }
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Other.toString()); rule.setSourceType(Rule.SourceDestType.Other);
} else if (source.equals(Rule.SourceDestType.User.toString())) { } else if (source.equals(Rule.SourceDestType.User.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceUserJID"); sourceJID = ParamUtils.getParameter(request, "sourceUserJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.User.toString()); rule.setSourceType(Rule.SourceDestType.User);
} else if (source.equals(Rule.SourceDestType.Group.toString())) { } else if (source.equals(Rule.SourceDestType.Group.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceGroupJID"); sourceJID = ParamUtils.getParameter(request, "sourceGroupJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Group.toString()); rule.setSourceType(Rule.SourceDestType.Group);
} else if (source.equals(Rule.SourceDestType.Component.toString())) { } else if (source.equals(Rule.SourceDestType.Component.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceComponentJID"); sourceJID = ParamUtils.getParameter(request, "sourceComponentJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Component.toString()); rule.setSourceType(Rule.SourceDestType.Component);
} }
if (destination.equals(Rule.SourceDestType.Any.toString())) { if (destination.equals(Rule.SourceDestType.Any.toString())) {
rule.setDestination(destination); rule.setDestination(destination);
rule.setDestType(Rule.SourceDestType.Any.toString()); rule.setDestType(Rule.SourceDestType.Any);
} else if (destination.equals(Rule.SourceDestType.Other.toString())) { } else if (destination.equals(Rule.SourceDestType.Other.toString())) {
destJID = ParamUtils.getParameter(request, "destOtherJID"); destJID = ParamUtils.getParameter(request, "destOtherJID");
if (destJID == null || !(sourceJID.length() > 0)) { if (destJID == null || !(sourceJID.length() > 0)) {
...@@ -173,19 +173,19 @@ ...@@ -173,19 +173,19 @@
errors.put("destOther", ""); errors.put("destOther", "");
} }
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Other.toString()); rule.setDestType(Rule.SourceDestType.Other);
} else if (destination.equals(Rule.SourceDestType.User.toString())) { } else if (destination.equals(Rule.SourceDestType.User.toString())) {
destJID = ParamUtils.getParameter(request, "destUserJID"); destJID = ParamUtils.getParameter(request, "destUserJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.User.toString()); rule.setDestType(Rule.SourceDestType.User);
} else if (destination.equals(Rule.SourceDestType.Group.toString())) { } else if (destination.equals(Rule.SourceDestType.Group.toString())) {
destJID = ParamUtils.getParameter(request, "destGroupJID"); destJID = ParamUtils.getParameter(request, "destGroupJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Group.toString()); rule.setDestType(Rule.SourceDestType.Group);
} else if (destination.equals(Rule.SourceDestType.Component.toString())) { } else if (destination.equals(Rule.SourceDestType.Component.toString())) {
destJID = ParamUtils.getParameter(request, "destComponentJID"); destJID = ParamUtils.getParameter(request, "destComponentJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Component.toString()); rule.setDestType(Rule.SourceDestType.Component);
} }
...@@ -195,8 +195,21 @@ ...@@ -195,8 +195,21 @@
rule.setRuleId(request.getParameter("ruleId")); rule.setRuleId(request.getParameter("ruleId"));
rule.setOrder(new Integer(order)); rule.setOrder(new Integer(order));
if (errors.isEmpty()) { if (errors.isEmpty()) {
if (rule.getSourceType() == Rule.SourceDestType.User ||
rule.getDestType() == Rule.SourceDestType.Other) {
rule.setSource(rule.getSource().toLowerCase()); rule.setSource(rule.getSource().toLowerCase());
}
else {
rule.setSource(rule.getSource());
}
if (rule.getDestType() == Rule.SourceDestType.User ||
rule.getDestType() == Rule.SourceDestType.Other) {
rule.setDestination(rule.getDestination().toLowerCase()); rule.setDestination(rule.getDestination().toLowerCase());
}
else {
rule.setDestination(rule.getDestination());
}
rm.updateRule(rule); rm.updateRule(rule);
response.sendRedirect("pf-main.jsp"); response.sendRedirect("pf-main.jsp");
} }
......
src/plugins/packetFilter/src/web/rule-form.jsp
View file @ d1708df9
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
rule.setPacketType(Rule.PacketType.valueOf(packetType)); rule.setPacketType(Rule.PacketType.valueOf(packetType));
if (source.equals(Rule.SourceDestType.Any.toString())) { if (source.equals(Rule.SourceDestType.Any.toString())) {
rule.setSource(source); rule.setSource(source);
rule.setSourceType(Rule.SourceDestType.Any.toString()); rule.setSourceType(Rule.SourceDestType.Any);
} else if (source.equals(Rule.SourceDestType.Other.toString())) { } else if (source.equals(Rule.SourceDestType.Other.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceOtherJID"); sourceJID = ParamUtils.getParameter(request, "sourceOtherJID");
if (sourceJID == null || !(sourceJID.length() > 0)) { if (sourceJID == null || !(sourceJID.length() > 0)) {
...@@ -73,25 +73,25 @@ ...@@ -73,25 +73,25 @@
errors.put("sourceOther", ""); errors.put("sourceOther", "");
} }
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Other.toString()); rule.setSourceType(Rule.SourceDestType.Other);
} else if (source.equals(Rule.SourceDestType.User.toString())) { } else if (source.equals(Rule.SourceDestType.User.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceUserJID"); sourceJID = ParamUtils.getParameter(request, "sourceUserJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.User.toString()); rule.setSourceType(Rule.SourceDestType.User);
} else if (source.equals(Rule.SourceDestType.Group.toString())) { } else if (source.equals(Rule.SourceDestType.Group.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceGroupJID"); sourceJID = ParamUtils.getParameter(request, "sourceGroupJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Group.toString()); rule.setSourceType(Rule.SourceDestType.Group);
} else if (source.equals(Rule.SourceDestType.Component.toString())) { } else if (source.equals(Rule.SourceDestType.Component.toString())) {
sourceJID = ParamUtils.getParameter(request, "sourceComponentJID"); sourceJID = ParamUtils.getParameter(request, "sourceComponentJID");
rule.setSource(sourceJID); rule.setSource(sourceJID);
rule.setSourceType(Rule.SourceDestType.Component.toString()); rule.setSourceType(Rule.SourceDestType.Component);
} }
if (destination.equals(Rule.SourceDestType.Any.toString())) { if (destination.equals(Rule.SourceDestType.Any.toString())) {
rule.setDestination(destination); rule.setDestination(destination);
rule.setDestType(Rule.SourceDestType.Any.toString()); rule.setDestType(Rule.SourceDestType.Any);
} else if (destination.equals(Rule.SourceDestType.Other.toString())) { } else if (destination.equals(Rule.SourceDestType.Other.toString())) {
destJID = ParamUtils.getParameter(request, "destOtherJID"); destJID = ParamUtils.getParameter(request, "destOtherJID");
if (destJID == null || !(destJID.length() > 0)) { if (destJID == null || !(destJID.length() > 0)) {
...@@ -99,27 +99,40 @@ ...@@ -99,27 +99,40 @@
errors.put("destOther", ""); errors.put("destOther", "");
} }
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Other.toString()); rule.setDestType(Rule.SourceDestType.Other);
} else if (destination.equals(Rule.SourceDestType.User.toString())) { } else if (destination.equals(Rule.SourceDestType.User.toString())) {
destJID = ParamUtils.getParameter(request, "destUserJID"); destJID = ParamUtils.getParameter(request, "destUserJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.User.toString()); rule.setDestType(Rule.SourceDestType.User);
} else if (destination.equals(Rule.SourceDestType.Group.toString())) { } else if (destination.equals(Rule.SourceDestType.Group.toString())) {
destJID = ParamUtils.getParameter(request, "destGroupJID"); destJID = ParamUtils.getParameter(request, "destGroupJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Group.toString()); rule.setDestType(Rule.SourceDestType.Group);
} else if (destination.equals(Rule.SourceDestType.Component.toString())) { } else if (destination.equals(Rule.SourceDestType.Component.toString())) {
destJID = ParamUtils.getParameter(request, "destComponentJID"); destJID = ParamUtils.getParameter(request, "destComponentJID");
rule.setDestination(destJID); rule.setDestination(destJID);
rule.setDestType(Rule.SourceDestType.Component.toString()); rule.setDestType(Rule.SourceDestType.Component);
} }
rule.doLog(new Boolean(log).booleanValue()); rule.doLog(new Boolean(log).booleanValue());
rule.isDisabled(new Boolean(disable).booleanValue()); rule.isDisabled(new Boolean(disable).booleanValue());
if (errors.size() == 0) { if (errors.size() == 0) {
if (rule.getSourceType() == Rule.SourceDestType.User ||
rule.getDestType() == Rule.SourceDestType.Other ) {
rule.setSource(rule.getSource().toLowerCase()); rule.setSource(rule.getSource().toLowerCase());
}
else {
rule.setSource(rule.getSource());
}
if (rule.getDestType() == Rule.SourceDestType.User ||
rule.getDestType() == Rule.SourceDestType.Other) {
rule.setDestination(rule.getDestination().toLowerCase()); rule.setDestination(rule.getDestination().toLowerCase());
}
else {
rule.setDestination(rule.getDestination());
}
rm.addRule(rule); rm.addRule(rule);
response.sendRedirect("pf-main.jsp"); response.sendRedirect("pf-main.jsp");
} }
......
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