Update from whrandom.

This commit is contained in:
obenassy 2007-11-16 12:56:21 +00:00
parent feb0c94e79
commit 3693b3dbb0
6 changed files with 21 additions and 19 deletions

View File

@ -47,7 +47,7 @@ __version__ = '$Revision$'[11:-2]
import sys
import whrandom
import random
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
sys.path.insert(0, glasnostPythonDir)
@ -339,7 +339,7 @@ class BallotsServer(Server):
return voterId
def init(self):
self.randomGenerator = whrandom.whrandom()
self.randomGenerator = random.uniform
Server.init(self)
def isVoteSecret(self, voteToken):
@ -445,19 +445,19 @@ class BallotsServer(Server):
vote.id = voteId
while 1:
electionToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
electionToken = str(self.randomGenerator(0.1, 1))[2:]
if not virtualServer.electionIds.has_key(electionToken):
break
vote.electionToken = electionToken
while 1:
voterToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
voterToken = str(self.randomGenerator(0.1, 1))[2:]
if not virtualServer.voterIds.has_key(voterToken):
break
vote.voterToken = voterToken
while 1:
voteLocalToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
voteLocalToken = str(self.randomGenerator(0.1, 1))[2:]
voteToken = '%s/votes/%s' % (
commonTools.extractDispatcherId(virtualServerId),
voteLocalToken)

View File

@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
import os
import sgmllib
import sys
import whrandom
import random
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
sys.path.insert(0, glasnostPythonDir)
@ -191,7 +191,7 @@ class Dispatcher(Server):
virtualServer.lock.release()
else:
while 1:
clientToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
clientToken = str(self.randomGenerator(0.1, 1))[2:]
if not virtualServer.virtualServerIds.has_key(clientToken):
break
virtualServer.applicationTokens[clientId] = clientToken
@ -258,7 +258,7 @@ class Dispatcher(Server):
return virtualServer.serverAccessors[serverId]
def init(self):
self.randomGenerator = whrandom.whrandom()
self.randomGenerator = random.uniform
self.initProfiles()
Server.init(self)

View File

@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
import md5
import sys
import time
import whrandom
import random
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
sys.path.insert(0, glasnostPythonDir)
@ -204,7 +204,7 @@ class IdentitiesVirtualServer(objects.ObjectsVirtualServer):
else:
server = context.getVar('server')
while 1:
randomSalt = str(server.randomGenerator.uniform(0.1, 1))[2:]
randomSalt = str(server.randomGenerator(0.1, 1))[2:]
digest = md5.new(randomSalt)
localToken = digest.hexdigest()
objectToken = '%s/%s' % (self.virtualServerId, localToken)
@ -411,6 +411,7 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
identity.releaseNonCore()
virtualServer.markObjectAsDirty(identity)
virtualServer.markCoreAsDirty()
self.saveVirtualServer(virtualServer)qy
def getAdminIdentitiesRoles(self):
return (self.getAdminCore(check = 0).identitiesRoles) or []
@ -556,7 +557,7 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
return virtualServer.getObjectToken(object)
def init(self):
self.randomGenerator = whrandom.whrandom()
self.randomGenerator = random.uniform
objects.ObjectsServer.init(self)
def registerPublicMethods(self):

View File

@ -394,6 +394,7 @@ The Glasnost administrator - %(fromAddress)s
passwordAccount.releaseNonCore()
virtualServer.markObjectAsDirty(passwordAccount)
virtualServer.markCoreAsDirty()
self.saveVirtualServer(virtualServer)
def getAdminEmailAddresses(self, stopAsap = 0):

View File

@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
import cPickle
import sys
import time
import whrandom
import random
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
sys.path.insert(0, glasnostPythonDir)
@ -91,7 +91,7 @@ class SessionsServer(Server):
if not self.temporaryData:
self.temporaryData = {}
while 1:
dataToken = str(self.randomGenerator.uniform(0.1, 1))
dataToken = str(self.randomGenerator(0.1, 1))
if not self.temporaryData.has_key(dataToken):
break
self.temporaryData[sessionToken+dataToken] = data
@ -136,7 +136,7 @@ class SessionsServer(Server):
virtualServerId = context.getVar('applicationId')
virtualServer = self.getVirtualServer(virtualServerId)
try:
int(sessionToken)
long(sessionToken)
except (ValueError, TypeError):
raise faults.UnknownSessionToken(repr(sessionToken))
if not virtualServer.objects.has_key(sessionToken):
@ -185,7 +185,7 @@ class SessionsServer(Server):
return result
def init(self):
self.randomGenerator = whrandom.whrandom()
self.randomGenerator = random.uniform
Server.init(self)
def loadConfigOptions(self):
@ -219,7 +219,7 @@ class SessionsServer(Server):
virtualServer = self.getVirtualServer(virtualServerId)
virtualServer.lock.acquire()
while 1:
sessionToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
sessionToken = str(self.randomGenerator(0.1, 1))[2:]
if not virtualServer.objects.has_key(sessionToken):
break
session = {

View File

@ -51,7 +51,7 @@ import md5
import sha
import sys
import time
import whrandom
import random
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
sys.path.insert(0, glasnostPythonDir)
@ -106,7 +106,7 @@ class TokenAccountsServer(
virtualServer = self.getVirtualServer(virtualServerId)
object = virtualServer.loadObjectCore(objectId)
while 1:
randomSalt = str(self.randomGenerator.uniform(0.1, 1))[2:]
randomSalt = str(self.randomGenerator(0.1, 1))[2:]
token = md5.new(randomSalt).hexdigest()[:16].upper()
token = '%s-%s-%s-%s' % (
token[:4], token[4:8], token[8:12], token[12:])
@ -148,7 +148,7 @@ class TokenAccountsServer(
return [userToken, 'token']
def init(self):
self.randomGenerator = whrandom.whrandom()
self.randomGenerator = random.uniform
objects.ObjectsServer.init(self)
def registerPublicMethods(self):