Merge pull request #105 from gombasg/deep_resource_protection

Resource protection should be deep, not shallow
quattor · Aug 4, 2016 · cabb3d0 · cabb3d0
2 parents 9bb8b60 + a5743f1
commit cabb3d0
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 23 deletions.
diff --git a/panc/src/main/java/org/quattor/pan/dml/data/HashResource.java b/panc/src/main/java/org/quattor/pan/dml/data/HashResource.java
@@ -209,7 +209,11 @@ public String toString() {
 
 	@Override
 	public Resource.Iterator iterator() {
-		return new HashResourceIterator(map);
+		return new HashResourceIterator(map, false);
+	}
+
+	public Resource.Iterator protectedIterator() {
+		return new HashResourceIterator(map, true);
 	}
 
 	private static class HashResourceIterator implements Resource.Iterator {
@@ -218,9 +222,12 @@ private static class HashResourceIterator implements Resource.Iterator {
 
 		private final Map<String, Element> backingHash;
 
-		public HashResourceIterator(Map<String, Element> backingHash) {
+		private final boolean isProtected;
+
+		public HashResourceIterator(Map<String, Element> backingHash, boolean isProtected) {
 			assert (backingHash != null);
 			this.backingHash = backingHash;
+			this.isProtected = isProtected;
 			iterator = backingHash.keySet().iterator();
 		}
 
@@ -244,6 +251,9 @@ public Resource.Entry next() {
 							MessageUtils.format(MSG_CONCURRENT_MODIFICATION),
 							null);
 				}
+				if (isProtected) {
+					value = value.protect();
+				}
 				entry = new HashResourceEntry(key, value);
 			} catch (NoSuchElementException nsee) {
 				throw new EvaluationException(

diff --git a/panc/src/main/java/org/quattor/pan/dml/data/ListResource.java b/panc/src/main/java/org/quattor/pan/dml/data/ListResource.java
@@ -202,7 +202,11 @@ public int size() {
 
 	@Override
 	public Resource.Iterator iterator() {
-		return new ListResourceIterator(list);
+		return new ListResourceIterator(list, false);
+	}
+
+	public Resource.Iterator protectedIterator() {
+		return new ListResourceIterator(list, true);
 	}
 
 	@Override
@@ -286,13 +290,16 @@ public String toString() {
 
 	private static class ListResourceIterator implements Resource.Iterator {
 
-        private final AtomicInteger index = new AtomicInteger(0);
+	private final AtomicInteger index = new AtomicInteger(0);
 
 		private final List<Element> backingList;
 
-		public ListResourceIterator(List<Element> backingList) {
+		private final boolean isProtected;
+
+		public ListResourceIterator(List<Element> backingList, boolean isProtected) {
 			assert (backingList != null);
 			this.backingList = backingList;
+			this.isProtected = isProtected;
 		}
 
 		public void remove() {
@@ -306,10 +313,16 @@ public boolean hasNext() {
 
 		public Resource.Entry next() {
 			try {
-                int i = index.getAndIncrement();
+				int i = index.getAndIncrement();
+
+				Element value = backingList.get(i);
+				if (isProtected && value != null) {
+					value = value.protect();
+				}
+
 				Resource.Entry entry = new ListResourceEntry(LongProperty.getInstance(i),
-						backingList.get(i));
-                return entry;
+						value);
+				return entry;
 			} catch (NoSuchElementException nsee) {
 				throw new EvaluationException(MessageUtils
 						.format(MSG_CONCURRENT_MODIFICATION), null);

diff --git a/panc/src/main/java/org/quattor/pan/dml/data/ProtectedHashResource.java b/panc/src/main/java/org/quattor/pan/dml/data/ProtectedHashResource.java
@@ -26,7 +26,11 @@ public Element duplicate() {
 
 	@Override
 	public Element get(Term key) throws InvalidTermException {
-		return baseHash.get(key);
+		final Element value = baseHash.get(key);
+		if (value != null) {
+			return value.protect();
+		}
+		return value;
 	}
 
 	@Override
@@ -84,7 +88,12 @@ public String toString() {
 
 	@Override
 	public Resource.Iterator iterator() {
-		return baseHash.iterator();
+		return baseHash.protectedIterator();
+	}
+
+	@Override
+	public Resource.Iterator protectedIterator() {
+		return baseHash.protectedIterator();
 	}
 
 	@Override

diff --git a/panc/src/main/java/org/quattor/pan/dml/data/ProtectedListResource.java b/panc/src/main/java/org/quattor/pan/dml/data/ProtectedListResource.java
@@ -25,7 +25,11 @@ public Element duplicate() {
 
 	@Override
 	public Element get(Term key) throws InvalidTermException {
-		return baseList.get(key);
+		final Element value = baseList.get(key);
+		if (value != null) {
+			return value.protect();
+		}
+		return value;
 	}
 
 	@Override
@@ -38,14 +42,29 @@ public Element put(int index, Element newValue) {
 		throw CompilerError.create(MSG_ILLEGAL_WRITE_TO_PROTECTED_LIST);
 	}
 
+	@Override
+	public void append(Element e) {
+		throw CompilerError.create(MSG_ILLEGAL_WRITE_TO_PROTECTED_LIST);
+	}
+
+	@Override
+	public void prepend(Element e) {
+		throw CompilerError.create(MSG_ILLEGAL_WRITE_TO_PROTECTED_LIST);
+	}
+
 	@Override
 	public int size() {
 		return baseList.size();
 	}
 
 	@Override
 	public Resource.Iterator iterator() {
-		return baseList.iterator();
+		return baseList.protectedIterator();
+	}
+
+	@Override
+	public Resource.Iterator protectedIterator() {
+		return baseList.protectedIterator();
 	}
 
 	@Override

diff --git a/panc/src/main/java/org/quattor/pan/parser/ASTBaseTypeSpec.java b/panc/src/main/java/org/quattor/pan/parser/ASTBaseTypeSpec.java
@@ -25,9 +25,9 @@ Centre National de la Recherche Scientifique (CNRS).
 public class ASTBaseTypeSpec extends SimpleNode {
 
 	private Range range = null;
-	
+
 	private boolean extensible = false;
-	
+
 	private String identifier = null;
 
 	public ASTBaseTypeSpec(int id) {
@@ -45,19 +45,19 @@ public void setExtensible(boolean extensible) {
 	public boolean isExtensible() {
 		return extensible;
 	}
-	
+
 	public void setIdentifier(String identifier) {
 		this.identifier = identifier;
 	}
-	
+
 	public String getIdentifier() {
 		return identifier;
 	}
-	
+
 	public void setRange(Range range) {
 		this.range = range;
 	}
-	
+
 	public Range getRange() {
 		return range;
 	}

diff --git a/panc/src/main/java/org/quattor/pan/parser/ASTFunction.java b/panc/src/main/java/org/quattor/pan/parser/ASTFunction.java
@@ -32,11 +32,11 @@ public ASTFunction(int id) {
 	public ASTFunction(PanParser p, int id) {
 		super(p, id);
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}

diff --git a/panc/src/main/java/org/quattor/pan/template/BuildContext.java b/panc/src/main/java/org/quattor/pan/template/BuildContext.java
@@ -459,7 +459,7 @@ public void setObjectAndLoadpath() {
 		setGlobalVariable("OBJECT", sname, true);
 		setGlobalVariable("LOADPATH", new ListResource(), false);
 	}
-	
+
 	public String getObjectName() {
 		return (objectTemplate != null) ? objectTemplate.name : "unknown";
 	}

diff --git a/panc/src/main/java/org/quattor/pan/template/Context.java b/panc/src/main/java/org/quattor/pan/template/Context.java
@@ -133,7 +133,7 @@ public interface Context {
 	 * Set the name of the object template. Define the necessary variables.
 	 */
 	public void setObjectAndLoadpath();
-	
+
 	/**
 	 * Get the name of the object template.
 	 */

diff --git a/panc/src/main/java/org/quattor/pan/type/FullType.java b/panc/src/main/java/org/quattor/pan/type/FullType.java
@@ -65,7 +65,11 @@ public FullType(String source, SourceRange sourceRange, BaseType baseType,
 		assert (baseType != null);
 
 		this.baseType = baseType;
-		this.defaultValue = defaultValue;
+		if (defaultValue != null) {
+			this.defaultValue = defaultValue.protect();
+		} else {
+			this.defaultValue = null;
+		}
 		this.dml = dml;
 	}
 

diff --git a/panc/src/test/pan/Functionality/global/global6.tpl b/panc/src/test/pan/Functionality/global/global6.tpl
@@ -0,0 +1,17 @@
+#
+# see if globals can be modified indirectly via iterators in dml
+#
+# @expect="/nlist[@name='profile']/list[@name='data']/*[1]/string[@name='a']='OK'"
+#
+object template global6;
+
+variable GLOBAL = list(nlist("a", "OK"));
+
+variable GLOBAL = {
+    foreach (idx; item; GLOBAL) {
+        item["a"] = "BAD";
+    };
+    SELF;
+};
+
+"/data" = GLOBAL;
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,7 @@ public interface Context { @@
     	 * Set the name of the object template. Define the necessary variables.
     	 */
     	public void setObjectAndLoadpath();
     	/**
     	 * Get the name of the object template.
     	 */
@@ Expand Down @@