Attachment 921040 Details for Bug 1123477 – patch to correct the flaw

[patch] patch to correct the flaw

0001-nscpentrywsi-only-as-root.patch (text/plain), 3.72 KB, created by Vincent Danen on 2014-07-25 19:23:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Danen

Created: 2014-07-25 19:23:51 UTC

Size: 3.72 KB

patch

obsolete

>>From 056ca5c42759d7ff3e47be1905c65ce5fc7f93d1 Mon Sep 17 00:00:00 2001
>From: Ludwig Krispenz <lkrispen@redhat.com>
>Date: Fri, 25 Jul 2014 18:15:30 +0200
>Subject: [PATCH] nscpentrywsi only as root
>
>---
> ldap/servers/slapd/computed.c     | 17 +++++++++++++++--
> ldap/servers/slapd/entrywsi.c     |  2 +-
> ldap/servers/slapd/slapi-plugin.h |  1 +
> 3 files changed, 17 insertions(+), 3 deletions(-)
>
>diff --git a/ldap/servers/slapd/computed.c b/ldap/servers/slapd/computed.c
>index 7c99b45..22a4eec 100644
>--- a/ldap/servers/slapd/computed.c
>+++ b/ldap/servers/slapd/computed.c
>@@ -58,6 +58,7 @@ struct _computed_attr_context {
> 
> struct _compute_evaluator {
> 	struct _compute_evaluator *next;
>+	int rootonly;
> 	slapi_compute_callback_t function;
> };
> typedef struct _compute_evaluator compute_evaluator;
>@@ -95,6 +96,13 @@ int compute_call_evaluators_nolock(computed_attr_context *c,slapi_compute_output
>         compute_evaluator *current = NULL;
>         
>         for (current = compute_evaluators; (current != NULL) && (-1 == rc); current = current->next) {
>+		if (current->rootonly) {
>+			int isroot;
>+			slapi_pblock_get(c->pb, SLAPI_REQUESTOR_ISROOT, &isroot);
>+			if (!isroot) {
>+				continue;
>+			}
>+		}
>                 rc = (*(current->function))(c,type,e,outfn);
>         }
>         return rc;
>@@ -157,14 +165,19 @@ compute_stock_evaluator(computed_attr_context *c,char* type,Slapi_Entry *e,slapi
> }
> 
> static void
>-compute_add_evaluator_nolock(slapi_compute_callback_t function, compute_evaluator *new_eval)
>+compute_add_evaluator_nolock(slapi_compute_callback_t function, compute_evaluator *new_eval, int rootonly)
> {
>     new_eval->next = compute_evaluators;
>     new_eval->function = function;
>+    new_eval->rootonly = rootonly;
>     compute_evaluators = new_eval;
> }
> int slapi_compute_add_evaluator(slapi_compute_callback_t function)
> {
>+	return slapi_compute_add_evaluator_ext(function, 0);
>+}
>+int slapi_compute_add_evaluator_ext(slapi_compute_callback_t function, int rootonly)
>+{
> 	int rc = 0;
> 	compute_evaluator *new_eval = NULL;
> 	PR_ASSERT(NULL != function);
>@@ -187,7 +200,7 @@ int slapi_compute_add_evaluator(slapi_compute_callback_t function)
>                     slapi_rwlock_wrlock(compute_evaluators_lock);
>                 }
>                 
>-                compute_add_evaluator_nolock(function, new_eval);
>+                compute_add_evaluator_nolock(function, new_eval, rootonly);
>                 
>                 if (need_lock) {
>                     slapi_rwlock_unlock(compute_evaluators_lock);
>diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
>index 23bb797..7039bfc 100644
>--- a/ldap/servers/slapd/entrywsi.c
>+++ b/ldap/servers/slapd/entrywsi.c
>@@ -1086,7 +1086,7 @@ entry_compute_nscpentrywsi(computed_attr_context *c,char* type,Slapi_Entry *e,sl
> int 
> entry_computed_attr_init()
> {
>-	slapi_compute_add_evaluator(entry_compute_nscpentrywsi);
>+	slapi_compute_add_evaluator_ext(entry_compute_nscpentrywsi, 1 /* root only */);
> 	return 0;
> }
> 
>diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
>index b803f91..f318bb6 100644
>--- a/ldap/servers/slapd/slapi-plugin.h
>+++ b/ldap/servers/slapd/slapi-plugin.h
>@@ -6344,6 +6344,7 @@ typedef int (*slapi_compute_output_t)(computed_attr_context *c,Slapi_Attr *a , S
> typedef int (*slapi_compute_callback_t)(computed_attr_context *c,char* type,Slapi_Entry *e,slapi_compute_output_t outputfn);
> typedef int (*slapi_search_rewrite_callback_t)(Slapi_PBlock *pb);
> int slapi_compute_add_evaluator(slapi_compute_callback_t function);
>+int slapi_compute_add_evaluator_ext(slapi_compute_callback_t function, int rootonly);
> int slapi_compute_add_search_rewriter(slapi_search_rewrite_callback_t function);
> int	compute_rewrite_search_filter(Slapi_PBlock *pb);
> 
>-- 
>1.7.11.7
>

Flags:

rmeggins: review+

Actions: View | Diff

Attachments on bug 1123477: 921040 | 921712 | 921835