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

Make kerberos initialization static.

Browse source 
There does not seem to be any reason to initialize the members more than
once globally.
This commit is contained in:
Johanna Amann 2018-06-01 13:12:46 -07:00
parent 6f3ccd507b
commit 3a9575bf8a
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -242,6 +242,9 @@ New Functionality
- Added new SMB events: smb1_transaction_secondary_request,
smb1_transaction2_secondary_request, smb1_transaction_response
- Bro can now decrypt Kerberos tickets, and retrieve the authentication from
them, given a suitable keytab file.
Changed Functionality
---------------------

31
src/analyzer/protocol/krb/KRB.cc
View file

@ -6,13 +6,25 @@
using namespace analyzer::krb;
bool KRB_Analyzer::krb_available = false;
#ifdef USE_KRB5
krb5_context KRB_Analyzer::krb_context = nullptr;
krb5_keytab KRB_Analyzer::krb_keytab = nullptr;
std::once_flag KRB_Analyzer::krb_initialized;
#endif
KRB_Analyzer::KRB_Analyzer(Connection* conn)
: Analyzer("KRB", conn),
krb_available(false)
: Analyzer("KRB", conn)
{
interp = new binpac::KRB::KRB_Conn(this);
#ifdef USE_KRB5
std::call_once(krb_initialized, Initialize_Krb);
#endif
}
#ifdef USE_KRB5
void KRB_Analyzer::Initialize_Krb()
{
if ( BifConst::KRB::keytab->Len() == 0 )
return; // no keytab set
@ -37,20 +49,11 @@ KRB_Analyzer::KRB_Analyzer(Connection* conn)
return;
}
krb_available = true;
#endif
}
#endif
KRB_Analyzer::~KRB_Analyzer()
{
#ifdef USE_KRB5
if ( krb_available )
{
krb5_error_code retval = krb5_kt_close(krb_context, krb_keytab);
if ( retval )
reporter->Warning("KRB: Couldn't close keytab (%s)", krb5_get_error_message(krb_context, retval));
krb5_free_context(krb_context);
}
#endif
delete interp;
}
@ -125,7 +128,9 @@ StringVal* KRB_Analyzer::GetAuthenticationInfo(const BroString* principal, const
StringVal* ret = new StringVal(cp);
krb5_free_unparsed_name(krb_context, cp);
#endif
return ret;
#else
return nullptr;
#endif
}

9
src/analyzer/protocol/krb/KRB.h
View file

@ -30,10 +30,13 @@ protected:
binpac::KRB::KRB_Conn* interp;
bool krb_available;
private:
static bool krb_available;
#ifdef USE_KRB5
krb5_context krb_context;
krb5_keytab krb_keytab;
static std::once_flag krb_initialized;
static void Initialize_Krb();
static krb5_context krb_context;
static krb5_keytab krb_keytab;
#endif
};