puppet 0.13.6 → 0.16.0

data/test/server/authconfig.rb

@@ -0,0 +1,56 @@
+if __FILE__ == $0
+    $:.unshift '../../lib'
+    $:.unshift '..'
+    $puppetbase = "../.."
+end
+
+require 'puppet'
+require 'puppet/server/authconfig'
+require 'test/unit'
+require 'puppettest.rb'
+
+class TestAuthConfig < Test::Unit::TestCase
+	include TestPuppet
+
+    def test_parsingconfigfile
+        file = tempfile()
+        assert(Puppet[:authconfig], "No config path")
+
+        Puppet[:authconfig] = file
+
+        File.open(file, "w") { |f|
+            f.puts "[pelementserver.describe]
+    allow *.madstop.com
+    deny 10.10.1.1
+
+[fileserver]
+    allow *.madstop.com
+    deny 10.10.1.1
+
+[fileserver.list]
+    allow 10.10.1.1
+"
+        }
+
+        config = nil
+        assert_nothing_raised {
+            config = Puppet::Server::AuthConfig.new(file)
+        }
+
+        assert_nothing_raised {
+            assert(config.allowed?("pelementserver.describe",
+                "culain.madstop.com", "1.1.1.1"), "Did not allow host")
+            assert(! config.allowed?("pelementserver.describe",
+                "culain.madstop.com", "10.10.1.1"), "Allowed host")
+            assert(config.allowed?("fileserver.yay",
+                "culain.madstop.com", "10.1.1.1"), "Did not allow host to fs")
+            assert(! config.allowed?("fileserver.yay",
+                "culain.madstop.com", "10.10.1.1"), "Allowed host to fs")
+            assert(config.allowed?("fileserver.list",
+                "culain.madstop.com", "10.10.1.1"), "Did not allow host to fs.list")
+        }
+    end
+end
+
+# $Id: authconfig.rb 1129 2006-04-21 19:14:59Z luke $
+

data/test/server/bucket.rb

@@ -14,25 +14,36 @@ require 'base64'
 
 class TestBucket < Test::Unit::TestCase
 	include ServerTest
+
+    def out
+        if defined? @num
+            @num += 1
+        else
+            @num = 1
+        end
+
+        Puppet.err "#{Process.pid}: %s: %s" % [@num, memory()]
+        GC.start
+    end
     # run through all of the files and exercise the filebucket methods
     def checkfiles(client)
         files = filelist()
+        #files = %w{/usr/local/bin/vim /etc/motd /etc/motd /etc/motd /etc/motd}
+        #files = %w{/usr/local/bin/vim}
 
         # iterate across all of the files
         files.each { |file|
-            spin
+            Puppet.warning file
+            out
             tempdir = tempfile()
             Dir.mkdir(tempdir)
             name = File.basename(file)
             tmppath = File.join(tempdir,name)
             @@tmpfiles << tmppath
 
+            out
             # copy the files to our tmp directory so we can modify them...
-            File.open(tmppath,File::WRONLY|File::TRUNC|File::CREAT) { |wf|
-                File.open(file) { |rf|
-                    wf.print(rf.read)
-                }
-            }
+            FileUtils.cp(file, tmppath)
 
             # make sure the copy worked
             assert(FileTest.exists?(tmppath))
@@ -41,14 +52,15 @@ class TestBucket < Test::Unit::TestCase
             osum = nil
             tsum = nil
             nsum = nil
-            spin
+            out
             assert_nothing_raised {
                 osum = client.backup(file)
             }
-            spin
+            out
             assert_nothing_raised {
                 tsum = client.backup(tmppath)
             }
+            out
 
             # verify you got the same sum back for both
             assert(tsum == osum)
@@ -57,30 +69,32 @@ class TestBucket < Test::Unit::TestCase
             File.open(tmppath,File::WRONLY|File::TRUNC) { |wf|
                 wf.print "This is some test text\n"
             }
+            out
 
             # back it up
-            spin
             assert_nothing_raised {
                 #STDERR.puts("backing up %s" % tmppath) if $debug
                 nsum = client.backup(tmppath)
             }
+            out
 
             # and verify the sum changed
             assert(tsum != nsum)
 
             # restore the orig
-            spin
             assert_nothing_raised {
                 nsum = client.restore(tmppath,tsum)
             }
+            out
 
             # and verify it actually got restored
-            spin
             contents = File.open(tmppath) { |rf|
                 #STDERR.puts("reading %s" % tmppath) if $debug
                 rf.read
             }
+            out
             csum = Digest::MD5.hexdigest(contents)
+            out
             assert(tsum == csum)
         }
     end
