Changeset 152

Timestamp:

06/23/11 14:36:55 (12 years ago)

Author:

bowman

Message:

Fixed csp-connect bug where profiles removed from a user were still available to the client proxy as long as the locally cached service state remained (and no removal from that state ever occured, short of a manual reset).

Location:

trunk/src/com/bowman/cardserv

Files:

• cws/CspCwsConnector.java (modified) (4 diffs)
• session/AbstractSession.java (modified) (3 diffs)

trunk/src/com/bowman/cardserv/cws/CspCwsConnector.java

@@ -150 +150 @@
   }
 
-  private void handleStatusUpdate(CspNetMessage msg, boolean full) throws IOException {
+  private void handleStatusUpdate(CspNetMessage msg, boolean full, boolean initial) throws IOException {
     // notify service mappers
     if(!msg.isEmpty()) {
@@ -158 +158 @@
         updates = msg.getStatusUpdatesForKey(key);
         if(updates != null) reportRemoteState(key, updates, full);
+      }
+      if(initial) { // remove profiles no longer available from the state before saving
+        for(Iterator iter = receivedState.keySet().iterator(); iter.hasNext(); ) {
+          key = (CspNetMessage.ProfileKey)iter.next();
+          if(!keys.contains(key)) {
+            iter.remove();
+            logger.warning("Profile no longer available: " + key);
+            CaProfile profile = config.getProfileById(key.onid, key.caid);
+            if(profile != null) { // remove local service mappings if removed remote profile had a corresponding local one
+              connManager.reportMultiStatus(this, profile, new ServiceMapping[0], true, false); // clear candecode
+              connManager.reportMultiStatus(this, profile, new ServiceMapping[0], false, false); // clear cannotdecode
+            }
+          }
+        }
       }
       saveRemoteState();
@@ -272 +286 @@
       } else {
         remoteProxyId = msg.getOriginId();
-        handleStatusUpdate(msg, true);
+        handleStatusUpdate(msg, true, true);
 
         if(remoteProxyId == config.getProxyOriginId()) {
@@ -308 +322 @@
                 break;
               case CspNetMessage.TYPE_FULLSTATE:
-                handleStatusUpdate(msg, true);
+                handleStatusUpdate(msg, true, false);
                 break;
               case CspNetMessage.TYPE_INCRSTATE:
-                handleStatusUpdate(msg, false);
+                handleStatusUpdate(msg, false, false);
                 break;
               case CspNetMessage.TYPE_STATEACK:

trunk/src/com/bowman/cardserv/session/AbstractSession.java

@@ -26 +26 @@
   boolean userDebug;
 
-  Set allowedConnectors, mappedProfiles;
+  Set allowedConnectors, mappedProfiles, allowedProfiles = new HashSet();
   Map allowedServices, blockedServices;
   int allowedRate;
@@ -141 +141 @@
     allowedConnectors = um.getAllowedConnectors(user);
     allowedRate = um.getAllowedEcmRate(user);
+    allowedProfiles = um.getAllowedProfiles(user);
     if(allowedRate != -1) allowedRate = allowedRate * 1000;
     if(um.isAdmin(user)) maxPending = 30;
@@ -188 +189 @@
 
       if(interval < 60000) avgList.addRecord(now, (int)interval); // avoid extreme entries after standby/idletime
+
+      if(!allowedProfiles.isEmpty())
+        if(!allowedProfiles.contains(profileName)) {
+          msg.setFilteredBy("Profile not allowed: " + profileName);
+          return false;
+        }
 
       Set services;