src/python/dm/ds_web_service/service/impl/pathTracker.py

+#!/usr/bin/env python
+
+from dm.common.utility.objectTracker import ObjectTracker
+
+class PathTracker(ObjectTracker):
+
+    # Cache configuration
+    pass
+
+####################################################################
+# Testing
+
+if __name__ == '__main__':
+    et = PathTracker.getInstance()
+    print et
+    et2 = PathTracker.getInstance()
+    print et2
+    et.put('xyz', 1)
+    print et.get('xyz')
+    print et.get('xyz2')
+
+
+

src/python/dm/ds_web_service/service/impl/userInfoSessionControllerImpl.py

+#!/usr/bin/env python
+
+#
+# Implementation for user info controller.
+#
+
+from dm.common.objects.dmObject import DmObject
+from dm.common.objects.dmObjectManager import DmObjectManager
+from dm.common.db.api.userDbApi import UserDbApi
+from dm.ds_web_service.service.impl.experimentManager import ExperimentManager
+
+class UserInfoSessionControllerImpl(DmObjectManager):
+    """ User info controller implementation class. """
+
+    def __init__(self):
+        DmObjectManager.__init__(self)
+        self.userDbApi = UserDbApi()
+
+    def getUsers(self):
+        return self.userDbApi.getUsers()
+
+    def getUserById(self, id):
+        return self.userDbApi.getUserById(id)
+
+    def getUserByUsername(self, username):
+        return self.userDbApi.getUserByUsername(username)
+
+    def addUser(self, username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate):
+        userInfo = self.userDbApi.addUser(username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate)
+        return userInfo
+
+    def updateUser(self, id, username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate):
+        userInfo = self.userDbApi.updateUser(id, username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate)
+        return userInfo
+
+    def addUserExperimentRole(self, username, experimentName, roleName):
+        userInfo = self.userDbApi.addUserExperimentRole(username, experimentName, roleName)
+        ExperimentManager.getInstance().addUserToGroup(username, experimentName)
+        return userInfo
+
+    def deleteUserExperimentRole(self, username, experimentName, roleName):
+        userInfo = self.userDbApi.deleteUserExperimentRole(username, experimentName, roleName)
+        ExperimentManager.getInstance().deleteUserFromGroup(username, experimentName)
+        return userInfo
+

src/python/dm/ds_web_service/service/userInfoSessionController.py

+#!/usr/bin/env python
+
+import cherrypy
+
+from dm.common.utility.encoder import Encoder
+from dm.common.service.dmSessionController import DmSessionController
+from dm.ds_web_service.service.impl.userInfoSessionControllerImpl import UserInfoSessionControllerImpl
+
+class UserInfoSessionController(DmSessionController):
+
+    def __init__(self):
+        DmSessionController.__init__(self)
+        self.userInfoSessionControllerImpl = UserInfoSessionControllerImpl()
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def getUsers(self, **kwargs):
+        return self.listToJson(self.userInfoSessionControllerImpl.getUsers())
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def getUserById(self, id, **kwargs):
+        if not id:
+            raise InvalidRequest('Invalid id provided.')
+        response = self.userInfoSessionControllerImpl.getUserById(id).getFullJsonRep()
+        self.logger.debug('Returning user info for %s: %s' % (id,response))
+        return response
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def getUserByUsername(self, username, **kwargs):
+        if not len(username):
+            raise InvalidRequest('Invalid username provided.')
+        response = self.userInfoSessionControllerImpl.getUserByUsername(username).getFullJsonRep()
+        self.logger.debug('Returning user info for %s: %s' % (username,response))
+        return response
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def addUser(self, **kwargs):
+        username = kwargs.get('username')
+        if not username:
+            raise InvalidRequest('Invalid username provided.')
+        firstName = kwargs.get('firstName')
+        if not firstName:
+            raise InvalidRequest('Invalid first name provided.')
+        firstName = Encoder.decode(firstName)
+        lastName = kwargs.get('lastName')
+        if not lastName:
+            raise InvalidRequest('Invalid last name provided.')
+        lastName = Encoder.decode(lastName)
+        middleName = Encoder.decode(kwargs.get('middleName'))
+        email = Encoder.decode(kwargs.get('email'))
+        badge = Encoder.decode(kwargs.get('badge'))
+        globusUsername = Encoder.decode(kwargs.get('globusUsername'))
+        description = Encoder.decode(kwargs.get('description'))
+        password = Encoder.decode(kwargs.get('password'))
+        isLocalUser = kwargs.get('isLocalUser')
+        lastUpdate = Encoder.decode(kwargs.get('lastUpdate'))
+
+        response = self.userInfoSessionControllerImpl.addUser(username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate).getFullJsonRep()
+        return response
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def updateUser(self, id, **kwargs):
+        if not id:
+            raise InvalidRequest('Invalid user id provided.')
+        username = kwargs.get('username')
+        firstName = Encoder.decode(kwargs.get('firstName'))
+        lastName = Encoder.decode(kwargs.get('lastName'))
+        middleName = Encoder.decode(kwargs.get('middleName'))
+        email = Encoder.decode(kwargs.get('email'))
+        badge = Encoder.decode(kwargs.get('badge'))
+        globusUsername = Encoder.decode(kwargs.get('globusUsername'))
+        description = Encoder.decode(kwargs.get('description'))
+        password = Encoder.decode(kwargs.get('password'))
+        isLocalUser = kwargs.get('isLocalUser')
+        lastUpdate = Encoder.decode(kwargs.get('lastUpdate'))
+
+        response = self.userInfoSessionControllerImpl.updateUser(id, username, firstName, lastName, middleName, email, badge, globusUsername, description, password, isLocalUser, lastUpdate).getFullJsonRep()
+        return response
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def addUserExperimentRole(self, username, experimentName, roleName, **kwargs):
+        if not username:
+            raise InvalidRequest('Invalid username provided.')
+        if not experimentName:
+            raise InvalidRequest('Invalid experiment name provided.')
+        if not roleName:
+            raise InvalidRequest('Invalid role name provided.')
+        response = self.userInfoSessionControllerImpl.addUserExperimentRole(username, experimentName, roleName).getFullJsonRep()
+        return response
+
+    @cherrypy.expose
+    @DmSessionController.require(DmSessionController.isAdministrator())
+    @DmSessionController.execute
+    def deleteUserExperimentRole(self, username, experimentName, roleName, **kwargs):
+        if not username:
+            raise InvalidRequest('Invalid username provided.')
+        if not experimentName:
+            raise InvalidRequest('Invalid experiment name provided.')
+        if not roleName:
+            raise InvalidRequest('Invalid role name provided.')
+        response = self.userInfoSessionControllerImpl.deleteUserExperimentRole(username, experimentName, roleName).getFullJsonRep()
+        return response
+

