You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2014/06/24 17:19:30 UTC

svn commit: r1605108 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java

Author: challngr
Date: Tue Jun 24 15:19:30 2014
New Revision: 1605108

URL: http://svn.apache.org/r1605108
Log:
UIMA-3904 Authenticate / authorize VaryOn and VaryOff.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java?rev=1605108&r1=1605107&r2=1605108&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java Tue Jun 24 15:19:30 2014
@@ -245,7 +245,7 @@ public abstract class AbstractDuccCompon
     /**
      * Is the event apparently issue by a DUCC registered admin or not?
      */
-    private boolean validateAdministrator(DuccAdminEvent event)
+    public boolean validateAdministrator(DuccAdminEvent event)
     {
     	String methodName = "validate_user";
                 

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1605108&r1=1605107&r2=1605108&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java Tue Jun 24 15:19:30 2014
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.uima.ducc.common.admin.event.DuccAdminEvent;
 import org.apache.uima.ducc.common.admin.event.RmAdminQLoad;
 import org.apache.uima.ducc.common.admin.event.RmAdminQOccupancy;
 import org.apache.uima.ducc.common.admin.event.RmAdminReply;
@@ -137,21 +138,35 @@ public class ResourceManagerComponent 
             logger.info(methodName, null, "Received Admin Message of Type:",  body.getClass().getName());
 
             RmAdminReply reply = null;
-            if (body instanceof RmAdminVaryOff) {
-             	RmAdminVaryOff vo = (RmAdminVaryOff) body;
-                reply = new RmAdminReply(scheduler.varyoff(vo.getNodes()));
-            } else
-            if (body instanceof RmAdminVaryOn) {
-            	RmAdminVaryOn vo = (RmAdminVaryOn) body;            	 
-                reply = new RmAdminReply(scheduler.varyon(vo.getNodes()));
-            } else
-            if (body instanceof RmAdminQLoad) {
-                reply = scheduler.queryLoad();
-            } else
-            if (body instanceof RmAdminQOccupancy) {
-                reply = scheduler.queryOccupancy();
+            if ( body instanceof DuccAdminEvent ) {
+                DuccAdminEvent dae = (DuccAdminEvent) body;
+                if (body instanceof RmAdminVaryOff) {
+                    if ( ! validateAdministrator(dae) ) {
+                        reply = new RmAdminReply("Not authorized");
+                    } else {
+                        RmAdminVaryOff vo = (RmAdminVaryOff) body;
+                        reply = new RmAdminReply(scheduler.varyoff(vo.getNodes()));
+                    }
+                } else
+                if (body instanceof RmAdminVaryOn) {
+                    if ( ! validateAdministrator(dae) ) {
+                        reply = new RmAdminReply("Not authorized");
+                    } else {
+                        RmAdminVaryOn vo = (RmAdminVaryOn) body;            	 
+                        reply = new RmAdminReply(scheduler.varyon(vo.getNodes()));
+                    }
+                } else
+                if (body instanceof RmAdminQLoad) {
+                    // not priveleged
+                    reply = scheduler.queryLoad();
+                } else
+                if (body instanceof RmAdminQOccupancy) {
+                    // not priveleged
+                    reply = scheduler.queryOccupancy();
+                }
+            } else {
+                reply = new RmAdminReply("Unrecognized RM admin request.");
             }
-
             exchange.getIn().setBody(reply);
         }
     }