Changeset 154

Timestamp:

06/27/11 15:07:42 (12 years ago)

Author:

samerajarmeh

Message:

 

Location:

trunk

Files:

• CardServProxy.ipr (modified) (3 diffs)
• plugins/DcwFilterPlugin/src/com/bowman/cardserv/DcwFilterPlugin.java (modified) (1 diff)
• src/com/bowman/cardserv/CaProfile.java (modified) (3 diffs)
• src/com/bowman/cardserv/CardServProxy.java (modified) (3 diffs)
• src/com/bowman/cardserv/MySQLUserManager.java (modified) (2 diffs)
• src/com/bowman/cardserv/ProxyConfig.java (modified) (10 diffs)
• src/com/bowman/cardserv/SimpleUserManager.java (modified) (5 diffs)
• src/com/bowman/cardserv/interfaces/CamdConstants.java (modified) (1 diff)
• src/com/bowman/cardserv/interfaces/UserManager.java (modified) (2 diffs)
• src/com/bowman/cardserv/mysql/ConnectionPoolManager.java (modified) (2 diffs)
• src/com/bowman/cardserv/proxy.xml (modified) (3 diffs)
• 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/AbstractSession.java (modified) (1 diff)
• src/com/bowman/cardserv/session/CspSession.java (modified) (1 diff)
• src/com/bowman/cardserv/session/ExtNewcamdSession.java (modified) (2 diffs)
• src/com/bowman/cardserv/session/NewcamdSession.java (modified) (10 diffs)
• src/com/bowman/cardserv/web/XmlHelper.java (modified) (1 diff)
• src/com/bowman/cardserv/web/status-commands.xml (modified) (7 diffs)
• web/js/cs-status.js (modified) (2 diffs)

trunk/CardServProxy.ipr

@@ -4 +4 @@
     <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="32" />
+      <properties />
+    </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/build.local.xml">
       <additionalClassPath />
       <antReference projectDefault="true" />
@@ -57 +65 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <file url="file://$PROJECT_DIR$/src/com/bowman/cardserv/MySQLUserManager.java" />
-    </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -107 +112 @@
     <entry_points version="2.0" />
   </component>
-  <component name="ExcludeFromValidation">
-    <file url="file://$PROJECT_DIR$/src/com/bowman/cardserv/MySQLUserManager.java" />
-  </component>
   <component name="ExportToHTMLSettings">
     <option name="OUTPUT_DIRECTORY" value="C:\IdeaProjects\CSP-svn\exportToHTML" />

trunk/plugins/DcwFilterPlugin/src/com/bowman/cardserv/DcwFilterPlugin.java

