Changeset 172

Timestamp:

06/28/11 14:41:38 (12 years ago)

Author:

merek

Message:

Backporting start and expiration date feature from branch

Location:

trunk

Files:

• changelog.txt (modified) (1 diff)
• config/proxy-reference.html (modified) (2 diffs)
• src/com/bowman/cardserv/SimpleUserManager.java (modified) (6 diffs)
• src/com/bowman/cardserv/interfaces/UserManager.java (modified) (1 diff)
• src/com/bowman/cardserv/rmi/RemoteHandler.java (modified) (2 diffs)
• src/com/bowman/cardserv/rmi/UserStatus.java (modified) (3 diffs)
• src/com/bowman/cardserv/session/NewcamdSession.java (modified) (4 diffs)
• src/com/bowman/cardserv/web/XmlHelper.java (modified) (1 diff)

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.
 
 - 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)</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, 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 />
@@ -804 +804 @@
 - <strong class='bold'>enabled</strong>: true/false (default: true). Allows disabling of accounts without deleting them.<br />
 - <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'>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 />
 <br />

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

@@ -70 +70 @@
     } catch (ConfigException e) {}
 
+    String startDate = null;
+    try {
+      startDate = xml.getStringValue("start-date");
+    } catch (ConfigException e) {}
+
+    String expirationDate = null;
+    try {
+      expirationDate = xml.getStringValue("expiration-date");
+    } catch (ConfigException e) {}
+
     int maxConnections = xml.getIntValue("max-connections", -1);
 
@@ -78 +88 @@
 
     UserEntry user = new UserEntry(xml.getStringValue("name"), xml.getStringValue("password"), ipMask, emailAddr,
-        maxConnections, enabled, admin, exclude, debug);
+        maxConnections, enabled, admin, exclude, startDate, expirationDate, debug);
 
     try {
@@ -164 +174 @@
   }
 
+  public String getStartDate(String user) {
+    UserEntry entry = getUser(user);
+    if(entry == null) return null;
+    else return entry.startDate;
+  }
+
+  public String getExpirationDate(String user) {
+    UserEntry entry = getUser(user);
+    if(entry == null) return null;
+    else return entry.expirationDate;
+  }
+
   public Set getAllowedProfiles(String user) {
     UserEntry entry = getUser(user);
@@ -235 +257 @@
     String ipMask;
     String email, displayName;
+    String startDate, expirationDate;
     int maxConnections;
     boolean enabled, admin, exclude, debug;
@@ -240 +263 @@
 
     public UserEntry(String name, String password, String ipMask, String email, int maxConnections, boolean enabled,
-                     boolean admin, boolean exclude, boolean debug)
+                     boolean admin, boolean exclude, String startDate, String expirationDate, boolean debug)
     {
       this.name = name;
@@ -251 +274 @@
       this.admin = admin;
       this.exclude = exclude;
+      this.startDate = startDate;
+      this.expirationDate = expirationDate;
       this.debug = debug;
     }

trunk/src/com/bowman/cardserv/interfaces/UserManager.java

@@ -34 +34 @@
   Set getAllowedConnectors(String user); // return Set of String, null for all
   int getAllowedEcmRate(String user); // return minimum interval between ecm in seconds, -1 for no limit
+  String getStartDate(String user);
+  String getExpirationDate(String user);
 
 }

trunk/src/com/bowman/cardserv/rmi/RemoteHandler.java

