added the private and server full connect for anybody with master or …

…admin

server-init.cfg

@@ -2,3 +2,4 @@ serverdesc "Another XSBS Server"
 publicserver 1
 maxclients 19
 adminpass xsbsrules
+serverport 20000

src/fpsgame/server.cpp

@@ -1524,6 +1524,7 @@ namespace server
 
     int allowconnect(clientinfo *ci, const char *pwd)
     {
+    	if(SbPy::triggerPolicyEventIntString("connect_with_pass", ci->clientnum, pwd)) return DISC_NONE;
         if(!m_mp(gamemode)) return DISC_PRIVATE;
         if(serverpass[0])
         {
@@ -1611,15 +1612,16 @@ namespace server
                 getstring(text, p);
 
                 SbPy::triggerEventInt("player_connect_pre", ci->clientnum);
-                SbPy::triggerEventInt("player_connect", ci->clientnum);
 
                 int disc = allowconnect(ci, text);
                 if(disc)
                 {
                     disconnect_client(sender, disc);
                     return;
                 }
-
+
+                SbPy::triggerEventInt("player_connect", ci->clientnum);
+
                 ci->playermodel = getint(p);
 
                 if(m_demo) enddemoplayback();

src/pyscripts/xsbs/users/__init__.py

@@ -1,7 +1,7 @@
 from elixir import Entity, Field, String, ManyToOne, OneToMany, setup_all, session
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
-
-from xsbs.events import eventHandler, triggerServerEvent, registerServerEventHandler, registerPolicyEventHandler
+from privilege import isUserAtLeastMaster
+from xsbs.events import eventHandler, policyHandler, triggerServerEvent, registerServerEventHandler, registerPolicyEventHandler
 from xsbs.commands import commandHandler, UsageError, StateError, ArgumentValueError
 from xsbs.colors import red, green, orange
 from xsbs.ui import info, error, warning
@@ -240,6 +240,27 @@ def onPlayerActive(cn):
 	p.warning_for_login = True
 	p.warn_nickacct = nickacct
 	warnNickReserved(cn, 0, sbserver.playerSessionId(cn))
+
+@policyHandler('connect_with_pass')
+def connectWithPass(cn, args):
+	p = player(cn)
+	adminhash = sbserver.hashPassword(cn, sbserver.adminPassword())
+	try:
+		na = NickAccount.query.filter(NickAccount.nick==p.name()).one()
+	except NoResultFound:
+		return False
+	except MultipleResultsFound:
+		p.message(error('Multiple names linked to this account.  Contact the system administrator.'))
+		return False
+	else:
+		nickhash = sbserver.hashPassword(cn, na.user.password)
+		if args == nickhash:
+			login(cn, na.user)
+			user_id = p.user.id
+			if isUserAtLeastMaster:
+				return True
+		else:
+			return False
 
 @eventHandler('player_name_changed')
 def onPlayerNameChanged(cn, old_name, new_name):