mirror of
https://github.com/SerenityOS/serenity
synced 2024-09-06 17:06:31 +00:00
Kernel: Make File::{chown,chmod} take credentials as input
...instead of getting them from Process::current(). :^)
This commit is contained in:
parent
c3351d4b9f
commit
006f753647
|
@ -346,7 +346,7 @@ ErrorOr<void> Coredump::write()
|
|||
TRY(write_regions());
|
||||
TRY(write_notes_segment(builder.bytes()));
|
||||
|
||||
return m_description->chmod(0600); // Make coredump file read/writable
|
||||
return m_description->chmod(Process::current().credentials(), 0600); // Make coredump file read/writable
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -98,8 +98,8 @@ public:
|
|||
|
||||
virtual ErrorOr<void> truncate(u64) { return EINVAL; }
|
||||
virtual ErrorOr<void> sync() { return EINVAL; }
|
||||
virtual ErrorOr<void> chown(OpenFileDescription&, UserID, GroupID) { return EBADF; }
|
||||
virtual ErrorOr<void> chmod(OpenFileDescription&, mode_t) { return EBADF; }
|
||||
virtual ErrorOr<void> chown(Credentials const&, OpenFileDescription&, UserID, GroupID) { return EBADF; }
|
||||
virtual ErrorOr<void> chmod(Credentials const&, OpenFileDescription&, mode_t) { return EBADF; }
|
||||
|
||||
virtual StringView class_name() const = 0;
|
||||
|
||||
|
|
|
@ -115,18 +115,18 @@ ErrorOr<void> InodeFile::sync()
|
|||
return {};
|
||||
}
|
||||
|
||||
ErrorOr<void> InodeFile::chown(OpenFileDescription& description, UserID uid, GroupID gid)
|
||||
ErrorOr<void> InodeFile::chown(Credentials const& credentials, OpenFileDescription& description, UserID uid, GroupID gid)
|
||||
{
|
||||
VERIFY(description.inode() == m_inode);
|
||||
VERIFY(description.custody());
|
||||
return VirtualFileSystem::the().chown(Process::current().credentials(), *description.custody(), uid, gid);
|
||||
return VirtualFileSystem::the().chown(credentials, *description.custody(), uid, gid);
|
||||
}
|
||||
|
||||
ErrorOr<void> InodeFile::chmod(OpenFileDescription& description, mode_t mode)
|
||||
ErrorOr<void> InodeFile::chmod(Credentials const& credentials, OpenFileDescription& description, mode_t mode)
|
||||
{
|
||||
VERIFY(description.inode() == m_inode);
|
||||
VERIFY(description.custody());
|
||||
return VirtualFileSystem::the().chmod(Process::current().credentials(), *description.custody(), mode);
|
||||
return VirtualFileSystem::the().chmod(credentials, *description.custody(), mode);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -40,8 +40,8 @@ public:
|
|||
|
||||
virtual ErrorOr<void> truncate(u64) override;
|
||||
virtual ErrorOr<void> sync() override;
|
||||
virtual ErrorOr<void> chown(OpenFileDescription&, UserID, GroupID) override;
|
||||
virtual ErrorOr<void> chmod(OpenFileDescription&, mode_t) override;
|
||||
virtual ErrorOr<void> chown(Credentials const&, OpenFileDescription&, UserID, GroupID) override;
|
||||
virtual ErrorOr<void> chmod(Credentials const&, OpenFileDescription&, mode_t) override;
|
||||
|
||||
virtual StringView class_name() const override { return "InodeFile"sv; }
|
||||
|
||||
|
|
|
@ -430,14 +430,14 @@ void OpenFileDescription::set_file_flags(u32 flags)
|
|||
});
|
||||
}
|
||||
|
||||
ErrorOr<void> OpenFileDescription::chmod(mode_t mode)
|
||||
ErrorOr<void> OpenFileDescription::chmod(Credentials const& credentials, mode_t mode)
|
||||
{
|
||||
return m_file->chmod(*this, mode);
|
||||
return m_file->chmod(credentials, *this, mode);
|
||||
}
|
||||
|
||||
ErrorOr<void> OpenFileDescription::chown(UserID uid, GroupID gid)
|
||||
ErrorOr<void> OpenFileDescription::chown(Credentials const& credentials, UserID uid, GroupID gid)
|
||||
{
|
||||
return m_file->chown(*this, uid, gid);
|
||||
return m_file->chown(credentials, *this, uid, gid);
|
||||
}
|
||||
|
||||
FileBlockerSet& OpenFileDescription::blocker_set()
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
ErrorOr<size_t> read(UserOrKernelBuffer&, u64 offset, size_t);
|
||||
ErrorOr<size_t> write(u64 offset, UserOrKernelBuffer const&, size_t);
|
||||
|
||||
ErrorOr<void> chmod(mode_t);
|
||||
ErrorOr<void> chmod(Credentials const& credentials, mode_t);
|
||||
|
||||
bool can_read() const;
|
||||
bool can_write() const;
|
||||
|
@ -121,7 +121,7 @@ public:
|
|||
|
||||
off_t offset() const;
|
||||
|
||||
ErrorOr<void> chown(UserID, GroupID);
|
||||
ErrorOr<void> chown(Credentials const& credentials, UserID, GroupID);
|
||||
|
||||
FileBlockerSet& blocker_set();
|
||||
|
||||
|
|
|
@ -445,8 +445,10 @@ ErrorOr<void> LocalSocket::ioctl(OpenFileDescription& description, unsigned requ
|
|||
return EINVAL;
|
||||
}
|
||||
|
||||
ErrorOr<void> LocalSocket::chmod(OpenFileDescription&, mode_t mode)
|
||||
ErrorOr<void> LocalSocket::chmod(Credentials const&, OpenFileDescription&, mode_t mode)
|
||||
{
|
||||
// FIXME: Use the credentials.
|
||||
|
||||
auto inode = m_inode.strong_ref();
|
||||
if (inode)
|
||||
return inode->chmod(mode);
|
||||
|
@ -455,14 +457,15 @@ ErrorOr<void> LocalSocket::chmod(OpenFileDescription&, mode_t mode)
|
|||
return {};
|
||||
}
|
||||
|
||||
ErrorOr<void> LocalSocket::chown(OpenFileDescription&, UserID uid, GroupID gid)
|
||||
ErrorOr<void> LocalSocket::chown(Credentials const& credentials, OpenFileDescription&, UserID uid, GroupID gid)
|
||||
{
|
||||
// FIXME: Use the credentials.
|
||||
|
||||
auto inode = m_inode.strong_ref();
|
||||
if (inode)
|
||||
return inode->chown(uid, gid);
|
||||
|
||||
auto& current_process = Process::current();
|
||||
if (!current_process.is_superuser() && (current_process.euid() != uid || !current_process.in_group(gid)))
|
||||
if (!credentials.is_superuser() && (credentials.euid() != uid || !credentials.in_group(gid)))
|
||||
return set_so_error(EPERM);
|
||||
|
||||
m_prebind_uid = uid;
|
||||
|
|
|
@ -49,8 +49,8 @@ public:
|
|||
virtual ErrorOr<size_t> recvfrom(OpenFileDescription&, UserOrKernelBuffer&, size_t, int flags, Userspace<sockaddr*>, Userspace<socklen_t*>, Time&) override;
|
||||
virtual ErrorOr<void> getsockopt(OpenFileDescription&, int level, int option, Userspace<void*>, Userspace<socklen_t*>) override;
|
||||
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;
|
||||
virtual ErrorOr<void> chown(OpenFileDescription&, UserID, GroupID) override;
|
||||
virtual ErrorOr<void> chmod(OpenFileDescription&, mode_t) override;
|
||||
virtual ErrorOr<void> chown(Credentials const&, OpenFileDescription&, UserID, GroupID) override;
|
||||
virtual ErrorOr<void> chmod(Credentials const&, OpenFileDescription&, mode_t) override;
|
||||
|
||||
private:
|
||||
explicit LocalSocket(int type, NonnullOwnPtr<DoubleBuffer> client_buffer, NonnullOwnPtr<DoubleBuffer> server_buffer);
|
||||
|
|
|
@ -37,7 +37,7 @@ ErrorOr<FlatPtr> Process::sys$fchmod(int fd, mode_t mode)
|
|||
VERIFY_NO_PROCESS_BIG_LOCK(this);
|
||||
TRY(require_promise(Pledge::fattr));
|
||||
auto description = TRY(open_file_description(fd));
|
||||
TRY(description->chmod(mode));
|
||||
TRY(description->chmod(credentials(), mode));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ ErrorOr<FlatPtr> Process::sys$fchown(int fd, UserID uid, GroupID gid)
|
|||
VERIFY_NO_PROCESS_BIG_LOCK(this);
|
||||
TRY(require_promise(Pledge::chown));
|
||||
auto description = TRY(open_file_description(fd));
|
||||
TRY(description->chown(uid, gid));
|
||||
TRY(description->chown(credentials(), uid, gid));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue