More experiments wit wicket serialization checkers

Evolveum · Jul 28, 2017 · 848f777 · 848f777
1 parent b4427eb
commit 848f777
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.java
@@ -29,8 +29,9 @@
  * @author lazyman
  */
 public class FocusSubwrapperDto<O extends ObjectType> implements Serializable {
+	private static final long serialVersionUID = 1L;
 
-    private ObjectWrapper<O> object;
+	private ObjectWrapper<O> object;
     private UserDtoStatus status;
 
     private boolean loadedOK = true;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -295,18 +295,18 @@ public void init() {
     }
 
     private void initializeDevelopmentSerializers() {
-    	JavaSerializer javaSerializer = new JavaSerializer( getApplicationKey() )
-    	{
-    	    @Override
-    	    protected ObjectOutputStream newObjectOutputStream(OutputStream out) throws IOException
-    	    {
-    	    	IObjectChecker checker1 = new MidPointObjectChecker();
-//    	        IObjectChecker checker2 = new NotDetachedModelChecker();
-    	        IObjectChecker checker3 = new ObjectSerializationChecker();
-    	        return new CheckingObjectOutputStream(out, checker1, checker3);
-    	    }
-    	};
-    	getFrameworkSettings().setSerializer( javaSerializer );
+//    	JavaSerializer javaSerializer = new JavaSerializer( getApplicationKey() ) {
+//    	    @Override
+//    	    protected ObjectOutputStream newObjectOutputStream(OutputStream out) throws IOException {
+//    	    	LOGGER.info("XXXXXXX YX Y");
+////    	    	IObjectChecker checker1 = new MidPointObjectChecker();
+//////    	        IObjectChecker checker2 = new NotDetachedModelChecker();
+////    	        IObjectChecker checker3 = new ObjectSerializationChecker();
+////    	        return new CheckingObjectOutputStream(out, checker1, checker3);
+//    	        return new ObjectOutputStream(out);
+//    	    }
+//    	};
+//    	getFrameworkSettings().setSerializer( javaSerializer );
 
 	}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointObjectChecker.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointObjectChecker.java
@@ -67,9 +67,9 @@ public Result check(Object object) {
 		} else if (object instanceof Document) {
 			return new Result( Result.Status.FAILURE, "Storage of DOM documents not allowed: "+object);
 //			LOGGER.warn("Attempt to serialize DOM element: {}", DOMUtil.getQName((Element)object));
-		} else if (object instanceof Element) {
-			return new Result( Result.Status.FAILURE, "Storage of DOM elements not allowed: "+object);
-//			LOGGER.warn("Attempt to serialize DOM element: {}", DOMUtil.getQName((Element)object));
+//		} else if (object instanceof Element) {
+//			return new Result( Result.Status.FAILURE, "Storage of DOM elements not allowed: "+object);
+////			LOGGER.warn("Attempt to serialize DOM element: {}", DOMUtil.getQName((Element)object));
 
 		// JAXBElement: expression evaluator in expressions, it is JAXBElement even in prism objects
 //		} else if (object instanceof JAXBElement) {
@@ -84,10 +84,10 @@ public Result check(Object object) {
 
 	private <O extends ObjectType> Result checkObject(PrismObject<O> object) {
 
-		LOGGER.info("Serializing prism object: {}", object);
-		if (object.canRepresent(ResourceType.class)) {
-			return new Result( Result.Status.FAILURE, "Storage of ResourceType objects not allowed: "+object);
-		}
+		LOGGER.info("Check for serialization of prism object: {}", object);
+//		if (object.canRepresent(ResourceType.class)) {
+//			return new Result( Result.Status.FAILURE, "Storage of ResourceType objects not allowed: "+object);
+//		}
 
 		return Result.SUCCESS;
 	}

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java
@@ -16,6 +16,8 @@
 
 package com.evolveum.midpoint.prism;
 
+import java.io.Serializable;
+
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.util.CloneUtil;
@@ -24,8 +26,9 @@
 /**
  * @author mederly
  */
-public class ExpressionWrapper implements Cloneable {
-
+public class ExpressionWrapper implements Cloneable, Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private QName elementName;
     private Object expression;