aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-01-03 14:56:34 -05:00
Code

Feature: Report on dashboard if no secure password hashing is supported

Browse Source 
See also: #2010
This commit is contained in:
Philipp Schafft 2023-02-21 23:38:14 +00:00
parent 0ef660bcde
commit 4d9094096a
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/admin.c
View File

@ -1840,6 +1840,10 @@ static void command_dashboard (client_t *client, source_t *source, adm
} }
} }
if (!util_crypt_is_new_secure()) {
__reportxml_add_maintenance(reportnode, config->reportxml_db, "40d134e3-fbbe-46b1-a409-9b2ca8954528", "warning", "No secure password hash support detected.", NULL);
}
reportxml_helper_add_value_health(resource, "status", health); reportxml_helper_add_value_health(resource, "status", health);
reportxml_node_add_child(incident, resource); reportxml_node_add_child(incident, resource);

42
src/util_crypt.c
View File

@ -38,21 +38,23 @@ static pthread_mutex_t crypt_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif #endif
#if (defined(HAVE_CRYPT_R) || defined(HAVE_CRYPT)) && HAVE_PTHREAD #if (defined(HAVE_CRYPT_R) || defined(HAVE_CRYPT)) && HAVE_PTHREAD
struct algo {
const char prefix[4];
const size_t saltlen;
const bool secure;
};
static pthread_once_t crypt_detect = PTHREAD_ONCE_INIT; static pthread_once_t crypt_detect = PTHREAD_ONCE_INIT;
static const char *new_prefix; static const struct algo *new_algo;
static size_t new_saltlen; #define HAVE_new_algo
void crypt_detect_run(void) void crypt_detect_run(void)
{ {
static const struct { static const struct algo list[] = {{"$6$", 12, true}, {"$5$", 12, true}, {"$1$", 6, false}};
const char prefix[4];
const size_t saltlen;
} list[] = {{"$6$", 12}, {"$5$", 12}, {"$1$", 6}};
for (size_t i = 0; i < (sizeof(list)/sizeof(*list)); i++) { for (size_t i = 0; i < (sizeof(list)/sizeof(*list)); i++) {
if (util_crypt_is_supported(list[i].prefix)) { if (util_crypt_is_supported(list[i].prefix)) {
new_prefix = list[i].prefix; new_algo = &(list[i]);
new_saltlen = list[i].saltlen;
return; return;
} }
} }
@ -75,7 +77,7 @@ char * util_crypt_hash(const char *pw)
if (pthread_once(&crypt_detect, crypt_detect_run) != 0) if (pthread_once(&crypt_detect, crypt_detect_run) != 0)
return NULL; return NULL;
if (new_prefix) { if (new_algo) {
char input[128]; char input[128];
char salt[64]; char salt[64];
char *salt_base64; char *salt_base64;
@ -87,18 +89,18 @@ char * util_crypt_hash(const char *pw)
#endif #endif
/* if this is true, we have a bug */ /* if this is true, we have a bug */
if (new_saltlen > sizeof(salt)) if (new_algo->saltlen > sizeof(salt))
return NULL; return NULL;
len = igloo_prng_read(igloo_instance, salt, new_saltlen, igloo_PRNG_FLAG_NONE); len = igloo_prng_read(igloo_instance, salt, new_algo->saltlen, igloo_PRNG_FLAG_NONE);
if (len != (ssize_t)new_saltlen) if (len != (ssize_t)new_algo->saltlen)
return NULL; return NULL;
salt_base64 = util_base64_encode(salt, new_saltlen); salt_base64 = util_base64_encode(salt, new_algo->saltlen);
if (!salt_base64) if (!salt_base64)
return NULL; return NULL;
snprintf(input, sizeof(input), "%s%s", new_prefix, salt_base64); snprintf(input, sizeof(input), "%s%s", new_algo->prefix, salt_base64);
free(salt_base64); free(salt_base64);
@ -234,3 +236,15 @@ bool util_crypt_is_supported(const char *prefix)
return supported; return supported;
} }
bool util_crypt_is_new_secure(void)
{
#ifdef HAVE_new_algo
if (pthread_once(&crypt_detect, crypt_detect_run) != 0)
return NULL;
return new_algo->secure;
#else
return false;
#endif
}

1
src/util_crypt.h
View File

@ -14,6 +14,7 @@
char * util_crypt_hash(const char *pw); char * util_crypt_hash(const char *pw);
bool util_crypt_check(const char *plain, const char *crypted); bool util_crypt_check(const char *plain, const char *crypted);
bool util_crypt_is_supported(const char *prefix); bool util_crypt_is_supported(const char *prefix);
bool util_crypt_is_new_secure(void);
/* Exported for tests only!: */ /* Exported for tests only!: */
char * util_crypt_hash_oldstyle(const char *pw); char * util_crypt_hash_oldstyle(const char *pw);