Changeset 5043

Timestamp:

Aug 11, 2009, 1:02:08 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1355: Add "client application" for internal use

Location:

trunk/src/core/net/sf/basedb/core

Files:

• Application.java (modified) (2 diffs)
• Install.java (modified) (1 diff)
• InternalJobQueue.java (modified) (1 diff)
• InternalStorageController.java (modified) (1 diff)
• SessionControl.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/Application.java

@@ -25 +25 @@
 package net.sf.basedb.core;
 
-import net.sf.basedb.core.data.ClientData;
 import net.sf.basedb.core.data.SchemaVersionData;
 import net.sf.basedb.core.hibernate.JdbcWork;
@@ -937 +936 @@
     }
 
-    int clientId = 0;
-    if (externalClientId != null)
-    {
-      org.hibernate.Session session = null;
-      org.hibernate.Transaction tx = null;
-      try
-      {
-        session = HibernateUtil.newSession();
-        tx = HibernateUtil.newTransaction(session);
-        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_CLIENT_FOR_EXTERNAL_ID");
-        /*
-          SELECT cli
-          FROM ClientData cli
-          WHERE cli.externalId = :externalId
-        */
-        query.setString("externalId", externalClientId);
-        ClientData clientData = HibernateUtil.loadData(ClientData.class, query);
-        if (clientData == null)
-        {
-          throw new ItemNotFoundException("Client[externalId="+externalClientId+"]");
-        }
-        clientId = clientData.getId();
-      }
-      finally
-      {
-        if (tx != null) HibernateUtil.commit(tx);
-        if (session != null) HibernateUtil.close(session);
-      }
-    }
-
-    SessionControl sc = new SessionControl(sessionControlId, clientId, externalClientId, remoteId);
+    SessionControl sc = new SessionControl(sessionControlId, externalClientId, true, remoteId);
     sessionCache.put(sessionControlId, sc);
     return sc;

trunk/src/core/net/sf/basedb/core/Install.java

@@ -595 +595 @@
       createClient(rootUser, "net.sf.basedb.clients.migration", "Migration tool", "This client is used to migrate BASE 1.2.x data to BASE 2", null);
       createClient(rootUser, "net.sf.basedb.clients.jobagent", "Job agent client", "This client is used by all job agents", keyJobAgentUse);
+      createClient(rootUser, "net.sf.basedb.clients.internal", "Internal", 
+        "This client is used by the internal processes such as the job queue and secondary " +
+        "storage controller. Do not remove!", keyEveryoneRead);
   
       // Plugins

trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -277 +277 @@
     runnersGroup.setDaemon(false);
     runnersGroup.setMaxPriority(Config.getInt("jobqueue.internal.maxthreadpriority", Thread.NORM_PRIORITY - 1));
-    sc = new SessionControl(null, 0, null, null);
+    sc = new SessionControl(null, "net.sf.basedb.clients.internal", false, Application.getHostName());
     sc.login(new JobQueueKeyring());
   }

trunk/src/core/net/sf/basedb/core/InternalStorageController.java

@@ -122 +122 @@
       throw new BaseException("Path not found: " + settings);
     }
-    sc = new SessionControl(null, 0, null, null);
+    sc = new SessionControl(null, "net.sf.basedb.clients.internal", false, Application.getHostName());
     sc.login(new StorageKeyring());
     log.info("InternalStorageController has been initialised");

trunk/src/core/net/sf/basedb/core/SessionControl.java

@@ -166 +166 @@
     Creates a new <code>SessionControl</code> object.
     @param id The id used in {@link Application#newSessionControl(String,String,String)}
-    @param clientId The id of the client application
+    @param externalClientId Optional external ID of the client application in use
+    @param failIfNoClient If TRUE, an exception is thrown if an external client id
+      has been specified, but not found
     @param remoteId For example, the IP-address
   */
-  SessionControl(String id, int clientId, String externalClientId, String remoteId)
+  SessionControl(String id, String externalClientId, boolean failIfNoClient, String remoteId)
     throws BaseException
   {
     this.id = id;
-    this.clientId = clientId;
     this.externalClientId = externalClientId;
     this.remoteId = remoteId;
     this.dbControlCache = Collections.synchronizedMap(new WeakHashMap<DbControl,String>());
     this.currentContexts = Collections.synchronizedMap(new HashMap<ContextKey, ItemContext>());
-    if (clientId != 0)
-    {
-      // load default settings for client application
+    int tempClientId = 0;
+    if (externalClientId != null)
+    {
       org.hibernate.Session session = null;
       org.hibernate.Transaction tx = null;
@@ -187 +188 @@
         session = HibernateUtil.newSession();
         tx = HibernateUtil.newTransaction(session);
-        clientDefaultSettings = loadClientDefaultSettings(session, clientId);
+        
+        // Find the internal client id for the given external id
+        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_CLIENT_FOR_EXTERNAL_ID");
+        /*
+          SELECT cli
+          FROM ClientData cli
+          WHERE cli.externalId = :externalId
+        */
+        query.setString("externalId", externalClientId);
+        ClientData clientData = HibernateUtil.loadData(ClientData.class, query);
+        if (clientData != null)
+        {
+          tempClientId = clientData.getId();
+          // load default settings for client application
+          clientDefaultSettings = loadClientDefaultSettings(session, tempClientId);
+        }
+        else if (failIfNoClient)
+        {
+          throw new ItemNotFoundException("Client[externalId="+externalClientId+"]");
+        }
       }
       finally
@@ -195 +215 @@
       }
     }
+    this.clientId = tempClientId;
     updateLastAccess();
   }
@@ -620 +641 @@
     // If a client has been specified - check for USE permission
     ClientData clientData = null;
-    if (getClientId() != 0 && !impersonated) 
+    if (getClientId() != 0) 
     {
       clientData = HibernateUtil.loadData(session, ClientData.class, getClientId());
-      int permissions = li.keyring.getAllPermissions(
-        Item.CLIENT, clientData.getOwner(), clientData.getItemKey(), clientData.getProjectKey()
-        );
-      if (!Permission.hasPermission(permissions, Permission.USE))
-      {
-        throw new PermissionDeniedException(Permission.USE, "Client[externalId="+clientData.getExternalId()+"]");
+      if (!impersonated)
+      {
+        int permissions = li.keyring.getAllPermissions(
+          Item.CLIENT, clientData.getOwner(), clientData.getItemKey(), clientData.getProjectKey()
+          );
+        if (!Permission.hasPermission(permissions, Permission.USE))
+        {
+          throw new PermissionDeniedException(Permission.USE, "Client[externalId="+clientData.getExternalId()+"]");
+        }
       }
     }