@@ -18 +18 @@
 public class DcwFilterPlugin implements ProxyPlugin, ReplyFilter {
 
-    private static final byte[] badDcw1 = DESUtil.stringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00");
-    private static final byte[] badDcw2 = DESUtil.stringToBytes("00 00 00 00 00 00 3C 3C 00 00 00 00 00 00 3C 3C");
-    private static final byte[] badDcw3 = DESUtil.stringToBytes("FF FF FF FD FF FF FF FD FF FF FF FD FF FF FF FD");
-    private static final byte[] badDcw4 = DESUtil.stringToBytes("01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16");
+  private static final byte[] badDcw1 = DESUtil.stringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00");
+  private static final byte[] badDcw2 = DESUtil.stringToBytes("00 00 00 00 00 00 3C 3C 00 00 00 00 00 00 3C 3C");
 
   private ProxyLogger logger;

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

@@ -33 +33 @@
   private String name;
   private boolean enabled, cacheOnly, debug, mismatchedCards;
-  private boolean ecmBlocker;
   private Boolean requireProviderMatch;
   private int caId, networkId;
   private long maxCwWait, congestionLimit;
   private int serviceConflicts;
-  private int blockerStart, blockerEnd;
   private String servicesFile, providerFilter, fileCaId, servicesFileFormat;
   private FileWatchdog servicesFwd;
@@ -62 +60 @@
     debug = "true".equalsIgnoreCase(xml.getStringValue("debug", "true"));
     cacheOnly = "true".equalsIgnoreCase(xml.getStringValue("cache-only", "false"));
-    ecmBlocker = "true".equalsIgnoreCase(xml.getStringValue("ecm-blocker","false")) ;
-    try { blockerStart = xml.getIntValue("blocker-start"); } catch (ConfigException e) { blockerStart = 0;
-    } try { blockerEnd = xml.getIntValue("blocker-end"); } catch (ConfigException e) { blockerEnd = 0;
-    }
     requireProviderMatch = null;
     try {
@@ -438 +432 @@
   }
 
-    public boolean getecmBlocker() {
-      return ecmBlocker;
-    }
-
-    public int getblockerStart() {
-      return blockerStart;
-    }
-
-    public int getblockerEnd() {
-      return blockerEnd;
-    }
-    
-
   public Integer[] getProviderIdents() {
     Set set = getProviderSet();

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

@@ -24 +24 @@
 public class CardServProxy implements CamdMessageListener, XmlConfigurable, Runnable {
 
-  public static final String APP_VERSION = "DreamCo.0.9.0";
-  public static String APP_BUILD = "114";
+  public static final String APP_VERSION = "0.9.0";
+  public static String APP_BUILD = "";
   static ProxyLogger logger;
   private static Registry registry;
@@ -260 +260 @@
 
   public static void main(String[] args) {
-    System.out.println("This Software Is Totaly Free From Samerjarmeh d1.zapto@hotmail.com for http://d1d2.org/vb");   
+
     if("true".equalsIgnoreCase(System.getProperty("com.bowman.cardserv.allowanyjvm"))) {
       // any jvm allowed
@@ -370 +370 @@
       }
       msg.setProfileName(profile.getName()); // just a lookup shortcut for all remaining processing
-      if (profile.getecmBlocker() && msg.getType() == CamdNetMessage.TYPE_RECEIVED && msg != null){
-      if (msg.getDataLength() >= profile.getblockerStart() && msg.getDataLength() <= profile.getblockerEnd()) {
-      } else { logger.warning("Ecm-Blocker block ECM - SID:" + Integer.toHexString(msg.getServiceId()) + " Length:" + msg.getDataLength() + " Profile :" + session.getProfileName() + " User:" + session.getUser() + " Command:" + msg.getCommandName());
-      denyMessage(session, msg); return;
-      } } }
+    }
 
     switch(msg.getCommandTag()) { 

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

@@ -290 +290 @@
     /**
      * delete specified user from the MySQL database.
-     * @param  - user to delete.
+     * @param id - user to delete.
      */
     public boolean deleteUser(String username) {
@@ -298 +298 @@
     /**
      * delete all users from the database.
-     * @param  - the user which should not be deleted.
+     * @param id - the user which should not be deleted.
      *        This may be because the user is currently logged in and
      *        therefore shouldn't be deleted.

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

@@ -38 +38 @@
   private int proxyOriginId = (int)System.currentTimeMillis(); // use lower 4 bytes of sys clock as id for this run
   private int logRotateCount, logRotateLimit;
-  private String logFile, logLevel, wtBadFlags, msgtoemu, clientMsg;
+  private String logFile, logLevel, wtBadFlags;
   private int wtMaxDelay, etMinCount, maxThreads, sessionTimeout, newcamdMaxMsgSize, maxPending, maxConnectionsIP;
-  private boolean silent, debug, userAllowOnFailure, logFailures, logEcm, logEmm, logZap, hideIPs, blockCaidMismatch, blockEmm, osdMsg;
+  private boolean silent, debug, userAllowOnFailure, logFailures, logEcm, logEmm, logZap, hideIPs, blockCaidMismatch;
   private boolean wtIncludeFile, userAllowDifferentIp;
-  private Set denyCam;
 
   private boolean firstRead = true, started = false;
@@ -76 +75 @@
     return real;
   }
-
+  
   public CaProfile getProfile(String name) {
     if(name == null) return null;
@@ -255 +254 @@
     CaProfile profile;
     profile = getProfile(msg.getProfileName());
-    if(profile == null) profile = getProfileById(msg.getNetworkId(), msg.getCaId());
+    if(profile == null) profile = getProfileById(msg.getNetworkId(), msg.getCaId());    
     String profileName = profile==null?"*":profile.getName();
     return getService(profileName, new ServiceMapping(msg));
@@ -313 +312 @@
           break;
         }
-    }
+    }    
     return warning;
   }
@@ -392 +391 @@
     blockCaidMismatch = "true".equalsIgnoreCase(profileConf.getStringValue("block-caid-mismatch", "true"));
     maxConnectionsIP = profileConf.getIntValue("max-connections-ip", 0);
-    osdMsg = "true".equalsIgnoreCase(profileConf.getStringValue("msg-enabled", "false"));
-    clientMsg = profileConf.getStringValue("msg-words", " Your Account will Be Expire In ");
-    msgtoemu = profileConf.getStringValue("msg-emu", "");
-    denyCam = new HashSet(Arrays.asList(profileConf.getStringValue("deny-cam", "").split(" ")));
-    blockEmm = "true".equalsIgnoreCase(profileConf.getStringValue("drop-emm", "false"));
 
     ProxyXmlConfig keepAliveConf = null;
@@ -644 +638 @@
     return plugin;
   }
-
+  
   public void stopPlugins() {
     if(!proxyPlugins.isEmpty() && logger != null) logger.info("Stopping " + proxyPlugins.size() + " loaded plugins...");
@@ -694 +688 @@
       if(!"".equals(jarName)) { // jar-file specified, load using disposable classloader
         File jarFile = null;
-        try {
+        try { 
           jarFile = new File("plugins", jarName);
           if(!jarFile.exists()) throw new ConfigException(subConf.getFullName(), "File not found: " + jarFile.getAbsolutePath());
@@ -819 +813 @@
     return etMinCount;
   }
-
+  
   public int getMaxPending() {
     return maxPending;
@@ -880 +874 @@
               identSet = true;
             } else sm.setCustomId(Integer.parseInt(service[2], 16));
-          }
+          }         
         }
         if(!identSet) sm.setProviderIdent(ServiceMapping.NO_PROVIDER);
@@ -902 +896 @@
     }
   }
-    public String getclientMsg() { return clientMsg; }
-    public String getmsgtoemu() { return msgtoemu; }
-    public boolean getosdMsg(){ return osdMsg; }
-    public Set getdenyCam() { return denyCam; }
-
 }

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

@@ -70 +70 @@
     } catch (ConfigException e) {}
 
-    String expireDate = null; try { expireDate = xml.getStringValue("endDate"); } catch(ConfigException e) { expireDate = null; }
-    String startDate = null; try { startDate = xml.getStringValue("startDate"); } catch(ConfigException e) {  startDate = null; }
-    int EcmRate = -1; try { EcmRate = xml.getIntValue("ecm-rate"); } catch(ConfigException e) { EcmRate = -1; }
     int maxConnections = xml.getIntValue("max-connections", -1);
 
@@ -78 +75 @@
     boolean admin = "true".equalsIgnoreCase(xml.getStringValue("admin", "false"));
     boolean exclude = "true".equalsIgnoreCase(xml.getStringValue("map-exclude", "false"));
-    boolean debug = "true".equalsIgnoreCase(xml.getStringValue("debug", "true"));
-    boolean spider = "true".equalsIgnoreCase(xml.getStringValue("spider", "true"));
+    boolean debug = "true".equalsIgnoreCase(xml.getStringValue("debug", "false"));
 
     UserEntry user = new UserEntry(xml.getStringValue("name"), xml.getStringValue("password"), ipMask, emailAddr,
-        maxConnections, enabled, admin, exclude, debug, startDate, expireDate, EcmRate, spider);
+        maxConnections, enabled, admin, exclude, debug);
 
     try {
@@ -92 +88 @@
       for(StringTokenizer st = new StringTokenizer(profiles); st.hasMoreTokens(); ) user.profiles.add(st.nextToken());
     } catch (ConfigException e) {}
-      try {
-      String allowServ = xml.getStringValue("allowedServices");
-      for(StringTokenizer st = new StringTokenizer(allowServ); st.hasMoreTokens(); ) user.allowedServices.add(st.nextToken());
-    } catch (ConfigException e) {}
-      try {
-      String blockServ = xml.getStringValue("blockedServices");
-      for(StringTokenizer st = new StringTokenizer(blockServ); st.hasMoreTokens(); ) user.blockedServices.add(st.nextToken());
-    } catch (ConfigException e) {}
-      try {
-      String allowConn = xml.getStringValue("allowedConnectors");
-      for(StringTokenizer st = new StringTokenizer(allowConn); st.hasMoreTokens(); ) user.allowedConnectors.add(st.nextToken());
-    } catch (ConfigException e) {}
+
     return user;
   }
@@ -135 +120 @@
     } else return entry.password;
   }
-    public String getExpireDate(String user) {  UserEntry _la = getUser(user); if(_la == null) return null; else return _la.expireDate; }
-    public boolean isSpider(String user) { UserEntry entry = getUser(user); if(entry == null) return false; else return entry.spider; }
-    public String getStartDate(String user) { UserEntry entry = getUser(user); if(entry == null) return null; else return entry.startDate; }
 
   public String getUserName(String user) {
@@ -232 +214 @@
 
   // access control/limits
-  public Set getAllowedServices(String user, String profile){
+  public Set getAllowedServices(String user, String profile) {
     return null; // return Set of Integer, null for all
-  }  /*
-  {
-      HashSet hashset = new HashSet();
-      if((user = getUser(user)) != null && !((g) (user)).r.isEmpty())
-      {
-          user = ((g) (user)).r.iterator();
-          do
-          {
-              if(!user.hasNext())
-                  break;
-              String s2;
-              if((s2 = (String)user.next()).matches("^" + profile + ":[a-zA-Z0-9]*"))
-                  hashset.add(new Integer(Integer.parseInt(s2.replace(profile + ":", ""), 16)));
-          } while(true);
-      } else
-      {
-          hashset = null;
-      }
-      return hashset;
-  }  */
-
-  public Set getBlockedServices(String user, String profile)
-  {
-      return null; // return Set of Integer, null for all
-    }  /*
-  {
-      UserEntry entry = getUser(user);
-      if((user = a(user)) != null && !((g) (user)).s.isEmpty())
-      {
-          user = ((g) (user)).s.iterator();
-          do
-          {
-              if(!user.hasNext())
-                  break;
-              String s2;
-              if((s2 = (String)user.next()).matches("^" + profile + ":[a-zA-Z0-9]*"))
-                  hashset.add(new Integer(Integer.parseInt(s2.replace(profile + ":", ""), 16)));
-          } while(true);
-      } else
-      {
-          hashset = null;
-      }
-      return hashset;
-  }    */
-
-    public Set getAllowedConnectors(String user) {
-      UserEntry entry = getUser(user);
-      if(entry == null) {
-        return Collections.EMPTY_SET;
-      }
-      else return entry.allowedConnectors;
-    }
-
-    public int getAllowedEcmRate(String user) {
-        UserEntry entry = getUser(user);
-        if(entry == null) return -1;
-        else return entry.EcmRate;
-    }
-
-    static class UserEntry {
-
-      String name, password;
-      String ipMask;
-      String email, displayName, expireDate, startDate;
-      int maxConnections, EcmRate;
-      boolean enabled, admin, exclude, debug, spider;
-      Set profiles = new HashSet();
-      Set blockedServices = new HashSet();
-      Set allowedServices = new HashSet();
-      Set allowedConnectors = new HashSet();
-      public UserEntry(String name, String password, String ipMask, String email, int maxConnections, boolean enabled,
-                       boolean admin, boolean exclude, boolean debug, String startDate, String expireDate, int EcmRate, boolean spider)
-      {
-        this.name = name;
-        this.displayName = name;
-        this.password = password;
-        this.ipMask = ipMask;
-        this.email = email;
-        this.maxConnections = maxConnections;
-        this.enabled = enabled;
-        this.admin = admin;
-        this.exclude = exclude;
-        this.debug = debug;
-        this.spider = spider;
-        this.expireDate = expireDate;
-        this.EcmRate = EcmRate;
-        this.startDate = startDate;
-      }
+  }
+
+  public Set getBlockedServices(String user, String profile) {
+    return null; // return Set of Integer, null for all
+  }
+
+  public Set getAllowedConnectors(String user) {
+    return null; // return Set of String, null for all
+  }
+
+  public int getAllowedEcmRate(String user) {
+    return -1; // return minimum interval between ecm in seconds, -1 for no limit
+  }
+
+  static class UserEntry {
+
+    String name, password;
+    String ipMask;
+    String email, displayName;
+    int maxConnections;
+    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, boolean debug)
+    {
+      this.name = name;
+      this.displayName = name;
+      this.password = password;
+      this.ipMask = ipMask;
+      this.email = email;
+      this.maxConnections = maxConnections;
+      this.enabled = enabled;
+      this.admin = admin;
+      this.exclude = exclude;
+      this.debug = debug;
+    }
 
   }

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

@@ -17 +17 @@
   public static final int EXT_GET_VERSION = 0xD6;
   public static final int EXT_SID_LIST = 0xD7;
-  public static final int CWS_CHECKSPID = 0xA1;
 
   public static final int

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

@@ -17 +17 @@
   int getMaxConnections(String user);
   String getIpMask(String user);
-  String getExpireDate(String  user);
-  String getStartDate(String s);
   String getEmailAddress(String user);
   String getDisplayName(String user);
@@ -28 +26 @@
   boolean isDebug(String user);
   void setDebug(String user, boolean debug);
-  boolean isSpider(String user);
   int getUserCount();
   void start();

trunk/src/com/bowman/cardserv/mysql/ConnectionPoolManager.java

@@ -32 +32 @@
      * main constructor to initialize the connection pool manager
      * 
-     * @param  - maximum established connections
+     * @param maxPoolSize - maximum established connections
      * @param databaseHost - MySQL hostname
      * @param databasePort - MySQL tcp destination port
@@ -84 +84 @@
     /**
      * turns back an unused PoolConnection
-     * @param
+     * @param PoolConnection 
      */
     public synchronized void returnMySQLConnection(MySQLConnection mySQLConnection) {

trunk/src/com/bowman/cardserv/proxy.xml

@@ -5 +5 @@
 
     <extended-newcamd listen-port="15112" debug="true"/>
-      <deny-cam></deny-cam>      <!--deny unwanted cam clients-->
-      <msg-enabled>true</msg-enabled>  <!--true = send expire days to clints screens like Acamd , Mgacmd , Prifix-->
-      <msg-emu>Mgcamd Acamd Prifix Dream</msg-emu>
-      <msg-words>Wellcom To Server Your Account Will Expire In </msg-words>    <!--message to clients when loged in with remaining days in Server-->
 
-    <profile name="myprofile" ca-id="0604" network-id="0800" provider-idents="00 00 00" enabled="true" debug="true">
+    <profile name="myprofile" ca-id="0000" network-id="0000" provider-idents="00 00 00" enabled="true" debug="true">
       <newcamd listen-port="11112">
         <no-validation>true</no-validation>
@@ -19 +15 @@
       <services-file>etc/services</services-file>
       <max-cw-wait>8500 ms</max-cw-wait>
-      <ecm-blocker>true</ecm-blocker>
-      <blocker-start>49</blocker-start>
-      <blocker-end>65</blocker-end>
     </profile>
   </ca-profiles>
@@ -47 +40 @@
     <auth-config>
       <user name="admin" password="secret" max-connections="3" admin="true"/>
-      <user name="user1" password="secret1" profiles="myprofile" start-date="01-07-2010" expire-date="01-11-2010" ecm-rate="-1"/>
+      <user name="user1" password="secret1" profiles="myprofile"/>
     </auth-config>
   </user-manager>

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.getStartDate(name),um.getExpireDate(name), um.getMaxConnections(name), false);
-          user.addSession(session);
-          users.put(name, user);
+        user = new UserStatus(name, displayName, 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.getStartDate(userName),um.getExpireDate(userName), um.getMaxConnections(userName), um.isAdmin(userName));
-          }
-          user.addSession(session);
+          user = new UserStatus(userName, displayName, um.getMaxConnections(userName), um.isAdmin(userName));
         }
-      }
-      return user;
-    }
+        user.addSession(session);
+      }
+    }
+    return user;
+  }
 
   private boolean profileExists(String profileName) {

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

@@ -20 +20 @@
   private final boolean admin;
   private final int maxSessions;
-  private final String expire, start;
 
   private final List sessions = new ArrayList();
 
-   public UserStatus(String userName, String displayName, String start, String expire, int maxSessions, boolean admin) {
-      this.userName = userName;
-      this.displayName = displayName;
-      this.admin = admin;
-      this.start = start;
-      this.expire = expire;
-      this.maxSessions = maxSessions;
-    }
+  public UserStatus(String userName, String displayName, int maxSessions, boolean admin) {
+    this.userName = userName;
+    this.displayName = displayName;
+    this.admin = admin;
+    this.maxSessions = maxSessions;
+  }
 
   public String getUserName() {
@@ -40 +37 @@
     return displayName;
   }
-    public String getExpireDate()
-    {
-        return expire;
-    }
 
   public boolean isAdmin() {
@@ -60 +53 @@
     return maxSessions;
   }
-    public String getStartDate() {
-      return start;
-    }
 
   void addSession(ProxySession session) {

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

@@ -23 +23 @@
   int sessionId, maxPending, maxSessions;
   String user, loginName, clientId;
-  String startMsg;
   String remoteAddress;
   boolean userDebug;

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

@@ -81 +81 @@
     return false;
   }
-    public String getstartMsg()
-    {
-        return startMsg;
-    }
 
   public void run() {

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

@@ -60 +60 @@
     return (Integer[])providers.toArray(new Integer[providers.size()]);
   }
-    public String getstartMsg()
-    {
-        return startMsg;
-    }
 
   protected CamdNetMessage getLoginOkMsg() {
@@ -166 +162 @@
     return allowed == null || allowed.isEmpty() || allowed.contains(profile.getName());
   }
-
 
   CamdNetMessage readMessage() throws IOException {

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.*;
 
@@ -23 +20 @@
 
   private static final int LOGIN_SO_TIMEOUT = 30 * 1000;
-  public String OsdMessage;
+
   private int emmCount, keepAliveCount;
   private long lastKeepAliveTimeStamp;
@@ -116 +113 @@
           } else if(checkProfile && !profiles.contains(getProfileName())) {
             loginFailure(user, "no access for profile: " + getProfileName(), msg);
-          } else if(checkExpired(user, um) || checkStart(user, um)) {
-            loginFailure(user, "account has expired or not started", msg);
-          }  else if(config.getdenyCam().contains(clientId)) {
-            loginFailure(user, "User has Denied Client ID : " + clientId, msg);
           } else { // successful login
 
             maxSessions = config.getUserManager().getMaxConnections(user);
-              if(maxSessions == -1) maxSessions = 1;
+            if(maxSessions == -1) maxSessions = getProfile().getNewcamdPortCount();
 
             int sessionCount = sm.syncCountSessions(user, getProfileName());
@@ -129 +122 @@
             logger.info("User '" + user + "' (" + com.bowman.cardserv.util.CustomFormatter.formatAddress(getRemoteAddress()) +
                 ") login successful. Client: " + clientId + " - [" + (sessionCount + 1) + "/" + maxSessions + "]");
-            if(!um.isSpider(user)) checkuserspider(config.getRemoteHandler().getName());
+
             if(sessionCount >= maxSessions) {
               long idleMins = sm.closeOldestSession(user, false, getProfileName()) / 60000;
               logger.info("User '" + user + "' already has [" + maxSessions + "] connection(s), closing oldest (idle " +
-                  idleMins + " mins)"); }
+                  idleMins + " mins)");
+            }
 
             if(config.getMaxConnectionsIP() > 0 && sessionCount >= config.getMaxConnectionsIP()) {
@@ -139 +133 @@
               logger.info("IP '" + com.bowman.cardserv.util.CustomFormatter.formatAddress(getRemoteAddress()) +
                   "' already has [" + sessionCount + "] connection(s), closing oldest (idle " +
-                  idleMins + " mins)"); }
+                  idleMins + " mins)");
+            }
 
             this.user = user;
