From ddf112378b7e9abef79fde13828ba904723c1ffd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Jan 2013 03:06:45 +0100 Subject: permission: convert to C++ --- Makefile.am | 3 +- src/AllCommands.cxx | 2 +- src/ClientNew.cxx | 2 +- src/Main.cxx | 2 +- src/OtherCommands.cxx | 2 +- src/Permission.cxx | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/Permission.hxx | 38 ++++++++++++++ src/permission.c | 138 ------------------------------------------------ src/permission.h | 38 -------------- 9 files changed, 184 insertions(+), 182 deletions(-) create mode 100644 src/Permission.cxx create mode 100644 src/Permission.hxx delete mode 100644 src/permission.c delete mode 100644 src/permission.h diff --git a/Makefile.am b/Makefile.am index 8fafcb7d3..fb1ff80f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,6 @@ mpd_headers = \ src/output/httpd_client.h \ src/output/httpd_internal.h \ src/page.h \ - src/permission.h \ src/player_control.h \ src/playlist.h \ src/playlist_error.h \ @@ -282,7 +281,7 @@ src_mpd_SOURCES = \ src/path.c \ src/Mapper.cxx src/Mapper.hxx \ src/page.c \ - src/permission.c \ + src/Permission.cxx src/Permission.hxx \ src/PlayerThread.cxx src/PlayerThread.hxx \ src/player_control.c \ src/playlist.c \ diff --git a/src/AllCommands.cxx b/src/AllCommands.cxx index 6026c6906..6017f9859 100644 --- a/src/AllCommands.cxx +++ b/src/AllCommands.cxx @@ -31,7 +31,7 @@ extern "C" { #include "OutputCommands.hxx" #include "MessageCommands.hxx" #include "OtherCommands.hxx" -#include "permission.h" +#include "Permission.hxx" #include "tag.h" extern "C" { diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx index 28a837b62..e1c042614 100644 --- a/src/ClientNew.cxx +++ b/src/ClientNew.cxx @@ -25,8 +25,8 @@ extern "C" { extern "C" { #include "fifo_buffer.h" #include "resolver.h" -#include "permission.h" } +#include "Permission.hxx" #include "glib_socket.h" #include diff --git a/src/Main.cxx b/src/Main.cxx index 24da70bc4..4dc606a30 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -27,6 +27,7 @@ #include "Mapper.hxx" #include "DatabaseGlue.hxx" #include "DatabaseSimple.hxx" +#include "Permission.hxx" extern "C" { #include "daemon.h" @@ -47,7 +48,6 @@ extern "C" { #include "output_all.h" #include "volume.h" #include "log.h" -#include "permission.h" #include "pcm_resample.h" #include "replay_gain_config.h" #include "decoder_list.h" diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index a7a262495..756f8d5b6 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -37,9 +37,9 @@ extern "C" { #include "decoder_print.h" #include "volume.h" #include "stats.h" -#include "permission.h" } +#include "Permission.hxx" #include "PlaylistFile.hxx" extern "C" { diff --git a/src/Permission.cxx b/src/Permission.cxx new file mode 100644 index 000000000..e455f7ee7 --- /dev/null +++ b/src/Permission.cxx @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "Permission.hxx" +#include "mpd_error.h" + +extern "C" { +#include "conf.h" +} + +#include + +#include +#include + +#define PERMISSION_PASSWORD_CHAR '@' +#define PERMISSION_SEPERATOR "," + +#define PERMISSION_READ_STRING "read" +#define PERMISSION_ADD_STRING "add" +#define PERMISSION_CONTROL_STRING "control" +#define PERMISSION_ADMIN_STRING "admin" + +static GHashTable *permission_passwords; + +static unsigned permission_default; + +static unsigned parsePermissions(const char *string) +{ + unsigned permission = 0; + gchar **tokens; + + if (!string) + return 0; + + tokens = g_strsplit(string, PERMISSION_SEPERATOR, 0); + for (unsigned i = 0; tokens[i] != NULL; ++i) { + char *temp = tokens[i]; + + if (strcmp(temp, PERMISSION_READ_STRING) == 0) { + permission |= PERMISSION_READ; + } else if (strcmp(temp, PERMISSION_ADD_STRING) == 0) { + permission |= PERMISSION_ADD; + } else if (strcmp(temp, PERMISSION_CONTROL_STRING) == 0) { + permission |= PERMISSION_CONTROL; + } else if (strcmp(temp, PERMISSION_ADMIN_STRING) == 0) { + permission |= PERMISSION_ADMIN; + } else { + MPD_ERROR("unknown permission \"%s\"", temp); + } + } + + g_strfreev(tokens); + + return permission; +} + +void initPermissions(void) +{ + char *password; + unsigned permission; + const struct config_param *param; + + permission_passwords = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); + + permission_default = PERMISSION_READ | PERMISSION_ADD | + PERMISSION_CONTROL | PERMISSION_ADMIN; + + param = config_get_next_param(CONF_PASSWORD, NULL); + + if (param) { + permission_default = 0; + + do { + const char *separator = + strchr(param->value, PERMISSION_PASSWORD_CHAR); + + if (separator == NULL) + MPD_ERROR("\"%c\" not found in password string " + "\"%s\", line %i", + PERMISSION_PASSWORD_CHAR, + param->value, param->line); + + password = g_strndup(param->value, + separator - param->value); + + permission = parsePermissions(separator + 1); + + g_hash_table_replace(permission_passwords, + password, + GINT_TO_POINTER(permission)); + } while ((param = config_get_next_param(CONF_PASSWORD, param))); + } + + param = config_get_param(CONF_DEFAULT_PERMS); + + if (param) + permission_default = parsePermissions(param->value); +} + +int getPermissionFromPassword(char const* password, unsigned* permission) +{ + bool found; + gpointer key, value; + + found = g_hash_table_lookup_extended(permission_passwords, + password, &key, &value); + if (!found) + return -1; + + *permission = GPOINTER_TO_INT(value); + return 0; +} + +void finishPermissions(void) +{ + g_hash_table_destroy(permission_passwords); +} + +unsigned getDefaultPermissions(void) +{ + return permission_default; +} diff --git a/src/Permission.hxx b/src/Permission.hxx new file mode 100644 index 000000000..de8558494 --- /dev/null +++ b/src/Permission.hxx @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_PERMISSION_HXX +#define MPD_PERMISSION_HXX + +#define PERMISSION_NONE 0 +#define PERMISSION_READ 1 +#define PERMISSION_ADD 2 +#define PERMISSION_CONTROL 4 +#define PERMISSION_ADMIN 8 + + +int getPermissionFromPassword(char const* password, unsigned* permission); + +void finishPermissions(void); + +unsigned getDefaultPermissions(void); + +void initPermissions(void); + +#endif diff --git a/src/permission.c b/src/permission.c deleted file mode 100644 index cd52b9c86..000000000 --- a/src/permission.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" -#include "permission.h" -#include "conf.h" -#include "mpd_error.h" - -#include - -#include -#include - -#define PERMISSION_PASSWORD_CHAR '@' -#define PERMISSION_SEPERATOR "," - -#define PERMISSION_READ_STRING "read" -#define PERMISSION_ADD_STRING "add" -#define PERMISSION_CONTROL_STRING "control" -#define PERMISSION_ADMIN_STRING "admin" - -static GHashTable *permission_passwords; - -static unsigned permission_default; - -static unsigned parsePermissions(const char *string) -{ - unsigned permission = 0; - gchar **tokens; - - if (!string) - return 0; - - tokens = g_strsplit(string, PERMISSION_SEPERATOR, 0); - for (unsigned i = 0; tokens[i] != NULL; ++i) { - char *temp = tokens[i]; - - if (strcmp(temp, PERMISSION_READ_STRING) == 0) { - permission |= PERMISSION_READ; - } else if (strcmp(temp, PERMISSION_ADD_STRING) == 0) { - permission |= PERMISSION_ADD; - } else if (strcmp(temp, PERMISSION_CONTROL_STRING) == 0) { - permission |= PERMISSION_CONTROL; - } else if (strcmp(temp, PERMISSION_ADMIN_STRING) == 0) { - permission |= PERMISSION_ADMIN; - } else { - MPD_ERROR("unknown permission \"%s\"", temp); - } - } - - g_strfreev(tokens); - - return permission; -} - -void initPermissions(void) -{ - char *password; - unsigned permission; - const struct config_param *param; - - permission_passwords = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, NULL); - - permission_default = PERMISSION_READ | PERMISSION_ADD | - PERMISSION_CONTROL | PERMISSION_ADMIN; - - param = config_get_next_param(CONF_PASSWORD, NULL); - - if (param) { - permission_default = 0; - - do { - const char *separator = - strchr(param->value, PERMISSION_PASSWORD_CHAR); - - if (separator == NULL) - MPD_ERROR("\"%c\" not found in password string " - "\"%s\", line %i", - PERMISSION_PASSWORD_CHAR, - param->value, param->line); - - password = g_strndup(param->value, - separator - param->value); - - permission = parsePermissions(separator + 1); - - g_hash_table_replace(permission_passwords, - password, - GINT_TO_POINTER(permission)); - } while ((param = config_get_next_param(CONF_PASSWORD, param))); - } - - param = config_get_param(CONF_DEFAULT_PERMS); - - if (param) - permission_default = parsePermissions(param->value); -} - -int getPermissionFromPassword(char const* password, unsigned* permission) -{ - bool found; - gpointer key, value; - - found = g_hash_table_lookup_extended(permission_passwords, - password, &key, &value); - if (!found) - return -1; - - *permission = GPOINTER_TO_INT(value); - return 0; -} - -void finishPermissions(void) -{ - g_hash_table_destroy(permission_passwords); -} - -unsigned getDefaultPermissions(void) -{ - return permission_default; -} diff --git a/src/permission.h b/src/permission.h deleted file mode 100644 index 6c3771362..000000000 --- a/src/permission.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_PERMISSION_H -#define MPD_PERMISSION_H - -#define PERMISSION_NONE 0 -#define PERMISSION_READ 1 -#define PERMISSION_ADD 2 -#define PERMISSION_CONTROL 4 -#define PERMISSION_ADMIN 8 - - -int getPermissionFromPassword(char const* password, unsigned* permission); - -void finishPermissions(void); - -unsigned getDefaultPermissions(void); - -void initPermissions(void); - -#endif -- cgit v1.2.3