cowrie/cowrie
1
0
Fork 0
mirror of https://github.com/cowrie/cowrie.git synced 2025-07-01 18:07:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

dshield py3 (#1184)

Browse Source
This commit is contained in:
Michel Oosterhof
2019-08-25 12:26:19 +04:00
committed by GitHub
parent a97b1ead51
commit 7329d26974
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cowrie/output/dshield.py
View File

@ -84,17 +84,18 @@ class Output(cowrie.core.output.Output):
nonce = base64.b64decode(_nonceb64) nonce = base64.b64decode(_nonceb64)
digest = base64.b64encode( digest = base64.b64encode(
hmac.new( hmac.new(
b'{0}{1}'.format(nonce, self.userid), nonce+self.userid.encode('ascii'),
base64.b64decode(self.auth_key), base64.b64decode(self.auth_key),
hashlib.sha256).digest() hashlib.sha256).digest()
) )
auth_header = 'credentials={0} nonce={1} userid={2}'.format(digest, _nonceb64, self.userid) auth_header = 'credentials={0} nonce={1} userid={2}'.format(digest.decode('ascii'), _nonceb64, self.userid)
headers = { headers = {
'X-ISC-Authorization': auth_header, 'X-ISC-Authorization': auth_header,
'Content-Type': 'text/plain' 'Content-Type': 'text/plain'
} }
if self.debug: if self.debug:
log.msg('dshield: posting: {}'.format(repr(headers)))
log.msg('dshield: posting: {}'.format(log_output)) log.msg('dshield: posting: {}'.format(log_output))
req = threads.deferToThread( req = threads.deferToThread(
@ -108,7 +109,7 @@ class Output(cowrie.core.output.Output):
def check_response(resp): def check_response(resp):
failed = False failed = False
response = resp.content response = resp.content.decode('utf8')
if self.debug: if self.debug:
log.msg("dshield: status code {}".format(resp.status_code)) log.msg("dshield: status code {}".format(resp.status_code))
@ -122,7 +123,7 @@ class Output(cowrie.core.output.Output):
log.err('dshield: ERROR: Response: {0}'.format(repr(response))) log.err('dshield: ERROR: Response: {0}'.format(repr(response)))
failed = True failed = True
sha1_local = hashlib.sha1() sha1_local = hashlib.sha1()
sha1_local.update(log_output) sha1_local.update(log_output.encode('utf8'))
if sha1_match.group(1) != sha1_local.hexdigest(): if sha1_match.group(1) != sha1_local.hexdigest():
log.err( log.err(
'dshield: ERROR: SHA1 Mismatch {0} {1} .'.format(sha1_match.group(1), sha1_local.hexdigest())) 'dshield: ERROR: SHA1 Mismatch {0} {1} .'.format(sha1_match.group(1), sha1_local.hexdigest()))
@ -133,7 +134,7 @@ class Output(cowrie.core.output.Output):
log.err('dshield: ERROR: Could not find md5checksum in response') log.err('dshield: ERROR: Could not find md5checksum in response')
failed = True failed = True
md5_local = hashlib.md5() md5_local = hashlib.md5()
md5_local.update(log_output) md5_local.update(log_output.encode('utf8'))
if md5_match.group(1) != md5_local.hexdigest(): if md5_match.group(1) != md5_local.hexdigest():
log.err('dshield: ERROR: MD5 Mismatch {0} {1} .'.format(md5_match.group(1), md5_local.hexdigest())) log.err('dshield: ERROR: MD5 Mismatch {0} {1} .'.format(md5_match.group(1), md5_local.hexdigest()))
failed = True failed = True