add some more escaptions

5 files changed, 77 insertions, 38 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/Logger.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/Logger.java
index 3730b36ce..9152f2549 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/Logger.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/logging/Logger.java
@@ -27,6 +27,9 @@ package at.gv.egovernment.moa.logging;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
+
 /**
  * A utility class acting as a facade to the logging subsystem.
  * 
@@ -88,7 +91,7 @@ public class Logger {
   private static String prepareMessage(Object message) {
       if(null == message)
           return "no message given";
-      return message.toString();
+      return StringEscapeUtils.escapeHtml4(message.toString());
   }
   
   /**
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
index 3291f8a15..8d6aea164 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
@@ -53,40 +53,7 @@ public class FileUtils {
     in.close();
     return content;
   }
-//  /**
-//   * Reads a file, given by URL, into a String.
-//   * @param urlString file URL
-//   * @param encoding character encoding
-//   * @return file content
-//   * @throws IOException on any exception thrown
-//   */
-//  public static String readURL(String urlString, String encoding) throws IOException {
-//    byte[] content = readURL(urlString);
-//    return new String(content, encoding);
-//  }
-//  /**
-//   * Reads a file, given by filename, into a byte array.
-//   * @param filename filename
-//   * @return file content
-//   * @throws IOException on any exception thrown
-//   */
-//  public static byte[] readFile(String filename) throws IOException {
-//    BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
-//    byte[] content = StreamUtils.readStream(in);
-//    in.close();
-//    return content;
-//  }
-//  /**
-//   * Reads a file, given by filename, into a String.
-//   * @param filename filename
-//   * @param encoding character encoding
-//   * @return file content
-//   * @throws IOException on any exception thrown
-//   */
-//  public static String readFile(String filename, String encoding) throws IOException {
-//    byte[] content = readFile(filename);
-//    return new String(content, encoding);
-//  }
+
   /**
    * Reads a file from a resource.
    * @param name resource name
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/FileUtils.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/FileUtils.java
new file mode 100644
index 000000000..8941ab4cf
--- /dev/null
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/FileUtils.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package test.at.gv.egovernment.moa.util;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import at.gv.egovernment.moa.util.StreamUtils;
+
+/**
+ * @author tlenz
+ *
+ */
+public class FileUtils extends at.gv.egovernment.moa.util.FileUtils {
+
+  /**
+  * Reads a file, given by URL, into a String.
+  * @param urlString file URL
+  * @param encoding character encoding
+  * @return file content
+  * @throws IOException on any exception thrown
+  */
+ public static String readURL(String urlString, String encoding) throws IOException {
+   byte[] content = readURL(urlString);
+   return new String(content, encoding);
+ }
+ /**
+  * Reads a file, given by filename, into a byte array.
+  * @param filename filename
+  * @return file content
+  * @throws IOException on any exception thrown
+  */
+ public static byte[] readFile(String filename) throws IOException {
+   BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
+   byte[] content = StreamUtils.readStream(in);
+   in.close();
+   return content;
+ }
+ /**
+  * Reads a file, given by filename, into a String.
+  * @param filename filename
+  * @param encoding character encoding
+  * @return file content
+  * @throws IOException on any exception thrown
+  */
+ public static String readFile(String filename, String encoding) throws IOException {
+   byte[] content = readFile(filename);
+   return new String(content, encoding);
+ }
+	
+}
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
index 2ded896d0..9196a8718 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
@@ -26,9 +26,7 @@ package test.at.gv.egovernment.moa.util;
 
 import java.net.URLEncoder;
 
-import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.URLDecoder;
-
 import junit.framework.TestCase;
 
 /*
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
index 5f72c8aad..d89e9f21f 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
@@ -24,7 +24,6 @@
 
 package test.at.gv.egovernment.moa.util;
 
-import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.URLDecoder;
 import at.gv.egovernment.moa.util.URLEncoder;
 import junit.framework.TestCase;