added schema validation

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2757 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/userImportExport/src/java/org/jivesoftware/messenger/plugin/ImportExportPlugin.java

@@ -101,6 +101,16 @@ public class ImportExportPlugin implements Plugin {
         return importUsers(document, previousDomain);
     }
     
+    public boolean validateImportFile(FileItem file) {
+        try { 
+            return new UserSchemaValidator(file, "messenger-user-schema.xsd.xml").validate(); 
+        } 
+        catch (Exception e) {
+            Log.error(e);
+            return false;
+        } 
+    }
+    
     private Document exportUsers() {
         Document document = DocumentHelper.createDocument();
         Element root = document.addElement("JiveMessenger");
@@ -150,7 +160,7 @@ public class ImportExportPlugin implements Plugin {
         return document;
     }
     
-    private List<String> importUsers(Document document, String previousDomain) throws DocumentException {        
+    private List<String> importUsers(Document document, String previousDomain) {        
         List<String> duplicateUsers = new ArrayList<String>();
         
         UserManager userManager = UserManager.getInstance();

src/plugins/userImportExport/src/java/org/jivesoftware/messenger/plugin/UserSchemaValidator.java

@@ -5,6 +5,7 @@ import com.sun.msv.reader.util.IgnoreController;
 import com.sun.msv.verifier.DocumentDeclaration;
 import com.sun.msv.verifier.Verifier;
 
+import org.apache.commons.fileupload.FileItem;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.io.SAXReader;
@@ -15,8 +16,7 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
-import java.io.File;
-import java.net.MalformedURLException;
+import java.io.IOException;
 import java.net.URL;
 
 import javax.xml.parsers.SAXParserFactory;
@@ -25,12 +25,11 @@ public class UserSchemaValidator {
     private Document doc;
     private String schema;
     
-    UserSchemaValidator(String usersFile, String schemaFile) throws MalformedURLException, DocumentException {
-        URL usersURL = new File(usersFile).toURL();       
-        URL schemaURL = this.getClass().getClassLoader().getResource(schemaFile);        
-        
+    UserSchemaValidator(FileItem usersFile, String schemaFile) throws DocumentException, IOException {
         SAXReader reader = new SAXReader();
-        doc = reader.read(usersURL);
+        doc = reader.read(usersFile.getInputStream());
+        
+        URL schemaURL = this.getClass().getClassLoader().getResource(schemaFile); 
         schema = schemaURL.toExternalForm();
     }
 

src/plugins/userImportExport/src/web/import-user-data.jsp

@@ -28,6 +28,7 @@
         FileItem pd = (FileItem) i.next();
         String previousDomain = pd.getString();
         
+        if (plugin.validateImportFile(fi)) {
             try {
                 if (isEmpty(previousDomain)) {
                     duplicateUsers.addAll(plugin.importUserData(fi, null));
@@ -53,6 +54,10 @@
                 errors.put("DocumentException", "DocumentException");
             }
         }
+        else {
+            errors.put("invalidUserFile", "invalidUserFile");
+        }
+    }
 %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />