Adding permission checks for Java; fixing type translations for return and parameter...

diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java
index 94029cad39c9e16d5040fef0578123b142466d52..90734e3f5dde470427cbd19757be160c3be9086a 100644 (file)
--- a/iotjava/iotpolicy/IoTCompiler.java
+++ b/iotjava/iotpolicy/IoTCompiler.java
@@ -302,7 +302,8 @@ public class IoTCompiler {
                // Generate array of parameter types
                print("Class<?>[] paramCls = new Class<?>[] { ");
                for (int i = 0; i < methParams.size(); i++) {
-                       print(getSimpleType(methPrmTypes.get(i)) + ".class");
+                       String paramType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i));
+                       print(getSimpleType(paramType) + ".class");
                        // Check if this is the last element (don't print a comma)
                        if (i != methParams.size() - 1) {
                                print(", ");
@@ -556,7 +557,8 @@ public class IoTCompiler {
                // Generate array of parameter types
                print("string paramCls[] = { ");
                for (int i = 0; i < methParams.size(); i++) {
-                       print("\"" + checkAndGetCplusType(methPrmTypes.get(i)) + "\"");
+                       String paramType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i));
+                       print("\"" + getSimpleType(paramType) + "\"");
                        // Check if this is the last element (don't print a comma)
                        if (i != methParams.size() - 1) {
                                print(", ");
@@ -1101,6 +1103,22 @@ public class IoTCompiler {
        }
 
 
+       // Detect array declaration, e.g. int A[],
+       //              then generate type "int[]"
+       private String checkAndGetArray(String paramType, String param) {
+
+               String paramTypeRet = null;
+               // Check for array declaration
+               if (param.contains("[]")) {
+                       paramTypeRet = paramType + "[]";
+               } else
+                       // Just return it as is if it's not an array
+                       paramTypeRet = paramType;
+
+               return paramTypeRet;
+       }
+
+
        // Get simple types, e.g. HashSet for HashSet<...>
        // Basically strip off the "<...>"
        private String checkAndGetParamClass(String paramType, boolean needPtr) {

diff --git a/iotjava/iotrmi/Java/IoTRMIObject.java b/iotjava/iotrmi/Java/IoTRMIObject.java
index 90e5b548f558890f6ad4b72d9c75d8a026e59704..6f52228bb0d021b72c02a69582e03997b65f0e07 100644 (file)
--- a/iotjava/iotrmi/Java/IoTRMIObject.java
+++ b/iotjava/iotrmi/Java/IoTRMIObject.java
@@ -114,6 +114,22 @@ public class IoTRMIObject {
        }
 
 
+       /**
+        * static version of getMethodId()
+        */
+       public static int getMethodId(byte[] methodBytes) {
+
+               // Get method Id bytes
+               byte[] methodIdBytes = new byte[IoTRMIUtil.METHOD_ID_LEN];
+               // Method Id is positioned after object Id in the byte array
+               System.arraycopy(methodBytes, IoTRMIUtil.OBJECT_ID_LEN, methodIdBytes, 0, IoTRMIUtil.METHOD_ID_LEN);
+               // Get method Id
+               int methodId = IoTRMIUtil.byteArrayToInt(methodIdBytes);
+               // Get method Id
+               return methodId;
+       }
+
+
        /**
         * getMethodParams() gets method params based on byte array received
         * <p>

diff --git a/iotjava/iotrmi/Java/sample/CallBack_CBSkeleton.java b/iotjava/iotrmi/Java/sample/CallBack_CBSkeleton.java
index 0e01eba2619aac8d3f2a37f9c9be46a90324fd6b..7eaf1ff555e08bd68d105b916d5022725b9d28b4 100644 (file)
--- a/iotjava/iotrmi/Java/sample/CallBack_CBSkeleton.java
+++ b/iotjava/iotrmi/Java/sample/CallBack_CBSkeleton.java
@@ -8,11 +8,6 @@ import iotrmi.Java.IoTRMIObject;
 public class CallBack_CBSkeleton implements CallBackInterface {
 
        private int objectId = 0;       // Default value is 0
-       private final static String[] methodSignatures = {
-
-               "intprintInt()",
-               "voidsetInt(int)"
-       };
        private CallBackInterface cb;
 
 
@@ -65,13 +60,6 @@ public class CallBack_CBSkeleton implements CallBackInterface {
        }
 
 
-       // Return method signatures
-       public static String[] getMethodSignatures() {
-
-               return methodSignatures;
-       }
-
-
        public static void main(String[] args) throws Exception {
 
        }

diff --git a/iotjava/iotrmi/Java/sample/CallBack_CBStub.java b/iotjava/iotrmi/Java/sample/CallBack_CBStub.java
index 1278d6ec7f99ec9a79c5403736707b73d2fafddc..f43877822a4ff00ed358e3088bb3c517735717e6 100644 (file)
--- a/iotjava/iotrmi/Java/sample/CallBack_CBStub.java
+++ b/iotjava/iotrmi/Java/sample/CallBack_CBStub.java
@@ -11,11 +11,6 @@ public class CallBack_CBStub implements CallBackInterface {
        private IoTRMICall rmiCall;
 
        private int objectId = 0;       // Default value is 0
-       private final static String[] methodSignatures = {
-
-               "intprintInt()",
-               "voidsetInt(int)"
-       };
 
        /**
         * Constructors
@@ -27,13 +22,6 @@ public class CallBack_CBStub implements CallBackInterface {
        }
 
 
-       // Return method signatures
-       public static String[] getMethodSignatures() {
-
-               return methodSignatures;
-       }
-
-
        public int printInt() {
 
                int methodId = 0;

diff --git a/iotjava/iotrmi/Java/sample/TestClass_Skeleton.java b/iotjava/iotrmi/Java/sample/TestClass_Skeleton.java
index c16b1241a32ba7e03644bcbdbdbd2eacb0e579a5..5958f1f347aa60691bc311ff1a82905ee747a050 100644 (file)
--- a/iotjava/iotrmi/Java/sample/TestClass_Skeleton.java
+++ b/iotjava/iotrmi/Java/sample/TestClass_Skeleton.java
@@ -6,6 +6,10 @@ import java.util.Set;
 import java.util.Map;
 import java.util.HashMap;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+
 import iotrmi.Java.IoTRMIObject;
 import iotrmi.Java.IoTRMICall;
 
@@ -14,7 +18,6 @@ public class TestClass_Skeleton implements TestClassInterface {
        /**
         * Class Constants
         */
-       private int objectId = 0;       // Default value is 0
        private static int objIdCnt = 0; // Counter for callback object Ids
        private TestClassInterface tc;
        private int port;
@@ -22,6 +25,11 @@ public class TestClass_Skeleton implements TestClassInterface {
        private IoTRMICall rmiCall;
        private CallBackInterface cbstub;
 
+       // Object permission
+       private int object0Id = 0;
+       private static Integer[] object0Permission = { 0, 1, 2, 3, 4, 5 };
+       private List<Integer> set0Allowed;
+
 
        /**
         * Constructors
@@ -33,6 +41,7 @@ public class TestClass_Skeleton implements TestClassInterface {
                tc = _tc;
                port = _port;
                rmiObj = new IoTRMIObject(_port);
+               set0Allowed = Arrays.asList(object0Permission);
                ___waitRequestInvokeMethod();
        }
 
@@ -290,30 +299,39 @@ public class TestClass_Skeleton implements TestClassInterface {
 
                        rmiObj.getMethodBytes();
                        int _objectId = rmiObj.getObjectId();
-                       if (_objectId == objectId) {
+                       int methodId = rmiObj.getMethodId();
+                       if (_objectId == object0Id) {
                        // Multiplex based on object Id
-                               int methodId = rmiObj.getMethodId();
-                               switch (methodId) {
+                               // Complain if the method is not allowed
+                               if (!set0Allowed.contains(methodId))
+                                       throw new Error("TestClass_Skeleton: This object is not allowed to access method " + methodId);
+                       // If we have more than 1 object Id...
+                       //else if (_objectId == object1Id) {
+
+                       } else
+                               throw new Error("TestClass_Skeleton: Unrecognizable object Id: " + _objectId);
 
-                                       case 0: ___setA(); break;
-                                       case 1: ___setB(); break;
-                                       case 2: ___setC(); break;
-                                       case 3: ___sumArray(); break;
-                                       case 4: ___setAndGetA(); break;
-                                       case 5: ___setACAndGetA(); break;
-                                       case 6: ___callBack(); break; 
-                                       case 7: ___registerCallback(); break;
-                                       case 8: ____registerCallback(); break;
-                                       // Special option to register callback
-                                       case 9: ___regCB(); break;
-                                       // Struct handling (3 is the size of the struct)
-                                       case 10: ___handleStruct(structSize1); break;
-                                       case 11: structSize1 = ___structSize(); break;
-                                       case 12: ___handleEnum(); break;
-                                       default:
-                                               throw new Error("Method Id not recognized!");
-                               }
+                       switch (methodId) {
+
+                               case 0: ___setA(); break;
+                               case 1: ___setB(); break;
+                               case 2: ___setC(); break;
+                               case 3: ___sumArray(); break;
+                               case 4: ___setAndGetA(); break;
+                               case 5: ___setACAndGetA(); break;
+                               case 6: ___callBack(); break; 
+                               case 7: ___registerCallback(); break;
+                               case 8: ____registerCallback(); break;
+                               // Special option to register callback
+                               case 9: ___regCB(); break;
+                               // Struct handling (3 is the size of the struct)
+                               case 10: ___handleStruct(structSize1); break;
+                               case 11: structSize1 = ___structSize(); break;
+                               case 12: ___handleEnum(); break;
+                               default:
+                                       throw new Error("Method Id not recognized!");
                        }
+
                }
        }
        

diff --git a/iotjava/iotrmi/Java/sample/TestClass_Stub.java b/iotjava/iotrmi/Java/sample/TestClass_Stub.java
index 9e2006d31f23ead3ad092c30a6614599510bdc02..bb6df9bb10759a78fca3d8febddc8540659ca294 100644 (file)
--- a/iotjava/iotrmi/Java/sample/TestClass_Stub.java
+++ b/iotjava/iotrmi/Java/sample/TestClass_Stub.java
@@ -24,7 +24,9 @@ public class TestClass_Stub implements TestClassInterface {
         * Class Constants
         */
        private int objectId = 0;       // Default value is 0
-
+       // This is permission system for callback objects
+       private static Integer[] object0Permission = { 0, 1 };  // object0 is the callback object
+       private List<Integer> set0Allowed;
 
        /**
         * Properties and constants for Callbacks!
@@ -43,6 +45,8 @@ public class TestClass_Stub implements TestClassInterface {
                ports = _ports;
                rmiCall = new IoTRMICall(_port, _address, _rev);
 
+               set0Allowed = Arrays.asList(object0Permission);
+
                // Only for callbacks!!!
                listCBObj = new ArrayList<CallBackInterface>();
                ___initCallBack();
@@ -69,6 +73,11 @@ public class TestClass_Stub implements TestClassInterface {
                                        Object retObj = null;
                                        while (true) {
                                                byte[] method = rmiObj.getMethodBytes();
+                                               // Permission checking
+                                               int methId = IoTRMIObject.getMethodId(method);
+                                               if (!set0Allowed.contains(methId))
+                                                       throw new Error("CallBack_CBSkeleton: This object is not allowed to access method " + methId);
+
                                                int objId = IoTRMIObject.getObjectId(method);
                                                CallBack_CBSkeleton skel = (CallBack_CBSkeleton) listCBObj.get(objId);
                                                if (skel != null) {