nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

logparse.pl: add a verbose dump system.

Browse Source 
This allows me to request a verbose dump of the contents of some
particular packet type, or for all packet types.

Currently, the only packet type for which I've written a verbose dump
function is KEXINIT, but the framework is there to add further verbose
dumpers as and when they're needed.
This commit is contained in:
Simon Tatham 2018-04-05 18:22:59 +01:00
parent 204780080d
commit 48625ece7d
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
contrib/logparse.pl
View File

@ -7,8 +7,12 @@ use FileHandle;
my $dumpchannels = 0; my $dumpchannels = 0;
my $dumpdata = 0; my $dumpdata = 0;
my $verbose_all;
my %verbose_packet;
GetOptions("dump-channels|c" => \$dumpchannels, GetOptions("dump-channels|c" => \$dumpchannels,
"dump-data|d" => \$dumpdata, "dump-data|d" => \$dumpdata,
"verbose|v" => \$verbose_all,
"full|f=s" => sub { $verbose_packet{$_[1]} = 1; },
"help" => sub { &usage(\*STDOUT, 0); }) "help" => sub { &usage(\*STDOUT, 0); })
or &usage(\*STDERR, 1); or &usage(\*STDERR, 1);
@ -18,6 +22,8 @@ sub usage {
usage: logparse.pl [ options ] [ input-log-file ] usage: logparse.pl [ options ] [ input-log-file ]
options: --dump-channels, -c dump the final state of every channel options: --dump-channels, -c dump the final state of every channel
--dump-data, -d save data of every channel to ch0.i, ch0.o, ... --dump-data, -d save data of every channel to ch0.i, ch0.o, ...
--full=PKT, -f PKT print extra detail for packets of type PKT
--verbose, -v print extra detail for all packets if available
EOF EOF
exit $exitstatus; exit $exitstatus;
} }
@ -536,6 +542,34 @@ my %packets = (
}, },
); );
my %verbose_packet_dump_functions = (
'SSH2_MSG_KEXINIT' => sub {
my ($data) = @_;
my ($cookie0, $cookie1, $cookie2, $cookie3,
$kex, $hostkey, $cscipher, $sccipher, $csmac, $scmac,
$cscompress, $sccompress, $cslang, $sclang, $guess) =
&parse("uuuussssssssssb", $data);
printf(" cookie: %08x%08x%08x%08x\n",
$cookie0, $cookie1, $cookie2, $cookie3);
my $print_namelist = sub {
my @names = split /,/, $_[1];
printf " %s: name-list with %d items%s\n", $_[0], (scalar @names),
join "", map { "\n $_" } @names;
};
$print_namelist->("kex", $kex);
$print_namelist->("host key", $hostkey);
$print_namelist->("client->server cipher", $cscipher);
$print_namelist->("server->client cipher", $sccipher);
$print_namelist->("client->server MAC", $csmac);
$print_namelist->("server->client MAC", $scmac);
$print_namelist->("client->server compression", $cscompress);
$print_namelist->("server->client compression", $sccompress);
$print_namelist->("client->server language", $cslang);
$print_namelist->("server->client language", $sclang);
printf " first kex packet follows: %s\n", $guess;
},
);
my %sftp_packets = ( my %sftp_packets = (
#define SSH_FXP_INIT 1 /* 0x1 */ #define SSH_FXP_INIT 1 /* 0x1 */
0x1 => sub { 0x1 => sub {
@ -763,6 +797,12 @@ my %sftp_packets = (
}, },
); );
for my $type (keys %verbose_packet) {
if (!defined $verbose_packet_dump_functions{$type}) {
die "no verbose dump available for packet type $type\n";
}
}
my ($direction, $seq, $ourseq, $type, $data, $recording); my ($direction, $seq, $ourseq, $type, $data, $recording);
my %ourseqs = ('i'=>0, 'o'=>0); my %ourseqs = ('i'=>0, 'o'=>0);
@ -780,6 +820,10 @@ while (<>) {
} else { } else {
printf "raw %s\n", join "", map { sprintf "%02x", $_ } @$data; printf "raw %s\n", join "", map { sprintf "%02x", $_ } @$data;
} }
if (defined $verbose_packet_dump_functions{$type} &&
($verbose_all || defined $verbose_packet{$type})) {
$verbose_packet_dump_functions{$type}->($data);
}
} }
} }
if (/^(Incoming|Outgoing) packet #0x([0-9a-fA-F]+), type \d+ \/ 0x[0-9a-fA-F]+ \((.*)\)/) { if (/^(Incoming|Outgoing) packet #0x([0-9a-fA-F]+), type \d+ \/ 0x[0-9a-fA-F]+ \((.*)\)/) {