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

code review commit... 

my repo np.
Natenom/support-murmur-13-1446181288462
withgod 16 years ago
parent
d0a8a88c2f
commit
066f9942d1
4 changed files with 198 additions and 71 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. 153
      pyweb/mumble/mctl.py
  2. 11
      pyweb/mumble/mmobjects.py
  3. 93
      pyweb/mumble/models.py
  4. 0
      pyweb/mumble/views.py

153
pyweb/mumble/mctl.py
View File

@ -0,0 +1,153 @@
# -*- coding: utf-8 -*-
# mumble-django contributed by withgod@sourceforge.net
import dbus
#zope.interface is good but don't standard interface library
#abc is better but 2.6 higher.
#import abc
#from django.conf import settings
class MumbleCtlBase ():
''' abstract Ctrol Object '''
def setConf(self, srvid, key, value):
pass
def getValue(self, srvid, key):
pass
def newServer(self):
pass
def setSuperUserPassword(self, srvid, value):
pass
def start(self, srvid):
pass
def stop(self, srvid):
pass
def isBooted(self, srvid):
pass
def deleteServer(self, srvid):
pass
def getUsers(self, srvid):
pass
def getPlayers(self, srvid):
pass
def getChannels(self, srvid):
pass
def registerPlayer(self, srvid, name):
pass
def setRegistration(self, mumbleid, name, email, password):
pass
def getBootedServers(self):
pass
def getACL(self, srvid, identifier):
pass
@staticmethod
def newInstance():
# if dbus
#if settings.DAOTYPE == 'dbus':
ret = MumbleCtlDbus()
#else:
# ret = MumbleCtlIce()
return ret
class MumbleCtlDbus(MumbleCtlBase):
meta = None
dbus_base='net.sourceforge.mumble.murmur'
def __init__(self):
# Prior to saving the model, connect to murmur via dbus and update its settings.
self.meta = self._getDbusMeta();
def _getDbusMeta( self ):
return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/' ), 'net.sourceforge.mumble.Meta' );
def _getDbusServerObject( self, srvid):
"Connects to DBus and returns an mmServer object representing this Murmur instance."
if srvid not in self.getBootedServers():
raise Exception, 'No murmur process with the given server ID (%d) is running and attached to system dbus under %s.' % ( srvid, self.meta );
return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/%d' % srvid ), 'net.sourceforge.mumble.Murmur' );
def setConf(self, srvid, key, value):
srvid = dbus.Int32( srvid )
self.meta.setConf(srvid, key, value)
def deleteServer( self, srvid ):
srvid = dbus.Int32( srvid );
if self.meta.isBooted( srvid ):
self.meta.stop( srvid );
self.meta.deleteServer( srvid );
def registerPlayer(self, name):
pass
def getChannels(self, srvid):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getChannels())
def getPlayers(self, srvid):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getPlayers())
def getACL(self, srvid, identifier):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).getACL(identifier))
def getBootedServers(self):
return MumbleCtlDbus.converDbusTypeToNative(self.meta.getBootedServers())
def setSuperUserPassword(self, srvid, value):
self.meta.setSuperUserPassword(dbus.Int32(srvid), value)
def registerPlayer(self, srvid, name):
return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).registerPlayer(srvid, name))
@staticmethod
def converDbusTypeToNative(data):
#i know dbus.* type is extends python native type.
#but dbus.* type is not native type. it's not good transparent for using Ice/Dbus.
ret = None
if isinstance(data, tuple) or type(data) is data.__class__ is dbus.Array or data.__class__ is dbus.Struct :
ret = []
for x in data:
ret.append(MumbleCtlDbus.converDbusTypeToNative(x))
else:
if data.__class__ is dbus.Boolean:
ret = bool(data)
elif data.__class__ is dbus.String:
ret = str(data)
elif data.__class__ is dbus.Int32 or data.__class__ is dbus.UInt32:
ret = int(data)
return ret
if __name__ == "__main__":
print "--- test start"
#ctl = MumbleCtlBase.newInstance()
ctl = MumbleCtlDbus()
print ctl
print ctl.meta
print "booted server", ctl.getBootedServers()
print "chans"
print ctl.getChannels(1)
print "users"
print ctl.getPlayers(1)
print "getACL", ctl.getACL(1, 0)
print ctl.getACL(1, 0)[0].__class__ is dbus.Array
print "--- test end"

11
pyweb/mumble/mmobjects.py
View File