@@ -127,6 +141,11 @@ class TestBucket < Test::Unit::TestCase
         @@tmpfiles << @bucket
     end
 
+    #def teardown
+    #    system("lsof -p %s" % Process.pid)
+    #    super
+    #end
+
     # test operating against the local filebucket object
     # this calls the direct server methods, which are different than the
     # Dipper methods
@@ -141,7 +160,6 @@ class TestBucket < Test::Unit::TestCase
 
         # iterate across them...
         files.each { |file|
-            spin
             contents = File.open(file) { |of| of.read }
 
             md5 = nil
@@ -170,10 +188,6 @@ class TestBucket < Test::Unit::TestCase
     def test_localboth
         files = filelist()
 
-        tmpdir = File.join(tmpdir(),"tmpfiledir")
-        @@tmpfiles << tmpdir
-        FileUtils.mkdir_p(tmpdir)
-
         bucket = nil
         client = nil
         threads = []
@@ -190,8 +204,8 @@ class TestBucket < Test::Unit::TestCase
             )
         }
 
+        #4.times { checkfiles(client) }
         checkfiles(client)
-
     end
 
     # test that things work over the wire
@@ -224,4 +238,4 @@ class TestBucket < Test::Unit::TestCase
     end
 end
 
-# $Id: bucket.rb 873 2006-02-07 23:12:33Z luke $
+# $Id: bucket.rb 1129 2006-04-21 19:14:59Z luke $

data/test/server/fileserver.rb

@@ -72,19 +72,19 @@ class TestFileServer < Test::Unit::TestCase
             )
         }
 
