Merge branch 'master' into feature/removing-email-aliases

2 files changed, 56 insertions, 57 deletions

diff --git a/certs/app/models/cert.rb b/certs/app/models/cert.rb
deleted file mode 100644
index 9a6c98d..0000000
--- a/certs/app/models/cert.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-class Cert < CouchRest::Model::Base
-
-  use_database 'client_certificates'
-
-  timestamps!
-
-  property :random, Float, :accessible => false
-
-  before_validation :set_random, :attach_zip, :on => :create
-
-  validates :random, :presence => true,
-    :numericality => {:greater_than => 0, :less_than => 1}
-
-  validates :zip_attachment, :presence => true
-
-  design do
-    view :by_random
-  end
-
-  class << self
-    def sample
-      self.by_random.startkey(rand).first || self.by_random.first
-    end
-
-    def pick_from_pool
-      cert = self.sample || self.create!
-      cert.destroy
-      return cert
-    rescue RESOURCE_NOT_FOUND
-      retry if Cert.by_random.count > 0
-      raise RECORD_NOT_FOUND
-    end
-
-  end
-
-  def set_random
-    self.random = rand
-  end
-
-  def attach_zip
-    file = File.open(Rails.root.join("config", "cert"))
-    self.create_attachment :file => file, :name => zipname
-  end
-
-  def zipname
-    'cert.txt'
-  end
-
-  def zip_attachment
-    attachments[zipname]
-  end
-
-  def zipped
-    read_attachment(zipname)
-  end
-
-end
diff --git a/certs/app/models/leap_ca/cert.rb b/certs/app/models/leap_ca/cert.rb
new file mode 100644
index 0000000..9d4f15e
--- /dev/null
+++ b/certs/app/models/leap_ca/cert.rb
@@ -0,0 +1,56 @@
+#
+# Model for certificates stored in CouchDB.
+#
+# This file must be loaded after Config has been loaded.
+#
+
+module LeapCA
+  class Cert < CouchRest::Model::Base
+
+# No config yet.    use_database LeapCA::Config.db_name
+    use_database 'client_certificates'
+
+    timestamps!
+
+    property :key, String                          # the client private RSA key
+    property :cert, String                         # the client x509 certificate, signed by the CA
+    property :valid_until, Time                    # expiration time of the client certificate
+    property :random, Float, :accessible => false  # used to help pick a random cert by the webapp
+
+    before_validation :set_random, :on => :create
+
+    validates :key, :presence => true
+    validates :cert, :presence => true
+    validates :random, :presence => true
+    validates :random, :numericality => {:greater_than => 0, :less_than => 1}
+
+    design do
+      view :by_random
+    end
+
+    def set_random
+      self.random = rand
+    end
+
+    class << self
+      def sample
+        self.by_random.startkey(rand).first || self.by_random.first
+      end
+
+      def pick_from_pool
+        cert = self.sample
+        raise RECORD_NOT_FOUND unless cert
+        cert.destroy
+        return cert
+      rescue RESOURCE_NOT_FOUND
+        retry if self.by_random.count > 0
+        raise RECORD_NOT_FOUND
+      end
+
+      def valid_attributes_hash
+        {:key => "ABCD", :cert => "A123"}
+      end
+    end
+
+  end
+end