Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for #56 #57

Merged
merged 2 commits into from
Jan 25, 2024
Merged

fix for #56 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e508973
fix for #56
noeltimothy Jan 25, 2024
8b5bf4d
removed unwanted prints
noeltimothy Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions python/ja4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,13 @@ def main():

# Added for SSH
if 'tcp' in x['protos'] and 'ja4ssh' in output_types:
cache_update(x, 'count', 0, STREAM)
cache_update(x, 'stats', [], STREAM)
entry = get_cache(x)[x['stream']]
update_ssh_entry(entry, x, ssh_sample_count, STREAM)
if 'flags' in x and int(x['flags'], 0) & TCP_FLAGS['FIN'] and int(x['flags'], 0) & TCP_FLAGS['ACK']:
finalize_ja4ssh(x['stream'])
if (int(x['srcport']) == 22) or (int(x['dstport']) == 22):
cache_update(x, 'count', 0, STREAM)
cache_update(x, 'stats', [], STREAM)
entry = get_cache(x)[x['stream']]
update_ssh_entry(entry, x, ssh_sample_count, STREAM)
if 'flags' in x and int(x['flags'], 0) & TCP_FLAGS['FIN'] and int(x['flags'], 0) & TCP_FLAGS['ACK']:
finalize_ja4ssh(x['stream'])

# Timestamp recording happens on cache here
# This is for TCP
Expand Down
13 changes: 7 additions & 6 deletions python/ja4ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,23 @@ def process_extra_parameters(entry, x, direction):
## we return 1 whenever a new stats entry is added based on the sample rate
## This way the caller can print this packet out
def update_ssh_entry(entry, x, ssh_sample_count, debug_stream=None):

if entry['count'] == 0 and len(entry['stats']) == 0:
entry['stats'].append(dict(ja4sh_stats))

entry['count'] += 1
# Only count SSH PSHACK packets
if 'ssh' in x['protos']:
entry['count'] += 1

e = entry['stats'][-1]
direction = 'client' if entry['src'] == x['src'] else 'server'

if 'ssh' in x['protos']:
e[f'{direction}_payloads'].append(x['len'])
e[f'{direction}_packets'] += 1

# Update ACK count based on direction if the Flag has an ACK
if 'ssh' not in x['protos'] and x['flags_ack']:
# Update ACK count based on direction and Bare Acks
if 'ssh' not in x['protos'] and x['flags'] == '0x0010':
e[f'{direction}_acks'] += 1

# Added extra output parameters
Expand All @@ -68,7 +71,6 @@ def update_ssh_entry(entry, x, ssh_sample_count, debug_stream=None):
if (entry['count'] % ssh_sample_count) == 0:
to_ja4ssh(entry) if entry['count'] != 0 else None
if (entry['count'] / ssh_sample_count) == len(entry['stats']):
print (f'adding new entry at count {entry["count"]}')
entry['stats'].append(dict(ja4sh_stats))

if debug_stream and int(x['stream']) == debug_stream:
Expand All @@ -85,7 +87,6 @@ def update_ssh_entry(entry, x, ssh_sample_count, debug_stream=None):
##
def to_ja4ssh(x):
idx = len(x['stats'])
print (f'calling ja4ssh with idx = {idx}')
e = x['stats'][idx-1]
if e['client_payloads'] or e['server_payloads']:
mode_client = max(e['client_payloads'], key=e['client_payloads'].count) if e['client_payloads'] else 0
Expand Down
Loading