Changeset 173

Timestamp:

06/28/11 14:51:32 (12 years ago)

Author:

merek

Message:

Backport ecm-rate from branch

Location:

trunk

Files:

• changelog.txt (modified) (1 diff)
• config/proxy-reference.html (modified) (2 diffs)
• src/com/bowman/cardserv/SimpleUserManager.java (modified) (5 diffs)

trunk/changelog.txt

@@ -29 +29 @@
 - Added: DreamboxPlugin (csp-agent) support for more/older dm500 images. Basic (unsecured) file upload support.
 - Added: proxy-reference.html updated with highlighting for important elements and additional examples.
-- Added: Ability to set start and expiration date for user accounts.
+- Added: Ability to set start and expiration date for user accounts (only Simple and XmlUsermanager).
+- Added: Ability to set minimum interval between ecm's in seconds (ecm-rate).
 
 - Changes to proxy.xml:

trunk/config/proxy-reference.html

@@ -793 +793 @@
 
 <a name="user-manager/auth-config/user">
-<div class='indent'><strong>user-manager/auth-config/user (attributes: *name, *password, display-name, ip-mask, profiles, max-connections, admin, enabled, map-exclude, start-date, expiration-date, debug)</strong></div><br />
+<div class='indent'><strong>user-manager/auth-config/user (attributes: *name, *password, display-name, ip-mask, profiles, max-connections, admin, enabled, map-exclude, start-date, expiration-date, ecm-rate, debug)</strong></div><br />
 One user definition for the SimpleUserManager (also used by the XmlUserManager, see <strong>README.XmlUserManager.txt</strong> for more details):<br /><br />
 - <strong class='bold'>name</strong>: User name, avoid long names, spaces and special characters. There are no particular limitations as far as the proxy is concerned, but the camd clients may have them.<br />
@@ -805 +805 @@
 - <strong class='bold'>map-exclude</strong>: true/false (default: false). Set to true to prevent the user from causing changes to the service maps. If a particular user is sending bad ecms or is otherwise misbehaving, this will protect the service mappings and ensure no other users are affected. Only use this if you are sure a particular client is misbehaving, the service mapping can't work if no clients are allowed to update the map.<br />
 - <strong class='bold'>start-date</strong>: (dd-mm-yyyy) Start date for user account.<br />
+- <strong class='bold'>ecm-rate</strong>: Minimum interval between ecm's in seconds (disabled by default).<br />
 - <strong class='bold'>expiration-date</strong>: (dd-mm-yyyy) Expiration date for the user account.<br /> 
 - <strong class='bold'>debug</strong>: true/false (default: false). Set to true to enable ecm/emm/zap logging for this user only (has no effect if these are already enabled globally).<br />

trunk/src/com/bowman/cardserv/SimpleUserManager.java

@@ -80 +80 @@
     } catch (ConfigException e) {}
 
+    int EcmRate = -1;
+    try {
+      EcmRate = xml.getIntValue("ecm-rate");
+    } catch (ConfigException e) {}
+
     int maxConnections = xml.getIntValue("max-connections", -1);
 
@@ -88 +93 @@
 
     UserEntry user = new UserEntry(xml.getStringValue("name"), xml.getStringValue("password"), ipMask, emailAddr,
-        maxConnections, enabled, admin, exclude, startDate, expirationDate, debug);
+        maxConnections, enabled, admin, exclude, startDate, expirationDate, EcmRate, debug);
 
     try {
@@ -249 +254 @@
 
   public int getAllowedEcmRate(String user) {
-    return -1; // return minimum interval between ecm in seconds, -1 for no limit
+    UserEntry entry = getUser(user);
+    if(entry == null) return -1; // return minimum interval between ecm in seconds, -1 for no limit
+    else return entry.EcmRate;
   }
 
@@ -258 +265 @@
     String email, displayName;
     String startDate, expirationDate;
-    int maxConnections;
+    int maxConnections, EcmRate;
     boolean enabled, admin, exclude, debug;
     Set profiles = new HashSet();
 
     public UserEntry(String name, String password, String ipMask, String email, int maxConnections, boolean enabled,
-                     boolean admin, boolean exclude, String startDate, String expirationDate, boolean debug)
+                     boolean admin, boolean exclude, String startDate, String expirationDate, int EcmRate, boolean debug)
     {
       this.name = name;
@@ -276 +283 @@
       this.startDate = startDate;
       this.expirationDate = expirationDate;
+      this.EcmRate = EcmRate;
       this.debug = debug;
     }