Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-27 09:49:09 +01:00
Code Issues Packages Projects Releases Activity

Do not use socket.MSG_WAITALL

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-11-27 08:50:22 +01:00
parent 7357d83b73
commit 3e19f28cc0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py
View File

@@ -46,6 +46,17 @@ def print_messages(ui, messages):
msg += ": " + message['message'] + "\n"
ui.warn(msg.encode('utf-8'))
def read_bytes(connection, length):
received = bytearray()
while len(received) < length:
buffer = connection.recv(length - len(received))
received = received + buffer
return received
def read_int(connection):
data = read_bytes(connection, 4)
return struct.unpack('>i', bytearray(data))[0]
def fire_hook(ui, repo, hooktype, node):
abort = True
ui.debug( b"send scm-hook for " + node + b"\n" )
@@ -59,13 +70,12 @@ def fire_hook(ui, repo, hooktype, node):
connection.send(struct.pack('>i', len(data)))
connection.sendall(data)
d = connection.recv(4, socket.MSG_WAITALL)
length = struct.unpack('>i', bytearray(d))[0]
length = read_int(connection)
if length > 8192:
ui.warn( b"scm-hook received message with exceeds the limit of 8192\n" )
return True
d = connection.recv(length, socket.MSG_WAITALL)
d = read_bytes(connection, length)
response = json.loads(d.decode("utf-8"))
abort = response['abort']
@@ -112,4 +122,3 @@ def pre_hook(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs)
def post_hook(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs):
return callback(ui, repo, "POST_RECEIVE", node)