@@ -158 +153 @@
             conn.setSoTimeout(config.getSessionTimeout());
             Thread.currentThread().setName(Thread.currentThread().getName() + "[" + user + "]");
-            OsdMessage = config.getmsgtoemu();
-            if(config.getosdMsg() && checkExpiredtime(user, um) != 0L && OsdMessage.contains(clientId) && sessionCount == 0)
-            startMsg = config.getclientMsg() + " " + um.getExpireDate(user);
           }
         }
@@ -197 +189 @@
             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(checkExpired(this.user, um)) { logger.warning("'User '" + user + "' kicked, account has expired");
-            close(); }
             if(!checksOk) {
               setFlag(msg, 'B');
@@ -325 +315 @@
 
         fireCamdMessage(cardDataMsg, true);
-        if (this.getstartMsg()!= null) {
-        sendOsdMessage(this.getstartMsg());
-        }        break;
+        break;
     }
     return true;
@@ -452 +440 @@
     return status;
   }
-    public boolean checkStart(String user, UserManager um) {
-      Date startDateDt = null;
-      try {
-                  String startDateStr = um.getStartDate(user);
-                  DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-                  if (startDateStr == null) startDateDt = null;
-                  else startDateDt = df.parse(startDateStr);
-          }
-          catch(ParseException ignored) {}
-          long currDateMs = System.currentTimeMillis();
-          long startDateMs = 0;
-          if (startDateDt != null) startDateMs = startDateDt.getTime();
-
-        return (startDateMs != 0) && (currDateMs < startDateMs);
-    }
-
-    public boolean checkExpired(String user, UserManager um)
-      {
-          Date expireDateDt = null;
-          long currDate = System.currentTimeMillis();
-          long expDateMs = 0L;
-          try
-          {
-              String expireDateStr = um.getExpireDate(user);
-              DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-              if(expireDateStr == null)
-                  expireDateDt = null;
-              else
-                  expireDateDt = df.parse(expireDateStr);
-          }
-          catch(ParseException ex) { }
-          currDate = System.currentTimeMillis();
-          expDateMs = 0L;
-          if(expireDateDt != null)
-              expDateMs = expireDateDt.getTime();
-          return expDateMs != 0L && currDate > expDateMs;
-      }
-
-      public long checkExpiredtime(String user, UserManager um)
-      { Date expireDateDt = null; long currDate = System.currentTimeMillis();  long expDateMs = 0L;
-          try {  String expireDateStr = um.getExpireDate(user);
-              DateFormat df = new SimpleDateFormat("dd-MM-yyyy");  if(expireDateStr == null)  expireDateDt = null;
-              else  expireDateDt = df.parse(expireDateStr);  } catch(ParseException ex) { }  currDate = System.currentTimeMillis();
-          expDateMs = 0L; if(expireDateDt != null) expDateMs = expireDateDt.getTime(); if(expireDateDt != null) return (expDateMs - currDate) / 0x5265c00L; else return 0L; }
-
-    public String getstartMsg() {
-        return startMsg;
-    }
 
   public int sendEcmReplyNative(CamdNetMessage ecmRequest, CamdNetMessage ecmReply) {
@@ -534 +474 @@
   }
 
