Update from whrandom.
This commit is contained in:
parent
feb0c94e79
commit
3693b3dbb0
|
@ -47,7 +47,7 @@ __version__ = '$Revision$'[11:-2]
|
||||||
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import whrandom
|
import random
|
||||||
|
|
||||||
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
||||||
sys.path.insert(0, glasnostPythonDir)
|
sys.path.insert(0, glasnostPythonDir)
|
||||||
|
@ -339,7 +339,7 @@ class BallotsServer(Server):
|
||||||
return voterId
|
return voterId
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
self.randomGenerator = whrandom.whrandom()
|
self.randomGenerator = random.uniform
|
||||||
Server.init(self)
|
Server.init(self)
|
||||||
|
|
||||||
def isVoteSecret(self, voteToken):
|
def isVoteSecret(self, voteToken):
|
||||||
|
@ -445,19 +445,19 @@ class BallotsServer(Server):
|
||||||
vote.id = voteId
|
vote.id = voteId
|
||||||
|
|
||||||
while 1:
|
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):
|
if not virtualServer.electionIds.has_key(electionToken):
|
||||||
break
|
break
|
||||||
vote.electionToken = electionToken
|
vote.electionToken = electionToken
|
||||||
|
|
||||||
while 1:
|
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):
|
if not virtualServer.voterIds.has_key(voterToken):
|
||||||
break
|
break
|
||||||
vote.voterToken = voterToken
|
vote.voterToken = voterToken
|
||||||
|
|
||||||
while 1:
|
while 1:
|
||||||
voteLocalToken = str(self.randomGenerator.uniform(0.1, 1))[2:]
|
voteLocalToken = str(self.randomGenerator(0.1, 1))[2:]
|
||||||
voteToken = '%s/votes/%s' % (
|
voteToken = '%s/votes/%s' % (
|
||||||
commonTools.extractDispatcherId(virtualServerId),
|
commonTools.extractDispatcherId(virtualServerId),
|
||||||
voteLocalToken)
|
voteLocalToken)
|
||||||
|
|
|
@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
|
||||||
import os
|
import os
|
||||||
import sgmllib
|
import sgmllib
|
||||||
import sys
|
import sys
|
||||||
import whrandom
|
import random
|
||||||
|
|
||||||
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
||||||
sys.path.insert(0, glasnostPythonDir)
|
sys.path.insert(0, glasnostPythonDir)
|
||||||
|
@ -191,7 +191,7 @@ class Dispatcher(Server):
|
||||||
virtualServer.lock.release()
|
virtualServer.lock.release()
|
||||||
else:
|
else:
|
||||||
while 1:
|
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):
|
if not virtualServer.virtualServerIds.has_key(clientToken):
|
||||||
break
|
break
|
||||||
virtualServer.applicationTokens[clientId] = clientToken
|
virtualServer.applicationTokens[clientId] = clientToken
|
||||||
|
@ -258,7 +258,7 @@ class Dispatcher(Server):
|
||||||
return virtualServer.serverAccessors[serverId]
|
return virtualServer.serverAccessors[serverId]
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
self.randomGenerator = whrandom.whrandom()
|
self.randomGenerator = random.uniform
|
||||||
self.initProfiles()
|
self.initProfiles()
|
||||||
Server.init(self)
|
Server.init(self)
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
|
||||||
import md5
|
import md5
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import whrandom
|
import random
|
||||||
|
|
||||||
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
||||||
sys.path.insert(0, glasnostPythonDir)
|
sys.path.insert(0, glasnostPythonDir)
|
||||||
|
@ -204,7 +204,7 @@ class IdentitiesVirtualServer(objects.ObjectsVirtualServer):
|
||||||
else:
|
else:
|
||||||
server = context.getVar('server')
|
server = context.getVar('server')
|
||||||
while 1:
|
while 1:
|
||||||
randomSalt = str(server.randomGenerator.uniform(0.1, 1))[2:]
|
randomSalt = str(server.randomGenerator(0.1, 1))[2:]
|
||||||
digest = md5.new(randomSalt)
|
digest = md5.new(randomSalt)
|
||||||
localToken = digest.hexdigest()
|
localToken = digest.hexdigest()
|
||||||
objectToken = '%s/%s' % (self.virtualServerId, localToken)
|
objectToken = '%s/%s' % (self.virtualServerId, localToken)
|
||||||
|
@ -411,6 +411,7 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
|
||||||
identity.releaseNonCore()
|
identity.releaseNonCore()
|
||||||
virtualServer.markObjectAsDirty(identity)
|
virtualServer.markObjectAsDirty(identity)
|
||||||
virtualServer.markCoreAsDirty()
|
virtualServer.markCoreAsDirty()
|
||||||
|
self.saveVirtualServer(virtualServer)qy
|
||||||
|
|
||||||
def getAdminIdentitiesRoles(self):
|
def getAdminIdentitiesRoles(self):
|
||||||
return (self.getAdminCore(check = 0).identitiesRoles) or []
|
return (self.getAdminCore(check = 0).identitiesRoles) or []
|
||||||
|
@ -556,7 +557,7 @@ class IdentitiesServer(commonIdentities.IdentitiesCommonMixin,
|
||||||
return virtualServer.getObjectToken(object)
|
return virtualServer.getObjectToken(object)
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
self.randomGenerator = whrandom.whrandom()
|
self.randomGenerator = random.uniform
|
||||||
objects.ObjectsServer.init(self)
|
objects.ObjectsServer.init(self)
|
||||||
|
|
||||||
def registerPublicMethods(self):
|
def registerPublicMethods(self):
|
||||||
|
|
|
@ -394,6 +394,7 @@ The Glasnost administrator - %(fromAddress)s
|
||||||
passwordAccount.releaseNonCore()
|
passwordAccount.releaseNonCore()
|
||||||
virtualServer.markObjectAsDirty(passwordAccount)
|
virtualServer.markObjectAsDirty(passwordAccount)
|
||||||
virtualServer.markCoreAsDirty()
|
virtualServer.markCoreAsDirty()
|
||||||
|
self.saveVirtualServer(virtualServer)
|
||||||
|
|
||||||
|
|
||||||
def getAdminEmailAddresses(self, stopAsap = 0):
|
def getAdminEmailAddresses(self, stopAsap = 0):
|
||||||
|
|
|
@ -49,7 +49,7 @@ __version__ = '$Revision$'[11:-2]
|
||||||
import cPickle
|
import cPickle
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import whrandom
|
import random
|
||||||
|
|
||||||
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
||||||
sys.path.insert(0, glasnostPythonDir)
|
sys.path.insert(0, glasnostPythonDir)
|
||||||
|
@ -91,7 +91,7 @@ class SessionsServer(Server):
|
||||||
if not self.temporaryData:
|
if not self.temporaryData:
|
||||||
self.temporaryData = {}
|
self.temporaryData = {}
|
||||||
while 1:
|
while 1:
|
||||||
dataToken = str(self.randomGenerator.uniform(0.1, 1))
|
dataToken = str(self.randomGenerator(0.1, 1))
|
||||||
if not self.temporaryData.has_key(dataToken):
|
if not self.temporaryData.has_key(dataToken):
|
||||||
break
|
break
|
||||||
self.temporaryData[sessionToken+dataToken] = data
|
self.temporaryData[sessionToken+dataToken] = data
|
||||||
|
@ -136,7 +136,7 @@ class SessionsServer(Server):
|
||||||
virtualServerId = context.getVar('applicationId')
|
virtualServerId = context.getVar('applicationId')
|
||||||
virtualServer = self.getVirtualServer(virtualServerId)
|
virtualServer = self.getVirtualServer(virtualServerId)
|
||||||
try:
|
try:
|
||||||
int(sessionToken)
|
long(sessionToken)
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
raise faults.UnknownSessionToken(repr(sessionToken))
|
raise faults.UnknownSessionToken(repr(sessionToken))
|
||||||
if not virtualServer.objects.has_key(sessionToken):
|
if not virtualServer.objects.has_key(sessionToken):
|
||||||
|
@ -185,7 +185,7 @@ class SessionsServer(Server):
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
self.randomGenerator = whrandom.whrandom()
|
self.randomGenerator = random.uniform
|
||||||
Server.init(self)
|
Server.init(self)
|
||||||
|
|
||||||
def loadConfigOptions(self):
|
def loadConfigOptions(self):
|
||||||
|
@ -219,7 +219,7 @@ class SessionsServer(Server):
|
||||||
virtualServer = self.getVirtualServer(virtualServerId)
|
virtualServer = self.getVirtualServer(virtualServerId)
|
||||||
virtualServer.lock.acquire()
|
virtualServer.lock.acquire()
|
||||||
while 1:
|
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):
|
if not virtualServer.objects.has_key(sessionToken):
|
||||||
break
|
break
|
||||||
session = {
|
session = {
|
||||||
|
|
|
@ -51,7 +51,7 @@ import md5
|
||||||
import sha
|
import sha
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import whrandom
|
import random
|
||||||
|
|
||||||
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
|
||||||
sys.path.insert(0, glasnostPythonDir)
|
sys.path.insert(0, glasnostPythonDir)
|
||||||
|
@ -106,7 +106,7 @@ class TokenAccountsServer(
|
||||||
virtualServer = self.getVirtualServer(virtualServerId)
|
virtualServer = self.getVirtualServer(virtualServerId)
|
||||||
object = virtualServer.loadObjectCore(objectId)
|
object = virtualServer.loadObjectCore(objectId)
|
||||||
while 1:
|
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 = md5.new(randomSalt).hexdigest()[:16].upper()
|
||||||
token = '%s-%s-%s-%s' % (
|
token = '%s-%s-%s-%s' % (
|
||||||
token[:4], token[4:8], token[8:12], token[12:])
|
token[:4], token[4:8], token[8:12], token[12:])
|
||||||
|
@ -148,7 +148,7 @@ class TokenAccountsServer(
|
||||||
return [userToken, 'token']
|
return [userToken, 'token']
|
||||||
|
|
||||||
def init(self):
|
def init(self):
|
||||||
self.randomGenerator = whrandom.whrandom()
|
self.randomGenerator = random.uniform
|
||||||
objects.ObjectsServer.init(self)
|
objects.ObjectsServer.init(self)
|
||||||
|
|
||||||
def registerPublicMethods(self):
|
def registerPublicMethods(self):
|
||||||
|
|
Reference in New Issue