Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Whitespace cleanup & fixes

Browse source 
[nomail]
This commit is contained in:
Vlad Grigorescu 2020-03-05 11:50:41 -06:00
parent d961e21185
commit c38e1fa91a
1 changed files with 83 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

166
src/analyzer/protocol/mysql/mysql-protocol.pac
View file

@ -7,18 +7,18 @@
# Basic Types # Basic Types
type uint24le = record { type uint24le = record {
byte3 : uint8; byte3: uint8;
byte2 : uint8; byte2: uint8;
byte1 : uint8; byte1: uint8;
}; };
type LengthEncodedInteger = record { type LengthEncodedInteger = record {
length : uint8; length : uint8;
integer : LengthEncodedIntegerLookahead(length); integer: LengthEncodedIntegerLookahead(length);
}; };
type LengthEncodedIntegerArg(length: uint8) = record { type LengthEncodedIntegerArg(length: uint8) = record {
integer : LengthEncodedIntegerLookahead(length); integer: LengthEncodedIntegerLookahead(length);
}; };
type LengthEncodedIntegerLookahead(length: uint8) = record { type LengthEncodedIntegerLookahead(length: uint8) = record {
@ -156,13 +156,13 @@ type NUL_String = RE/[^\0]*\0/;
# MySQL PDU # MySQL PDU
type MySQL_PDU(is_orig: bool) = record { type MySQL_PDU(is_orig: bool) = record {
hdr : Header; hdr : Header;
msg : case is_orig of { msg : case is_orig of {
false -> server_msg: Server_Message(hdr.seq_id, hdr.len); false -> server_msg: Server_Message(hdr.seq_id, hdr.len);
true -> client_msg: Client_Message(state); true -> client_msg: Client_Message(state);
} &requires(state); } &requires(state);
} &let { } &let {
state : int = $context.connection.get_state(); state: int = $context.connection.get_state();
} &length=hdr.len &byteorder=bigendian; } &length=hdr.len &byteorder=bigendian;
type Header = record { type Header = record {
@ -185,127 +185,127 @@ type Client_Message(state: int) = case state of {
# Handshake Request # Handshake Request
type Initial_Handshake_Packet = record { type Initial_Handshake_Packet = record {
version : uint8; version : uint8;
pkt : case version of { pkt : case version of {
10 -> handshake10 : Handshake_v10; 10 -> handshake10: Handshake_v10;
9 -> handshake9 : Handshake_v9; 9 -> handshake9 : Handshake_v9;
default -> error : ERR_Packet; default -> error : ERR_Packet;
}; };
} &let { } &let {
set_version : bool = $context.connection.set_version(version); set_version: bool = $context.connection.set_version(version);
}; };
type Handshake_v10 = record { type Handshake_v10 = record {
server_version : NUL_String; server_version : NUL_String;
connection_id : uint32; connection_id : uint32;
auth_plugin_data_part_1 : bytestring &length=8; auth_plugin_data_part_1: bytestring &length=8;
filler_1 : uint8; filler_1 : uint8;
capability_flag_1 : uint16; capability_flag_1 : uint16;
character_set : uint8; character_set : uint8;
status_flags : uint16; status_flags : uint16;
capability_flags_2 : uint16; capability_flags_2 : uint16;
auth_plugin_data_len : uint8; auth_plugin_data_len : uint8;
auth_plugin_name : NUL_String; auth_plugin_name : NUL_String;
}; };
type Handshake_v9 = record { type Handshake_v9 = record {
server_version : NUL_String; server_version: NUL_String;
connection_id : uint32; connection_id : uint32;
scramble : NUL_String; scramble : NUL_String;
}; };
# Handshake Response # Handshake Response
type Handshake_Response_Packet = case $context.connection.get_version() of { type Handshake_Response_Packet = case $context.connection.get_version() of {
10 -> v10_response : Handshake_Response_Packet_v10; 10 -> v10_response: Handshake_Response_Packet_v10;
9 -> v9_response : Handshake_Response_Packet_v9; 9 -> v9_response : Handshake_Response_Packet_v9;
} &let { } &let {
version : uint8 = $context.connection.get_version(); version: uint8 = $context.connection.get_version();
} &byteorder=bigendian; } &byteorder=bigendian;
type Handshake_Response_Packet_v10 = record { type Handshake_Response_Packet_v10 = record {
cap_flags : uint32; cap_flags : uint32;
max_pkt_size : uint32; max_pkt_size: uint32;
char_set : uint8; char_set : uint8;
pad : padding[23]; pad : padding[23];
username : NUL_String; username : NUL_String;
password : bytestring &restofdata; password : bytestring &restofdata;
}; };
type Handshake_Response_Packet_v9 = record { type Handshake_Response_Packet_v9 = record {
cap_flags : uint16; cap_flags : uint16;
max_pkt_size : uint24le; max_pkt_size : uint24le;
username : NUL_String; username : NUL_String;
auth_response : NUL_String; auth_response: NUL_String;
have_db : case ( cap_flags & 0x8 ) of { have_db : case ( cap_flags & 0x8 ) of {
0x8 -> database : NUL_String; 0x8 -> database: NUL_String;
0x0 -> none : empty; 0x0 -> none : empty;
}; };
password : bytestring &restofdata; password : bytestring &restofdata;
}; };
# Command Request # Command Request
type Command_Request_Packet = record { type Command_Request_Packet = record {
command : uint8; command: uint8;
arg : bytestring &restofdata; arg : bytestring &restofdata;
} &let { } &let {
update_expectation : bool = $context.connection.set_next_expected_from_command(command); update_expectation: bool = $context.connection.set_next_expected_from_command(command);
}; };
# Command Response # Command Response
type Command_Response(pkt_len: uint32) = case $context.connection.get_expectation() of { type Command_Response(pkt_len: uint32) = case $context.connection.get_expectation() of {
EXPECT_COLUMN_COUNT -> col_count_meta : ColumnCountMeta; EXPECT_COLUMN_COUNT -> col_count_meta: ColumnCountMeta;
EXPECT_COLUMN_DEFINITION -> col_def : ColumnDefinition; EXPECT_COLUMN_DEFINITION -> col_def : ColumnDefinition;
EXPECT_COLUMN_DEFINITION_OR_EOF -> def_or_eof : ColumnDefinitionOrEOF(pkt_len); EXPECT_COLUMN_DEFINITION_OR_EOF -> def_or_eof : ColumnDefinitionOrEOF(pkt_len);
EXPECT_RESULTSET -> resultset : Resultset(pkt_len); EXPECT_RESULTSET -> resultset : Resultset(pkt_len);
EXPECT_REST_OF_PACKET -> rest : bytestring &restofdata; EXPECT_REST_OF_PACKET -> rest : bytestring &restofdata;
EXPECT_STATUS -> status : Command_Response_Status; EXPECT_STATUS -> status : Command_Response_Status;
EXPECT_AUTH_SWITCH -> auth_switch : AuthSwitchRequest; EXPECT_AUTH_SWITCH -> auth_switch : AuthSwitchRequest;
EXPECT_EOF -> eof : EOF1; EXPECT_EOF -> eof : EOF1;
default -> unknow : empty; default -> unknown : empty;
}; };
type Command_Response_Status = record { type Command_Response_Status = record {
pkt_type: uint8; pkt_type: uint8;
response: case pkt_type of { response: case pkt_type of {
0x00 -> data_ok: OK_Packet; 0x00 -> data_ok: OK_Packet;
0xfe -> data_eof: EOF_Packet; 0xfe -> data_eof: EOF_Packet;
0xff -> data_err: ERR_Packet; 0xff -> data_err: ERR_Packet;
default -> unknown: empty; default -> unknown: empty;
}; };
}; };
type ColumnCountMeta = record { type ColumnCountMeta = record {
byte : uint8; byte : uint8;
pkt_type: case byte of { pkt_type: case byte of {
0x00 -> ok : OK_Packet; 0x00 -> ok : OK_Packet;
0xff -> err : ERR_Packet; 0xff -> err : ERR_Packet;
# 0xfb -> Not implemented # 0xfb -> Not implemented
default -> col_count: ColumnCount(byte); default -> col_count: ColumnCount(byte);
}; };
}; };
type ColumnCount(byte: uint8) = record { type ColumnCount(byte: uint8) = record {
le_column_count : LengthEncodedIntegerLookahead(byte); le_column_count : LengthEncodedIntegerLookahead(byte);
} &let { } &let {
col_num : uint32 = to_int()(le_column_count); col_num : uint32 = to_int()(le_column_count);
update_col_num : bool = $context.connection.set_col_count(col_num); update_col_num : bool = $context.connection.set_col_count(col_num);
update_remain : bool = $context.connection.set_remaining_cols(col_num); update_remain : bool = $context.connection.set_remaining_cols(col_num);
update_expectation : bool = $context.connection.set_next_expected(EXPECT_COLUMN_DEFINITION); update_expectation: bool = $context.connection.set_next_expected(EXPECT_COLUMN_DEFINITION);
}; };
type ColumnDefinition = record { type ColumnDefinition = record {
dummy: uint8; dummy: uint8;
def : ColumnDefinition41(dummy); def : ColumnDefinition41(dummy);
} &let { } &let {
update_remain : bool = $context.connection.dec_remaining_cols(); update_remain : bool = $context.connection.dec_remaining_cols();
update_expectation : bool = $context.connection.set_next_expected($context.connection.get_remaining_cols() > 0 ? EXPECT_COLUMN_DEFINITION : EXPECT_EOF); update_expectation: bool = $context.connection.set_next_expected($context.connection.get_remaining_cols() > 0 ? EXPECT_COLUMN_DEFINITION : EXPECT_EOF);
}; };
type ColumnDefinitionOrEOF(pkt_len: uint32) = record { type ColumnDefinitionOrEOF(pkt_len: uint32) = record {
marker: uint8; marker : uint8;
def_or_eof: case is_eof of { def_or_eof: case is_eof of {
true -> eof: EOF_Packet; true -> eof: EOF_Packet;
false -> def: ColumnDefinition41(marker); false -> def: ColumnDefinition41(marker);
@ -316,27 +316,27 @@ type ColumnDefinitionOrEOF(pkt_len: uint32) = record {
type EOF1 = record { type EOF1 = record {
eof : EOF_Packet; eof: EOF_Packet;
} &let { } &let {
update_result_seen : bool = $context.connection.set_results_seen(0); update_result_seen: bool = $context.connection.set_results_seen(0);
update_expectation : bool = $context.connection.set_next_expected(EXPECT_RESULTSET); update_expectation: bool = $context.connection.set_next_expected(EXPECT_RESULTSET);
}; };
type Resultset(pkt_len: uint32) = record { type Resultset(pkt_len: uint32) = record {
marker: uint8; marker : uint8;
row_or_eof: case is_eof of { row_or_eof: case is_eof of {
true -> eof: EOF_Packet; true -> eof: EOF_Packet;
false -> row: ResultsetRow(marker); false -> row: ResultsetRow(marker);
} &requires(is_eof); } &requires(is_eof);
} &let { } &let {
is_eof: bool = (marker == 0xfe && pkt_len <= 13); is_eof : bool = (marker == 0xfe && pkt_len <= 13);
update_result_seen : bool = $context.connection.inc_results_seen(); update_result_seen: bool = $context.connection.inc_results_seen();
update_expectation : bool = $context.connection.set_next_expected(is_eof ? NO_EXPECTATION : EXPECT_RESULTSET); update_expectation: bool = $context.connection.set_next_expected(is_eof ? NO_EXPECTATION : EXPECT_RESULTSET);
}; };
type ResultsetRow(first_byte: uint8) = record { type ResultsetRow(first_byte: uint8) = record {
first_field: LengthEncodedStringArg(first_byte); first_field: LengthEncodedStringArg(first_byte);
fields: LengthEncodedString[$context.connection.get_col_count() - 1]; fields : LengthEncodedString[$context.connection.get_col_count() - 1];
}; };
type ColumnDefinition41(first_byte: uint8) = record { type ColumnDefinition41(first_byte: uint8) = record {
@ -357,8 +357,8 @@ type ColumnDefinition41(first_byte: uint8) = record {
type AuthSwitchRequest = record { type AuthSwitchRequest = record {
status: uint8; status: uint8;
name: NUL_String; name : NUL_String;
data: bytestring &restofdata; data : bytestring &restofdata;
}; };
type ColumnDefinition320 = record { type ColumnDefinition320 = record {
@ -371,8 +371,8 @@ type ColumnDefinition320 = record {
}; };
type OK_Packet = record { type OK_Packet = record {
le_rows : LengthEncodedInteger; le_rows: LengthEncodedInteger;
todo : bytestring &restofdata; todo : bytestring &restofdata;
} &let { } &let {
rows : uint32 = to_int()(le_rows); rows : uint32 = to_int()(le_rows);
update_state: bool = $context.connection.update_state(COMMAND_PHASE); update_state: bool = $context.connection.update_state(COMMAND_PHASE);