src/python/dm/ds_web_service/service/userRouteDescriptor.py

+#!/usr/bin/env python
+
+#
+# User route descriptor.
+#
+
+from dm.common.utility.configurationManager import ConfigurationManager
+from userInfoSessionController import UserInfoSessionController
+
+class UserRouteDescriptor:
+
+    @classmethod
+    def getRoutes(cls):
+        contextRoot = ConfigurationManager.getInstance().getContextRoot()
+
+        # Static instances shared between different routes
+        userInfoSessionController = UserInfoSessionController()
+
+        # Define routes.
+        routes = [
+
+            # Get user info list
+            {
+                'name' : 'getUsers',
+                'path' : '%s/users' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'getUsers', 
+                'method' : ['GET']
+            },
+
+            # Get user by id
+            {
+                'name' : 'getUserById',
+                'path' : '%s/users/:(id)' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'getUserById', 
+                'method' : ['GET']
+            },
+
+            # Get user by username
+            {
+                'name' : 'getUserByUsername',
+                'path' : '%s/usersByUsername/:(username)' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'getUserByUsername', 
+                'method' : ['GET']
+            },
+
+            # Add user
+            {
+                'name' : 'addUser',
+                'path' : '%s/users' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'addUser',
+                'method' : ['POST']
+            },
+
+            # Update user
+            {
+                'name' : 'updateUser',
+                'path' : '%s/users/:(id)' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'updateUser',
+                'method' : ['PUT']
+            },
+
+            # Add user experiment role
+            {
+                'name' : 'addUserExperimentRole',
+                'path' : '%s/usersByExperiment/:(username)/:(experimentName)/:(roleName)' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'addUserExperimentRole',
+                'method' : ['POST']
+            },
+
+            # Delete user experiment role
+            {
+                'name' : 'deleteUserExperimentRole',
+                'path' : '%s/usersByExperiment/:(username)/:(experimentName)/:(roleName)' % contextRoot,
+                'controller' : userInfoSessionController,
+                'action' : 'deleteUserExperimentRole',
+                'method' : ['DELETE']
+            },
+
+        ]
+       
+        return routes
+
+

tools/make/RULES_DM

+all:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d $(ARCH); done
+
+dist:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d $(ARCH); done
+
+clean:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
+
+distclean:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done
+	for d in $(SUBDIRS); do rm -f `find $$d -name 'RELEASE.local'`; done
+
+tidy: distclean
+