SF.net SVN: fclient: [329] trunk/sandbox/fcp2/client.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient: [329] trunk/sandbox/fcp2/client.py
|
From: <jU...@us...> - 2008-03-07 09:53:14
|
Revision: 329
http://fclient.svn.sourceforge.net/fclient/?rev=329&view=rev
Author: jUrner
Date: 2008-03-07 01:53:17 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
private message params come now without Fc prefix
Modified Paths:
--------------
trunk/sandbox/fcp2/client.py
Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py 2008-03-06 18:25:54 UTC (rev 328)
+++ trunk/sandbox/fcp2/client.py 2008-03-07 09:53:17 UTC (rev 329)
@@ -295,8 +295,8 @@
# clean left over DDA test tmp files
for initialRequest in self._ddaTests:
- if initialRequest['FcTestDDA'].get('TmpFile', None) is not None:
- tools.saveRemoveFile(initialRequest['FcTestDDA']['TmpFile'])
+ if initialRequest['TestDDA'].get('TmpFile', None) is not None:
+ tools.saveRemoveFile(initialRequest['TestDDA']['TmpFile'])
self._ddaTests = []
self._requests = {}
@@ -324,9 +324,9 @@
#NOTE: non Get / Put related requests do not have a Persistence param
removeRequest = request.params.get('Persistence', consts.Persistence.Connection) == consts.Persistence.Connection
if removeRequest:
- request['FcRequestStatus'] |= consts.RequestStatus.RemovedFromQueue
+ request['RequestStatus'] |= consts.RequestStatus.RemovedFromQueue
- request['FcRequestStatus'] |= consts.RequestStatus.Completed
+ request['RequestStatus'] |= consts.RequestStatus.Completed
if event is not None:
event(request)
@@ -358,41 +358,44 @@
"""
identifier = fcparams.newUuid(uuids=self._requests) if identifier is None else identifier
+ #TODO: keep an eye on additional params, they may collide with Fcp parameters
+ Private = message.Message.privateParamName
+
if requestType & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
msg.params.update({
# persistent params that will go into identifier
- 'FcRequestType': requestType, # identifies sub message types
- 'FcInitTime': time.time() if initTime is None else initTime, # when was the request started?
- 'FcFilenameCollision': filenameCollision, # handle fielanem collisions?
- 'FcPersistentUserData': persistentUserData, # any user defined persistent data
+ Private('RequestType'): requestType, # identifies sub message types
+ Private('InitTime'): time.time() if initTime is None else initTime, # when was the request started?
+ Private('FilenameCollision'): filenameCollision, # handle fielanem collisions?
+ Private('PersistentUserData'): persistentUserData, # any user defined persistent data
# non persistent params
- 'FcRequestStatus': consts.RequestStatus.Null,
- 'FcErrorMessage': None, # error message in case an error occured
- 'FcUserData': userData, # any user defined runtime data here
+ Private('RequestStatus'): consts.RequestStatus.Null,
+ Private('ErrorMessage'): None, # error message in case an error occured
+ Private('UserData'): userData, # any user defined runtime data here
# params for SSKKeypair
- 'FcPrivateKey': None,
- 'FcPublicKey': None,
+ Private('PrivateKey'): None,
+ Private('PublicKey'): None,
# params from DataFound
- 'FcMetadataContentType': '', # contecnt type
- 'FcDataLength': '', # content size
+ Private('MetadataContentType'): '', # contecnt type
+ Private('MetadataSize'): 0, # content size
# params from PersistentRequestModified
- 'FcModified': {},
+ Private('Modified'): {},
# params for DDA test
- 'FcTestDDA': {},
+ Private('TestDDA'): {},
# params for SimpleProgress
- 'FcProgressTotal': '0',
- 'FcProgressRequired': '0',
- 'FcProgressFailed': '0',
- 'FcProgressFatalyFailed': '0',
- 'FcProgressSucceeeded': '0',
+ Private('ProgressTotal'): 0,
+ Private('ProgressRequired'): 0,
+ Private('ProgressFailed'): 0,
+ Private('ProgressFatalyFailed'): 0,
+ Private('ProgressSucceeeded'): 0,
})
# equip msg with some persistent pparams
@@ -401,34 +404,33 @@
elif requestType & consts.RequestType.MaskGenerateKeypair:
msg.params.update({
- 'FcRequestType': requestType, # identifies sub message types
- 'FcRequestStatus': consts.RequestStatus.Null,
- 'FcInitTime': initTime, # when was the request started?
- 'FcModified': {},
+ Private('RequestType'): requestType, # identifies sub message types
+ Private('RequestStatus'): consts.RequestStatus.Null,
+ Private('InitTime'): initTime, # when was the request started?
+ Private('Modified'): {},
- 'FcPrivateKey': None,
- 'FcPublicKey': None,
+ Private('PrivateKey'): None,
+ Private('PublicKey'): None,
})
elif requestType & consts.RequestType.PluginMessage:
msg.params.update({
- 'FcRequestType': requestType, # identifies sub message types
- 'FcRequestStatus': consts.RequestStatus.Null,
- 'FcInitTime': initTime, # when was the request started?
- 'FcModified': {},
+ Private('RequestType'): requestType, # identifies sub message types
+ Private('RequestStatus'): consts.RequestStatus.Null,
+ Private('InitTime'): initTime, # when was the request started?
+ Private('Modified'): {},
- 'FcPluginReply': None,
+ Private('PluginReply'): None,
})
else:
msg.params.update({
- 'FcRequestType': requestType, # identifies sub message types
- 'FcRequestStatus': consts.RequestStatus.Null,
- 'FcInitTime': initTime, # when was the request started?
- 'FcModified': {},
+ Private('RequestType'): requestType, # identifies sub message types
+ Private('RequestStatus'): consts.RequestStatus.Null,
+ Private('InitTime'): initTime, # when was the request started?
+ Private('Modified'): {},
})
- msg['FcRequestStatus'] |= consts.RequestStatus.Null
msg['Identifier'] = identifier
self._requests[identifier] = msg
@@ -618,7 +620,7 @@
self._requests[newIdentifier] = initialRequest
del self._requests[requestIdentifier]
initialRequest['Identifier'] = newIdentifier
- initialRequest['FcModified'] = {consts.RequestModified.Identifier: requestIdentifier}
+ initialRequest['Modified'] = {consts.RequestModified.Identifier: requestIdentifier}
self.events.RequestModified(initialRequest)
self.sendMessageEx(initialRequest)
return True
@@ -656,7 +658,7 @@
ddaRequestMsg['Directory'] = directory
# add params required for testing
- initialRequest['FcTestDDA'] = {
+ initialRequest['TestDDA'] = {
'Directory': directory,
'Replied': False,
'TmpFile': None,
@@ -670,44 +672,44 @@
# handle filename collisions
elif code == consts.ProtocolError.DiskTargetExists:
- handleCollision = initialRequest.get('FcFilenameCollision', consts.FilenameCollision.HandleNever)
+ handleCollision = initialRequest.get('FilenameCollision', consts.FilenameCollision.HandleNever)
collisionHandled = bool(handleCollision & consts.FilenameCollision.CollisionHandled)
# rename filename
if handleCollision & consts.FilenameCollision.HandleRename:
filename = initialRequest['Filename']
- initialRequest['FcFilenameCollision'] |= consts.FilenameCollision.CollisionHandled
+ initialRequest['FilenameCollision'] |= consts.FilenameCollision.CollisionHandled
newFilename = namespace.unique_filename(filename, extensions=1, ispostfixed=collisionHandled)
initialRequest['Filename'] = newFilename
- initialRequest['FcModified'] = {consts.RequestModified.Filename: filename}
+ initialRequest['Modified'] = {consts.RequestModified.Filename: filename}
self.sendMessageEx(initialRequest)
self.events.RequestModified(initialRequest)
return True
# don't handle
else:
- initialRequest['FcFilenameCollision'] &= ~consts.FilenameCollision.CollisionHandled
+ initialRequest['FilenameCollision'] &= ~consts.FilenameCollision.CollisionHandled
# handle plugin related request failures
elif code == consts.ProtocolError.NoSuchPlugin or code == consts.ProtocolError.AccessDenied:
if initialRequest.name == consts.Message.GetPluginInfo:
- initialRequest['FcErrorMessage'] = msg
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Error
self._finalizeRequest(msg, initialRequest, self.events.PluginInfoFailed)
return True
elif initialRequest.name == consts.Message.FCPPluginMessage:
- initialRequest['FcErrorMessage'] = msg
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Error
self._finalizeRequest(msg, initialRequest, self.events.PluginMessageFailed)
return True
# only requests should get through to here
# NOTE: Fcp already removed the request
- initialRequest['FcErrorMessage'] = msg
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Error
self._finalizeRequest(msg, initialRequest, self.events.RequestFailed)
return True
@@ -726,9 +728,9 @@
# find message that triggered the call
for initialRequest in self._ddaTests:
- if initialRequest['FcTestDDA']['Directory'] == directory:
- if not initialRequest['FcTestDDA']['Replied']:
- initialRequest['FcTestDDA']['Replied'] = True
+ if initialRequest['TestDDA']['Directory'] == directory:
+ if not initialRequest['TestDDA']['Replied']:
+ initialRequest['TestDDA']['Replied'] = True
break
else:
# fell through
@@ -749,7 +751,7 @@
if not written:
tools.saveRemoveFile(fpathWrite)
else:
- initialRequest['FcTestDDA']['TmpFile'] = fpathWrite
+ initialRequest['TestDDA']['TmpFile'] = fpathWrite
self.sendMessage(
consts.Message.TestDDAResponse,
@@ -765,8 +767,8 @@
# find message that triggered the call
for initialRequest in self._ddaTests:
- if initialRequest['FcTestDDA']['Directory'] == directory:
- if initialRequest['FcTestDDA']['Replied']:
+ if initialRequest['TestDDA']['Directory'] == directory:
+ if initialRequest['TestDDA']['Replied']:
break
else:
# fell through
@@ -774,9 +776,9 @@
# remove test and clean tmp data
self._ddaTests.remove(initialRequest)
- if initialRequest['FcTestDDA']['TmpFile'] is not None:
- tools.saveRemoveFile(initialRequest['FcTestDDA']['TmpFile'])
- wantWrite = initialRequest.params['FcTestDDA']['WantWrite']
+ if initialRequest['TestDDA']['TmpFile'] is not None:
+ tools.saveRemoveFile(initialRequest['TestDDA']['TmpFile'])
+ wantWrite = initialRequest.params['TestDDA']['WantWrite']
# check if test was sucessful
testFailed = False
@@ -786,8 +788,8 @@
testFailed = not msg.params.get('ReadDirectoryAllowed', False)
if testFailed:
- initialRequest['FcRequestStatus'] = consts.RequestStatus.Error
- initialRequest['FcErrorMessage'] = initialRequest['FcTestDDA']['ErrorMsg']
+ initialRequest['RequestStatus'] = consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = initialRequest['TestDDA']['ErrorMsg']
self._finalizeRequest(msg, initialRequest, self.events.RequestFailed)
return True
@@ -817,7 +819,7 @@
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
initialRequest.data = msg.data
self._finalizeRequest(msg, initialRequest, self.events.RequestCompleted)
return True
@@ -826,16 +828,16 @@
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
- initialRequest['FcMetadataContentType'] = msg.get('Metadata.ContentType', '')
- initialRequest['FcDataLength'] = msg.get('DataLength', '')
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['MetadataContentType'] = msg.get('Metadata.ContentType', '')
+ initialRequest['MetadataSize'] = msg.get('DataLength', '')
# except from GetData all requests are complete here. Next GetData will run through AllData...
# For GetData with persistence != connection the node sends no All Data message
# whatever that is good for ..fix this here to get all GetData request to complete on
# All Data.
- if initialRequest['FcRequestType'] == consts.RequestType.GetData:
+ if initialRequest['RequestType'] == consts.RequestType.GetData:
if initialRequest['Persistence'] != consts.Persistence.Connection:
self.sendMessage(
consts.Message.GetRequestStatus,
@@ -858,14 +860,14 @@
return False
# check if it is one of our requests for key information
- if code == consts.FetchError.TooBig and initialRequest['FcRequestType'] == consts.RequestType.GetKeyInfo:
- initialRequest['FcMetadataContentType'] = msg.get('ExpectedMetadata.ContentType', '')
- initialRequest['FcDataLength'] = msg.get('ExpectedDataLength', -1)
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
+ if code == consts.FetchError.TooBig and initialRequest['RequestType'] == consts.RequestType.GetKeyInfo:
+ initialRequest['MetadataContentType'] = msg.get('ExpectedMetadata.ContentType', '')
+ initialRequest['DataLength'] = msg.get('ExpectedDataLength', -1)
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
self._finalizeRequest(msg, initialRequest, self.events.RequestCompleted)
else:
- initialRequest['FcErrorMessage'] = msg
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Error
self._finalizeRequest(msg, initialRequest, self.events.RequestFailed)
return True
@@ -878,6 +880,8 @@
# not one of our requests... so cancel it
if fcParams is None or CancelPersistentRequests:
+ if fcParams is None:
+ self._loggers['Runtime'].critical(consts.LogMessages.RequestInvalidClientToken)
self.sendMessage(
consts.Message.RemovePersistentRequest,
Identifier=requestIdentifier,
@@ -902,7 +906,7 @@
#FIX: [0001965: Persistence vs PersistenceType]
if 'PersistenceType' in initialRequest.params:
initialRequest['Persistence'] = initialRequest.params.pop('PersistenceType')
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Restored
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Restored
self.events.RequestRestored(initialRequest)
return True
@@ -940,7 +944,7 @@
modified[consts.RequestModified.PriorityClass] = None
initialRequest['PriorityClass'] = priorityClass
- initialRequest['FcModified'] = modified
+ initialRequest['Modified'] = modified
self.events.RequestModified(initialRequest)
return True
@@ -949,7 +953,7 @@
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Removed
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Removed
self._finalizeRequest(msg, initialRequest, self.events.RequestRemoved)
return True
@@ -958,11 +962,11 @@
if initialRequest is None:
return False
- initialRequest['FcProgressTotal'] = msg['Total']
- initialRequest['FcProgressRequired'] = msg['Required']
- initialRequest['FcProgressFailed'] = msg['Failed']
- initialRequest['FcProgressFatalyFailed'] = msg['FatallyFailed']
- initialRequest['FcProgressSucceeeded'] = msg['Succeeded']
+ initialRequest['ProgressTotal'] = msg['Total']
+ initialRequest['ProgressRequired'] = msg['Required']
+ initialRequest['ProgressFailed'] = msg['Failed']
+ initialRequest['ProgressFatalyFailed'] = msg['FatallyFailed']
+ initialRequest['ProgressSucceeeded'] = msg['Succeeded']
self.events.RequestProgress(initialRequest)
return True
@@ -976,6 +980,8 @@
# not one of our requests... so cancel it
if fcParams is None or CancelPersistentRequests:
+ if fcParams is None:
+ self._loggers['Runtime'].critical(consts.LogMessages.RequestInvalidClientToken)
self.sendMessage(
consts.Message.RemovePersistentRequest,
Identifier=requestIdentifier,
@@ -1005,7 +1011,7 @@
#FIX: remove Started param from PersistentGet / Put
del initialRequest.params['Started']
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Restored
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Restored
self.events.RequestRestored(initialRequest)
return True
@@ -1021,8 +1027,8 @@
if code == consts.InsertError.Canceled:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Error
- initialRequest['FcErrorMessage'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Error
+ initialRequest['ErrorMessage'] = msg
self._finalizeRequest(msg, initialRequest, self.events.RequestFailed)
return True
@@ -1042,7 +1048,7 @@
# TODO: StartupTime and CompletionTime are passed, but
# as long as no corrosponding params are passed in DataFound
# we ignore them
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
initialRequest['URI'] = msg['URI']
self._finalizeRequest(msg, initialRequest, self.events.RequestCompleted)
return True
@@ -1057,14 +1063,14 @@
elif msg.name == consts.Message.FinishedCompression:
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Compressed
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Compressed
self.events.RequestCompressionFinished(initialRequest)
return True
elif msg.name == consts.Message.StartedCompression:
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Compressing
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Compressing
self.events.RequestCompressionStarted(initialRequest)
return True
@@ -1109,15 +1115,15 @@
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
self._finalizeRequest(msg, initialRequest, self.events.PluginInfo)
return True
elif msg.name == consts.Message.FCPPluginReply:
if initialRequest is None:
return False
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
- initialRequest['FcPluginReply'] = msg
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['PluginReply'] = msg
self._finalizeRequest(msg, initialRequest, self.events.PluginMessage)
return True
@@ -1144,13 +1150,13 @@
insertURI = key.stripKey(msg['InsertURI'])
requestURI = key.stripKey(msg['RequestURI'])
- if initialRequest['FcRequestType'] == consts.RequestType.GenerateUSKKeypair:
+ if initialRequest['RequestType'] == consts.RequestType.GenerateUSKKeypair:
insertURI = insertURI.replace(consts.KeyType.SSK, consts.KeyType.USK, 1)
requestURI = requestURI.replace(consts.KeyType.SSK, consts.KeyType.USK, 1)
- initialRequest['FcPrivateKey'] = insertURI
- initialRequest['FcPublicKey'] = requestURI
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Success
+ initialRequest['PrivateKey'] = insertURI
+ initialRequest['PublicKey'] = requestURI
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Success
self._finalizeRequest(msg, initialRequest, self.events.KeypairGenerated)
return True
@@ -1216,7 +1222,7 @@
# check if we have running requests. Assert False
haveRunningRequests = False
for request in self._requests.values():
- if not request['FcRequestStatus'] & consts.RequestStatus.Completed:
+ if not request['RequestStatus'] & consts.RequestStatus.Completed:
haveRunningRequests = True
break
@@ -1562,7 +1568,7 @@
DontPoll=dontPoll,
)
self._registerRequest(msg, consts.RequestType.SubscribeUSK)
- msg['FcRequestStatus'] |= consts.RequestStatus.Completed
+ msg['RequestStatus'] |= consts.RequestStatus.Completed
self.sendMessageEx(msg)
return msg['Identifier']
@@ -1594,7 +1600,7 @@
to this method
@note: to upload multiple items at once pass a dict for each item containig the following members:
- - FcRequestType: L{consts.RequestType.PutData}, L{consts.RequestType.PutFile} or L{consts.RequestType.PutRedirect}
+ - RequestType: L{consts.RequestType.PutData}, L{consts.RequestType.PutFile} or L{consts.RequestType.PutRedirect}
- Data: if requestType is L{consts.RequestType.PutData}, data to upload
- Filename: if requestType is L{consts.RequestType.PutFile}, filepath of the file to upload
- TargetURI: if requestType is L{consts.RequestType.PutRedirect}, uri to redirect to
@@ -1658,8 +1664,7 @@
data = ''
for n, item in enumerate(items):
-
- requestType = item.get('FcRequestType', None)
+ requestType = item.get('RequestType', None)
if requestType is None:
raise ValueError('No request type specified for item: %s' % n)
uploadFrom = uploadTypeMapping.get(requestType, None)
@@ -1674,7 +1679,7 @@
allowedParams = dict(paramMapping[requestType])
msg.params['Files.%s.UploadFrom' % n] = uploadFrom
for param, value in item.items():
- if param.startswith('Fc'):
+ if param == 'RequestType':
continue
if param in allowedParams:
@@ -2169,7 +2174,7 @@
Fcp does not provide means to do so.
"""
initialRequest = self._requests[requestIdentifier]
- if not initialRequest['FcRequestType'] & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
+ if not initialRequest['RequestType'] & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
raise ValueError('Can not modify request: %s' % initialRequest.name)
#FIX: [0002083]
@@ -2180,11 +2185,11 @@
# raise ValueError('Can not modify priority of requests with Persistence=connection')
if persistentUserData is not None:
- initialRequest['FcPersistentUserData'] = persistentUserData
+ initialRequest['PersistentUserData'] = persistentUserData
initialRequest['ClientToken'] = fcparams.messageToParams(initialRequest)
modified[consts.RequestModified.PersistentUserData] = None
- initialRequest['FcModified'] = modified
+ initialRequest['Modified'] = modified
self.events.RequestModified(initialRequest)
return
@@ -2194,7 +2199,7 @@
Global=False,
)
if persistentUserData is not None:
- initialRequest['FcPersistentUserData'] = persistentUserData
+ initialRequest['PersistentUserData'] = persistentUserData
msg['ClientToken'] = fcparams.messageToParams(initialRequest)
if priorityClass is not None:
msg['PriorityClass'] = priorityClass
@@ -2207,8 +2212,8 @@
@param requestIdentifier: (str) identifier of the request to remove
"""
initialRequest = self._requests[requestIdentifier]
- initialRequest['FcRequestStatus'] |= consts.RequestStatus.Removed | consts.RequestStatus.Completed
- if initialRequest['FcRequestType'] & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
+ initialRequest['RequestStatus'] |= consts.RequestStatus.Removed | consts.RequestStatus.Completed
+ if initialRequest['RequestType'] & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
# remove Persistence.Connection emidiately
# ..make up a PersistentRequestRemoved message for this case
@@ -2236,18 +2241,18 @@
request, it will be removed. The new request will have FcInitTime reset and FcUserData amd FcPersistentUserData
taken over from the old request
- @note: for SSK and USK puts, the private key is taken from request['FcPrivateKey']. Adjust private (and public
+ @note: for SSK and USK puts, the private key is taken from request['PrivateKey']. Adjust private (and public
key) if necessary
@todo: reset init time or not? Currently it is not reset.
"""
- requestType = request.get('FcRequestType', consts.RequestType.Null)
+ requestType = request.get('RequestType', consts.RequestType.Null)
if not requestType & (consts.RequestType.MaskGet | consts.RequestType.MaskPut):
raise ValueError('Can not resend request: %s' % requestMessage.name)
# we don't know what UserData may be, so back it up before copying
oldIdentifier = request['Identifier']
- oldUserData, request['FcUserData'] = request['FcUserData'], None
+ oldUserData, request['UserData'] = request['UserData'], None
newRequest = copy.deepcopy(request)
# reset key if necessary
@@ -2259,25 +2264,25 @@
if requestKey.KeyType == consts.KeyType.CHK:
newRequest['URI'] = consts.KeyType.CHK
elif requestKey.KeyType == consts.KeyType.SSK:
- newRequest['URI'] = request['FcPrivateKey']
+ newRequest['URI'] = request['PrivateKey']
if requestKey.filename:
newRequest['URI'] += '/' + requestKey.filename
elif requestKey.KeyType == consts.KeyType.USK:
- newRequest['URI'] = request['FcPrivateKey']
+ newRequest['URI'] = request['PrivateKey']
if requestKey.filename:
newRequest['URI'] += '/' + requestKey.filename
self._registerRequest(
newRequest,
requestType,
- filenameCollision=newRequest['FcFilenameCollision'] & consts.FilenameCollision.MaskHandle,
+ filenameCollision=newRequest['FilenameCollision'] & consts.FilenameCollision.MaskHandle,
#initTime=time.time(),
- persistentUserData=newRequest['FcPersistentUserData'],
+ persistentUserData=newRequest['PersistentUserData'],
userData=oldUserData,
)
if oldIdentifier in self._requests:
- request['FcUserData'] = oldUserData
+ request['UserData'] = oldUserData
self.removeRequest(request['Identifier'])
self.sendMessageEx(newRequest)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
