|
 |
ee2f06 |
diff -Naur old/authconfig.py new/authconfig.py
|
|
|
ee2f06 |
--- old/authconfig.py 2017-03-28 14:08:03.601258033 +0200
|
|
|
ee2f06 |
+++ new/authconfig.py 2017-03-28 14:10:35.055518926 +0200
|
|
|
ee2f06 |
@@ -353,6 +353,13 @@
|
|
|
ee2f06 |
help=_("require at least one other character in a password"))
|
|
|
ee2f06 |
parser.add_option("--disablereqother", action="store_true",
|
|
|
ee2f06 |
help=_("do not require other characters in a password"))
|
|
|
ee2f06 |
+
|
|
|
ee2f06 |
+ parser.add_option("--enablefaillock", action="store_true",
|
|
|
ee2f06 |
+ help=_("enable account locking in case of too many consecutive authentication failures"))
|
|
|
ee2f06 |
+ parser.add_option("--disablefaillock", action="store_true",
|
|
|
ee2f06 |
+ help=_("disable account locking on too many consecutive authentication failures"))
|
|
|
ee2f06 |
+ parser.add_option("--faillockargs", metavar=_("<options>"),
|
|
|
ee2f06 |
+ help=_("the pam_faillock module options"))
|
|
|
ee2f06 |
|
|
|
ee2f06 |
parser.add_option("--nostart", action="store_true",
|
|
|
ee2f06 |
help=_("do not start/stop portmap, ypbind, and nscd"))
|
|
|
ee2f06 |
@@ -466,7 +473,8 @@
|
|
|
ee2f06 |
"reqlower":"passReqLower",
|
|
|
ee2f06 |
"requpper":"passReqUpper",
|
|
|
ee2f06 |
"reqdigit":"passReqDigit",
|
|
|
ee2f06 |
- "reqother":"passReqOther"}
|
|
|
ee2f06 |
+ "reqother":"passReqOther",
|
|
|
ee2f06 |
+ "faillock":"enableFaillock"}
|
|
|
ee2f06 |
|
|
|
ee2f06 |
string_settings = {"passalgo":"passwordAlgorithm",
|
|
|
ee2f06 |
"hesiodlhs":"hesiodLHS",
|
|
|
ee2f06 |
@@ -495,7 +503,8 @@
|
|
|
ee2f06 |
"passminlen":"passMinLen",
|
|
|
ee2f06 |
"passminclass":"passMinClass",
|
|
|
ee2f06 |
"passmaxrepeat":"passMaxRepeat",
|
|
|
ee2f06 |
- "passmaxclassrepeat":"passMaxClassRepeat"}
|
|
|
ee2f06 |
+ "passmaxclassrepeat":"passMaxClassRepeat",
|
|
|
ee2f06 |
+ "faillockargs":"faillockArgs"}
|
|
|
ee2f06 |
|
|
|
ee2f06 |
for opt, aival in bool_settings.iteritems():
|
|
|
ee2f06 |
if getattr(self.options, "enable"+opt):
|
|
|
ee2f06 |
diff -Naur old/authinfo.py new/authinfo.py
|
|
|
ee2f06 |
--- old/authinfo.py 2017-03-28 14:08:03.599258069 +0200
|
|
|
ee2f06 |
+++ new/authinfo.py 2017-03-28 14:25:31.403421162 +0200
|
|
|
ee2f06 |
@@ -489,6 +489,8 @@
|
|
|
ee2f06 |
"otp", argv_otp_auth],
|
|
|
ee2f06 |
[False, AUTH, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
"winbind", argv_winbind_auth],
|
|
|
ee2f06 |
+ [False, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", ["authfail"]],
|
|
|
ee2f06 |
[True, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
# Account management is tricky. Because we've implicitly committed to
|
|
|
ee2f06 |
@@ -508,6 +510,8 @@
|
|
|
ee2f06 |
# successful call to pam_permit at the end as a requirement.
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"access", []],
|
|
|
ee2f06 |
+ [False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", []],
|
|
|
ee2f06 |
[True, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"unix", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
@@ -618,6 +622,8 @@
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"access", []],
|
|
|
ee2f06 |
+ [False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", []],
|
|
|
ee2f06 |
[True, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"unix", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
@@ -654,6 +660,8 @@
|
|
|
ee2f06 |
"ldap", argv_ldap_password],
|
|
|
ee2f06 |
[False, PASSWORD, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
"winbind", argv_winbind_password],
|
|
|
ee2f06 |
+ [False, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", ["authfail"]],
|
|
|
ee2f06 |
[True, PASSWORD, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
[True, SESSION, LOGIC_OPTIONAL,
|
|
|
ee2f06 |
@@ -689,10 +697,14 @@
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
[False, AUTH, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
"fprintd", []],
|
|
|
ee2f06 |
+ [False, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", ["authfail"]],
|
|
|
ee2f06 |
[True, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"access", []],
|
|
|
ee2f06 |
+ [False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", []],
|
|
|
ee2f06 |
[True, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"unix", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
@@ -748,10 +760,14 @@
|
|
|
ee2f06 |
"krb5", argv_krb5_sc_auth],
|
|
|
ee2f06 |
[False, AUTH, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
"permit", []],
|
|
|
ee2f06 |
+ [False, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", ["authfail"]],
|
|
|
ee2f06 |
[True, AUTH, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"deny", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"access", []],
|
|
|
ee2f06 |
+ [False, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
+ "faillock", []],
|
|
|
ee2f06 |
[True, ACCOUNT, LOGIC_REQUIRED,
|
|
|
ee2f06 |
"unix", []],
|
|
|
ee2f06 |
[False, ACCOUNT, LOGIC_SUFFICIENT,
|
|
|
ee2f06 |
@@ -1392,6 +1408,11 @@
|
|
|
ee2f06 |
self.passReqDigit = None
|
|
|
ee2f06 |
self.passReqOther = None
|
|
|
ee2f06 |
|
|
|
ee2f06 |
+ # Faillock
|
|
|
ee2f06 |
+ self.enableFaillock = None
|
|
|
ee2f06 |
+ self.faillockArgs = "deny=4 unlock_time=1200"
|
|
|
ee2f06 |
+
|
|
|
ee2f06 |
+
|
|
|
ee2f06 |
# Not really options.
|
|
|
ee2f06 |
self.joinUser = ""
|
|
|
ee2f06 |
self.joinPassword = ""
|
|
|
ee2f06 |
@@ -1453,6 +1474,7 @@
|
|
|
ee2f06 |
("enableNIS3", "b"), ("enableNIS", "b"), ("enableIPAv2", "b"),
|
|
|
ee2f06 |
("enableSSSD", "b"), ("preferDNSinHosts", "b"), ("implicitSSSD", "b")]),
|
|
|
ee2f06 |
SaveGroup(self.writePAM, None, [("pwqualityArgs", "c"), ("passwdqcArgs", "c"),
|
|
|
ee2f06 |
+ ("faillockArgs", "c"), ("enableFaillock", "b"),
|
|
|
ee2f06 |
("localuserArgs", "c"), ("pamAccessArgs", "c"), ("enablePAMAccess", "b"),
|
|
|
ee2f06 |
("mkhomedirArgs", "c"), ("enableMkHomeDir", "b"), ("algoRounds", "c"),
|
|
|
ee2f06 |
("passwordAlgorithm", "i"), ("enableShadow", "b"), ("enableNIS", "b"),
|
|
|
ee2f06 |
@@ -1470,6 +1492,7 @@
|
|
|
ee2f06 |
("enableEcryptfs", "b"), ("enableSmartcard", "b"), ("forceSmartcard", "b"),
|
|
|
ee2f06 |
("enableWinbindAuth", "b"), ("enableWinbind", "b"), ("winbindKrb5", "b"), ("enableDB", "b"),
|
|
|
ee2f06 |
("enableHesiod", "b"), ("enablePWQuality", "b"), ("enablePasswdQC", "b"),
|
|
|
ee2f06 |
+ ("enableFaillock", "b"), ("faillockArgs", "c"),
|
|
|
ee2f06 |
("enableLocAuthorize", "b"), ("enablePAMAccess", "b"), ("enableCacheCreds", "b"),
|
|
|
ee2f06 |
("enableMkHomeDir", "b"), ("enableSysNetAuth", "b"), ("enableFprintd", "b"),
|
|
|
ee2f06 |
("enableSSSD", "b"), ("enableSSSDAuth", "b"), ("enableForceLegacy", "b"),
|
|
|
ee2f06 |
@@ -2247,6 +2270,12 @@
|
|
|
ee2f06 |
if stack == "auth":
|
|
|
ee2f06 |
if module.startswith("pam_unix"):
|
|
|
ee2f06 |
self.setParam("enableNullOk", args.find("nullok") >= 0, ref)
|
|
|
ee2f06 |
+ if module.startswith("pam_faillock"):
|
|
|
ee2f06 |
+ self.setParam("enableFaillock", True, ref)
|
|
|
ee2f06 |
+ if args:
|
|
|
ee2f06 |
+ args.replace('authfail', '').strip()
|
|
|
ee2f06 |
+ self.setParam("faillockArgs", args, ref)
|
|
|
ee2f06 |
+ continue
|
|
|
ee2f06 |
if stack == "account":
|
|
|
ee2f06 |
if module.startswith("pam_unix"):
|
|
|
ee2f06 |
self.setParam("brokenShadow", args.find("broken_shadow") >= 0, ref)
|
|
|
ee2f06 |
@@ -2305,6 +2334,11 @@
|
|
|
ee2f06 |
except ValueError:
|
|
|
ee2f06 |
pass
|
|
|
ee2f06 |
try:
|
|
|
ee2f06 |
+ self.enableFaillock = shv.getBoolValue("USEFAILLOCK")
|
|
|
ee2f06 |
+ self.faillockArgs = shv.getValue("FAILLOCKARGS")
|
|
|
ee2f06 |
+ except ValueError:
|
|
|
ee2f06 |
+ pass
|
|
|
ee2f06 |
+ try:
|
|
|
ee2f06 |
self.enableEcryptfs = shv.getBoolValue("USEECRYPTFS")
|
|
|
ee2f06 |
except ValueError:
|
|
|
ee2f06 |
pass
|
|
|
ee2f06 |
@@ -3912,6 +3946,8 @@
|
|
|
ee2f06 |
if (self.forceBrokenShadow or self.enableLDAPAuth or
|
|
|
ee2f06 |
self.enableKerberos or self.enableWinbindAuth):
|
|
|
ee2f06 |
output += " broken_shadow"
|
|
|
ee2f06 |
+ if name == "faillock" and stack == "auth":
|
|
|
ee2f06 |
+ args = " ".join(module[ARGV]) + " " + self.faillockArgs
|
|
|
ee2f06 |
if args:
|
|
|
ee2f06 |
output += " " + args
|
|
|
ee2f06 |
output += "\n"
|
|
|
ee2f06 |
@@ -3978,6 +4014,7 @@
|
|
|
ee2f06 |
(self.enableAFS and module[NAME] == "afs") or
|
|
|
ee2f06 |
(self.enableAFSKerberos and module[NAME] == "afs.krb") or
|
|
|
ee2f06 |
(self.enablePWQuality and module[NAME] == "pwquality") or
|
|
|
ee2f06 |
+ (self.enableFaillock and module[NAME] == "faillock") or
|
|
|
ee2f06 |
(self.enableEcryptfs and module[NAME] == "ecryptfs") or
|
|
|
ee2f06 |
(self.enableEPS and module[NAME] == "eps") or
|
|
|
ee2f06 |
((self.enableKerberos and not self.implicitSSSDAuth)and module[NAME] == "krb5" and
|
|
|
ee2f06 |
@@ -4039,6 +4076,8 @@
|
|
|
ee2f06 |
return False
|
|
|
ee2f06 |
|
|
|
ee2f06 |
shv.setBoolValue("USEPWQUALITY", self.enablePWQuality)
|
|
|
ee2f06 |
+ shv.setBoolValue("USEFAILLOCK", self.enableFaillock)
|
|
|
ee2f06 |
+ shv.setValue("FAILLOCKARGS", self.faillockArgs)
|
|
|
ee2f06 |
shv.setBoolValue("USEDB", self.enableDB)
|
|
|
ee2f06 |
shv.setBoolValue("USEHESIOD", self.enableHesiod)
|
|
|
ee2f06 |
shv.setBoolValue("USELDAP", self.enableLDAP)
|
|
|
ee2f06 |
@@ -4314,6 +4353,8 @@
|
|
|
ee2f06 |
self.passwdqcArgs)
|
|
|
ee2f06 |
print "pam_access is %s (%s)" % (formatBool(self.enablePAMAccess),
|
|
|
ee2f06 |
self.pamAccessArgs)
|
|
|
ee2f06 |
+ print "pam_faillock is %s (%s)" % (formatBool(self.enableFaillock),
|
|
|
ee2f06 |
+ self.faillockArgs)
|
|
|
ee2f06 |
print "pam_mkhomedir or pam_oddjob_mkhomedir is %s (%s)" % (formatBool(self.enableMkHomeDir),
|
|
|
ee2f06 |
self.mkhomedirArgs)
|
|
|
ee2f06 |
print "Always authorize local users is %s (%s)" % (formatBool(self.enableLocAuthorize),
|