summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-01-31 15:51:35 +0100
committerStephen Gallagher <sgallagh@redhat.com>2012-02-04 08:27:16 -0500
commit4be402505ba20b43361753f0e6e1589c9b029e81 (patch)
treee2606c902503c99f294401be96bfa5d7e5c943a8
parentc9aab1c04c399ca2d1abef74f6df22ced34983dc (diff)
downloadsssd-4be402505ba20b43361753f0e6e1589c9b029e81.tar.gz
sssd-4be402505ba20b43361753f0e6e1589c9b029e81.tar.bz2
sssd-4be402505ba20b43361753f0e6e1589c9b029e81.zip
Fixes for sudo_timed
https://fedorahosted.org/sssd/ticket/1116
-rw-r--r--src/db/sysdb_sudo.c63
-rw-r--r--src/man/sssd.conf.5.xml13
2 files changed, 53 insertions, 23 deletions
diff --git a/src/db/sysdb_sudo.c b/src/db/sysdb_sudo.c
index cea4fcba..5f87a80c 100644
--- a/src/db/sysdb_sudo.c
+++ b/src/db/sysdb_sudo.c
@@ -43,20 +43,29 @@ static errno_t sysdb_sudo_check_time(struct sysdb_attrs *rule,
TALLOC_CTX *tmp_ctx = NULL;
const char **values = NULL;
char *tret = NULL;
+ time_t notBefore = 0;
+ time_t notAfter = 0;
time_t converted;
struct tm tm;
errno_t ret;
int i;
+ if (!result) return EINVAL;
+ *result = false;
+
tmp_ctx = talloc_new(NULL);
NULL_CHECK(tmp_ctx, ret, done);
/*
* From man sudoers.ldap:
*
- * A timestamp is in the form yyyymmddHHMMZ.
+ * A timestamp is in the form yyyymmddHHMMSSZ.
* If multiple sudoNotBefore entries are present, the *earliest* is used.
* If multiple sudoNotAfter entries are present, the *last one* is used.
+ *
+ * From sudo sources, ldap.c:
+ * If either the sudoNotAfter or sudoNotBefore attributes are missing,
+ * no time restriction shall be imposed.
*/
/* check for sudoNotBefore */
@@ -64,19 +73,27 @@ static errno_t sysdb_sudo_check_time(struct sysdb_attrs *rule,
tmp_ctx, &values);
if (ret != EOK) {
goto done;
+ } else if (ret == ENOENT) {
+ DEBUG(SSSDBG_TRACE_LIBS,
+ ("notBefore attribute is missing, the rule is valid\n"));
+ *result = true;
+ ret = EOK;
}
- if (values != NULL && values[0] != NULL) {
- tret = strptime(values[0], SYSDB_SUDO_TIME_FORMAT, &tm);
+
+ for (i=0; values[i] ; i++) {
+ tret = strptime(values[i], SYSDB_SUDO_TIME_FORMAT, &tm);
if (tret == NULL || *tret != '\0') {
- DEBUG(SSSDBG_FUNC_DATA, ("Invalid time format!\n"));
+ DEBUG(SSSDBG_MINOR_FAILURE, ("Invalid time format!\n"));
ret = EINVAL;
goto done;
}
converted = mktime(&tm);
- if (now < converted) {
- *result = false;
- goto done;
+ /* Grab the earliest */
+ if (!notBefore) {
+ notBefore = converted;
+ } else if (notBefore > converted) {
+ notBefore = converted;
}
}
@@ -85,36 +102,36 @@ static errno_t sysdb_sudo_check_time(struct sysdb_attrs *rule,
tmp_ctx, &values);
if (ret != EOK) {
goto done;
+ } else if (ret == ENOENT) {
+ DEBUG(SSSDBG_TRACE_LIBS,
+ ("notAfter attribute is missing, the rule is valid\n"));
+ *result = true;
+ ret = EOK;
}
- if (values != NULL && values[0] != NULL) {
- /* find last value */
- for (i = 0; values[i] != NULL; i++) {
- // do nothing
- }
- tret = strptime(values[i - 1], SYSDB_SUDO_TIME_FORMAT, &tm);
+ for (i=0; values[i] ; i++) {
+ tret = strptime(values[i], SYSDB_SUDO_TIME_FORMAT, &tm);
if (tret == NULL || *tret != '\0') {
- DEBUG(SSSDBG_FUNC_DATA, ("Invalid time format!\n"));
+ DEBUG(SSSDBG_MINOR_FAILURE, ("Invalid time format!\n"));
ret = EINVAL;
goto done;
}
converted = mktime(&tm);
- if (now > converted) {
- *result = false;
- goto done;
+ /* Grab the latest */
+ if (!notAfter) {
+ notAfter = converted;
+ } else if (notAfter < converted) {
+ notAfter = converted;
}
}
- *result = true;
- ret = EOK;
-
-done:
- if (ret == ENOENT) {
+ if (now >= notBefore && now <= notAfter) {
*result = true;
- ret = EOK;
}
+ ret = EOK;
+done:
talloc_free(tmp_ctx);
return ret;
}
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index e8e8b334..7916e1f8 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -629,6 +629,19 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>sudo_timed (bool)</term>
+ <listitem>
+ <para>
+ Whether or not to evaluate the sudoNotBefore
+ and sudoNotAfter attributes that implement
+ time-dependent sudoers entries.
+ </para>
+ <para>
+ Default: false
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect2>