Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ldap: Clean up from code review

Browse source 
Co-authored-by: Benjamin Bannier <benjamin.bannier@corelight.com>
This commit is contained in:
Arne Welzel 2025-04-15 20:07:23 +02:00
parent 07bf7f8b18
commit b8e573a3b9
3 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/protocols/ldap/consts.zeek
View file

@ -26,6 +26,8 @@ export {
const BIND_SIMPLE = "bind simple"; const BIND_SIMPLE = "bind simple";
const BIND_SASL = "bind SASL"; const BIND_SASL = "bind SASL";
const BIND_SICILY_NEGOTIATE = "sicily_negotiate";
const BIND_SICILY_RESPONSE= "sicily_response";
const RESULT_CODES = { [ LDAP::ResultCode_SUCCESS ] = "success", [ const RESULT_CODES = { [ LDAP::ResultCode_SUCCESS ] = "success", [
LDAP::ResultCode_OPERATIONS_ERROR ] = "operations error", [ LDAP::ResultCode_OPERATIONS_ERROR ] = "operations error", [

20
scripts/base/protocols/ldap/main.zeek
View file

@ -376,17 +376,23 @@ event LDAP::bind_request(c: connection,
if ( m?$opcode ) if ( m?$opcode )
Reporter::conn_weird("LDAP_bind_opcode_already_set", c, m$opcode, "LDAP"); Reporter::conn_weird("LDAP_bind_opcode_already_set", c, m$opcode, "LDAP");
if (authType == LDAP::BindAuthType_BIND_AUTH_SIMPLE) { switch ( authType ) {
case LDAP::BindAuthType_BIND_AUTH_SIMPLE:
m$opcode = BIND_SIMPLE; m$opcode = BIND_SIMPLE;
} else if (authType == LDAP::BindAuthType_BIND_AUTH_SASL) { break;
case LDAP::BindAuthType_BIND_AUTH_SASL:
m$opcode = BIND_SASL; m$opcode = BIND_SASL;
} else if (authType == LDAP::BindAuthType_SICILY_NEGOTIATE ) { break;
m$opcode = "sicily_negotiate"; case LDAP::BindAuthType_SICILY_NEGOTIATE:
} else if (authType == LDAP::BindAuthType_SICILY_RESPONSE ) { m$opcode = BIND_SICILY_NEGOTIATE;
m$opcode = "sicily_response"; break;
} else { case LDAP::BindAuthType_SICILY_RESPONSE:
m$opcode = BIND_SICILY_RESPONSE;
break;
default:
Reporter::conn_weird("LDAP_unknown_auth_type", c, cat(authType), "LDAP"); Reporter::conn_weird("LDAP_unknown_auth_type", c, cat(authType), "LDAP");
m$opcode = cat(authType); m$opcode = cat(authType);
break;
} }
} }

45
src/analyzer/protocol/ldap/ldap.spicy
View file

@ -416,10 +416,11 @@ type SaslCredentials = unit() {
}; };
}; };
type SicilyMessage = unit(bat: BindAuthType) { type SicilyMessage = unit() {
# Just ensure the signature matches. We could do more, # Just ensure the signature matches. We could do more,
# but it'd be better to forward to an NTLM analyzer. # but it'd be better to forward to an NTLM analyzer.
signature: b"NTLMSSP"; signature: skip b"NTLMSSP";
var signature_decoded: string = "NTLMSSP";
}; };
type GSS_SPNEGO_Subsequent = unit { type GSS_SPNEGO_Subsequent = unit {
@ -481,26 +482,30 @@ type BindRequest = unit(inout message: Message, ctx: Ctx&) {
self.authType = cast<BindAuthType>(cast<uint8>($$.application_id)); self.authType = cast<BindAuthType>(cast<uint8>($$.application_id));
self.authData = $$.application_data; self.authData = $$.application_data;
} }
if ((self.authType == BindAuthType::BIND_AUTH_SIMPLE) && (|self.authData| > 0)) {
self.simpleCreds = self.authData.decode();
if (|self.simpleCreds| > 0) {
message.arg = self.simpleCreds;
}
}
}
saslCreds: SaslCredentials() &parse-from=self.authData if ((self.authType == BindAuthType::BIND_AUTH_SASL) &&
(|self.authData| > 0)) {
message.arg = self.saslCreds.mechanism;
ctx.saslMechanism = self.saslCreds.mechanism;
} }
if ( |self.authData| > 0 ) {
switch ( self.authType ) {
BindAuthType::BIND_AUTH_SIMPLE ->
: void {
self.simpleCreds = self.authData.decode();
message.arg = self.simpleCreds;
}
sicilyMessage: SicilyMessage(self.authType) &parse-from=self.authData if ((self.authType == BindAuthType::SICILY_NEGOTIATE BindAuthType::BIND_AUTH_SASL ->
|| self.authType == BindAuthType::SICILY_RESPONSE) saslCreds: SaslCredentials {
&& (|self.authData| > 0)) { message.arg = self.saslCreds.mechanism;
message.arg = self.sicilyMessage.signature.decode(); ctx.saslMechanism = self.saslCreds.mechanism;
} }
BindAuthType::SICILY_NEGOTIATE, BindAuthType::SICILY_RESPONSE ->
sicilyMessage: SicilyMessage {
message.arg = self.sicilyMessage.signature_decoded;
}
* -> : void;
} &parse-from=self.authData;
};
} &requires=(self?.authType && (self.authType != BindAuthType::Undef)); } &requires=(self?.authType && (self.authType != BindAuthType::Undef));
type ServerSaslCreds = unit { type ServerSaslCreds = unit {