-        assert_raise(Puppet::Server::FileServerError) {
+        assert_raise(Puppet::FileServerError) {
             server.mount("/tmp", "invalid+name")
         }
 
-        assert_raise(Puppet::Server::FileServerError) {
+        assert_raise(Puppet::FileServerError) {
             server.mount("/tmp", "invalid-name")
         }
 
-        assert_raise(Puppet::Server::FileServerError) {
+        assert_raise(Puppet::FileServerError) {
             server.mount("/tmp", "invalid name")
         }
 
-        assert_raise(Puppet::Server::FileServerError) {
+        assert_raise(Puppet::FileServerError) {
             server.mount("/tmp", "")
         }
     end
@@ -113,13 +113,13 @@ class TestFileServer < Test::Unit::TestCase
         # and verify different iterations of 'root' return the same value
         list = nil
         assert_nothing_raised {
-            list = server.list("/test/", true, false)
+            list = server.list("/test/", :ignore, true, false)
         }
 
         assert(list =~ pattern)
 
         assert_nothing_raised {
-            list = server.list("/test", true, false)
+            list = server.list("/test", :ignore, true, false)
         }
         assert(list =~ pattern)
 
@@ -147,7 +147,7 @@ class TestFileServer < Test::Unit::TestCase
         list = nil
         sfile = "/test/tmpfile"
         assert_nothing_raised {
-            list = server.list(sfile, true, false)
+            list = server.list(sfile, :ignore, true, false)
         }
 
         assert_nothing_raised {
@@ -204,7 +204,7 @@ class TestFileServer < Test::Unit::TestCase
         list = nil
         sfile = "/test/"
         assert_nothing_raised {
-            list = server.list(sfile, true, false)
+            list = server.list(sfile, :ignore, true, false)
         }
 
         # create the new file
@@ -214,7 +214,7 @@ class TestFileServer < Test::Unit::TestCase
 
         newlist = nil
         assert_nothing_raised {
-            newlist = server.list(sfile, true, false)
+            newlist = server.list(sfile, :ignore, true, false)
         }
 
         # verify the list has changed
@@ -243,12 +243,12 @@ class TestFileServer < Test::Unit::TestCase
 
         list = nil
         assert_nothing_raised {
-            list = server.list("/root/" + testdir, true, false)
+            list = server.list("/root/" + testdir, :ignore, true, false)
         }
 
         assert(list =~ pattern)
         assert_nothing_raised {
-            list = server.list("/root" + testdir, true, false)
+            list = server.list("/root" + testdir, :ignore, true, false)
         }
 
         assert(list =~ pattern)
@@ -283,7 +283,7 @@ class TestFileServer < Test::Unit::TestCase
         # get our list
         list = nil
         assert_nothing_raised {
-            list = server.list("/test/with", false, false)
+            list = server.list("/test/with", :ignore, false, false)
         }
 
         # make sure we only got one line, since we're not recursing
@@ -292,7 +292,7 @@ class TestFileServer < Test::Unit::TestCase
         # for each level of recursion, make sure we get the right list
         [0, 1, 2].each { |num|
             assert_nothing_raised {
-                list = server.list("/test/with", num, false)
+                list = server.list("/test/with", :ignore, num, false)
             }
 
             count = 0
@@ -336,13 +336,13 @@ class TestFileServer < Test::Unit::TestCase
         list = nil
         # and then check a few dirs
         assert_nothing_raised {
-            list = server.list("/localhost/with", false, false)
+            list = server.list("/localhost/with", :ignore, false, false)
         }
 
         assert(list !~ /with/)
 
         assert_nothing_raised {
-            list = server.list("/localhost/with/some/sub", true, false)
+            list = server.list("/localhost/with/some/sub", :ignore, true, false)
         }
 
         assert(list !~ /sub/)
@@ -374,7 +374,7 @@ class TestFileServer < Test::Unit::TestCase
 
         list = nil
         assert_nothing_raised {
-            list = server.list("/localhost/", 1, false)
+            list = server.list("/localhost/", :ignore, 1, false)
         }
         assert_instance_of(String, list, "Server returned %s instead of string")
         list = list.split("\n")
@@ -406,7 +406,7 @@ class TestFileServer < Test::Unit::TestCase
         list = nil
         sfile = "/test/"
         assert_nothing_raised {
-            list = server.list(sfile, true, false)
+            list = server.list(sfile, :ignore, true, false)
         }
 
         # and describe each file in the list
@@ -433,7 +433,7 @@ class TestFileServer < Test::Unit::TestCase
 
         # Now try to describe some sources that don't even exist
         retval = nil
-        assert_raise(Puppet::Server::FileServerError,
+        assert_raise(Puppet::FileServerError,
             "Describing non-existent mount did not raise an error") {
             retval = server.describe("/notmounted/" + "noexisties")
         }
@@ -495,7 +495,7 @@ class TestFileServer < Test::Unit::TestCase
         mounts.each { |mount, files|
             mount = "/#{mount}/"
             assert_nothing_raised {
-                list = server.list(mount, true, false)
+                list = server.list(mount, :ignore, true, false)
             }
 
             assert_nothing_raised {
@@ -547,12 +547,12 @@ class TestFileServer < Test::Unit::TestCase
                         assert_raise(Puppet::Server::AuthorizationError,
                             "Host %s, ip %s, allowed %s" %
                             [host, ip, mount]) {
-                                list = server.list(mount, true, false, host, ip)
+                                list = server.list(mount, :ignore, true, false, host, ip)
                         }
                     when :allow:
                         assert_nothing_raised("Host %s, ip %s, denied %s" %
                             [host, ip, mount]) {
-                                list = server.list(mount, true, false, host, ip)
+                                list = server.list(mount, :ignore, true, false, host, ip)
                         }
                     end
                 }
@@ -603,9 +603,9 @@ class TestFileServer < Test::Unit::TestCase
                 )
             }
 
-            assert_raise(Puppet::Server::FileServerError,
+            assert_raise(Puppet::FileServerError,
                 "Invalid mount was mounted") {
-                    server.list(mount)
+                    server.list(mount, :ignore)
             }
         }
 
@@ -617,7 +617,7 @@ class TestFileServer < Test::Unit::TestCase
 
             # create a server with the file
             server = nil
-            assert_raise(Puppet::Server::FileServerError,
+            assert_raise(Puppet::FileServerError,
                 "Invalid config %s did not raise error" % i) {
                 server = Puppet::Server::FileServer.new(
                     :Local => true,
@@ -658,13 +658,13 @@ class TestFileServer < Test::Unit::TestCase
 
         list = nil
         assert_nothing_raised {
-            list = server.list("/thing/", false, false,
+            list = server.list("/thing/", :ignore, false, false,
                 "test1.domain.com", "127.0.0.1")
         }
         assert(list != "", "List returned nothing in rereard test")
 
         assert_raise(Puppet::Server::AuthorizationError, "List allowed invalid host") {
-            list = server.list("/thing/", false, false,
+            list = server.list("/thing/", :ignore, false, false,
                 "test2.domain.com", "127.0.0.1")
         }
 
@@ -679,12 +679,12 @@ class TestFileServer < Test::Unit::TestCase
         }
         
         assert_raise(Puppet::Server::AuthorizationError, "List allowed invalid host") {
-            list = server.list("/thing/", false, false,
+            list = server.list("/thing/", :ignore, false, false,
                 "test1.domain.com", "127.0.0.1")
         }
 
         assert_nothing_raised {
-            list = server.list("/thing/", false, false,
+            list = server.list("/thing/", :ignore, false, false,
                 "test2.domain.com", "127.0.0.1")
         }
 
@@ -702,9 +702,54 @@ class TestFileServer < Test::Unit::TestCase
             mount = Puppet::Server::FileServer::Mount.new(name, path)
         }
 
-        assert_equal(name + ":" + path, mount.to_s)
+        assert_equal("mount[#{name}]", mount.to_s)
+    end
+
+    def test_servinglinks
+        server = nil
+        source = tempfile()
+        file = File.join(source, "file")
+        link = File.join(source, "link")
+        Dir.mkdir(source)
+        File.open(file, "w") { |f| f.puts "yay" }
+        File.symlink(file, link)
+        assert_nothing_raised {
+            server = Puppet::Server::FileServer.new(
+                :Local => true,
+                :Config => false
+            )
+        }
+
+        assert_nothing_raised {
+            server.mount(source, "mount")
+        }
+
+        # First describe the link when following
+        results = {}
+        assert_nothing_raised {
+            server.describe("/mount/link", :follow).split("\t").zip(
+                Puppet::Server::FileServer::CHECKPARAMS
+            ).each { |v,p| results[p] = v }
+        }
+
+        assert_equal("file", results[:type])
+
+        # Then not
+        results = {}
+        assert_nothing_raised {
+            server.describe("/mount/link", :ignore).split("\t").zip(
+                Puppet::Server::FileServer::CHECKPARAMS
+            ).each { |v,p| results[p] = v }
+        }
+
+        assert_equal("link", results[:type])
+
+        results.each { |p,v|
+            assert(v, "%s has no value" % p)
+            assert(v != "", "%s has no value" % p)
+        }
     end
 end
 
-# $Id: fileserver.rb 805 2006-01-12 01:58:19Z luke $
+# $Id: fileserver.rb 1016 2006-03-12 03:29:13Z luke $