Attachment 9067 Details for Bug 618 – correctly set permissions on the home directory, v1.1

[patch] correctly set permissions on the home directory, v1.1

userdrake_fix_home_perms.diff (text/plain), 5.24 KB, created by Frédéric "LpSolit" Buclin on 2017-03-11 15:39:11 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric "LpSolit" Buclin

Created: 2017-03-11 15:39:11 CET

Size: 5.24 KB

patch

obsolete

>From 7d984d73f66d1c32d1f6ecb814a2d736aafe9c4e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
>Date: Fri, 10 Mar 2017 22:10:29 +0100
>Subject: [PATCH] Correctly set permissions on the home directory when creating
> a new user (mga#618)
>
>---
> NEWS         |  3 +++
> USER/USER.xs |  5 +++--
> userdrake    | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 3 files changed, 72 insertions(+), 4 deletions(-)
>
>diff --git a/NEWS b/NEWS
>index 3f990bd..537816a 100644
>--- a/NEWS
>+++ b/NEWS
>@@ -1,3 +1,6 @@
>+- Correctly set permissions on the home directory
>+  when creating a new user (mga#618)
>+
> Version 2.14 - 24 February 2017
> 
> - Do not encrypt the empty password (mga#19318)
>diff --git a/USER/USER.xs b/USER/USER.xs
>index 086580b..ff9fc41 100644
>--- a/USER/USER.xs
>+++ b/USER/USER.xs
>@@ -67,11 +67,12 @@ Admin_DESTROY(self)
>         if (self) lu_end(self);
> 
> int
>-Admin_UserAdd(self, ent, is_system, dont_create_home)
>+Admin_UserAdd(self, ent, is_system, dont_create_home, homePermissions)
>         USER::ADMIN *self
>         USER::ENT *ent
>         int is_system
>         int dont_create_home
>+        short homePermissions
>         CODE:
>         USER__ERR *error = NULL;
>         long uidNumber, gidNumber;
>@@ -114,7 +115,7 @@ Admin_UserAdd(self, ent, is_system, dont_create_home)
>                 homeDirectory = g_value_get_string(value);
>                 
>                 if (lu_homedir_populate(self, skeleton, homeDirectory,
>-                                        uidNumber, gidNumber, 0700,
>+                                        uidNumber, gidNumber, homePermissions,
>                                         &error) == 0) {
>                         warn(_("Error creating `%s': %s"), homeDirectory, error ? error->string : "unknown error");
>                         RETVAL = 2;
>diff --git a/userdrake b/userdrake
>index 5994012..b986ccd 100755
>--- a/userdrake
>+++ b/userdrake
>@@ -255,10 +255,67 @@ undef $window_splash;
> $us->{wnd}->main;
> ugtk3->exit(0);
> 
>+=head1 NAME
>+
>+userdrake - Mageia Users Management Tool
>+
>+=head1 SYNOPSIS
>+
>+  userdrake
>+  drakuser (alias to userdrake)
>+
>+=head1 DESCRIPTION
>+
>+This script manages user accounts for your Mageia installation.
>+It requires the root password.
>+
>+=head1 FUNCTIONS
>+
>+=over
>+
>+=item C<get_params($file, @parameters)>
>+
>+This function parses and returns data from a text file in the format:
>+
>+  # Parameters and values are separated by whitespaces.
>+  PARAMETER1 VALUE1
>+  PARAMETER2 VALUE2
>+  ...
>+
>+or
>+
>+  # Parameters and values are separated by the '=' symbol.
>+  PARAMETER1=VALUE1
>+  PARAMETER2=VALUE2
>+  ...
>+
>+It is somehow similar to L<MDK::Common::System::getVarsFromSh> except that
>+get_params() is also able to parse files where whitespaces are used as separator.
>+Maybe one day both functions will be merged.
>+
>+ Params:  $file - The name of the text file to parse.
>+          @parameters - The list of parameters for which you want their value.
>+
>+ Returns: A hashref in the form { PARAMETER1 => VALUE1, PARAMETER2 => VALUE2, ... }.
>+
>+=back
>+=cut
>+
> sub is_xguest_installed() {
>     -e '/etc/security/namespace.d/xguest.conf';
> }
> 
>+sub get_params {
>+    my ($file, @parameters) = @_;
>+    if (open(my $fh, '<', $file)) {
>+        my @lines = <$fh>;
>+        close $fh;
>+        my $param_list = join('|', @parameters);
>+        my %params = map { /^($param_list)\b(?:=|\s+)(.+)$/; $1 => $2 } grep {/^(?:$param_list)\b/} @lines;
>+        return \%params;
>+    }
>+}
>+
> sub GrayDelEdit() {
>     foreach ($tbedit, $tbdel, $buttorcheck{edit}, $buttorcheck{delete}) {
>         defined $_ and $_->set_sensitive(0);
>@@ -414,7 +471,10 @@ sub GetFaceIcon {
> 
> sub AddUser() {
>     my $w = NewWindow(N("Create New User"));
>-    my $dontcreatehomedir = 0; my $is_system = 0;
>+    my $dontcreatehomedir = 0;
>+    # Be restrictive by default, and use umask if known.
>+    my $homedir_perms = 0700;
>+    my $is_system = 0;
>     my %u; 
>     gtkpack_($w->get_child,
> 		    0, BuildUui(),
>@@ -457,6 +517,10 @@ sub AddUser() {
>                                $dontcreatehomedir = 0;
>                                $u{homedir} = $us->{o}{homedir}->get_text;
>                                $userEnt and $userEnt->HomeDir($u{homedir});
>+                               # Correctly set permissions on the home directory.
>+                               if (my $umask = get_params('/etc/login.defs', qw(UMASK))->{UMASK}) {
>+                                   $homedir_perms = 0777 &~ oct($umask);
>+                               }
>                            } else {
>                                $dontcreatehomedir = 1;
>                            }
>@@ -500,7 +564,7 @@ sub AddUser() {
>                                $userEnt->Gid($u{gid});
>                                $userEnt->ShadowMin(-1); $userEnt->ShadowMax(99999);
>                                $userEnt->ShadowWarn(-1); $userEnt->ShadowInact(-1);
>-                               $ctx->UserAdd($userEnt, $is_system, $dontcreatehomedir);
>+                               $ctx->UserAdd($userEnt, $is_system, $dontcreatehomedir, $homedir_perms);
>                                $ctx->UserSetPass($userEnt, $u{passwd});
>                                defined $us->{o}{iconval} and
>                                  any::addKdmIcon($u{username}, $us->{o}{iconval});
>-- 
>2.10.2
>

From 7d984d73f66d1c32d1f6ecb814a2d736aafe9c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Fri, 10 Mar 2017 22:10:29 +0100
Subject: [PATCH] Correctly set permissions on the home directory when creating
 a new user (mga#618)

---
 NEWS         |  3 +++
 USER/USER.xs |  5 +++--
 userdrake    | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 3f990bd..537816a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- Correctly set permissions on the home directory
+  when creating a new user (mga#618)
+
 Version 2.14 - 24 February 2017
 
 - Do not encrypt the empty password (mga#19318)
diff --git a/USER/USER.xs b/USER/USER.xs
index 086580b..ff9fc41 100644
--- a/USER/USER.xs
+++ b/USER/USER.xs
@@ -67,11 +67,12 @@ Admin_DESTROY(self)
         if (self) lu_end(self);
 
 int
-Admin_UserAdd(self, ent, is_system, dont_create_home)
+Admin_UserAdd(self, ent, is_system, dont_create_home, homePermissions)
         USER::ADMIN *self
         USER::ENT *ent
         int is_system
         int dont_create_home
+        short homePermissions
         CODE:
         USER__ERR *error = NULL;
         long uidNumber, gidNumber;
@@ -114,7 +115,7 @@ Admin_UserAdd(self, ent, is_system, dont_create_home)
                 homeDirectory = g_value_get_string(value);
                 
                 if (lu_homedir_populate(self, skeleton, homeDirectory,
-                                        uidNumber, gidNumber, 0700,
+                                        uidNumber, gidNumber, homePermissions,
                                         &error) == 0) {
                         warn(_("Error creating `%s': %s"), homeDirectory, error ? error->string : "unknown error");
                         RETVAL = 2;
diff --git a/userdrake b/userdrake
index 5994012..b986ccd 100755
--- a/userdrake
+++ b/userdrake
@@ -255,10 +255,67 @@ undef $window_splash;
 $us->{wnd}->main;
 ugtk3->exit(0);
 
+=head1 NAME
+
+userdrake - Mageia Users Management Tool
+
+=head1 SYNOPSIS
+
+  userdrake
+  drakuser (alias to userdrake)
+
+=head1 DESCRIPTION
+
+This script manages user accounts for your Mageia installation.
+It requires the root password.
+
+=head1 FUNCTIONS
+
+=over
+
+=item C<get_params($file, @parameters)>
+
+This function parses and returns data from a text file in the format:
+
+  # Parameters and values are separated by whitespaces.
+  PARAMETER1 VALUE1
+  PARAMETER2 VALUE2
+  ...
+
+or
+
+  # Parameters and values are separated by the '=' symbol.
+  PARAMETER1=VALUE1
+  PARAMETER2=VALUE2
+  ...
+
+It is somehow similar to L<MDK::Common::System::getVarsFromSh> except that
+get_params() is also able to parse files where whitespaces are used as separator.
+Maybe one day both functions will be merged.
+
+ Params:  $file - The name of the text file to parse.
+          @parameters - The list of parameters for which you want their value.
+
+ Returns: A hashref in the form { PARAMETER1 => VALUE1, PARAMETER2 => VALUE2, ... }.
+
+=back
+=cut
+
 sub is_xguest_installed() {
     -e '/etc/security/namespace.d/xguest.conf';
 }
 
+sub get_params {
+    my ($file, @parameters) = @_;
+    if (open(my $fh, '<', $file)) {
+        my @lines = <$fh>;
+        close $fh;
+        my $param_list = join('|', @parameters);
+        my %params = map { /^($param_list)\b(?:=|\s+)(.+)$/; $1 => $2 } grep {/^(?:$param_list)\b/} @lines;
+        return \%params;
+    }
+}
+
 sub GrayDelEdit() {
     foreach ($tbedit, $tbdel, $buttorcheck{edit}, $buttorcheck{delete}) {
         defined $_ and $_->set_sensitive(0);
@@ -414,7 +471,10 @@ sub GetFaceIcon {
 
 sub AddUser() {
     my $w = NewWindow(N("Create New User"));
-    my $dontcreatehomedir = 0; my $is_system = 0;
+    my $dontcreatehomedir = 0;
+    # Be restrictive by default, and use umask if known.
+    my $homedir_perms = 0700;
+    my $is_system = 0;
     my %u; 
     gtkpack_($w->get_child,
 		    0, BuildUui(),
@@ -457,6 +517,10 @@ sub AddUser() {
                                $dontcreatehomedir = 0;
                                $u{homedir} = $us->{o}{homedir}->get_text;
                                $userEnt and $userEnt->HomeDir($u{homedir});
+                               # Correctly set permissions on the home directory.
+                               if (my $umask = get_params('/etc/login.defs', qw(UMASK))->{UMASK}) {
+                                   $homedir_perms = 0777 &~ oct($umask);
+                               }
                            } else {
                                $dontcreatehomedir = 1;
                            }
@@ -500,7 +564,7 @@ sub AddUser() {
                                $userEnt->Gid($u{gid});
                                $userEnt->ShadowMin(-1); $userEnt->ShadowMax(99999);
                                $userEnt->ShadowWarn(-1); $userEnt->ShadowInact(-1);
-                               $ctx->UserAdd($userEnt, $is_system, $dontcreatehomedir);
+                               $ctx->UserAdd($userEnt, $is_system, $dontcreatehomedir, $homedir_perms);
                                $ctx->UserSetPass($userEnt, $u{passwd});
                                defined $us->{o}{iconval} and
                                  any::addKdmIcon($u{username}, $us->{o}{iconval});
-- 
2.10.2

Actions: View | Diff

Attachments on bug 618: 9066 | 9067 | 9068