fcf-cvs Mailing List for Flash Communication Framework

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/fcf/fcf/fcf/src/server/flashcom
In directory usw-pr-cvs1:/tmp/cvs-serv17733/fcf/src/server/flashcom

Modified Files:
	main.asc 
Log Message:
rewrote loging and user initialization code. it is much cleaner now, but still needs some work.

-users cannot login with names less that 1 char, and greater than 12.
-they can login if they do not pass a username to the server. they will be assigned a lurker role.
-usernames cannot begin or end with @.
-usernames cannot consist of just whitespace.
-whitespace will be trimmed from the begining and end of usernames before they are validated.

Index: main.asc
===================================================================
RCS file: /cvsroot/fcf/fcf/fcf/src/server/flashcom/main.asc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.asc	8 Oct 2002 03:09:18 -0000	1.4
--- main.asc	8 Oct 2002 04:07:42 -0000	1.5
***************
*** 39,71 ****
  {
  		trace("application.onConnection : user connected  username: " + username);
- 
- 		var fClient = new FCFClientWrapper(client);
- 		
- 		fClient = application.FCF.checkLogin(fClient, username, password);
  		
! 		if(fClient == undefined)
  		{
! 			return;
  		}
  }
  
! application.FCF.checkLogin = function(fClient, username, password)
  {
! 	fClient = application.FCF.validateConnection(fClient, username, password);
! 	
! 	if(fClient == null)
  	{
! 		return null;
  	}
  
! 	fClient = application.FCF.checkAccess(fClient, username, password);
! 
! 	if(fClient == null)
  	{
! 		return null;
  	}
- 
- 	fClient.fcfId = application.FCF.idCount++;
- 	fClient.loginTime = (new Date).getTime();
  
  	application.acceptConnection(fClient.getClient());
--- 39,89 ----
  {
  		trace("application.onConnection : user connected  username: " + username);
  		
! 		var fClient = new FCFClientWrapper(client);
! 		try
  		{
! 			application.FCF.addUser(fClient, username.trim(), password);
! 		}
! 		catch(errObj)
! 		{
! //this is for debug
! application.traceObject(errObj);
! 	
! 			var p = new FCFPacket();
! 				p.setFrom(fClient);
! 				p.setType(FCFPacket.EVENT);
! 				p.setAction(FCFEvent.CONNECT_REJECTED);
! 				p.setData(errObj);
! 			
! 			application.FCF.delegator.registerEvent(
! 				FCFEvent.CONNECT_REJECTED,
! 				p);
! 				
! 			application.rejectConnection(client, errObj);
  		}
+ 
  }
  
! application.FCF.addUser = function(fClient, username, password)
  {
! 	if(!application.FCF.isValidName(username))
  	{
! 		var errObj = application.getErrorObject("", 
! 			"Error", 
! 			"FCF.Connect.Rejected", 
! 			"Invalid Username. The Username cannot consist of just whitespace, and " +
! 			"cannot begin or end with @, and must be 12 charachters or less.");
! 			
! 		throw errObj;
  	}
  
! 	try
  	{
! 		fClient = application.FCF.initClient(fClient, username, password);
! 	}
! 	catch(e)
! 	{
! 		throw e;
  	}
  
  	application.acceptConnection(fClient.getClient());
***************
*** 79,122 ****
  	application.FCF.delegator.registerEvent(
  					FCFEvent.CONNECT_ACCEPTED,
! 					p);
! 						
! 	return fClient;			
  }
  
! application.FCF.validateConnection = function(fClient, username, password)
  {
  	if(username == undefined)
  	{
! 		fClient.role = FCFClientWrapper.LURKER;
  	}
! 	else
  	{
! 		username = username.trim();
! 		
! 		if(username.length < 1)
! 		{
! 			var errObj = application.getErrorObject("", 
! 				"Error", 
! 				"FCF.Connect.Rejected", 
! 				"The username cannot consist only of whitespace");
! 				
! 			//THROW REJECTED EVENT
! 			var p = new FCFPacket();
! 				p.setFrom(fClient);
! 				p.setType(FCFPacket.EVENT);
! 				p.setAction(FCFEvent.CONNECT_REJECTED);
! 				p.setData(errObj);
! 			
! 			application.FCF.delegator.registerEvent(
! 				FCFEvent.CONNECT_REJECTED,
! 				p);
! 			
! 			application.rejectConnection(client, errObj);
! 			return null;
! 		}
! 		fClient.role = FCFClientWrapper.USER;
! 		fClient.username = username;
  	}
  
  	if(application.FCF.userHash[username] != undefined)
  	{
--- 97,134 ----
  	application.FCF.delegator.registerEvent(
  					FCFEvent.CONNECT_ACCEPTED,
! 					p);			
  }
  
! //if this threw an exception, we could have more detailed error
! //messages.
! application.FCF.isValidName = function(username)
  {
+ 	//undefined username is valid, and is assigned a lurker
+ 	//role
  	if(username == undefined)
  	{
! 		return true;
! 	}	
! 
! 	if(username.length < 1)
! 	{
! 		return false;
  	}
! 
! 	if(username.length > 11)
  	{
! 		return false;
! 	}
! 
! 	if(username.beginsWith("@") || username.endsWith("@"))
! 	{
! 		return false;
  	}
  
+ 	return true;
+ }
+ 
+ application.FCF.initClient = function(fClient, username, password)
+ {
  	if(application.FCF.userHash[username] != undefined)
  	{
***************
*** 126,143 ****
  			"The user name you supplied is already in use.")
  
! 		//THROW REJECTED EVENT
! 		var p = new FCFPacket();
! 			p.setFrom(fClient);
! 			p.setType(FCFPacket.EVENT);
! 			p.setAction(FCFEvent.CONNECT_REJECTED);
! 			p.setData(errObj);
! 			
! 		application.FCF.delegator.registerEvent(
! 					FCFEvent.CONNECT_REJECTED,
! 					p);
! 			
! 		application.rejectConnection(fClient.client, errObj)
! 		return null;
  	
  	}
  	
--- 138,151 ----
  			"The user name you supplied is already in use.")
  
! 		throw errObj;
! 	}
  	
