Merge ~michal-maloszewski99/ubuntu/+source/samba:samba-tool-usrpassword-jammy-fix into ubuntu/+source/samba:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/samba-tool-password-fix-jammy-ppa

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/?format=plain)
  samba @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/amd64/s/samba/20230814_125822_43099@/log.gz
    14.08.23 12:58:22 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa1
  samba @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/arm64/s/samba/20230814_131919_884d5@/log.gz
    14.08.23 13:19:19 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa1
  samba @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/armhf/s/samba/20230814_125426_5208e@/log.gz
    14.08.23 12:54:26 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa1
  samba @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/ppc64el/s/samba/20230814_130220_54dc7@/log.gz
    14.08.23 13:02:20 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa1
  samba @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/s390x/s/samba/20230814_130309_35035@/log.gz
    14.08.23 13:03:09 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa1
Running: (none)
Waiting: (none)

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/?format=plain)
  samba @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/amd64/s/samba/20230818_231803_f7ab0@/log.gz
    18.08.23 23:18:03 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa14
  samba @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/arm64/s/samba/20230818_233429_60a90@/log.gz
    18.08.23 23:34:29 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa14
  samba @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/armhf/s/samba/20230818_230612_f0540@/log.gz
    18.08.23 23:06:12 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa14
  samba @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/ppc64el/s/samba/20230818_232023_60a90@/log.gz
    18.08.23 23:20:23 ❌ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa14
      1408s samba-ad-dc-provisioning-internal-dns FAIL 🟥
  samba @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-samba-tool-password-fix-jammy-ppa/jammy/s390x/s/samba/20230818_231145_f7ab0@/log.gz
    18.08.23 23:11:45 ✅ Triggers: samba/2:4.15.13+dfsg-0ubuntu1.4~ppa14
Running: (none)
Waiting: (none)

[Michał Małoszewski (michal-maloszewski99)]

ppc64el fails - samba-ad-dc-provisioning-internal-dns - IMO we should not consider it a failure in that specific situation. It is likely related to a failure in the process of setting up the Samba Active Directory Domain Controller with internal DNS.
The issue that has been fixed occurred at the command line arguments parse time, and it had nothing to do with the configuration of Samba AC DC.

[Michał Małoszewski (michal-maloszewski99)]

It can be reviewed :)

[Simon Quigley (tsimonq2)]

I strongly dislike your choice of patch name (quite long). Sponsoring anyway, thanks. :)

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: tsimonq2, michal-maloszewski99
Uploaders: tsimonq2
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

https://launchpad.net/ubuntu/+source/samba/2:4.15.13+dfsg-0ubuntu1.5 includes this fix (ubuntu1.4).

diff --git a/debian/changelog b/debian/changelog
index 5e12a5e..ae87cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+samba (2:4.15.13+dfsg-0ubuntu1.4) jammy; urgency=medium
+
+  * d/p/issue-when-updating-old-passwd-containing-regex-metachars.patch:
+    Add changes to fix uncaught exception when updating old password
+    containing regex metacharacters by simplifying samba-tool password
+    redaction (LP: #2002949).
+
+ -- Michal Maloszewski <[e-mail]>  Fri, 18 Aug 2023 15:53:14 +0200
+
 samba (2:4.15.13+dfsg-0ubuntu1.3) jammy; urgency=medium
 
   * d/p/secure-channel-faulty-kb5028166.patch: fix domain membership
diff --git a/debian/patches/issue-when-updating-old-passwd-containing-regex-metachars.patch b/debian/patches/issue-when-updating-old-passwd-containing-regex-metachars.patch
new file mode 100644
index 0000000..3375da0
--- /dev/null
+++ b/debian/patches/issue-when-updating-old-passwd-containing-regex-metachars.patch
@@ -0,0 +1,25 @@
+Description: Fix samba to allow updating old password
+ The patch here is one line long. It is created from the
+ 'suggested fix' in the reported bug in Ubuntu:
+ https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2002949
+ The trick is to replace '(opt_str, secret_data)' with re.escape that
+ are used to escape any special characters in 'opt_str' and
+ 'secret_data', ensuring that they are treated as literal characters in
+ the regex pattern.
+Origin: other, https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2002949
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=15289
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2002949
+Last-Update: 2023-08-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/python/samba/getopt.py
++++ b/python/samba/getopt.py
+@@ -198,7 +198,7 @@
+         #   [= ]    -> The option and the secret data might be separated by space
+         #              or equal sign.
+         #   [ ]*.*  -> After the secret data might be one, many or no space.
+-        pass_opt_re_str = "(.*[ ]+)(%s[= ]%s)([ ]*.*)" % (opt_str, secret_data)
++        pass_opt_re_str = "(.*[ ]+)(%s[= ]%s)([ ]*.*)" % (re.escape(opt_str), re.escape(secret_data))
+         pass_opt_re = re.compile(pass_opt_re_str)
+         # Get current proctitle.
+         cur_proctitle = setproctitle.getproctitle()
diff --git a/debian/patches/series b/debian/patches/series
index 0a6a142..6839522 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,3 +65,4 @@ CVE-2023-34968-10.patch
 CVE-2023-34968-11.patch
 CVE-2023-34968-12.patch
 secure-channel-faulty-kb5028166.patch
+issue-when-updating-old-passwd-containing-regex-metachars.patch