particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace md5 with sha256

Browse source
This commit is contained in:
Tomas Kopecek 2020-06-23 10:25:01 +02:00
parent a893e8bf2b
commit 50bcb6f3bc
10 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vm/kojikamid.py
View file

@ -608,7 +608,7 @@ def upload_file(server, prefix, path):
destpath = os.path.join(prefix, path)
fobj = open(destpath, 'r')
offset = 0
sum = hashlib.md5()
sum = hashlib.sha256()
while True:
data = fobj.read(131072)
if not data:
@ -619,8 +619,8 @@ def upload_file(server, prefix, path):
sum.update(data)
fobj.close()
digest = sum.hexdigest()
server.verifyChecksum(path, digest, 'md5')
logger.info('Uploaded %s (%s bytes, md5: %s)', destpath, offset, digest)
server.verifyChecksum(path, digest, 'sha256')
logger.info('Uploaded %s (%s bytes, sha256: %s)', destpath, offset, digest)
def get_mgmt_server():
@ -709,10 +709,10 @@ def stream_logs(server, handler, builds):
if contents:
size = len(contents)
data = base64.b64encode(contents)
digest = hashlib.md5(contents).hexdigest()
digest = hashlib.sha256(contents).hexdigest()
del contents
try:
server.uploadDirect(relpath, offset, size, digest, data)
server.uploadDirect(relpath, offset, size, ('sha256', digest), data)
except Exception:
log_local('error uploading %s' % relpath)
time.sleep(1)

4
vm/kojivmd
View file

@ -775,14 +775,14 @@ class VMExecTask(BaseTaskHandler):
fobj.close()
return len(data)
def uploadDirect(self, filepath, offset, size, md5sum, data):
def uploadDirect(self, filepath, offset, size, hash, data):
"""
Upload contents directly to the server.
"""
remotepath = os.path.dirname(os.path.join(self.getUploadDir(), filepath))
filename = os.path.basename(filepath)
self.session.uploadFile(remotepath, filename, size,
md5sum, offset, data)
hash, offset, data)
def verifyChecksum(self, path, checksum, algo='sha1'):
local_path = os.path.abspath(os.path.join(self.output_dir, path))