RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 05:37:44 +00:00
Code Issues Activity Actions

LibCore+su+passwd: Don't keep /etc/passwd and /etc/shadow open

Browse source 
Now that we've moved to atomic replacement of these files when altering
them, we don't need to keep them open for the lifetime of Core::Account
so just simplify this and close them when they are not needed.
This commit is contained in:
Andreas Kling 2021-01-21 11:17:06 +01:00
parent 77e0598c6d
commit 439f447ba8
4 changed files with 22 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibCore/Account.h
View file

@ -30,7 +30,6 @@
#include <AK/String.h>
#include <AK/Types.h>
#include <AK/Vector.h>
#include <LibCore/File.h>
#include <pwd.h>
#include <sys/types.h>
@ -38,20 +37,8 @@ namespace Core {
class Account {
public:
enum class OpenPasswdFile {
No,
ReadOnly,
ReadWrite,
};
enum class OpenShadowFile {
No,
ReadOnly,
ReadWrite,
};
static Result<Account, String> from_name(const char* username, OpenPasswdFile = OpenPasswdFile::No, OpenShadowFile = OpenShadowFile::No);
static Result<Account, String> from_uid(uid_t uid, OpenPasswdFile = OpenPasswdFile::No, OpenShadowFile = OpenShadowFile::No);
static Result<Account, String> from_name(const char* username);
static Result<Account, String> from_uid(uid_t uid);
bool authenticate(const char* password) const;
bool login() const;
@ -76,17 +63,14 @@ public:
bool sync();
private:
static Result<Account, String> from_passwd(const passwd&, OpenPasswdFile, OpenShadowFile);
static Result<Account, String> from_passwd(const passwd&);
Account(const passwd& pwd, Vector<gid_t> extra_gids, RefPtr<Core::File> passwd_file, RefPtr<Core::File> shadow_file);
Account(const passwd& pwd, Vector<gid_t> extra_gids);
void load_shadow_file();
String generate_passwd_file() const;
String generate_shadow_file() const;
RefPtr<Core::File> m_passwd_file;
RefPtr<Core::File> m_shadow_file;
String m_username;
// Contents of passwd field in passwd entry.