warricksothr
/
mumble-django
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

without DBus code modesl.py 

implements basic DBus Controller mctl.py
Natenom/support-murmur-13-1446181288462
withgod 16 years ago
parent
066f9942d1
commit
957f8ae01d
2 changed files with 69 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      pyweb/mumble/mctl.py
  2. 77
      pyweb/mumble/models.py

35
pyweb/mumble/mctl.py
View File

@ -48,7 +48,10 @@ class MumbleCtlBase ():
def registerPlayer(self, srvid, name): def registerPlayer(self, srvid, name):
pass pass
def setRegistration(self, mumbleid, name, email, password):
def setRegistration(self, srvid, mumbleid, name, email, password):
pass
def unregisterPlayer(self, srvid, mumbleid):
pass pass
def getBootedServers(self): def getBootedServers(self):
@ -57,6 +60,9 @@ class MumbleCtlBase ():
def getACL(self, srvid, identifier): def getACL(self, srvid, identifier):
pass pass
def setACL(self, srvid, acl):
pass
@staticmethod @staticmethod
def newInstance(): def newInstance():
# if dbus # if dbus
@ -86,17 +92,23 @@ class MumbleCtlDbus(MumbleCtlBase):
return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/%d' % srvid ), 'net.sourceforge.mumble.Murmur' ); return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/%d' % srvid ), 'net.sourceforge.mumble.Murmur' );
def setConf(self, srvid, key, value): def setConf(self, srvid, key, value):
srvid = dbus.Int32( srvid )
self.meta.setConf(srvid, key, value)
self.meta.setConf(dbus.Int32( srvid ), key, value)
def deleteServer( self, srvid ): def deleteServer( self, srvid ):
srvid = dbus.Int32( srvid );
srvid = dbus.Int32( srvid )
if self.meta.isBooted( srvid ): if self.meta.isBooted( srvid ):
self.meta.stop( srvid );
self.meta.deleteServer( srvid );
self.meta.stop( srvid )
def registerPlayer(self, name):
pass
self.meta.deleteServer( srvid )
def newServer(self):
return self.meta.newServer()
def registerPlayer(self, srvid, name):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).registerPlayer(name))
def unregisterPlayer(self, srvid, mumbleid):
self._getDbusServerObject(srvid).unregisterPlayer(dbus.Int32( mumbleid ))
def getChannels(self, srvid): def getChannels(self, srvid):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getChannels()) return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getChannels())
@ -107,14 +119,17 @@ class MumbleCtlDbus(MumbleCtlBase):
def getACL(self, srvid, identifier): def getACL(self, srvid, identifier):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getACL(identifier)) return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getACL(identifier))
def setACL(self, srvid, acl):
self._getDbusServerObject(srvid).setACL(*acl.pack())
def getBootedServers(self): def getBootedServers(self):
return MumbleCtlDbus.converDbusTypeToNative(self.meta.getBootedServers()) return MumbleCtlDbus.converDbusTypeToNative(self.meta.getBootedServers())
def setSuperUserPassword(self, srvid, value): def setSuperUserPassword(self, srvid, value):
self.meta.setSuperUserPassword(dbus.Int32(srvid), value) self.meta.setSuperUserPassword(dbus.Int32(srvid), value)
def registerPlayer(self, srvid, name):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).registerPlayer(srvid, name))
def setRegistration(self, srvid, mumbleid, name, email, password):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).setRegistration(dbus.Int32(mumbleid), dbus.String(name), dbus.String(email), dbus.String(password)))
@staticmethod @staticmethod
def converDbusTypeToNative(data): def converDbusTypeToNative(data):

77
pyweb/mumble/models.py
View File

