URL:
https://github.com/SSSD/sssd/pull/33
Title: #33: SECRETS: Some small misc fixes + fixing #3168
jhrozek commented:
"""
On Fri, Sep 30, 2016 at 07:55:00AM -0700, fidencio wrote:
And here is the diff between the last series and the new one
that's arriving in a few ...
src/config/SSSDConfig/__init__.py.in | 1 +
src/config/etc/sssd.api.conf | 1 +
src/responder/secrets/local.c | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index 15b9cd1..74c2ca5 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -120,6 +120,7 @@ option_strings = {
# [secrets]
'provider': _('The provider where the secrets will be stored in'),
+ 'containers_nest_level': _('The maximum allowed number of nested
containers'),
# secrets - proxy
'proxy_url': _('The URL Custodia server is listening on'),
'auth_type': _('The method to use when authenticating to a Custodia
server'),
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index f94c8d1..a7757dc 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -97,6 +97,7 @@ user_attributes = str, None, false
[secrets]
# Secrets service
provider = str, None, false
+containers_nest_level = int, None, false
# Secrets service - proxy
proxy_url = str, None, false
auth_type = str, None, false
diff --git a/src/responder/secrets/local.c b/src/responder/secrets/local.c
index 06260f3..ec84537 100644
--- a/src/responder/secrets/local.c
+++ b/src/responder/secrets/local.c
@@ -334,7 +334,7 @@ done:
}
static int local_db_check_containers_nest_level(struct local_context *lctx,
- struct ldb_dn *leaf_dn)
+ struct ldb_dn *leaf_dn)
{
int nest_level;
Thank you, all the patches look good to me now, I did some basic manual
testing, I tested the particular case which gives me a 406 when I reach
the nesting limit:
curl -H "Content-Type: application/json" --unix-socket /var/run/secrets.socket
-XPOST
http://localhost/secrets/con1/con2/con3/con4/con5/
<html>
<head>
<title>406 Not Acceptable</title></head>
<body>
<h1>Not Acceptable</h1>
<p>The request cannot be accepted.</p>
CI also passed:
http://sssd-ci.duckdns.org/logs/job/54/50/summary.html
so ACK to all patches.
"""
See the full comment at
https://github.com/SSSD/sssd/pull/33#issuecomment-251105537