!36 revert unreasonable patch on password setting and fix password policy
Merge pull request !36 from zhangqiumiao/master
This commit is contained in:
openeuler-ci-bot
Gitee
commit
f22465ce4e
@ -1,39 +0,0 @@
|
||||
From ebfecf7cdd3ed8cdaf118d3da97518c6f4de5023 Mon Sep 17 00:00:00 2001
|
||||
From: t_feng <fengtao40@huawei.com>
|
||||
Date: Thu, 18 Jun 2020 17:21:09 +0800
|
||||
Subject: [PATCH] add passwd check policy
|
||||
|
||||
---
|
||||
pyanaconda/ui/gui/spokes/root_password.py | 2 +-
|
||||
pyanaconda/ui/gui/spokes/user.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyanaconda/ui/gui/spokes/root_password.py b/pyanaconda/ui/gui/spokes/root_password.py
|
||||
index cfb9663..313ba0f 100644
|
||||
--- a/pyanaconda/ui/gui/spokes/root_password.py
|
||||
+++ b/pyanaconda/ui/gui/spokes/root_password.py
|
||||
@@ -290,7 +290,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler)
|
||||
self.needs_waiver = False
|
||||
else:
|
||||
if not self._validity_check.result.success:
|
||||
- self.can_go_back = True
|
||||
+ self.can_go_back = False
|
||||
self.needs_waiver = True
|
||||
elif not self._ascii_check.result.success:
|
||||
self.can_go_back = True
|
||||
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
|
||||
index 82fbdc8..29e60cb 100644
|
||||
--- a/pyanaconda/ui/gui/spokes/user.py
|
||||
+++ b/pyanaconda/ui/gui/spokes/user.py
|
||||
@@ -673,7 +673,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
|
||||
if not self._confirm_check.result.success:
|
||||
self.can_go_back = False
|
||||
if not self._validity_check.result.success:
|
||||
- self.can_go_back = True
|
||||
+ self.can_go_back = False
|
||||
self.needs_waiver = True
|
||||
elif not self._ascii_check.result.success:
|
||||
self.can_go_back = True
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%define _empty_manifest_terminate_build 0
|
||||
Name: anaconda
|
||||
Version: 33.19
|
||||
Release: 6
|
||||
Release: 7
|
||||
Summary: Graphical system installer
|
||||
License: GPLv2+ and MIT
|
||||
URL: http://fedoraproject.org/wiki/Anaconda
|
||||
@ -12,23 +12,21 @@ Patch6000: Fix-hiding-of-network-device-activation-switch.patch
|
||||
|
||||
Patch9000: add-passwd-policy.patch
|
||||
Patch9001: fix-hostname-info.patch
|
||||
patch9002: add-passwd-check-policy.patch
|
||||
Patch9003: bugfix-fix-data-encrypt-weak-passphrase-save.patch
|
||||
Patch9004: disable-set-passwd-without-confirmation.patch
|
||||
Patch9005: bugfix-logo-display-in-low-screen-resolution.patch
|
||||
Patch9006: make-name-not-force-to-uppercase.patch
|
||||
Patch9007: bugfix-GUI-nfs-unknown-error.patch
|
||||
Patch9008: hide-help-button.patch
|
||||
Patch9009: modify-interface-is-extended-in-Chinese-mode.patch
|
||||
Patch9010: remove-vender-issue-in-netdev.patch
|
||||
Patch9011: modify-arguments-parsing.patch
|
||||
Patch9012: add-boot-options-for-smmu-and-crashkernel.patch
|
||||
Patch9013: disable-product-name-in-welcome-is-uppercase.patch
|
||||
Patch9014: modify-default-timezone.patch
|
||||
Patch9015: modify-network-hostname-dot-illegal.patch
|
||||
Patch9016: disable-ssh-login-checkbox.patch
|
||||
Patch9017: bugfix-add-kdump-parameter-into-kernel-cmdline.patch
|
||||
Patch9018: bugfix-fix-password-policy.patch
|
||||
Patch9002: disable-set-passwd-without-confirmation.patch
|
||||
Patch9003: bugfix-logo-display-in-low-screen-resolution.patch
|
||||
Patch9004: make-name-not-force-to-uppercase.patch
|
||||
Patch9005: bugfix-GUI-nfs-unknown-error.patch
|
||||
Patch9006: hide-help-button.patch
|
||||
Patch9007: modify-interface-is-extended-in-Chinese-mode.patch
|
||||
Patch9008: remove-vender-issue-in-netdev.patch
|
||||
Patch9009: modify-arguments-parsing.patch
|
||||
Patch9010: add-boot-options-for-smmu-and-crashkernel.patch
|
||||
Patch9011: disable-product-name-in-welcome-is-uppercase.patch
|
||||
Patch9012: modify-default-timezone.patch
|
||||
Patch9013: modify-network-hostname-dot-illegal.patch
|
||||
Patch9014: disable-ssh-login-checkbox.patch
|
||||
Patch9015: bugfix-add-kdump-parameter-into-kernel-cmdline.patch
|
||||
Patch9016: bugfix-fix-password-policy.patch
|
||||
|
||||
Patch6001: anaconda-Fix-stage2-as-default-sources.patch
|
||||
Patch6002: anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch
|
||||
@ -245,6 +243,13 @@ update-desktop-database &> /dev/null || :
|
||||
%{_datadir}/gtk-doc
|
||||
|
||||
%changelog
|
||||
* Thu Sep 10 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.19-7
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:revert add-passwd-check-policy.patch and bugfix-fix-encrypt-weak-passphrase-save.patch
|
||||
fix password policy
|
||||
|
||||
* Fri Sep 4 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.19-6
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From e74a97aaf7e3f0e8d9b1f961eb68712337924720 Mon Sep 17 00:00:00 2001
|
||||
From: t_feng <fengtao40@huawei.com>
|
||||
Date: Thu, 18 Jun 2020 17:30:22 +0800
|
||||
Subject: [PATCH] bugfix fix data encrypt weak passphrase save
|
||||
|
||||
---
|
||||
pyanaconda/ui/gui/spokes/lib/passphrase.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py
|
||||
index 99ca2d4..0314d6d 100644
|
||||
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.py
|
||||
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py
|
||||
@@ -158,7 +158,7 @@ class PassphraseDialog(GUIObject):
|
||||
self._passphrase_good_enough = True
|
||||
elif len(self._checker.failed_checks) == 1 and self._validity_check in self._checker._failed_checks:
|
||||
# only the password validity check failed
|
||||
- if self._checker.policy.strict:
|
||||
+ if self._checker.policy.strict or self._strength_bar.get_value() < 2:
|
||||
# this is not fine for the strict password policy
|
||||
self._passphrase_good_enough = False
|
||||
else:
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,55 +1,29 @@
|
||||
From 1f703640773f49e4610baee9afd79b89c3c4bc1c Mon Sep 17 00:00:00 2001
|
||||
From 19264b192083d5cf38750a9cef0ec0a55eea3cfe Mon Sep 17 00:00:00 2001
|
||||
From: zhangqiumiao <zhangqiumiao1@huawei.com>
|
||||
Date: Thu, 3 Sep 2020 21:48:20 +0800
|
||||
Date: Thu, 10 Sep 2020 14:59:14 +0800
|
||||
Subject: [PATCH] bugfix fix password policy
|
||||
|
||||
---
|
||||
data/interactive-defaults.ks | 4 ++--
|
||||
pyanaconda/ui/gui/spokes/root_password.py | 2 +-
|
||||
pyanaconda/ui/gui/spokes/user.py | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
data/interactive-defaults.ks | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/data/interactive-defaults.ks b/data/interactive-defaults.ks
|
||||
index 0177cf9..7eac690 100644
|
||||
index 0177cf9..7e43a39 100644
|
||||
--- a/data/interactive-defaults.ks
|
||||
+++ b/data/interactive-defaults.ks
|
||||
@@ -4,8 +4,8 @@ firstboot --enable
|
||||
@@ -4,9 +4,9 @@ firstboot --enable
|
||||
|
||||
%anaconda
|
||||
# Default password policies
|
||||
-pwpolicy root --notstrict --minlen=8 --minquality=1 --nochanges --notempty
|
||||
-pwpolicy user --notstrict --minlen=8 --minquality=1 --nochanges --emptyok
|
||||
+pwpolicy root --notstrict --minlen=8 --minquality=1 --nochanges --notempty --strict
|
||||
+pwpolicy user --notstrict --minlen=8 --minquality=1 --nochanges --emptyok --strict
|
||||
pwpolicy luks --notstrict --minlen=8 --minquality=1 --nochanges --notempty
|
||||
-pwpolicy luks --notstrict --minlen=8 --minquality=1 --nochanges --notempty
|
||||
+pwpolicy root --strict --minlen=8 --minquality=1 --nochanges --notempty
|
||||
+pwpolicy user --strict --minlen=8 --minquality=1 --nochanges --emptyok
|
||||
+pwpolicy luks --strict --minlen=8 --minquality=1 --nochanges --notempty
|
||||
# NOTE: This applies only to *fully* interactive installations, partial kickstart
|
||||
# installations use defaults specified in pyanaconda/pwpolicy.py.
|
||||
diff --git a/pyanaconda/ui/gui/spokes/root_password.py b/pyanaconda/ui/gui/spokes/root_password.py
|
||||
index 2af9111..d609453 100644
|
||||
--- a/pyanaconda/ui/gui/spokes/root_password.py
|
||||
+++ b/pyanaconda/ui/gui/spokes/root_password.py
|
||||
@@ -292,7 +292,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler)
|
||||
self.needs_waiver = False
|
||||
else:
|
||||
if not self._validity_check.result.success:
|
||||
- self.can_go_back = False
|
||||
+ self.can_go_back = True
|
||||
self.needs_waiver = True
|
||||
elif not self._ascii_check.result.success:
|
||||
self.can_go_back = True
|
||||
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
|
||||
index 29e60cb..82fbdc8 100644
|
||||
--- a/pyanaconda/ui/gui/spokes/user.py
|
||||
+++ b/pyanaconda/ui/gui/spokes/user.py
|
||||
@@ -673,7 +673,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
|
||||
if not self._confirm_check.result.success:
|
||||
self.can_go_back = False
|
||||
if not self._validity_check.result.success:
|
||||
- self.can_go_back = False
|
||||
+ self.can_go_back = True
|
||||
self.needs_waiver = True
|
||||
elif not self._ascii_check.result.success:
|
||||
self.can_go_back = True
|
||||
# Automated kickstart installs simply ignore the password policy as the policy
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user