!80 [sync] PR-79: fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N)

From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333
fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N)
2024-12-05 03:31:50 +00:00 · 2024-12-05 10:53:39 +08:00 · 2024-12-02 08:53:04 +00:00 · 2024-12-02 14:23:30 +08:00 · 2024-01-15 01:14:49 +00:00 · 2024-01-12 02:46:07 +00:00
3 changed files with 385 additions and 16 deletions
--- a/backport-CVE-2024-48651.patch
+++ b/backport-CVE-2024-48651.patch
@ -0,0 +1,319 @@
+From cec01cc0a2523453e5da5a486bc6d977c3768db1 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Wed, 13 Nov 2024 06:33:35 -0800
+Subject: [PATCH] Issue #1830: When no supplemental groups are provided by the
+ underlying authentication providers, fall back to using the primary
+ group/GID. (#1835)
+
+This prevents surprise due to inheritance of the parent processes' supplemental group membership, which might inadvertently provided undesired access.
+---
+ contrib/mod_sftp/auth.c                       |  14 +-
+ modules/mod_auth.c                            |  19 +-
+ src/auth.c                                    |  14 +-
+ .../ProFTPD/Tests/Modules/mod_sql_sqlite.pm   | 174 ++++++++++++++++++
+ 4 files changed, 209 insertions(+), 12 deletions(-)
+
+diff --git a/contrib/mod_sftp/auth.c b/contrib/mod_sftp/auth.c
+index c7a694e..6196fec 100644
+--- a/contrib/mod_sftp/auth.c
+++ b/contrib/mod_sftp/auth.c
+@@ -388,8 +388,20 @@ static int setup_env(pool *p, const char *user) {
+       session.groups == NULL) {
+     res = pr_auth_getgroups(p, pw->pw_name, &session.gids, &session.groups);
+     if (res < 1) {
+      /* If no supplemental groups are provided, default to using the process
+       * primary GID as the supplemental group.  This prevents access
+       * regressions as seen in Issue #1830.
+       */
+       (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
+-        "no supplemental groups found for user '%s'", pw->pw_name);
+        "no supplemental groups found for user '%s', "
+        "using primary group %s (GID %lu)", pw->pw_name, session.group,
+        (unsigned long) session.login_gid);
+
+      session.gids = make_array(p, 2, sizeof(gid_t));
+      session.groups = make_array(p, 2, sizeof(char *));
+
+      *((gid_t *) push_array(session.gids)) = session.login_gid;
+      *((char **) push_array(session.groups)) = pstrdup(p, session.group);
+     }
+   }
+ 
+diff --git a/modules/mod_auth.c b/modules/mod_auth.c
+index a85be06..9eb9b48 100644
+--- a/modules/mod_auth.c
+++ b/modules/mod_auth.c
+@@ -1113,8 +1113,8 @@ static int setup_env(pool *p, cmd_rec *cmd, const char *user, char *pass) {
+     session.groups = NULL;
+   }
+ 
+-  if (!session.gids &&
+-      !session.groups) {
+  if (session.gids == NULL &&
+      session.groups == NULL) {
+     /* Get the supplemental groups.  Note that we only look up the
+      * supplemental group credentials if we have not cached the group
+      * credentials before, in session.gids and session.groups.  
+@@ -1124,8 +1124,19 @@ static int setup_env(pool *p, cmd_rec *cmd, const char *user, char *pass) {
+      */
+      res = pr_auth_getgroups(p, pw->pw_name, &session.gids, &session.groups);
+      if (res < 1) {
+-       pr_log_debug(DEBUG5, "no supplemental groups found for user '%s'",
+-         pw->pw_name);
+       /* If no supplemental groups are provided, default to using the process
+        * primary GID as the supplemental group.  This prevents access
+        * regressions as seen in Issue #1830.
+        */
+       pr_log_debug(DEBUG5, "no supplemental groups found for user '%s', "
+         "using primary group %s (GID %lu)", pw->pw_name, session.group,
+         (unsigned long) session.login_gid);
+
+       session.gids = make_array(p, 2, sizeof(gid_t));
+       session.groups = make_array(p, 2, sizeof(char *));
+
+       *((gid_t *) push_array(session.gids)) = session.login_gid;
+       *((char **) push_array(session.groups)) = pstrdup(p, session.group);
+      }
+   }
+ 
+diff --git a/src/auth.c b/src/auth.c
+index b90fe41..af39fc0 100644
+--- a/src/auth.c
+++ b/src/auth.c
+@@ -1471,12 +1471,12 @@ int pr_auth_getgroups(pool *p, const char *name, array_header **group_ids,
+   }
+ 
+   /* Allocate memory for the array_headers of GIDs and group names. */
+-  if (group_ids) {
+-    *group_ids = make_array(permanent_pool, 2, sizeof(gid_t));
+  if (group_ids != NULL) {
+    *group_ids = make_array(p, 2, sizeof(gid_t));
+   }
+ 
+-  if (group_names) {
+-    *group_names = make_array(permanent_pool, 2, sizeof(char *));
+  if (group_names != NULL) {
+    *group_names = make_array(p, 2, sizeof(char *));
+   }
+ 
+   cmd = make_cmd(p, 3, name, group_ids ? *group_ids : NULL,
+@@ -1495,7 +1495,7 @@ int pr_auth_getgroups(pool *p, const char *name, array_header **group_ids,
+      * for the benefit of auth_getgroup() implementors.
+      */
+ 
+-    if (group_ids) {
+    if (group_ids != NULL) {
+       register unsigned int i;
+       char *strgids = "";
+       gid_t *gids = (*group_ids)->elts;
+@@ -1511,7 +1511,7 @@ int pr_auth_getgroups(pool *p, const char *name, array_header **group_ids,
+         *strgids ? strgids : "(None; corrupted group file?)");
+     }
+ 
+-    if (group_names) {
+    if (group_names != NULL) {
+       register unsigned int i;
+       char *strgroups = ""; 
+       char **groups = (*group_names)->elts;
+@@ -1527,7 +1527,7 @@ int pr_auth_getgroups(pool *p, const char *name, array_header **group_ids,
+     }
+   }
+ 
+-  if (cmd->tmp_pool) {
+  if (cmd->tmp_pool != NULL) {
+     destroy_pool(cmd->tmp_pool);
+     cmd->tmp_pool = NULL;
+   }
+diff --git a/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm b/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm
+index 08c1542..42ba967 100644
+--- a/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm
+++ b/tests/t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm
+@@ -467,6 +467,11 @@ my $TESTS = {
+     order => ++$order,
+     test_class => [qw(forking bug mod_tls)],
+   },
+
+  sql_user_info_no_suppl_groups_issue1830 => {
+    order => ++$order,
+    test_class => [qw(forking bug rootprivs)],
+  },
+ };
+ 
+ sub new {
+@@ -15764,4 +15769,173 @@ EOC
+   test_cleanup($setup->{log_file}, $ex);
+ }
+ 
+sub sql_user_info_no_suppl_groups_issue1830 {
+  my $self = shift;
+  my $tmpdir = $self->{tmpdir};
+  my $setup = test_setup($tmpdir, 'sqlite');
+
+  my $db_file = File::Spec->rel2abs("$tmpdir/proftpd.db");
+
+  # Build up sqlite3 command to create users, groups tables and populate them
+  my $db_script = File::Spec->rel2abs("$tmpdir/proftpd.sql");
+
+  if (open(my $fh, "> $db_script")) {
+    print $fh <<EOS;
+CREATE TABLE users (
+  userid TEXT,
+  passwd TEXT,
+  uid INTEGER,
+  gid INTEGER,
+  homedir TEXT,
+  shell TEXT
+);
+INSERT INTO users (userid, passwd, uid, gid, homedir, shell) VALUES ('$setup->{user}', '$setup->{passwd}', $setup->{uid}, $setup->{gid}, '$setup->{home_dir}', '/bin/bash');
+
+CREATE TABLE groups (
+  groupname TEXT,
+  gid INTEGER,
+  members TEXT
+);
+INSERT INTO groups (groupname, gid, members) VALUES ('$setup->{group}', $setup->{gid}, '$setup->{user}');
+EOS
+
+    unless (close($fh)) {
+      die("Can't write $db_script: $!");
+    }
+
+  } else {
+    die("Can't open $db_script: $!");
+  }
+
+  my $cmd = "sqlite3 $db_file < $db_script";
+  build_db($cmd, $db_script);
+
+  # Make sure that, if we're running as root, the database file has
+  # the permissions/privs set for use by proftpd
+  if ($< == 0) {
+    unless (chmod(0666, $db_file)) {
+      die("Can't set perms on $db_file to 0666: $!");
+    }
+  }
+
+  my $config = {
+    PidFile => $setup->{pid_file},
+    ScoreboardFile => $setup->{scoreboard_file},
+    SystemLog => $setup->{log_file},
+    TraceLog => $setup->{log_file},
+    Trace => 'auth:20 sql:20',
+
+    # Required for logging the expected message
+    DebugLevel => 5,
+
+    IfModules => {
+      'mod_delay.c' => {
+        DelayEngine => 'off',
+      },
+
+      'mod_sql.c' => {
+        AuthOrder => 'mod_sql.c',
+
+        SQLAuthenticate => 'users',
+        SQLAuthTypes => 'plaintext',
+        SQLBackend => 'sqlite3',
+        SQLConnectInfo => $db_file,
+        SQLLogFile => $setup->{log_file},
+
+        # Set these, so that our lower UID/GID will be used
+        SQLMinUserUID => 100,
+        SQLMinUserGID => 100,
+      },
+    },
+  };
+
+  my ($port, $config_user, $config_group) = config_write($setup->{config_file},
+    $config);
+
+  # Open pipes, for use between the parent and child processes.  Specifically,
+  # the child will indicate when it's done with its test by writing a message
+  # to the parent.
+  my ($rfh, $wfh);
+  unless (pipe($rfh, $wfh)) {
+    die("Can't open pipe: $!");
+  }
+
+  my $ex;
+
+  # Fork child
+  $self->handle_sigchld();
+  defined(my $pid = fork()) or die("Can't fork: $!");
+  if ($pid) {
+    eval {
+      sleep(2);
+
+      my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port);
+      $client->login($setup->{user}, $setup->{passwd});
+
+      my $resp_msgs = $client->response_msgs();
+      my $nmsgs = scalar(@$resp_msgs);
+
+      my $expected = 1;
+      $self->assert($expected == $nmsgs,
+        test_msg("Expected $expected, got $nmsgs"));
+
+      $expected = "User $setup->{user} logged in";
+      $self->assert($expected eq $resp_msgs->[0],
+        test_msg("Expected response '$expected', got '$resp_msgs->[0]'"));
+
+      $client->quit();
+    };
+    if ($@) {
+      $ex = $@;
+    }
+
+    $wfh->print("done\n");
+    $wfh->flush();
+
+  } else {
+    eval { server_wait($setup->{config_file}, $rfh) };
+    if ($@) {
+      warn($@);
+      exit 1;
+    }
+
+    exit 0;
+  }
+
+  # Stop server
+  server_stop($setup->{pid_file});
+  $self->assert_child_ok($pid);
+
+  eval {
+    if (open(my $fh, "< $setup->{log_file}")) {
+      my $ok = 0;
+
+      while (my $line = <$fh>) {
+        chomp($line);
+
+        if ($ENV{TEST_VERBOSE}) {
+          print STDERR "# $line\n";
+        }
+
+        if ($line =~ /no supplemental groups found for user '$setup->{user}', using primary group/) {
+          $ok = 1;
+          last;
+        }
+      }
+
+      close($fh);
+
+      $self->assert($ok, test_msg("Did not see expected log message"));
+
+    } else {
+      die("Can't read $setup->{log_file}: $!");
+    }
+  };
+  if ($@) {
+    $ex = $@ unless $ex;
+  }
+
+  test_cleanup($setup->{log_file}, $ex);
+}
+
+ 1;
+-- 
+2.33.0
+
--- a/huawei-proftpd-service-add-restart.patch
+++ b/huawei-proftpd-service-add-restart.patch
@ -0,0 +1,24 @@
+From 39d7026876e29020dde52655927e73bf6f98f5ff Mon Sep 17 00:00:00 2001
+From: chengyechun <chengyechun1@huawei.com>
+Date: Wed, 3 Jan 2024 03:18:36 +0000
+Subject: [PATCH] huawei-proftpd-service-add-restart
+
+---
+ contrib/dist/rpm/proftpd.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/dist/rpm/proftpd.service b/contrib/dist/rpm/proftpd.service
+index 6c81db3..14ae9e5 100644
+--- a/contrib/dist/rpm/proftpd.service
+++ b/contrib/dist/rpm/proftpd.service
+@@ -11,6 +11,7 @@ ExecStartPre = /usr/sbin/proftpd --configtest
+ ExecStart = /usr/sbin/proftpd --nodaemon $PROFTPD_OPTIONS
+ ExecReload = /bin/kill -HUP $MAINPID
+ PIDFile = /run/proftpd/proftpd.pid
+Restart=on-failure
+ 
+ [Install]
+ WantedBy = multi-user.target
+-- 
+2.33.0
+
--- a/proftpd.spec
+++ b/proftpd.spec
@ -18,11 +18,9 @@

 %global mod_vroot_version 0.9.11

-%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
-
 Name:			proftpd
 Version:		1.3.8b
-Release:		1
+Release:		6
 Summary:		Flexible, stable and highly-configurable FTP server
 License:		GPLv2+
 URL:			http://www.proftpd.org/
@ -44,7 +42,9 @@ Patch3:			proftpd-1.3.4rc1-mod_vroot-test.patch
 Patch4:			proftpd-1.3.6-no-mod-wrap.patch
 Patch5:			proftpd-1.3.6-no-mod-geoip.patch
 Patch6:			proftpd-1.3.7rc3-logging-not-systemd.patch
-Patch8:			proftpd-1.3.8-fix-environment-sensitive-tests-failure.patch
+Patch7:			proftpd-1.3.8-fix-environment-sensitive-tests-failure.patch
+Patch8: 		huawei-proftpd-service-add-restart.patch
+Patch9: 		backport-CVE-2024-48651.patch

 BuildRequires:		coreutils
 BuildRequires:		gcc
@ -61,7 +61,7 @@ BuildRequires:		pcre-devel >= 7.0
 BuildRequires:		perl-generators
 BuildRequires:		perl-interpreter
 BuildRequires:		pkgconfig
-%if %{?vendor:1}0
+%if %{?openEuler:1}0
 BuildRequires:		postgresql-devel
 %endif
 BuildRequires:		sed
@ -141,7 +141,7 @@ Requires:	openssl-devel
 Requires:	pam-devel
 Requires:	pcre-devel
 Requires:	pkgconfig
-%if %{?vendor:1}0
+%if %{?openEuler:1}0
 Requires:	postgresql-devel
 %endif
 Requires:	sqlite-devel
@ -168,7 +168,7 @@ Requires:	%{name} = %{version}-%{release}
 %description mysql
 Module to add MySQL support to the ProFTPD FTP server.

-%if %{?vendor:1}0
+%if %{?openEuler:1}0
 %package postgresql
 Summary:	Module to add PostgreSQL support to the ProFTPD FTP server
 Requires:	%{name} = %{version}-%{release}
@ -225,20 +225,20 @@ sed -e 's|@RUNDIR@|%{rundir}|' %{SOURCE6} > anonftp.conf
 mv contrib/README contrib/README.contrib

 # Change shellbangs /usr/bin/env perl ⇒ /usr/bin/perl
-%patch1
+%patch 1

 # If we don't have libmemcached support, remove the mod_tls_memcache
 # snippet from the config file
-%patch2
+%patch 2

 # If we're running the full test suite, include the mod_vroot test
-%patch3 -p1 -b .test_vroot
+%patch 3 -p1 -b .test_vroot

 # Remove references to mod_wrap from the configuration file if necessary
-%patch4 -b .nowrappers
+%patch 4 -b .nowrappers

 # Remove references to mod_geoip from the configuration file if necessary
-%patch5 -b .nogeoip
+%patch 5 -b .nogeoip

 %if %{use_systemd}
 # Tweak logrotate script for systemd compatibility (#802178)
@ -246,10 +246,12 @@ sed -i -e '/killall/s/test.*/systemctl reload proftpd.service/' \
 	contrib/dist/rpm/proftpd.logrotate
 %else
 # Not using systemd, so we want hostname and timestamp in log messages
-%patch6
+%patch 6
 %endif

-%patch8 -p1
+%patch 7 -p1
+%patch 8 -p1
+%patch 9 -p1

 # Avoid docfile dependencies
 chmod -c -x contrib/xferstats.holger-preiss
@ -262,7 +264,7 @@ find doc/ contrib/ -name '*.orig' -delete

 %build
 # Modules to be built as DSO's (excluding mod_ifsession, always specified last)
-%if %{?vendor:1}0
+%if %{?openEuler:1}0
 SMOD1=mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite
 %else
 SMOD1=mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sql_sqlite
@ -511,7 +513,7 @@ fi
 %files mysql
 %{_libexecdir}/proftpd/mod_sql_mysql.so

-%if %{?vendor:1}0
+%if %{?openEuler:1}0
 %files postgresql
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 %endif
@ -535,6 +537,30 @@ fi
 %{_mandir}/man1/ftpwho.1*

 %changelog
+* Tue Dec 03 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 1.3.8b-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N)
+
+* Sat Nov 30 2024 liningjie <liningjie@xfusion.com> - 1.3.8b-5
+- Type:CVE
+- ID:NA
+- SUG:NA
+- DESC:fix CVE-2024-48651
+
+* Thu Jan 11 2024 chengyechun <chengyechun1@huawei.com> - 1.3.8b-4
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:add Restart in proftpd.service
+
+* Fri Dec 29 2023 wangkai <13474090681@163.com> - 1.3.8b-3
+- Adjust patch number
+
+* Wed Dec 27 2023 wangkai <13474090681@163.com> - 1.3.8b-2
+- Replace vendor with openEuler marco
+
 * Tue Dec 26 2023 wangkai <13474090681@163.com> - 1.3.8b-1
 - Update to 1.3.8b for fix CVE-2023-51713,CVE-2023-48795
Author	SHA1	Message	Date
openeuler-ci-bot	6ecd24196e	!80 [sync] PR-79: fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N) From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333	2024-12-05 03:31:50 +00:00
沈仲伟	5976e1a23b	fix: %patchN is deprecated (7 usages found), use %patch N (or %patch -P N) (cherry picked from commit 0acab5b2bec4cfa625931f32374c3e714a674fa8)	2024-12-05 10:53:39 +08:00
openeuler-ci-bot	a4485b6ee6	!74 [sync] PR-71: fix CVE-2024-48651 From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333	2024-12-02 08:53:04 +00:00
李宁杰	f07b55007f	fix CVE-2024-48651 (cherry picked from commit 256d719b0b68fb44c36797e7de5d0dbc806f4688)	2024-12-02 14:23:30 +08:00
openeuler-ci-bot	1e55ac6985	!62 add restart in proftpd.service From: @chengyechun Reviewed-by: @wk333 Signed-off-by: @wk333	2024-01-15 01:14:49 +00:00
chengyechun	c518a10feb	add restart in proftpd.service	2024-01-12 02:46:07 +00:00
openeuler-ci-bot	5acffd0697	!46 Adjust patch number From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2024-01-02 07:16:43 +00:00
wk333	50725a81c0	Adjust patch number	2023-12-29 10:01:43 +08:00
openeuler-ci-bot	9e66b44007	!39 Replace vendor with openEuler marco From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2023-12-27 03:33:47 +00:00
wk333	bbddbc091b	Replace vendor with openEuler marco	2023-12-27 10:12:29 +08:00
openeuler-ci-bot	86f4927525	!28 Update to 1.3.8b for fix CVE-2023-51713,CVE-2023-48795 From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2023-12-26 11:32:36 +00:00