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: Added support for hashed passwords to auth_static

Browse Source
This commit is contained in:
Philipp Schafft 2023-02-21 11:05:14 +00:00
parent 49fa3dafed
commit 468bd425d5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/auth_static.c
View File

@ -16,11 +16,13 @@
/* for strcmp() and strdup() */ /* for strcmp() and strdup() */
#include <string.h> #include <string.h>
#include <stdbool.h>
#include "auth.h" #include "auth.h"
#include "cfgfile.h" #include "cfgfile.h"
#include "client.h" #include "client.h"
#include "util.h" #include "util.h"
#include "util_crypt.h"
#include "logging.h" #include "logging.h"
#define CATMODULE "auth_static" #define CATMODULE "auth_static"
@ -30,6 +32,7 @@ typedef struct auth_static {
char *password; char *password;
auth_alter_t action; auth_alter_t action;
char *arg; char *arg;
bool is_hashed;
} auth_static_t; } auth_static_t;
static auth_result static_auth(auth_client *auth_user) static auth_result static_auth(auth_client *auth_user)
@ -48,8 +51,13 @@ static auth_result static_auth(auth_client *auth_user)
if (!client->password) if (!client->password)
return AUTH_NOMATCH; return AUTH_NOMATCH;
if (strcmp(auth_info->password, client->password) != 0) if (auth_info->is_hashed) {
return AUTH_FAILED; if (!util_crypt_check(client->password, auth_info->password))
return AUTH_FAILED;
} else {
if (strcmp(auth_info->password, client->password) != 0)
return AUTH_FAILED;
}
if (auth_info->action != AUTH_ALTER_NOOP) { if (auth_info->action != AUTH_ALTER_NOOP) {
@ -118,6 +126,8 @@ int auth_get_static_auth (auth_t *authenticator, config_options_t *options)
if (auth_info->password) if (auth_info->password)
free(auth_info->password); free(auth_info->password);
auth_info->password = strdup(options->value); auth_info->password = strdup(options->value);
} else if (strcmp(options->name, "hashed") == 0) {
auth_info->is_hashed = util_str_to_bool(options->value);
} else if (strcmp(options->name, "action") == 0) { } else if (strcmp(options->name, "action") == 0) {
auth_info->action = auth_str2alter(options->value); auth_info->action = auth_str2alter(options->value);
if (auth_info->action == AUTH_ALTER_NOOP) { if (auth_info->action == AUTH_ALTER_NOOP) {