@ -14,7 +14,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
""" """
import dbus
import mctl
import datetime import datetime
from time import time from time import time
@ -30,8 +30,8 @@ class mmServer( object ):
# id = int(); # id = int();
# rootName = str(); # rootName = str();
def __init__( self, serverID, serverObj, rootName = '' ):
self.dbusObj = serverObj;
def __init__( self, serverID, ctl, rootName = '' ):
#self.dbusObj = serverObj;
self.channels = dict(); self.channels = dict();
self.players = dict(); self.players = dict();
self.id = serverID; self.id = serverID;
@ -39,7 +39,7 @@ class mmServer( object ):
links = dict(); links = dict();
for theChan in serverObj.getChannels():
for theChan in ctl.getChannels(serverID):
# Channels - Fields: 0 = ID, 1 = Name, 2 = Parent-ID, 3 = Links # Channels - Fields: 0 = ID, 1 = Name, 2 = Parent-ID, 3 = Links
if( theChan[2] == -1 ): if( theChan[2] == -1 ):
@ -68,7 +68,8 @@ class mmServer( object ):
if self.rootName: if self.rootName:
self.channels[0].name = self.rootName; self.channels[0].name = self.rootName;
for thePlayer in serverObj.getPlayers():
for thePlayer in ctl.getPlayers(serverID):
# in DBus
# Players - Fields: 0 = UserID, 6 = ChannelID # Players - Fields: 0 = UserID, 6 = ChannelID
self.players[ thePlayer[0] ] = mmPlayer( thePlayer, self.channels[ thePlayer[6] ] ); self.players[ thePlayer[0] ] = mmPlayer( thePlayer, self.channels[ thePlayer[6] ] );

93
pyweb/mumble/models.py
View File