-    public boolean sendOsdMessage(String message) {
-        if(!OsdMessage.contains(clientId))  return false;
-        CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.EXT_OSD_MESSAGE);
-        try {  osdMsg.setCustomData(message.getBytes("ISO-8859-1")); } catch(UnsupportedEncodingException e) {  e.printStackTrace();  }  return sendMessage(osdMsg) != -1; }
-
-   public boolean checkuserspider(String user)
-     {  CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.CWS_CHECKSPID);
-         try  { osdMsg.setCustomData(user.getBytes("ISO-8859-1"));
-         } catch(UnsupportedEncodingException e)
-         { e.printStackTrace(); } return sendMessage(osdMsg) != -1;
-     }
-
+  public boolean sendOsdMessage(String message) {
+    if("Mgcamd".equals(clientId) || "Acamd".equals(clientId)) {
+      CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.EXT_OSD_MESSAGE);
+      try {
+        osdMsg.setCustomData(message.getBytes("ISO-8859-1"));
+      } catch(UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+      return sendMessage(osdMsg) != -1;
+    } else return false;
+  }
 }

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("startDate", users[i].getStartDate());
-      xb.appendAttr("expireDate", users[i].getExpireDate());
       if(users[i].isAdmin()) xb.appendAttr("admin", users[i].isAdmin());
 

