From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 15 May 2016 14:02:35 +0000 (-0400)
Subject: Shared secret policy should be stealth
X-Git-Tag: 7.0.1-4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed2ffd2c183c2c7e187b49ce93b84e4100982720;p=imagemagick

Shared secret policy should be stealth
---

diff --git a/MagickCore/option.c b/MagickCore/option.c
index d48d78607..d665966db 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1541,6 +1541,7 @@ static const OptionInfo
   PolicyDomainOptions[] =
   {
     { "Undefined", UndefinedPolicyDomain, UndefinedOptionFlag, MagickTrue },
+    { "Cache", CachePolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Coder", CoderPolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Delegate", DelegatePolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Filter", FilterPolicyDomain, UndefinedOptionFlag, MagickFalse },
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index e01f09da5..f2ced8b93 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -669,7 +669,8 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file,
     domain=CommandOptionToMnemonic(MagickPolicyDomainOptions,
       policy_info[i]->domain);
     (void) FormatLocaleFile(file,"  Policy: %s\n",domain);
-    if ((policy_info[i]->domain == ResourcePolicyDomain) ||
+    if ((policy_info[i]->domain == CachePolicyDomain) ||
+        (policy_info[i]->domain == ResourcePolicyDomain) ||
         (policy_info[i]->domain == SystemPolicyDomain))
       {
         if (policy_info[i]->name != (char *) NULL)
@@ -823,8 +824,8 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
                   file_xml=FileToXML(path,~0UL);
                   if (file_xml != (char *) NULL)
                     {
-                      status&=LoadPolicyCache(policy_cache,file_xml,path,depth+1,
-                        exception);
+                      status&=LoadPolicyCache(policy_cache,file_xml,path,
+                        depth+1,exception);
                       file_xml=DestroyString(file_xml);
                     }
                 }
diff --git a/MagickCore/policy.h b/MagickCore/policy.h
index 3ded005f2..5a216046a 100644
--- a/MagickCore/policy.h
+++ b/MagickCore/policy.h
@@ -33,7 +33,8 @@ typedef enum
   FilterPolicyDomain,
   PathPolicyDomain,
   ResourcePolicyDomain,
-  SystemPolicyDomain
+  SystemPolicyDomain,
+  CachePolicyDomain
 } PolicyDomain;
 
 typedef enum
diff --git a/config/policy.xml b/config/policy.xml
index 27c05d35e..5ec314c46 100644
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -64,5 +64,5 @@
   <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
-  <policy domain="cache" name="shared-secret" value="passphrase"/>
+  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
 </policymap>