@@ -175 +175 @@
       } else {
         String displayName = session.isTempUser()?session.getLoginName():um.getDisplayName(name);
-        user = new UserStatus(name, displayName, um.getMaxConnections(name), false);
+        user = new UserStatus(name, displayName, um.getStartDate(name), um.getExpirationDate(name), um.getMaxConnections(name), false);
         user.addSession(session);
         users.put(name, user);
@@ -205 +205 @@
         if(user == null) {
           String displayName = session.isTempUser()?session.getLoginName():um.getDisplayName(userName);
-          user = new UserStatus(userName, displayName, um.getMaxConnections(userName), um.isAdmin(userName));
+          user = new UserStatus(userName, displayName, um.getStartDate(userName), um.getExpirationDate(userName), um.getMaxConnections(userName), um.isAdmin(userName));
         }
         user.addSession(session);

trunk/src/com/bowman/cardserv/rmi/UserStatus.java

@@ -17 +17 @@
   private static final long serialVersionUID = -4091190186183181716L;
 
-  private final String userName, displayName;
+  private final String userName, displayName, startDate, expirationDate;
   private final boolean admin;
   private final int maxSessions;
@@ -23 +23 @@
   private final List sessions = new ArrayList();
 
-  public UserStatus(String userName, String displayName, int maxSessions, boolean admin) {
+  public UserStatus(String userName, String displayName, String startDate, String expirationDate, int maxSessions, boolean admin) {
     this.userName = userName;
     this.displayName = displayName;
     this.admin = admin;
+    this.startDate = startDate;
+    this.expirationDate = expirationDate;
     this.maxSessions = maxSessions;
   }
@@ -40 +42 @@
   public boolean isAdmin() {
     return admin;
+  }
+
+  public String getStartDate() {
+    return startDate;
+  }
+
+  public String getExpirationDate() {
+    return expirationDate;
   }
 

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

@@ -9 +9 @@
 import java.net.*;
 import java.io.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -113 +116 @@
           } else if(checkProfile && !profiles.contains(getProfileName())) {
             loginFailure(user, "no access for profile: " + getProfileName(), msg);
+          } else if(checkAccountExpired(user, um) || checkAccountStarted(user, um)) {
+            loginFailure(user, "account has expired or has not reached start date yet", msg);
           } else { // successful login
 
@@ -189 +194 @@
             checksOk = checksOk && handleMessage(msg);
             fireCamdMessage(msg, false); // still need to notify the rest of the proxy about the bad message to give plugins and logging a chance to see it
+            if(checkAccountExpired(this.user, um)) {
+              logger.warning("'User '" + user + "' kicked, account has expired");
+              close();
+            }
             if(!checksOk) {
               setFlag(msg, 'B');
@@ -211 +220 @@
   protected boolean checkClientId(String id) {
     return true;
+  }
+
+  public boolean checkAccountStarted(String user, UserManager um) {
+    Date startedDateDt = null;
+    try {
+      String startedDateStr = um.getStartDate(user);
+      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
+      if (startedDateStr == null)
+        startedDateDt = null;
+      else
+        startedDateDt = df.parse(startedDateStr);
+    }
+    catch(ParseException ignored) {}
+    long currDateMs = System.currentTimeMillis();
+    long startedDateMs = 0;
+
+    if (startedDateDt != null)
+      startedDateMs = startedDateDt.getTime();
+
+    return (startedDateMs != 0) && (currDateMs < startedDateMs);
+  }
+
+  public boolean checkAccountExpired(String user, UserManager um) {
+    Date expirationDateDt = null;
+    long currDate = System.currentTimeMillis();
+    long expirationDateMs = 0L;
+    try
+    {
+      String expirationDateStr = um.getExpirationDate(user);
+      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
+
+      if(expirationDateStr == null)
+        expirationDateDt = null;
+      else
+        expirationDateDt = df.parse(expirationDateStr);
+    }
+    catch(ParseException ex) { }
+    currDate = System.currentTimeMillis();
+    expirationDateMs = 0L;
+
+    if(expirationDateDt != null)
+      expirationDateMs = expirationDateDt.getTime();
+
+    return expirationDateMs != 0L && currDate > expirationDateMs;
   }
 

trunk/src/com/bowman/cardserv/web/XmlHelper.java

@@ -872 +872 @@
       xb.appendElement("user", "name", users[i].getUserName());
       xb.appendAttr("display-name", users[i].getDisplayName());
+      xb.appendAttr("start-date", users[i].getStartDate());
+      xb.appendAttr("expiration-date", users[i].getExpirationDate());
       if(users[i].isAdmin()) xb.appendAttr("admin", users[i].isAdmin());