trunk/src/com/bowman/cardserv/web/status-commands.xml

@@ -5 +5 @@
 
   <command name="ca-profiles" label="Show profile(s)" description="List of available profile definitions.">
-    <command-param name="name" label="" optional="true" admin-only="true">
+    <command-param name="name" label="" optional="true">
       <option source="@profiles"/>
     </command-param>
@@ -11 +11 @@
 
   <command name="cws-connectors" label="Show connector(s)" description="List of available connector definitions.">
-    <command-param name="name" label="" optional="true" admin-only="true">
+    <command-param name="name" label="" optional="true">
       <option source="@connectors"/>
     </command-param>
@@ -26 +26 @@
   </command>
 
-  <command name="proxy-status" label="Show status summary" description="Current proxy status."  admin-only="true"/>
+  <command name="proxy-status" label="Show status summary" description="Current proxy status." />
 
-  <command name="cache-status" label="Show cache status" description="Current cache status and metadata."  admin-only="true"/>
+  <command name="cache-status" label="Show cache status" description="Current cache status and metadata." />
 
-  <command name="error-log" label="Show cws events" description="Recent connector errors and events."  admin-only="true"/>
+  <command name="error-log" label="Show cws events" description="Recent connector errors and events." />
 
-  <command name="file-log" label="Show file log events" description="Recent SEVERE and WARNING level loggings." admin-only="true"/>
+  <command name="file-log" label="Show file log events" description="Recent SEVERE and WARNING level loggings."/>
 
   <command name="user-log" label="Show user transaction log" description="Recent ecm transaction for one user.">
