commit 83949a1bd87ed6d3bf376c7e41415edccd30d770
author Jordan Halterman <jordan@onlab.us> Wed Jun 21 10:35:38 2017 -0700
committer Ray Milkey <ray@onlab.us> Thu Jun 22 19:49:52 2017 +0000
tree 6c7e2e973ed9225a6a3cd441899f47826f3cae19
parent 9b10bc2b1dd8258afa701d72f6d00667f9710d48

Limit string field lengths for network/configuration objects

Change-Id: Ic375854bb697ee21a8fd7b15fccd0b0878212869

core/api/src/main/java/org/onosproject/net/config/basics/BasicUiTopoLayoutConfig.java

diff --git a/core/api/src/main/java/org/onosproject/net/config/basics/BasicUiTopoLayoutConfig.java b/core/api/src/main/java/org/onosproject/net/config/basics/BasicUiTopoLayoutConfig.java
index 4091f4e..92533a3 100644
--- a/core/api/src/main/java/org/onosproject/net/config/basics/BasicUiTopoLayoutConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/config/basics/BasicUiTopoLayoutConfig.java
@@ -54,14 +54,23 @@
     private static final String E_GEOMAP_ALREADY_SET =
             "Can't set sprites when geomap is already set";
 
+    private static final int GEOMAP_MAX_LENGTH = 128;
+    private static final int SPRITES_MAX_LENGTH = 128;
+
     @Override
     public boolean isValid() {
         if (object.has(GEOMAP) && object.has(SPRITES)) {
             throw new InvalidFieldException(GEOMAP, E_GEOMAP_SPRITE);
         }
 
+        // Validate the region and parent
+        region();
+        parent();
+
         return hasOnlyFields(REGION, PARENT, GEOMAP, SPRITES, SCALE,
-                OFFSET_X, OFFSET_Y);
+                OFFSET_X, OFFSET_Y)
+                && isValidLength(GEOMAP, GEOMAP_MAX_LENGTH)
+                && isValidLength(SPRITES, SPRITES_MAX_LENGTH);
     }
 
     @Override