+ 	try
+ 	{
+ 		fClient = application.FCF.setUserProperties(fClient, username, password);
+ 	}
+ 	catch(e)
+ 	{
+ 		throw e;
  	}
  	
***************
*** 146,150 ****
  
  
! application.FCF.checkAccess = function(fClient, username, password)
  {
  	var valid = true;
--- 154,158 ----
  
  
! application.FCF.setUserProperties = function(fClient, username, password)
  {
  	var valid = true;
***************
*** 154,158 ****
  	switch(username)
  	{
! 		case "mesh":
  		{
  			if(password == "pass")
--- 162,166 ----
  	switch(username)
  	{
! 		case ("mesh"):
  		{
  			if(password == "pass")
***************
*** 166,170 ****
  			break;
  		}
! 		case "gburch":
  		{
  			if(password == "pass")
--- 174,178 ----
  			break;
  		}
! 		case ("gburch"):
  		{
  			if(password == "pass")
***************
*** 178,181 ****
--- 186,199 ----
  			break;
  		}
+ 		case (undefined):
+ 		{
+ 			fClient.role = FCFClientWrapper.LURKER;
+ 			break;
+ 		}
+ 		default:
+ 		{
+ 			fClient.role = FCFClientWrapper.USER;		
+ 			break;
+ 		}		
  	}
  
***************
*** 187,206 ****
  				"Incorrect Password.");
  				
! 			//THROW REJECTED EVENT
! 			var p = new FCFPacket();
! 				p.setFrom(fClient);
! 				p.setType(FCFPacket.EVENT);
! 				p.setAction(FCFEvent.CONNECT_REJECTED);
! 				p.setData(errObj);
! 			
! 			application.FCF.delegator.registerEvent(
! 					FCFEvent.CONNECT_REJECTED, 
! 					p);
! 			
! 			application.rejectConnection(fClient.getClient(), errObj);
! 			
! 			return undefined;	
  	}
- 
  
  	return fClient;
--- 205,220 ----
  				"Incorrect Password.");
  				
! 				throw errObj;	
! 	}
! 	else
! 	{
! 		//is this property used anywhere?
! 		fClient.fcfId = application.FCF.idCount++;
! 		
! 		//we should be able to get this from the Admin server
! 		//although we might not want to.
! 		fClient.loginTime = (new Date).getTime();	
! 		fClient.username = username;
  	}
  
  	return fClient;
***************
*** 215,218 ****
--- 229,233 ----
  application.onDisconnect = function(client)
  {
+ 	//do we need to loop here?
  	for(var x in this.FCF.userHash)
  	{

fcf-cvs Mailing List for Flash Communication Framework

fcf-cvs — List for CVS Commits