@@ -46 +46 @@
   </command>
 
-  <command name="cws-log" label="Show cws transaction log" description="Recent ecm transaction for one connector.">
-    <command-param name="name" label="" optional="false" admin-only="true">
+  <command name="cws-log" label="Show cws transaction log" description="Recent ecm transaction for one connector." admin-only="true">
+    <command-param name="name" label="" optional="false">
       <option source="@connectors"/>
     </command-param>
@@ -56 +56 @@
   <command name="watched-services" label="Show watched services" description="List of the currently watched services." />
 
-  <command name="export-services" label="Export service maps" description="Export current state of service mappers as xml.">
-    <command-param name="name" label="" optional="true" admin-only="true">
+  <command name="export-services" label="Export service maps" description="Export current state of service mappers as xml." admin-only="true">
+    <command-param name="name" label="" optional="true">
       <option source="@connectors"/>
     </command-param>
@@ -77 +77 @@
 
   <command name="proxy-plugins" label="Show loaded plugins" description="List all currently loaded plugins.">
-    <command-param name="name" label="" optional="true"  admin-only="true"/>
+    <command-param name="name" label="" optional="true" />
   </command>
 
@@ -84 +84 @@
   <command name="ctrl-commands" label="Show ctrl-commands" description="Retrieve ctrl-command definitions and metadata." admin-only="true" />
 
-  <command name="status-commands" label="Show status-commands" description="Retrieve status-command definitions and metadata."  admin-only="true"/>
+  <command name="status-commands" label="Show status-commands" description="Retrieve status-command definitions and metadata." />
 
-  <command name="cws-bouquet" label="Create bouquet" description="Create enigma bouquet file from the specified services."  admin-only="true"/>
+  <command name="cws-bouquet" label="Create bouquet" description="Create enigma bouquet file from the specified services." />
 
   <command name="system-properties" label="System properties" description="Dump JVM system properties." admin-only="true" />

trunk/web/js/cs-status.js

@@ -138 +138 @@
     label: 'Status',
     queries: ['proxy-status', 'cache-status', 'proxy-plugins', 'ca-profiles', 'cws-connectors'],
-    repeat: false,
+    repeat: true,
     handler: function(xml) {
       var status = getFirstByTag('proxy-status', xml);
@@ -179 +179 @@
     label: 'Sessions',
     queries: ['proxy-status', 'ca-profiles', 'proxy-users hide-inactive="true"'],
-    repeat: false,
+    repeat: true,
     handler: function(xml) {
       if(hideInactive) getFirstByTag('proxy-users', xml).setAttribute('hide-inactive', 'true');