Client: add AllowFile() overload which throws exception
This commit is contained in:
parent
c598686bd9
commit
726fc53e62
|
@ -176,9 +176,12 @@ public:
|
||||||
* We cannot fix this as long as there are plugins that open a file by
|
* We cannot fix this as long as there are plugins that open a file by
|
||||||
* its name, and not by file descriptor / callbacks.
|
* its name, and not by file descriptor / callbacks.
|
||||||
*
|
*
|
||||||
|
* Throws #std::runtime_error on error.
|
||||||
|
*
|
||||||
* @param path_fs the absolute path name in filesystem encoding
|
* @param path_fs the absolute path name in filesystem encoding
|
||||||
* @return true if access is allowed
|
|
||||||
*/
|
*/
|
||||||
|
void AllowFile(Path path_fs) const;
|
||||||
|
|
||||||
bool AllowFile(Path path_fs, Error &error) const;
|
bool AllowFile(Path path_fs, Error &error) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -26,6 +26,31 @@
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
Client::AllowFile(Path path_fs) const
|
||||||
|
{
|
||||||
|
#ifdef WIN32
|
||||||
|
(void)path_fs;
|
||||||
|
|
||||||
|
throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
|
||||||
|
#else
|
||||||
|
if (uid >= 0 && (uid_t)uid == geteuid())
|
||||||
|
/* always allow access if user runs his own MPD
|
||||||
|
instance */
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (uid < 0)
|
||||||
|
/* unauthenticated client */
|
||||||
|
throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
|
||||||
|
|
||||||
|
const FileInfo fi(path_fs);
|
||||||
|
|
||||||
|
if (fi.GetUid() != (uid_t)uid && (fi.GetMode() & 0444) != 0444)
|
||||||
|
/* client is not owner */
|
||||||
|
throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
Client::AllowFile(Path path_fs, Error &error) const
|
Client::AllowFile(Path path_fs, Error &error) const
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue