aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

Feature: Work around and warn user if no PRNG seeds are configured

Browse Source
This commit is contained in:
Philipp Schafft 2020-10-22 09:49:10 +00:00
parent f688dce8a5
commit a5f7b621c0
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin.c
View File

@ -1472,6 +1472,8 @@ static void command_dashboard (client_t *client, source_t *source, adm
__reportxml_add_maintenance(reportnode, config->reportxml_db, "8defae31-a52e-4bba-b904-76db5362860f", "warning", "No useful location is given in <location>.", NULL); __reportxml_add_maintenance(reportnode, config->reportxml_db, "8defae31-a52e-4bba-b904-76db5362860f", "warning", "No useful location is given in <location>.", NULL);
if (config->config_problems & CONFIG_PROBLEM_ADMIN) if (config->config_problems & CONFIG_PROBLEM_ADMIN)
__reportxml_add_maintenance(reportnode, config->reportxml_db, "cf86d88e-dc20-4359-b446-110e7065d17a", "warning", "No admin contact given in <admin>. YP directory support will is disabled.", NULL); __reportxml_add_maintenance(reportnode, config->reportxml_db, "cf86d88e-dc20-4359-b446-110e7065d17a", "warning", "No admin contact given in <admin>. YP directory support will is disabled.", NULL);
if (config->config_problems & CONFIG_PROBLEM_PRNG)
__reportxml_add_maintenance(reportnode, config->reportxml_db, "e2ba5a8b-4e4f-41ca-b455-68ae5fb6cae0", "error", "No PRNG seed configured. PRNG is insecure.", NULL);
if (!has_sources) if (!has_sources)
__reportxml_add_maintenance(reportnode, config->reportxml_db, "f68dd8a3-22b1-4118-aba6-b039f2c5b51e", "info", "Currently no sources are connected to this server.", NULL); __reportxml_add_maintenance(reportnode, config->reportxml_db, "f68dd8a3-22b1-4118-aba6-b039f2c5b51e", "info", "Currently no sources are connected to this server.", NULL);

17
src/cfgfile.c
View File

@ -1166,6 +1166,23 @@ static void _parse_root(xmlDocPtr doc,
if (configuration->port == 0) if (configuration->port == 0)
configuration->port = 8000; configuration->port = 8000;
if (!configuration->prng_seed) {
configuration->config_problems |= CONFIG_PROBLEM_PRNG;
#ifndef _WIN32
configuration->prng_seed = calloc(1, sizeof(prng_seed_config_t));
if (configuration->prng_seed) {
configuration->prng_seed->filename = (char*)xmlStrdup(XMLSTR("linux")); // the linux profile is also fine on BSD.
configuration->prng_seed->type = PRNG_SEED_TYPE_PROFILE;
configuration->prng_seed->size = -1;
ICECAST_LOG_WARN("Warning, no PRNG seed configured, using default profile \"linux\".");
} else {
ICECAST_LOG_ERROR("No PRNG seed configured and unable to add one. PRNG is insecure.");
}
#else
ICECAST_LOG_ERROR("No PRNG seed configured and unable to add one. PRNG is insecure.");
#endif
}
/* issue some warnings on bad configurations */ /* issue some warnings on bad configurations */
if (!configuration->fileserve) if (!configuration->fileserve)
ICECAST_LOG_WARN("Warning, serving of static files has been disabled " ICECAST_LOG_WARN("Warning, serving of static files has been disabled "

1
src/cfgfile.h
View File

@ -31,6 +31,7 @@
#define CONFIG_PROBLEM_HOSTNAME 0x0001U #define CONFIG_PROBLEM_HOSTNAME 0x0001U
#define CONFIG_PROBLEM_LOCATION 0x0002U #define CONFIG_PROBLEM_LOCATION 0x0002U
#define CONFIG_PROBLEM_ADMIN 0x0004U #define CONFIG_PROBLEM_ADMIN 0x0004U
#define CONFIG_PROBLEM_PRNG 0x0008U
typedef enum _http_header_type { typedef enum _http_header_type {
/* static: headers are passed as is to the client. */ /* static: headers are passed as is to the client. */

5
web/assets/css/style.css
View File

@ -343,6 +343,11 @@ aside {
list-style: none; list-style: none;
} }
.maintenance-level-error > *:first-child::before {
font-weight: bold;
content: "Error: ";
}
.maintenance-level-warning > *:first-child::before { .maintenance-level-warning > *:first-child::before {
font-weight: bold; font-weight: bold;
content: "Warning: "; content: "Warning: ";