Changeset 197:000463188f40

Timestamp:

04/20/2008 07:48:16 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

JID validation for !muc banjid and !muc unban commands

Location:

src

Files:

• base/common.cpp (modified) (1 diff)
• base/common.h (modified) (1 diff)
• plugins/muc/mucplugin.cpp (modified) (1 diff)

src/base/common.cpp

@@ -159 +159 @@
 }
 
+bool isBareJidValid(const QString& jid)
+{
+        QString user=jid.section('@',0,-2);
+        QString server=jid.section('@',-1,-1);
+        qDebug() << "user: " << user << "; server: " << server; 
+        if (!isServerValid(server))
+                return false;
+        return (user.indexOf(' ')<0);
+}
+
+bool isServerValid(const QString& server) {
+        QRegExp exp("[A-Za-z0-9\\-_\\.]+\\.[A-Za-z0-9\\-_\\.]+");
+        return exp.exactMatch(server);
+}

src/base/common.h

@@ -10 +10 @@
 QString removeHtml(const QString&);
 
+bool isBareJidValid(const QString& jid);
+bool isServerValid(const QString& server);
+
 #endif

src/plugins/muc/mucplugin.cpp

@@ -451 +451 @@
                         return true;
                 }
+                
+                if (!isBareJidValid(jid) && !isServerValid(jid))
+                {
+                        reply(s,"JID is not valid");
+                        return true;
+                }
+                
                 QString reason=parser.nextToken();
                 QString affiliation=affiliationByCommand(cmd);