4 files changed, 179 insertions, 0 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index 86d7dbfdc..ffd147cd1 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -326,6 +326,16 @@ module Puppet
         :smtpserver => ["none",
             "The server through which to send email reports."]
     )
+
+    self.setdefaults(:facts,
+        :factstore => ["yaml",
+            "The backend store to use for client facts."]
+    )
+
+    self.setdefaults(:yamlfacts,
+        :yamlfactdir => ["$vardir/facts",
+            "The directory in which client facts are stored when the yaml fact store is used."]
+    )
 end
 
 # $Id$
diff --git a/lib/puppet/fact_stores/yaml.rb b/lib/puppet/fact_stores/yaml.rb
new file mode 100644
index 000000000..b4b0c0e7c
--- /dev/null
+++ b/lib/puppet/fact_stores/yaml.rb
@@ -0,0 +1,42 @@
+Puppet::Util::FactStore.newstore(:yaml) do
+    desc "Store client facts as flat files, serialized using YAML."
+
+    # Get a client's facts.
+    def get(node)
+        file = path(node)
+
+        return nil unless FileTest.exists?(file)
+
+        begin
+            facts = YAML::load(File.read(file))
+        rescue => detail
+            Puppet.err "Could not load facts for %s: %s" % [node, detail]
+        end
+        facts
+    end
+
+    def initialize
+        Puppet.config.use(:yamlfacts)
+    end
+
+    # Store the facts to disk.
+    def set(node, facts)
+        File.open(path(node), "w", 0600) do |f|
+            begin
+                f.print YAML::dump(facts)
+            rescue => detail
+                Puppet.err "Could not write facts for %s: %s" % [node, detail]
+            end
+        end
+        nil
+    end
+
+    private
+
+    # Return the path to a given node's file.
+    def path(node)
+        File.join(Puppet[:yamlfactdir], node + ".yaml")
+    end
+end
+
+# $Id$
diff --git a/lib/puppet/network/handler/facts.rb b/lib/puppet/network/handler/facts.rb
new file mode 100755
index 000000000..46c94b91a
--- /dev/null
+++ b/lib/puppet/network/handler/facts.rb
@@ -0,0 +1,67 @@
+require 'yaml'
+require 'puppet/util/fact_store'
+
+class Puppet::Network::Handler
+    # Receive logs from remote hosts.
+    class Facts < Handler
+        @interface = XMLRPC::Service::Interface.new("facts") { |iface|
+            iface.add_method("void set(string, string)")
+            iface.add_method("string get(string)")
+            iface.add_method("integer store_date(string)")
+        }
+
+        def initialize(hash = {})
+            super
+
+            backend = Puppet[:factstore]
+
+            unless klass = Puppet::Util::FactStore.store(backend)
+                raise Puppet::Error, "Could not find fact store %s" % backend
+            end
+
+            @backend = klass.new
+        end
+
+        # Get the facts from our back end.
+        def get(node)
+            if facts = @backend.get(node)
+                return strip_internal(facts)
+            else
+                return nil
+            end
+        end
+
+        # Set the facts in the backend.
+        def set(node, facts)
+            @backend.set(node, add_internal(facts))
+            nil
+        end
+
+        # Retrieve a client's storage date.
+        def store_date(node)
+            if facts = get(node)
+                facts[:_puppet_timestamp].to_i
+            else
+                nil
+            end
+        end
+
+        private
+
+        # Add internal data to the facts for storage.
+        def add_internal(facts)
+            facts = facts.dup
+            facts[:_puppet_timestamp] = Time.now
+            facts
+        end
+
+        # Strip out that internal data.
+        def strip_internal(facts)
+            facts = facts.dup
+            facts.find_all { |name, value| name.to_s =~ /^_puppet_/ }.each { |name, value| facts.delete(name) }
+            facts
+        end
+    end
+end
+
+# $Id$
diff --git a/lib/puppet/util/fact_store.rb b/lib/puppet/util/fact_store.rb
new file mode 100644
index 000000000..f872ebb01
--- /dev/null
+++ b/lib/puppet/util/fact_store.rb
@@ -0,0 +1,60 @@
+# Created on 2007-05-02
+# Copyright Luke Kanies
+
+module Puppet::Util
+    # The abstract base class for client fact storage.
+    class FactStore
+        extend Puppet::Util
+        extend Puppet::Util::Docs
+        extend Puppet::Util::ClassGen
+
+        @loader = Puppet::Util::Autoload.new(self, "puppet/fact_stores")
+        @stores = {}
+
+        # Add a new report type.
+        def self.newstore(name, options = {}, &block)
+            klass = genclass(name,
+                :block => block,
+                :prefix => "FactStore",
+                :hash => @stores,
+                :attributes => options
+            )
+        end
+
+        # Remove a store; really only used for testing.
+        def self.rmstore(name)
+            rmclass(name, :hash => @stores)
+        end
+
+        # Load a store.
+        def self.store(name)
+            name = symbolize(name)
+            unless @stores.include? name
+                if @loader.load(name)
+                    unless @stores.include? name
+                        Puppet.warning(
+                            "Loaded report file for %s but report was not defined" %
+                            name
+                        )
+                        return nil
+                    end
+                else
+                    return nil
+                end
+            end
+            @stores[name]
+        end
+
+        # Retrieve the facts for a node.
+        def get(node)
+            raise Puppet::DevError, "%s has not overridden get" % self.class.name
+        end
+
+        # Set the facts for a node.
+        def set(node, facts)
+            raise Puppet::DevError, "%s has not overridden set" % self.class.name
+        end
+    end
+end
+
+# $Id$