oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

client: pass permission mask to constructor

Browse Source 
Prepare for per-listener permissions.
This commit is contained in:
Max Kellermann 2018-07-13 18:20:47 +02:00
parent 524a7f4560
commit 8aa2c57413
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/Client.hxx
View File

@ -97,7 +97,9 @@ public:
std::list<ClientMessage> messages; std::list<ClientMessage> messages;
Client(EventLoop &loop, Partition &partition, Client(EventLoop &loop, Partition &partition,
UniqueSocketDescriptor fd, int uid, int num) noexcept; UniqueSocketDescriptor fd, int uid,
unsigned _permission,
int num) noexcept;
~Client() noexcept { ~Client() noexcept {
if (FullyBufferedSocket::IsDefined()) if (FullyBufferedSocket::IsDefined())
@ -239,6 +241,7 @@ client_manager_init();
void void
client_new(EventLoop &loop, Partition &partition, client_new(EventLoop &loop, Partition &partition,
UniqueSocketDescriptor fd, SocketAddress address, int uid) noexcept; UniqueSocketDescriptor fd, SocketAddress address, int uid,
unsigned permission) noexcept;
#endif #endif

10
src/client/ClientNew.cxx
View File

@ -42,12 +42,14 @@
static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n"; static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
Client::Client(EventLoop &_loop, Partition &_partition, Client::Client(EventLoop &_loop, Partition &_partition,
UniqueSocketDescriptor _fd, int _uid, int _num) noexcept UniqueSocketDescriptor _fd,
int _uid, unsigned _permission,
int _num) noexcept
:FullyBufferedSocket(_fd.Release(), _loop, :FullyBufferedSocket(_fd.Release(), _loop,
16384, client_max_output_buffer_size), 16384, client_max_output_buffer_size),
timeout_event(_loop, BIND_THIS_METHOD(OnTimeout)), timeout_event(_loop, BIND_THIS_METHOD(OnTimeout)),
partition(&_partition), partition(&_partition),
permission(getDefaultPermissions()), permission(_permission),
uid(_uid), uid(_uid),
num(_num) num(_num)
{ {
@ -56,7 +58,8 @@ Client::Client(EventLoop &_loop, Partition &_partition,
void void
client_new(EventLoop &loop, Partition &partition, client_new(EventLoop &loop, Partition &partition,
UniqueSocketDescriptor fd, SocketAddress address, int uid) noexcept UniqueSocketDescriptor fd, SocketAddress address, int uid,
unsigned permission) noexcept
{ {
static unsigned int next_client_num; static unsigned int next_client_num;
const auto remote = ToString(address); const auto remote = ToString(address);
@ -93,6 +96,7 @@ client_new(EventLoop &loop, Partition &partition,
(void)fd.Write(GREETING, sizeof(GREETING) - 1); (void)fd.Write(GREETING, sizeof(GREETING) - 1);
Client *client = new Client(loop, partition, std::move(fd), uid, Client *client = new Client(loop, partition, std::move(fd), uid,
permission,
next_client_num++); next_client_num++);
client_list.Add(*client); client_list.Add(*client);

4
src/client/Listener.cxx
View File

@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include "Listener.hxx" #include "Listener.hxx"
#include "Client.hxx" #include "Client.hxx"
#include "Permission.hxx"
#include "net/UniqueSocketDescriptor.hxx" #include "net/UniqueSocketDescriptor.hxx"
#include "net/SocketAddress.hxx" #include "net/SocketAddress.hxx"
@ -28,5 +29,6 @@ ClientListener::OnAccept(UniqueSocketDescriptor fd,
SocketAddress address, int uid) noexcept SocketAddress address, int uid) noexcept
{ {
client_new(GetEventLoop(), partition, client_new(GetEventLoop(), partition,
std::move(fd), address, uid); std::move(fd), address, uid,
getDefaultPermissions());
} }