Skip to content

Use Zeek 5 syntax and add Azure AD protocol negotiation to table #6

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

Open
tillson wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use Zeek 5 syntax and add Azure AD protocol negotiation to table #6

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee0a403
Use Zeek 5 syntax for table definition
tillson Jun 19, 2023
1dc0849
Add Azure AD protocol negotiation
tillson Jun 19, 2023
dd93f2b
Update rdfp.zeek
tillson Jun 19, 2023
657b79f
Style adjustments
tillson Jun 20, 2023
55d8247
merge
tillson Jun 20, 2023
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
164 changes: 82 additions & 82 deletions scripts/rdfp.zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@
module RDPrinting;

export {

redef enum Log::ID += { RDFP };
}

type RDPFPStorage: record {
id: conn_id &log &optional;
cookie: string &log &optional;
verMajor: int &default=0 &log;
verMinor: int &default=0 &log;
clusterFlags: string &default="" &log;
encMethods: string &default="" &log;
extEncMethods: string &default="" &log;
channelDef: string &default="" &log;
rdfp_string: string &default="" &log;
rdfp_hash: string &default="" &log;

};
type RDPFPStorage: record {
id: conn_id &log &optional;
cookie: string &log &optional;
verMajor: int &default=0 &log;
verMinor: int &default=0 &log;
clusterFlags: string &default="" &log;
encMethods: string &default="" &log;
extEncMethods: string &default="" &log;
channelDef: string &default="" &log;
rdfp_string: string &default="" &log;
rdfp_hash: string &default="" &log;
};


redef record connection += {
Expand All @@ -39,86 +37,88 @@ event zeek_init() {
const negproto: table[count] of string &redef;

redef negproto += {
[0] = ["RDP"],
[1] = ["SSL"],
[2] = ["HYBRID"],
[3] = ["Undefined"],
[4] = ["RDSTLS"],
[5] = ["undef5"],
[6] = ["undef6"],
[7] = ["undef8"],
[8] = ["HYBRID-EX"],

[0] = "RDP",
[1] = "SSL",
[2] = "HYBRID",
[3] = "Undefined",
[4] = "RDSTLS",
[5] = "undef5",
[6] = "undef6",
[7] = "undef8",
[8] = "HYBRID-EX",
[16] = "RDSAAD"
};

event rdp_connect_request(c: connection, cookie: string) &priority=5
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
c$rdfp$id = c$id;
c$rdfp$cookie = cookie;
}
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

c$rdfp$id = c$id;
c$rdfp$cookie = cookie;
}

event rdp_client_core_data(c: connection, data: RDP::ClientCoreData) &priority=5
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

c$rdfp$verMajor = data$version_major;
c$rdfp$verMinor = data$version_minor;
}
c$rdfp$verMajor = data$version_major;
c$rdfp$verMinor = data$version_minor;
}

event rdp_client_cluster_data(c: connection, data: RDP::ClientClusterData)
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
c$rdfp$clusterFlags = fmt("%08x",data$flags);
}
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

c$rdfp$clusterFlags = fmt("%08x",data$flags);
}

event rdp_client_security_data(c: connection, data: RDP::ClientSecurityData)
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
local encMethod = fmt("%08x",data$encryption_methods);
c$rdfp$encMethods = encMethod;
c$rdfp$extEncMethods = fmt("%08x",data$ext_encryption_methods);
}
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

local encMethod = fmt("%08x",data$encryption_methods);
c$rdfp$encMethods = encMethod;
c$rdfp$extEncMethods = fmt("%08x",data$ext_encryption_methods);
}

event rdp_client_network_data(c: connection, channels: RDP::ClientChannelList)
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
for ( i in channels ) {
if ( c$rdfp$channelDef == "" )
{
c$rdfp$channelDef = fmt("%s:%08x", gsub(channels[i]$name,/\x00/,""), channels[i]$options);
}
else {
c$rdfp$channelDef += fmt("%s%s:%08x", sep, gsub(channels[i]$name,/\x00/,""), channels[i]$options);

}
}
}

## RDFP = md5(verMajor;verMinor;clusterFlags;encryptionMethods;extEncMethods;channelDef)
event rdp_client_network_data(c: connection, channels: RDP::ClientChannelList)
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

for ( i in channels )
{
if ( c$rdfp$channelDef == "" )
c$rdfp$channelDef = fmt("%s:%08x", gsub(channels[i]$name,/\x00/,""), channels[i]$options);
else
c$rdfp$channelDef += fmt("%s%s:%08x", sep, gsub(channels[i]$name,/\x00/,""), channels[i]$options);
}
}

event rdp_begin_encryption(c: connection, security_protocol: count)
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();
local myproto = cat(negproto[security_protocol]);
if( c?$rdfp ) {
local rdfp_string = join_string_vec(vector(cat(c$rdfp$verMajor),
cat(c$rdfp$verMinor),
c$rdfp$encMethods,
c$rdfp$clusterFlags,
cat(c$rdfp$extEncMethods),
c$rdfp$channelDef
), rdfp_sep);
c$rdfp$rdfp_hash = md5_hash(rdfp_string);
c$rdfp$rdfp_string = rdfp_string;
c$rdfp$id = c$id;
Log::write(RDPrinting::RDFP, c$rdfp);
}
}
{
if ( !c?$rdfp )
c$rdfp = RDPFPStorage();

local myproto = cat(negproto[security_protocol]);

if ( c?$rdfp )
{
local rdfp_string = join_string_vec(vector(cat(c$rdfp$verMajor),
cat(c$rdfp$verMinor),
c$rdfp$encMethods,
c$rdfp$clusterFlags,
cat(c$rdfp$extEncMethods),
c$rdfp$channelDef
), rdfp_sep);
c$rdfp$rdfp_hash = md5_hash(rdfp_string);
c$rdfp$rdfp_string = rdfp_string;
c$rdfp$id = c$id;
Log::write(RDPrinting::RDFP, c$rdfp);
}
}