Allow untrusted mrconfig files to set parameters to true/false

* Allow untrusted mrconfig files to set parameters to true/false.
  So skip=true or deleted=true canbe used in an untrusted mrconfig file.
* Also allow order=N in an untrusted mrconfig file.

diff --git a/debian/changelog b/debian/changelog
index 68a67c227022fa5e823afa09ced262cbec869840..766b8da3223401c218e82034f1aeb02c1c8d3b56 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ mr (1.05) UNRELEASED; urgency=low
   * README now gives a quick into to using mr.
   * Brought back the "deleted" parameter, which provides an easy way to
     mark repositories that should be removed.
   * README now gives a quick into to using mr.
   * Brought back the "deleted" parameter, which provides an easy way to
     mark repositories that should be removed.

+  * Allow untrusted mrconfig files to set parameters to true/false.
+    So skip=true or deleted=true canbe used in an untrusted mrconfig file.
+  * Also allow order=N in an untrusted mrconfig file.

 
  -- Joey Hess <joeyh@debian.org>  Fri, 05 Aug 2011 13:29:21 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 05 Aug 2011 13:29:21 -0400
 

diff --git a/mr b/mr
index bd6c2d73d90656a332ec9f12acd6d1d47a1fd036..d5424caa2eed10a3ff23d1fe81d58bf5060b7b25 100755 (executable)
--- a/mr
+++ b/mr
@@ -1184,13 +1184,23 @@ sub loadconfig {
                        }
 
                        if (! $trusted) {
                        }
 
                        if (! $trusted) {

-                               # Untrusted files can only contain checkout
-                               # parameters.
-                               if ($parameter ne 'checkout') {
-                                       trusterror("mr: illegal setting \"$parameter=$value\"", $f, $line, $bootstrap_url);
+                               # Untrusted files can only contain a few
+                               # settings in specific known-safe formats.
+                               if ($parameter eq 'checkout') {
+                                       if (! is_trusted_checkout($value)) {
+                                               trusterror("mr: illegal checkout command \"$value\"", $f, $line, $bootstrap_url);
+                                       }
+                               }
+                               elsif ($parameter eq 'order') {
+                                       # not interpreted as a command, so
+                                       # safe.

                                }
                                }

-                               if (! is_trusted_checkout($value)) {
-                                       trusterror("mr: illegal checkout command \"$value\"", $f, $line, $bootstrap_url);
+                               elsif ($value eq 'true' || $value eq 'false') {
+                                       # skip=true , deleted=true etc are
+                                       # safe.
+                               }
+                               else {
+                                       trusterror("mr: illegal setting \"$parameter=$value\"", $f, $line, $bootstrap_url);

                                }
                        }
 
                                }
                        }