@ -58,53 +58,53 @@ class Mumble( models.Model ):
# check if this server already exists, if not call newServer and set my srvid first # check if this server already exists, if not call newServer and set my srvid first
murmur = MumbleCtlBase.newInstance();
ctl = MumbleCtlBase.newInstance();
if self.id is None: if self.id is None:
self.srvid = murmur.newServer();
self.srvid = ctl.newServer();
murmur.setConf( self.srvid, 'host', socket.gethostbyname( self.addr ) );
murmur.setConf( self.srvid, 'registername', self.name );
murmur.setConf( self.srvid, 'registerurl', self.url );
murmur.setConf( self.srvid, 'welcometext', self.motd );
murmur.setConf( self.srvid, 'password', self.passwd );
murmur.setConf( self.srvid, 'certificate', self.sslcrt );
murmur.setConf( self.srvid, 'key', self.sslkey );
murmur.setConf( self.srvid, 'obfuscate', str(self.obfsc).lower() );
murmur.setConf( self.srvid, 'playername', self.player );
murmur.setConf( self.srvid, 'channelname', self.channel );
murmur.setConf( self.srvid, 'defaultchannel', str(self.defchan) );
ctl.setConf( self.srvid, 'host', socket.gethostbyname( self.addr ) );
ctl.setConf( self.srvid, 'registername', self.name );
ctl.setConf( self.srvid, 'registerurl', self.url );
ctl.setConf( self.srvid, 'welcometext', self.motd );
ctl.setConf( self.srvid, 'password', self.passwd );
ctl.setConf( self.srvid, 'certificate', self.sslcrt );
ctl.setConf( self.srvid, 'key', self.sslkey );
ctl.setConf( self.srvid, 'obfuscate', str(self.obfsc).lower() );
ctl.setConf( self.srvid, 'playername', self.player );
ctl.setConf( self.srvid, 'channelname', self.channel );
ctl.setConf( self.srvid, 'defaultchannel', str(self.defchan) );
if self.port is not None: if self.port is not None:
murmur.setConf( self.srvid, 'port', str(self.port) );
ctl.setConf( self.srvid, 'port', str(self.port) );
else: else:
murmur.setConf( self.srvid, 'port', '' );
ctl.setConf( self.srvid, 'port', '' );
if self.users is not None: if self.users is not None:
murmur.setConf( self.srvid, 'users', str(self.users) );
ctl.setConf( self.srvid, 'users', str(self.users) );
else: else:
murmur.setConf( self.srvid, 'users', '' );
ctl.setConf( self.srvid, 'users', '' );
if self.bwidth is not None: if self.bwidth is not None:
murmur.setConf( self.srvid, 'bandwidth', str(self.bwidth) );
ctl.setConf( self.srvid, 'bandwidth', str(self.bwidth) );
else: else:
murmur.setConf( self.srvid, 'bandwidth', '' );
ctl.setConf( self.srvid, 'bandwidth', '' );
# registerHostname needs to take the port no into account # registerHostname needs to take the port no into account
if self.port and self.port != 64738: if self.port and self.port != 64738:
murmur.setConf( self.srvid, 'registerhostname', "%s:%d" % ( self.addr, self.port ) );
ctl.setConf( self.srvid, 'registerhostname', "%s:%d" % ( self.addr, self.port ) );
else: else:
murmur.setConf( self.srvid, 'registerhostname', self.addr );
ctl.setConf( self.srvid, 'registerhostname', self.addr );
if self.supw: if self.supw:
murmur.setSuperUserPassword( self.srvid, self.supw );
ctl.setSuperUserPassword( self.srvid, self.supw );
self.supw = ''; self.supw = '';
if self.booted != murmur.isBooted( self.srvid ):
if self.booted != ctl.isBooted( self.srvid ):
if self.booted: if self.booted:
murmur.start( self.srvid );
ctl.start( self.srvid );
else: else:
murmur.stop( self.srvid );
ctl.stop( self.srvid );
# Now allow django to save the record set # Now allow django to save the record set
return models.Model.save( self ); return models.Model.save( self );
@ -117,6 +117,11 @@ class Mumble( models.Model ):
return False; return False;
return False; return False;
def deleteServer( self ):
# Unregister this player in Murmur via ctroller.
print MumbleCtlBase.newInstance()
MumbleCtlBase.newInstance().deleteServer(self.srvid)
@staticmethod @staticmethod
def pre_delete_listener( **kwargs ): def pre_delete_listener( **kwargs ):
kwargs['instance'].deleteServer(); kwargs['instance'].deleteServer();
@ -152,10 +157,11 @@ class MumbleUser( models.Model ):
email = settings.DEFAULT_FROM_EMAIL; email = settings.DEFAULT_FROM_EMAIL;
ctl.setRegistration( ctl.setRegistration(
dbus.Int32( self.mumbleid ),
dbus.String( self.name ),
dbus.String( email ),
dbus.String( self.password )
self.server.srvid,
self.mumbleid,
self.name,
email,
self.password
); );
# Don't save the users' passwords, we don't need them anyway # Don't save the users' passwords, we don't need them anyway
@ -177,19 +183,19 @@ class MumbleUser( models.Model ):
def setAdmin( self, value ): def setAdmin( self, value ):
# Get ACL of root Channel, get the admin group and see if I'm in it # Get ACL of root Channel, get the admin group and see if I'm in it
bus = self.server.getDbusObject();
acl = mmACL( 0, bus.getACL(0) );
ctl = MumbleCtlBase.newInstance();
acl = mmACL( 0, ctl.getACL(self.server.srvid, 0) );
if not hasattr( acl, "admingroup" ): if not hasattr( acl, "admingroup" ):
raise ValueError( "The admin group was not found in the ACL's groups list!" ); raise ValueError( "The admin group was not found in the ACL's groups list!" );
if value != ( self.mumbleid in acl.admingroup['add'] ): if value != ( self.mumbleid in acl.admingroup['add'] ):
if value: if value:
acl.admingroup['add'].append( dbus.Int32(self.mumbleid) );
acl.admingroup['add'].append( self.mumbleid );
else: else:
acl.admingroup['add'].remove( self.mumbleid ); acl.admingroup['add'].remove( self.mumbleid );
bus.setACL( *acl.pack() );
ctl.setACL(self.server.srvid, acl);
return value; return value;
@ -198,9 +204,8 @@ class MumbleUser( models.Model ):
kwargs['instance'].unregister(); kwargs['instance'].unregister();
def unregister( self ): def unregister( self ):
# Unregister this player in Murmur via dbus.
murmur = self.server.getDbusObject();
murmur.unregisterPlayer( dbus.Int32( self.mumbleid ) );
# Unregister this player in Murmur via ctroller.
MumbleCtlBase.newInstance().unregisterPlayer(self.server.srvid, self.mumbleid)

Write Preview
Loading…
Cancel
Save