Merge pull request redhat-openstack#275 from mhaskel/validate_order

Add validation for order parameter

manifests/fragment.pp

@@ -42,6 +42,8 @@
   }
   if !(is_string($order) or is_integer($order)) {
     fail('$order is not a string or integer.')
+  } elsif $order =~ /[:\n\/]/ {
+    fail("Order cannot contain '/', ':', or '\n'.")
   }
   if $mode {
     warning('The $mode parameter to concat::fragment is deprecated and has no effect')

spec/unit/defines/concat_fragment_spec.rb

@@ -163,6 +163,34 @@
         expect { should }.to raise_error(Puppet::Error, /is not a string or integer/)
       end
     end
+
+    context '123:456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => '123:456', :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { should }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
+    context '123/456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => '123/456', :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { should }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
+    context '123\n456' do
+      let(:title) { 'motd_header' }
+      let(:facts) {{ :concat_basedir => '/tmp', :is_pe => false }}
+      let(:params) {{ :order => "123\n456", :target => '/etc/motd' }}
+
+      it 'should fail' do
+        expect { should }.to raise_error(Puppet::Error, /cannot contain/)
+      end
+    end
   end # order =>
 
   context 'more than one content source' do