Skip to content

Commit

Permalink
Refactoring: change macros to MACROS, remove TODOs and dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
@nichtsfrei
nichtsfrei committed Dec 10, 2024
1 parent c46d4a9 commit 1c4ee4b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 53 deletions.
13 changes: 6 additions & 7 deletions misc/openvas-krb5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ static OKrb5ErrorCode
okrb5_gss_authenticate (const OKrb5Credential *creds,
struct OKrb5GSSContext *gss_creds)
{
#define check_major_stat() \
#define CHECK_MAJOR_STAT() \
if (maj_stat != GSS_S_COMPLETE) \
{ \
result = O_KRB5_ERROR + maj_stat; \
Expand Down Expand Up @@ -365,18 +365,18 @@ okrb5_gss_authenticate (const OKrb5Credential *creds,

maj_stat =
gss_import_name (&min_stat, &userbuf, GSS_C_NT_USER_NAME, &gss_username);
check_major_stat ();
CHECK_MAJOR_STAT ();

maj_stat = gss_acquire_cred_with_password (&min_stat, gss_username, &pwbuf, 0,
&creds_mechs, GSS_C_INITIATE,
&cred, NULL, NULL);

(void) gss_release_name (&min_stat, &gss_username);
check_major_stat ();
CHECK_MAJOR_STAT ();

// let spnego only use the desired mechs
maj_stat = gss_set_neg_mechs (&min_stat, cred, &spnego_mechs);
check_major_stat ();
CHECK_MAJOR_STAT ();
gss_creds->gss_creds = cred;
result:
if (user_principal != NULL)
Expand Down Expand Up @@ -506,13 +506,12 @@ o_krb5_gss_prepare_context (const OKrb5Credential *creds,
gss_context->gss_time_rec = 0;
gss_context->gss_actual_mech_type = NULL;
result:
// TODO: cleanup target_principal_str on failure?
if (target_principal_str != NULL)
free (target_principal_str);

return result;
}

// TODO: this signature feels unintuitive based on the mix of in and out and
// changed gss_context as well...
OKrb5ErrorCode
o_krb5_gss_update_context (struct OKrb5GSSContext *gss_context,
const struct OKrb5Slice *in_data,
Expand Down
6 changes: 4 additions & 2 deletions nasl/nasl_host.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,9 @@ host_reverse_lookup (lex_ctxt *lexic)
}
else
{
// we need to duplicate it as get_str_var_by_name does store it within
// string_form which is released with the lex_ctxt release.
// we need to duplicate t because plug_get_host_ip_from_str allocates
// memory and to have the same behavior for both we simply duplicate the
// memory here
t = g_strdup (t);
}
if (t == NULL)
Expand All @@ -261,6 +262,7 @@ host_reverse_lookup (lex_ctxt *lexic)
if (target == NULL)
{
nasl_perror (lexic, "%s: Invalid target\n", t);
g_free (t);
goto fail;
}
g_free (t);
Expand Down
48 changes: 19 additions & 29 deletions nasl/nasl_krb5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <stdio.h>

#define nasl_print_krb_error(lexic, credential, result) \
#define NASL_PRINT_KRB_ERROR(lexic, credential, result) \
do \
{ \
char *error_str = okrb5_error_code_to_string (result); \
Expand All @@ -24,7 +24,7 @@

OKrb5ErrorCode last_okrb5_result;

#define set_slice_from_lex_or_env(lexic, slice, name, env_name) \
#define SET_SLICE_FROM_LEX_OR_ENV(lexic, slice, name, env_name) \
do \
{ \
okrb5_set_slice_from_str (slice, get_str_var_by_name (lexic, name)); \
Expand All @@ -35,10 +35,10 @@ OKrb5ErrorCode last_okrb5_result;
} \
while (0)

#define perror_set_slice_from_lex_or_env(lexic, slice, name, env_name) \
#define PERROR_SET_SLICE_FROM_LEX_OR_ENV(lexic, slice, name, env_name) \
do \
{ \
set_slice_from_lex_or_env (lexic, slice, name, env_name); \
SET_SLICE_FROM_LEX_OR_ENV (lexic, slice, name, env_name); \
if (slice.len == 0) \
{ \
nasl_perror (lexic, "Expected %s or env variable %s", name, \
Expand All @@ -55,37 +55,36 @@ build_krb5_credential (lex_ctxt *lexic)

char *kdc = NULL;

set_slice_from_lex_or_env (lexic, credential.config_path, "config_path",
SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.config_path, "config_path",
"KRB5_CONFIG");
if (credential.config_path.len == 0)
{
okrb5_set_slice_from_str (credential.config_path, "/etc/krb5.conf");
}
// TODO: enhance with redis check? maybe.

perror_set_slice_from_lex_or_env (lexic, credential.realm, "realm",
PERROR_SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.realm, "realm",
"KRB5_REALM");
perror_set_slice_from_lex_or_env (lexic, credential.kdc, "kdc", "KRB5_KDC");
perror_set_slice_from_lex_or_env (lexic, credential.user.user, "user",
PERROR_SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.kdc, "kdc", "KRB5_KDC");
PERROR_SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.user.user, "user",
"KRB5_USER");
perror_set_slice_from_lex_or_env (lexic, credential.user.password, "password",
PERROR_SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.user.password, "password",
"KRB5_PASSWORD");
perror_set_slice_from_lex_or_env (lexic, credential.target.host_name, "host",
PERROR_SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.target.host_name, "host",
"KRB5_TARGET_HOST");
// set_slice_from_lex_or_env (lexic, credential.target.service, "service",
// SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.target.service, "service",
// "KRB5_TARGET_SERVICE");

if ((code = o_krb5_find_kdc (&credential, &kdc)))
{
if (code != O_KRB5_REALM_NOT_FOUND && code != O_KRB5_CONF_NOT_FOUND)
{
nasl_print_krb_error (lexic, credential, code);
NASL_PRINT_KRB_ERROR (lexic, credential, code);
}
else
{
if ((code = o_krb5_add_realm (&credential, credential.kdc.data)))
{
nasl_print_krb_error (lexic, credential, code);
NASL_PRINT_KRB_ERROR (lexic, credential, code);
}
}
}
Expand All @@ -97,7 +96,7 @@ build_krb5_credential (lex_ctxt *lexic)
{
okrb5_set_slice_from_str (credential.target.service, "cifs");
}
set_slice_from_lex_or_env (lexic, credential.kdc, "kdc", "KRB5_KDC");
SET_SLICE_FROM_LEX_OR_ENV (lexic, credential.kdc, "kdc", "KRB5_KDC");

memset (&credential.target.domain, 0, sizeof (struct OKrb5Slice));

Expand Down Expand Up @@ -134,7 +133,7 @@ nasl_okrb5_find_kdc (lex_ctxt *lexic)

if ((last_okrb5_result = o_krb5_find_kdc (&credential, &kdc)))
{
nasl_print_krb_error (lexic, credential, last_okrb5_result);
NASL_PRINT_KRB_ERROR (lexic, credential, last_okrb5_result);
return FAKE_CELL;
}

Expand All @@ -149,15 +148,14 @@ nasl_okrb5_add_realm (lex_ctxt *lexic)
{
tree_cell *retc;
OKrb5Credential credential;
// TODO: create macro for that
char *kdc = get_str_var_by_name (lexic, "kdc");
if (kdc == NULL)
{
kdc = getenv ("KRB5_KDC");
if (kdc == NULL)
{
last_okrb5_result = O_KRB5_EXPECTED_NOT_NULL;
nasl_print_krb_error (lexic, credential, last_okrb5_result);
NASL_PRINT_KRB_ERROR (lexic, credential, last_okrb5_result);
goto exit;
}
}
Expand All @@ -166,7 +164,7 @@ nasl_okrb5_add_realm (lex_ctxt *lexic)

if ((last_okrb5_result = o_krb5_add_realm (&credential, kdc)))
{
nasl_print_krb_error (lexic, credential, last_okrb5_result);
NASL_PRINT_KRB_ERROR (lexic, credential, last_okrb5_result);
}

exit:
Expand All @@ -175,14 +173,6 @@ nasl_okrb5_add_realm (lex_ctxt *lexic)
return retc;
}

tree_cell *
nasl_okrb5_result (lex_ctxt *lexic)
{
(void) lexic;
// TODO: implement function to return string representation of result
return NULL;
}

/**
* @brief Returns 1 if the krb5 function was successful 0 otherwise
*
Expand Down Expand Up @@ -225,8 +215,8 @@ nasl_okrb5_is_failure (lex_ctxt *lexic)
return retc;
}

// TODO: may need a cacing mechanism for different configurations
// for now we just use one
// We use one context per run, this means that per run (target + oid) there is
// only on credential allowed.
struct OKrb5GSSContext *cached_gss_context = NULL;

tree_cell *
Expand Down
15 changes: 0 additions & 15 deletions nasl/nasl_krb5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,6 @@ nasl_okrb5_find_kdc (lex_ctxt *lexic);
tree_cell *
nasl_okrb5_add_realm (lex_ctxt *lexic);

/**
* @brief Returns the last result of the krb5 functions as a string
*
* The nasl function has one optional parameter:
* - retval: the return value of the krb5 function. If the value is not defined,
* the return value of the last krb5 function is used.
*
*
* @param[in] lexic NASL lexer.
*
* @return lex cell containing a number indicating success or failure.
*/
tree_cell *
nasl_okrb5_result (lex_ctxt *lexic);

/**
* @brief Returns 1 if the krb5 function was successful 0 otherwise
*
Expand Down

0 comments on commit 1c4ee4b

Please sign in to comment.