@ -21,7 +21,8 @@ from mmobjects import mmServer, mmACL
from django.conf import settings from django.conf import settings
import dbus
from mctl import *
import socket import socket
class Mumble( models.Model ): class Mumble( models.Model ):
@ -44,21 +45,8 @@ class Mumble( models.Model ):
defchan= models.IntegerField( 'Default channel', default=0 ); defchan= models.IntegerField( 'Default channel', default=0 );
booted = models.BooleanField( 'Boot Server', default = True ); booted = models.BooleanField( 'Boot Server', default = True );
def getDbusMeta( self ):
return dbus.Interface( dbus.SystemBus().get_object( self.dbus, '/' ), 'net.sourceforge.mumble.Meta' );
def getDbusObject( self ):
"Connects to DBus and returns an mmServer object representing this Murmur instance."
bus = dbus.SystemBus();
murmur = dbus.Interface( bus.get_object( self.dbus, '/' ), 'net.sourceforge.mumble.Meta');
if self.srvid not in murmur.getBootedServers():
raise Exception, 'No murmur process with the given server ID (%d) is running and attached to system dbus under %s.' % ( self.srvid, self.dbus );
return dbus.Interface( bus.get_object( self.dbus, '/%d' % self.srvid ), 'net.sourceforge.mumble.Murmur' );
def getServerObject( self ): def getServerObject( self ):
return mmServer( self.srvid, self.getDbusObject(), self.name );
return mmServer( self.srvid, MumbleCtlBase.newInstance(), self.name );
def __unicode__( self ): def __unicode__( self ):
return u'Murmur "%s" (%d)' % ( self.name, self.srvid ); return u'Murmur "%s" (%d)' % ( self.name, self.srvid );
@ -68,58 +56,55 @@ class Mumble( models.Model ):
# skip murmur configuration, e.g. because we're inserting models for existing servers. # skip murmur configuration, e.g. because we're inserting models for existing servers.
return models.Model.save( self ); return models.Model.save( self );
# Prior to saving the model, connect to murmur via dbus and update its settings.
murmur = self.getDbusMeta();
# 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();
if self.id is None: if self.id is None:
self.srvid = murmur.newServer(); self.srvid = murmur.newServer();
srvid = dbus.Int32( self.srvid );
murmur.setConf( srvid, 'host', socket.gethostbyname( self.addr ) );
murmur.setConf( srvid, 'registername', self.name );
murmur.setConf( srvid, 'registerurl', self.url );
murmur.setConf( srvid, 'welcometext', self.motd );
murmur.setConf( srvid, 'password', self.passwd );
murmur.setConf( srvid, 'certificate', self.sslcrt );
murmur.setConf( srvid, 'key', self.sslkey );
murmur.setConf( srvid, 'obfuscate', str(self.obfsc).lower() );
murmur.setConf( srvid, 'playername', self.player );
murmur.setConf( srvid, 'channelname', self.channel );
murmur.setConf( srvid, 'defaultchannel', str(self.defchan) );
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) );
if self.port is not None: if self.port is not None:
murmur.setConf( srvid, 'port', str(self.port) );
murmur.setConf( self.srvid, 'port', str(self.port) );
else: else:
murmur.setConf( srvid, 'port', '' );
murmur.setConf( self.srvid, 'port', '' );
if self.users is not None: if self.users is not None:
murmur.setConf( srvid, 'users', str(self.users) );
murmur.setConf( self.srvid, 'users', str(self.users) );
else: else:
murmur.setConf( srvid, 'users', '' );
murmur.setConf( self.srvid, 'users', '' );
if self.bwidth is not None: if self.bwidth is not None:
murmur.setConf( srvid, 'bandwidth', str(self.bwidth) );
murmur.setConf( self.srvid, 'bandwidth', str(self.bwidth) );
else: else:
murmur.setConf( srvid, 'bandwidth', '' );
murmur.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( srvid, 'registerhostname', "%s:%d" % ( self.addr, self.port ) );
murmur.setConf( self.srvid, 'registerhostname', "%s:%d" % ( self.addr, self.port ) );
else: else:
murmur.setConf( srvid, 'registerhostname', self.addr );
murmur.setConf( self.srvid, 'registerhostname', self.addr );
if self.supw: if self.supw:
murmur.setSuperUserPassword( srvid, self.supw );
murmur.setSuperUserPassword( self.srvid, self.supw );
self.supw = ''; self.supw = '';
if self.booted != murmur.isBooted( srvid ):
if self.booted != murmur.isBooted( self.srvid ):
if self.booted: if self.booted:
murmur.start( srvid );
murmur.start( self.srvid );
else: else:
murmur.stop( srvid );
murmur.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 );
@ -132,21 +117,10 @@ class Mumble( models.Model ):
return False; return False;
return False; return False;
def deleteServer( self ):
srvid = dbus.Int32( self.srvid );
murmur = self.getDbusMeta();
if murmur.isBooted( srvid ):
murmur.stop( srvid );
murmur.deleteServer( srvid );
@staticmethod @staticmethod
def pre_delete_listener( **kwargs ): def pre_delete_listener( **kwargs ):
kwargs['instance'].deleteServer(); kwargs['instance'].deleteServer();
class MumbleUser( models.Model ): class MumbleUser( models.Model ):
mumbleid = models.IntegerField( 'Mumble player_id', editable = False, default = -1 ); mumbleid = models.IntegerField( 'Mumble player_id', editable = False, default = -1 );
name = models.CharField( 'User name and Login', max_length = 200 ); name = models.CharField( 'User name and Login', max_length = 200 );
@ -163,12 +137,12 @@ class MumbleUser( models.Model ):
# skip murmur configuration, e.g. because we're inserting models for existing players. # skip murmur configuration, e.g. because we're inserting models for existing players.
return models.Model.save( self ); return models.Model.save( self );
# Before the record set is saved, update Murmur via dbus.
murmur = self.server.getDbusObject();
# Before the record set is saved, update Murmur via ctroller.
ctl = MumbleCtlBase.newInstance();
if self.id is None: if self.id is None:
# This is a new user record, so Murmur doesn't know about it yet # This is a new user record, so Murmur doesn't know about it yet
self.mumbleid = murmur.registerPlayer( dbus.String( self.name ) );
self.mumbleid = ctl.registerPlayer(self.server.srvid, self.name);
# Update user's registration # Update user's registration
if self.password: if self.password:
@ -177,7 +151,7 @@ class MumbleUser( models.Model ):
else: else:
email = settings.DEFAULT_FROM_EMAIL; email = settings.DEFAULT_FROM_EMAIL;
murmur.setRegistration(
ctl.setRegistration(
dbus.Int32( self.mumbleid ), dbus.Int32( self.mumbleid ),
dbus.String( self.name ), dbus.String( self.name ),
dbus.String( email ), dbus.String( email ),
@ -195,8 +169,7 @@ class MumbleUser( models.Model ):
def getAdmin( self ): def getAdmin( self ):
# 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) );
acl = mmACL( 0, MumbleCtlBase.newInstance().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!" );

0
pyweb/mumble/views.py
View File

Write Preview
Loading…
Cancel
Save